ports/79564: [PATCH] java/NetRexx: unbreak and update to 2.05

Sam Lawrance boris at brooknet.com.au
Tue Apr 5 14:40:04 UTC 2005


>Number:         79564
>Category:       ports
>Synopsis:       [PATCH] java/NetRexx: unbreak and update to 2.05
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 05 14:40:03 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Sam Lawrance
>Release:        FreeBSD 5.4-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD dirk.no.domain 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #11: Sun Mar  6 12:44:50 EST
>Description:
- Update to 2.05
- REMOVE files/patch-bin::NetRexxC.cmd
- ADD files/patch-bin::NetRexxC.sh
- Since NetRexxC.cmd and NetRexxC.sh do same thing, only install .sh
  version and remove dependency on rexx-imc.
- Overridable JAVA_HOME in NetRexxC.sh, courtesy of hq@

>How-To-Repeat:
>Fix:

--- NetRexx-2.05.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/java/netrexx/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile	26 Mar 2005 20:09:30 -0000	1.18
+++ Makefile	5 Apr 2005 14:25:56 -0000
@@ -6,22 +6,20 @@
 #
 
 PORTNAME=	NetRexx
-PORTVERSION=	2.02
-PORTREVISION=	3
+PORTVERSION=	2.05
 CATEGORIES=	java lang
-MASTER_SITES=	http://www2.hursley.ibm.com/netrexx/
+MASTER_SITES=	http://www-306.ibm.com/software/awdtools/netrexx/
 DISTNAME=	NetRexx
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Human-oriented programming language for writing/using Java classes
 
-RUN_DEPENDS=	${LOCALBASE}/bin/rexx:${PORTSDIR}/lang/rexx-imc
-
-BROKEN=		Unfetchable
-
 NO_BUILD=	yes
 USE_ZIP=	yes
 USE_JAVA=	yes
+USE_REINPLACE=	yes
+
+.include <bsd.port.pre.mk>
 
 pre-patch:
 	for file in ${WRKSRC}/bin/NetRexxC.sh ${WRKSRC}/read.me.first; do \
@@ -29,16 +27,17 @@
 	    ${MV} $${file}.new $${file}; \
 	done
 
+post-patch:
+	${REINPLACE_CMD} -e 's,%%JAVA_HOME%%,${JAVA_HOME},' \
+	                 -e 's,%%JAVAJARDIR%%,${JAVAJARDIR},' \
+	                 ${WRKSRC}/bin/NetRexxC.sh
+
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/NetRexxC.sh ${PREFIX}/bin
 	@${LN} -sf ${PREFIX}/bin/NetRexxC.sh ${PREFIX}/bin/nrc
-	@${INSTALL_SCRIPT} ${WRKSRC}/bin/NetRexxC.cmd \
-		${PREFIX}/bin/NetRexxC.rexx
-	@${LN} -sf ${PREFIX}/bin/NetRexxC.rexx ${PREFIX}/bin/nrc.rexx
-
-	@${MKDIR} ${PREFIX}/share/java/classes
-	@${INSTALL_DATA} ${WRKSRC}/lib/NetRexxC.jar ${PREFIX}/share/java/classes
-	@${INSTALL_DATA} ${WRKSRC}/runlib/NetRexxR.jar ${PREFIX}/share/java/classes
+
+	@${INSTALL_DATA} ${WRKSRC}/lib/NetRexxC.jar ${JAVAJARDIR}
+	@${INSTALL_DATA} ${WRKSRC}/runlib/NetRexxR.jar ${JAVAJARDIR}
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
@@ -58,4 +57,4 @@
 	@${ECHO} "====================  IMPORTANT!!  ===================="
 	@${CAT} ${WRKSRC}/read.me.first
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/java/netrexx/pkg-descr,v
retrieving revision 1.2
diff -u -r1.2 pkg-descr
--- pkg-descr	16 Nov 2001 06:14:31 -0000	1.2
+++ pkg-descr	5 Apr 2005 14:08:21 -0000
@@ -11,7 +11,7 @@
 For formal details of the language, please see the NetRexx documentation
 at
 
-WWW: http://www2.hursley.ibm.com/
+WWW: http://www-306.ibm.com/software/awdtools/netrexx/
 
 Mike Cowlishaw <mfc at uk.ibm.com>
 ___________________
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/java/netrexx/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist	23 Feb 2004 23:03:14 -0000	1.5
+++ pkg-plist	5 Apr 2005 14:14:33 -0000
@@ -1,7 +1,5 @@
 bin/NetRexxC.sh
 bin/nrc
-bin/NetRexxC.rexx
-bin/nrc.rexx
 %%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/RexxWords.class
 %%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/BadColumnException.class
 %%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/BadNumericException.class
@@ -134,8 +132,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/wordclock.html
 %%PORTDOCS%%%%DOCSDIR%%/ArchText.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/hello.nrx
-share/java/classes/NetRexxC.jar
-share/java/classes/NetRexxR.jar
+%%JAVAJARDIR%%/NetRexxC.jar
+%%JAVAJARDIR%%/NetRexxR.jar
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/netrexx/lang
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/netrexx
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
--- NetRexx-2.05.patch ends here ---

--- /dev/null	Wed Apr  6 00:22:01 2005
+++ files/patch-bin::NetRexxC.sh	Tue Apr  5 23:57:56 2005
@@ -0,0 +1,24 @@
+--- bin/NetRexxC.sh.orig	Sun Aug 20 12:47:22 2000
++++ bin/NetRexxC.sh	Tue Apr  5 23:52:45 2005
+@@ -29,6 +29,8 @@
+ # -----------------------------------------------------------------
+ #  2000.08.20 -- initial version derived from NetRexxC.bat
+ 
++JAVA_HOME="${JAVA_HOME:-"%%JAVA_HOME%%"}"
++
+ if test $# -eq 0; then
+   echo 'Usage:' $0 '[-run] [other options] filename'
+   echo ' '
+@@ -40,10 +42,10 @@
+   netrexx_run=yes
+ fi
+ 
+-java -ms4M $NETREXX_JAVA COM.ibm.netrexx.process.NetRexxC $*
++"${JAVA_HOME}/bin/java" -ms4M $NETREXX_JAVA -cp "${JAVA_HOME}/lib/tools.jar":"%%JAVAJARDIR%%/NetRexxC.jar" COM.ibm.netrexx.process.NetRexxC $*
+ if test $? -eq 0; then
+   if test "$netrexx_run" = "yes"; then
+     echo "Running $1..."
+-    java $1
++    "${JAVA_HOME}/bin/java" $1
+   fi
+ fi
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list