- Update to 2.05 [1]

- Since NetRexxC.cmd and NetRexxC.sh do same thing, only install .sh version
  and remove dependency on rexx-imc (and remove the patch for NetRexxC.cmd) [1]
- Add a patch for NetRexxC.sh so the user is able to override JAVA_HOME at
  runtime [1]
- Use FIND | {MKDIR,INSTALL_DATA} to install documentation
- Add $FreeBSD$ tag in pkg-plist

PR:		79564 [1]
Submitted by:	Sam Lawrance <boris@brooknet.com.au> [1]

5 files changed, 52 insertions, 31 deletions

diff --git a/java/netrexx/Makefile b/java/netrexx/Makefile
index 09cd4e3f1447..7d0cd321326c 100644
--- a/java/netrexx/Makefile
+++ b/java/netrexx/Makefile
@@ -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@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,26 +27,26 @@ pre-patch:
 	    ${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}
 	@${INSTALL_DATA} ${WRKSRC}/bin/hello.nrx \
 		${EXAMPLESDIR}
-	@${MKDIR} ${DOCSDIR}/netrexx/lang
-.for dir in netrexx/lang .
-	@${INSTALL_DATA} ${WRKSRC}/browse/${dir}/* ${DOCSDIR}/${dir}
-	@${RM} -Rf ${WRKSRC}/browse/netrexx
-.endfor
+	@cd ${WRKSRC}/browse && \
+		${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \;
+	@cd ${WRKSRC}/browse && \
+		${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
 .endif
 
 post-install:
@@ -58,4 +56,4 @@ post-install:
 	@${ECHO} "====================  IMPORTANT!!  ===================="
 	@${CAT} ${WRKSRC}/read.me.first
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/java/netrexx/files/patch-NetRexxC.sh-classpath b/java/netrexx/files/patch-NetRexxC.sh-classpath
new file mode 100644
index 000000000000..c3dc3efdd527
--- /dev/null
+++ b/java/netrexx/files/patch-NetRexxC.sh-classpath
@@ -0,0 +1,31 @@
+$FreeBSD$
+
+Add ${JAVA_HOME}/lib/tools.jar to the CLASSPATH.
+
+NOTE: JAVA_HOME is overridable but the default value is selected by bsd.java.mk
+when isntalling the port.
+
+--- 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
diff --git a/java/netrexx/files/patch-bin::NetRexxC.cmd b/java/netrexx/files/patch-bin::NetRexxC.cmd
deleted file mode 100644
index df3c7fe50146..000000000000
--- a/java/netrexx/files/patch-bin::NetRexxC.cmd
+++ /dev/null
@@ -1,7 +0,0 @@
---- bin/NetRexxC.cmd	Sun Aug 20 12:44:40 2000
-+++ bin/NetRexxC.cmd.new	Sun Nov  4 21:30:11 2001
-@@ -1,3 +1,4 @@
-+/*usr/bin/true; exec rexx "$0" "$@" # REXX program */
- /* Translate and compile a NetRexx program             */
- /*                                                     */
- /* use as:  NetRexxC hello [file2]...                  */
diff --git a/java/netrexx/pkg-descr b/java/netrexx/pkg-descr
index 92251c6f92e6..c740591eac37 100644
--- a/java/netrexx/pkg-descr
+++ b/java/netrexx/pkg-descr
@@ -11,7 +11,7 @@ NetRexx can use any Java class (and vice versa).
 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@uk.ibm.com>
 ___________________
diff --git a/java/netrexx/pkg-plist b/java/netrexx/pkg-plist
index f27169775f57..64ab0bfd478d 100644
--- a/java/netrexx/pkg-plist
+++ b/java/netrexx/pkg-plist
@@ -1,7 +1,6 @@
+@comment $FreeBSD$
 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 +133,8 @@ bin/nrc.rexx
 %%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%%