o update to 1.75

o support NOPORTDOCS
o assign maintainership to submitter

PR:		30428
Submitted by:	John Merryweather Cooper <jmcoopr@webmail.bmi.net>

12 files changed, 234 insertions, 117 deletions

diff --git a/lang/rexx-imc/Makefile b/lang/rexx-imc/Makefile
index 1e96cee14976..1a62e19d0a37 100644
--- a/lang/rexx-imc/Makefile
+++ b/lang/rexx-imc/Makefile
@@ -6,23 +6,58 @@
 #
 
 PORTNAME=	rexx-imc
-PORTVERSION=	1.7
+PORTVERSION=	1.75
 CATEGORIES=	lang
 MASTER_SITES=	http://users.comlab.ox.ac.uk/ian.collier/distribution/ \
 		ftp://ftp.sai.msu.su/pub/unix/rexx/ \
 		ftp://crydee.sai.msu.ru/zeus/unix/rexx/
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	${DISTNAME}-19990331.patch
-PATCH_DIST_STRIP= -p1
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jmcoopr@webmail.bmi.net
 
-MAKE_ENV=	MKDIR="${MKDIR}" OPTFLAGS="${CFLAGS}"
-INSTALLS_SHLIB=	yes
+HAS_CONFIGURE=		yes
+CONFIGURE_SCRIPT=	Make
+CONFIGURE_ENV=		CFLAGS="${CFLAGS}" \
+			PREFIX="${PREFIX}"
+CONFIGURE_ARGS=		o all
 
-MAN1=		rexx.1
+# configures and builds in one step
+NO_BUILD=		yes
 
-post-extract:
-	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
+INSTALLS_SHLIB=		yes
+
+MAN1=		rexx.1 rxstack.1 rxque.1
+
+DOCFILES=	rexx.info rexx.ref rexx.summary rexx.tech
+RMEFILES=       README README.Y2K README.bugreport README.docs \
+		README.files README.make README.news README.platforms
+
+do-install:
+# install interpreter and daemon helpers
+.for prog in rexx rxque rxstack
+	@${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${PREFIX}/bin
+.endfor
+# install shared libraries, include file, and rxlib
+# DO NOT delete rxlib or you will lose ability to call mathlib!!
+.for lib in librexx.so.2 rxmathfn.rxfn
+	@${INSTALL_PROGRAM} ${WRKSRC}/${lib} ${PREFIX}/lib
+.endfor
+	@${LN} -sf ${PREFIX}/lib/librexx.so.2 ${PREFIX}/lib/librexx.so
+	@${INSTALL_DATA} ${WRKSRC}/rexxsaa.h ${PREFIX}/include
+	@${INSTALL_DATA} ${WRKSRC}/rxmathfn.rxlib ${PREFIX}/lib
+# install man pages
+.for man in ${MAN1}
+	@${INSTALL_MAN} ${WRKSRC}/${man} ${PREFIX}/man/man1
+.endfor
+# install documenation and examples
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in ${DOCFILES} ${RMEFILES}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+	@${MKDIR} ${PREFIX}/share/examples/rexx-imc
+.for ex in box rexxcps.rexx rexxtest.rexx rxmathfn.rexx shell.rexx
+	@${INSTALL_SCRIPT} ${WRKSRC}/${ex} ${PREFIX}/share/examples/rexx-imc
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/lang/rexx-imc/distinfo b/lang/rexx-imc/distinfo
index a2aefd7462b6..0db978ce81d7 100644
--- a/lang/rexx-imc/distinfo
+++ b/lang/rexx-imc/distinfo
@@ -1,2 +1 @@
-MD5 (rexx-imc-1.7.tar.gz) = 2b55cbe521819e1edf43139125ced03a
-MD5 (rexx-imc-1.7-19990331.patch) = 17f6401cb20fda7facafdaca79080748
+MD5 (rexx-imc-1.75.tar.gz) = bccecc3578deb6d7932b069b1e647ee2
diff --git a/lang/rexx-imc/files/Makefile b/lang/rexx-imc/files/Makefile
deleted file mode 100644
index 0495bb30c441..000000000000
--- a/lang/rexx-imc/files/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# $FreeBSD$
-#
-# Makefile for REXX/imc-1.7?
-#
-# Based upon the original by the author
-# Heavily hacked by jfitz@FreeBSD.ORG
-#
-
-CC?=		gcc
-PIC=		-fPIC
-CCFLAGS=	-DHAS_TTYCOM -D_REQUIRED -DRENAME_UNDELETE -c ${PIC}
-
-OPTFLAGS?=	-O2
-
-# Release Date Variables
-RXDAY=		1
-RXMONTH=	8
-RXYEAR=		96
-DATE=		-DDAY=${RXDAY} -DMONTH=${RXMONTH} -DYEAR=${RXYEAR}
-
-REXXDOCS=	README README.bugreport README.docs \
-		README.files README.make README.news README.platforms \
-		rexx.info rexx.ref rexx.summary rexx.tech
-
-# Shared Library Version
-VER=		2
-SHAREDLIB=	librexx.so.${VER}
-STATICLIB=	librexx.a
-
-REXXLIB=${STATICLIB} ${SHAREDLIB}
-
-MATH=		rxmathfn.rxfn
-REXXIMC=	${PREFIX}/bin
-FILEDEFS=	-DREXXIMC=\"${REXXIMC}\"
-LIBFILES=	rexx.o rxfn.o calc.o util.o shell.o interface.o globals.o
-HFILES=		const.h globals.h functions.h rexxsaa.h
-
-all:		rexx rxque rxstack ${MATH} rexx.1
-
-interface.o:	interface.c ${HFILES}
-		${CC} ${OPTFLAGS} ${CCFLAGS} -c ${DATE} ${FILEDEFS} -o $@ interface.c
-
-${SHAREDLIB}:	${LIBFILES}
-		${CC} -shared -Wl,-soname,$@ -o ${SHAREDLIB} ${LIBFILES}
-		ln -sf ${SHAREDLIB} librexx.so
-
-${STATICLIB}:	${LIBFILES}
-		ar rc ${STATICLIB} ${LIBFILES}
-		${RANLIB} ${STATICLIB}
-
-rexx:		main.o ${REXXLIB}
-		${CC} ${OPTFLAGS} -o rexx main.o -L. -lrexx
-
-rxque:		rxque.o ${STATICLIB}
-		${CC} ${OPTFLAGS} -o rxque rxque.o
-
-rxstack:	rxstack.o ${STATICLIB}
-		${CC} ${OPTFLAGS} -o rxstack rxstack.o
-
-rxmathfn.rxfn:	rxmathfn.o ${HFILES}
-		${CC} -shared -o rxmathfn.rxfn rxmathfn.o -lm
-
-interface.o:	interface.c ${HFILES}
-		${CC} ${OPTFLAGS} ${CCFLAGS} -o interface.o ${FILEDEFS} interface.c
-
-rexx.1: rexx.1.in
-		sed -e "s|@REXXLIBDIR@|${PREFIX}/bin|" rexx.1.in > rexx.1
-
-install:
-		@strip rxmathfn.rxfn
-.for f in rexx rxque rxstack
-		${BSD_INSTALL_PROGRAM} ${f} ${PREFIX}/bin
-.endfor
-.for f in rxmathfn.rxfn rxmathfn.rxlib
-		${BSD_INSTALL_DATA} ${f} ${PREFIX}/bin
-.endfor
-.for f in ${REXXLIB}
-		${BSD_INSTALL_DATA} ${f} ${PREFIX}/lib
-.endfor
-		ln -sf ${SHAREDLIB} ${PREFIX}/lib/librexx.so
-		${BSD_INSTALL_DATA} rexxsaa.h ${PREFIX}/include
-		${BSD_INSTALL_MAN} rexx.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-		${MKDIR} ${PREFIX}/share/doc/rexx-imc
-.for f in ${REXXDOCS}
-		${BSD_INSTALL_DATA} ${f} ${PREFIX}/share/doc/rexx-imc
-.endfor
-.endif
-
-.c.o:
-		${CC} ${OPTFLAGS} ${CCFLAGS} -o $@ $<
diff --git a/lang/rexx-imc/files/patch-Make b/lang/rexx-imc/files/patch-Make
new file mode 100644
index 000000000000..d9fda5cbd624
--- /dev/null
+++ b/lang/rexx-imc/files/patch-Make
@@ -0,0 +1,87 @@
+--- Make	Wed Nov  1 10:04:27 2000
++++ Make.new	Fri Sep  7 16:39:54 2001
+@@ -18,7 +18,7 @@
+ LD=ld                      # linker for shared objects
+ COMPILEFLAG=""             # general compilation flags for cc
+ LINKFLAG=""                # general linker flags *for cc*
+-#STUFF="-DSTUFF_STACK"     # uncomment if you like queuing stack to keyboard
++STUFF="-DSTUFF_STACK"      # uncomment if you like queuing stack to keyboard
+                            # (not guaranteed to work on all systems)
+ SMALL=false                # true if you like small executables (not guaranteed
+                            # and not for ELF executables either)
+@@ -98,6 +98,9 @@
+         SunOS:5.*)
+             PREFIX="/opt/REXXimc"
+             ;;
++	FreeBSD:*)
++	    PREFIX="${PREFIX}"
++	    ;;
+         *|unknown)
+             PREFIX="/usr/local"
+             ;;
+@@ -384,14 +387,14 @@
+         esac
+         egrep -q tm_gmtoff /usr/include/time.h && CCFLAG="$CCFLAG -DHAS_GMTOFF"
+         ;;
+-    FreeBSD:*)
++    FreeBSD:3.*)
+         REXXLIB="librexx.so"
+         RANLIB=ranlib
+         MATH=rxmathfn.rxfn
+         LIBRARIES=""
+         SOFLAG="-Bshareable"
+         DLLFLAG="-Bshareable"
+-#       LREXX='$(LIBDIR)/$(SONAME)'
++        LREXX='$(LIBDIR)/$(SONAME)'
+ #       Uncomment above line if you have problems with LD_LIBRARY_PATH
+         case $CC in
+             gcc)
+@@ -401,6 +404,48 @@
+             *)  echo "Warning: I don't know the options for $CC"\
+                       "- trying the gcc ones" >&2
+                 CCFLAG="-DHAS_TTYCOM -D_REQUIRED -DRENAME_UNDELETE -DHAS_GMTOFF"
++                PIC="-fPIC"
++                ;;
++        esac
++        ;;
++    FreeBSD:4.*)
++        REXXLIB="librexx.so"
++	SOLINK="librexx.so"
++        RANLIB=ranlib
++        MATH=rxmathfn.rxfn
++        LIBRARIES=""
++        SOFLAG="-shared --export-dynamic"
++        : ${RUNLIBS='-L$(LIBDIR) -Wl,-rpath,$(PREFIX)/lib'}
++        DLLFLAG="-shared --export-dynamic"
++        case $CC in
++            gcc)
++                CCFLAG="${CFLAGS} -DHAS_TTYCOM -DRENAME_UNDELETE -DHAS_GMTOFF"
++                PIC="-fPIC"
++                ;;
++            *)  echo "Warning: I don't know the options for $CC"\
++                      "- trying the gcc ones" >&2
++                CCFLAG="${CFLAGS} -DHAS_TTYCOM -DRENAME_UNDELETE -DHAS_GMTOFF"
++                PIC="-fPIC"
++                ;;
++        esac
++        ;;
++    FreeBSD:5.*)
++        REXXLIB="librexx.so"
++	SOLINK="librexx.so"
++        RANLIB=ranlib
++        MATH=rxmathfn.rxfn
++        LIBRARIES=""
++        SOFLAG="-shared --export-dynamic"
++        : ${RUNLIBS='-L$(LIBDIR) -Wl,-rpath,$(PREFIX)/lib'}
++        DLLFLAG="-shared --export-dynamic"
++        case $CC in
++            gcc)
++                CCFLAG="${CFLAGS} -DHAS_TTYCOM -D_REQUIRED -DHAS_GMTOFF"
++                PIC="-fPIC"
++                ;;
++            *)  echo "Warning: I don't know the options for $CC"\
++                      "- trying the gcc ones" >&2
++                CCFLAG="${CFLAGS} -DHAS_TTYCOM -D_REQUIRED -DHAS_GMTOFF"
+                 PIC="-fPIC"
+                 ;;
+         esac
diff --git a/lang/rexx-imc/files/patch-Makefile.REXXimc b/lang/rexx-imc/files/patch-Makefile.REXXimc
new file mode 100644
index 000000000000..f45cd234481e
--- /dev/null
+++ b/lang/rexx-imc/files/patch-Makefile.REXXimc
@@ -0,0 +1,37 @@
+--- Makefile.REXXimc	Thu Feb 11 07:05:44 1999
++++ Makefile.REXXimc.new	Fri Sep  7 18:53:43 2001
+@@ -1,7 +1,7 @@
+ #Makefile for REXX/imc
+ 
+ SO = librexx.so
+-SONAME= $(SO).$(VER)
++SONAME= $(SO).2
+ 
+ DATE = -DDAY=$(RXDAY) -DMONTH=$(RXMONTH) -DYEAR=$(RXYEAR)
+ 
+@@ -35,11 +35,13 @@
+ 
+ install-fn: $(MATH)
+ 	$(VERBOSE) "install-fn:"
+-	test -f rxmathfn.rxfn && cp -p rxmathfn.rxfn $(SRC)/rxmathfn.rxlib $(REXXLIBDIR) \
+-	|| cp -p $(SRC)/rxmathfn.rexx $(SRC)/rxmathfn.rxlib $(REXXLIBDIR)
++	test -f rxmathfn.rxfn  && \
++	cp -p rxmathfn.rxfn $(SRC)/rxmathfn.rxlib $(PREFIX)/lib || \
++	cp -p $(SRC)/rxmathfn.rexx $(SRC)/rxmathfn.rxlib $(PREFIX)/lib
+ 
+ install-man: rexx.1
+ 	$(VERBOSE) "install-man:"
++	mkdir -p $(MANDIR)
+ 	cp -p rexx.1 $(SRC)/rxque.1 $(SRC)/rxstack.1 $(MANDIR)
+ 
+ uninstall: uninstall-pgm uninstall-fn uninstall-man
+@@ -69,8 +71,7 @@
+ 
+ $(LIBDIR)/$(SO): $(LIBDIR)/$(SONAME)
+ 	$(VERBOSE) "$(LIBDIR)/$(SO):"
+-	rm -f $(LIBDIR)/$(SO)
+-	ln -s $(SONAME) $(LIBDIR)/$(SO)
++	ln -sf $(SONAME) $(LIBDIR)/$(SO)
+ 
+ $(LIBDIR)/librexx.a: $(LIBFILES)
+ 	$(VERBOSE) "$(LIBDIR)/librexx.a:"
diff --git a/lang/rexx-imc/files/patch-box b/lang/rexx-imc/files/patch-box
new file mode 100644
index 000000000000..8e3d69f1f51e
--- /dev/null
+++ b/lang/rexx-imc/files/patch-box
@@ -0,0 +1,8 @@
+--- box	Sat Jan 23 16:51:19 1999
++++ box.new	Fri Sep  7 15:01:36 2001
+@@ -1,4 +1,4 @@
+-/*bin/true;exec rexx -x "$0" "$@";exit# This is a REXX program */
++/*usr/bin/true;exec rexx -x "$0" "$@";exit# This is a REXX program */
+ parse arg args
+ if args="" then args="/usr/games/fortune"/* default command */
+ args "| expand | rxstack"            /* stack the command's output */
diff --git a/lang/rexx-imc/files/patch-rexxcps.rexx b/lang/rexx-imc/files/patch-rexxcps.rexx
new file mode 100644
index 000000000000..917123df037d
--- /dev/null
+++ b/lang/rexx-imc/files/patch-rexxcps.rexx
@@ -0,0 +1,8 @@
+--- rexxcps.rexx	Fri Jun 25 05:14:43 1993
++++ rexxcps.rexx.new	Fri Sep  7 15:10:03 2001
+@@ -1,4 +1,4 @@
+-/* ReXX */
++/*usr/bin/true;exec rexx -x "$0" "$@";exit# ReXX */
+   /* Take a measure of REXX clauses-per-second (CPS)                 */
+   /* Mike Cowlishaw (mfc@ibm.com).  Multi-platform.                  */
+   /* 1.0 17 Jan 89 Original version                                  */
diff --git a/lang/rexx-imc/files/patch-rexxtest.rexx b/lang/rexx-imc/files/patch-rexxtest.rexx
new file mode 100644
index 000000000000..593dc6f19556
--- /dev/null
+++ b/lang/rexx-imc/files/patch-rexxtest.rexx
@@ -0,0 +1,8 @@
+--- rexxtest.rexx	Thu Jan 21 16:11:44 1999
++++ rexxtest.rexx.new	Fri Sep  7 15:04:39 2001
+@@ -1,4 +1,4 @@
+-/* test program for interpreter */
++/*usr/bin/true;exec rexx -x "$0" "$@";exit# test program for interpreter */
+ 
+ signal on syntax
+ parse source sys how me nick env
diff --git a/lang/rexx-imc/files/patch-rxmathfn.rexx b/lang/rexx-imc/files/patch-rxmathfn.rexx
new file mode 100644
index 000000000000..fb55b0b82685
--- /dev/null
+++ b/lang/rexx-imc/files/patch-rxmathfn.rexx
@@ -0,0 +1,9 @@
+--- rxmathfn.rexx	Thu Nov 19 10:25:43 1992
++++ rxmathfn.rexx.new	Fri Sep  7 15:06:45 2001
+@@ -1,4 +1,5 @@
+-/* Example Rexx program to provide mathematical functions */
++/*usr/bin/true;exec rexx -x "$0" "$@";exit# Example Rexx program */
++/* to provide mathematical functions */
+ trace off
+ 
+ Ecall=40 /* Incorrect call to routine */
diff --git a/lang/rexx-imc/files/patch-shell.rexx b/lang/rexx-imc/files/patch-shell.rexx
new file mode 100644
index 000000000000..6cd0f32de05c
--- /dev/null
+++ b/lang/rexx-imc/files/patch-shell.rexx
@@ -0,0 +1,8 @@
+--- shell.rexx	Wed Feb 10 14:42:33 1999
++++ shell.rexx.new	Fri Sep  7 15:08:23 2001
+@@ -1,4 +1,4 @@
+-/* small shell program. */
++/*usr/bin/true;exec rexx -x "$0" "$@";exit# small shell program. */
+ trace off
+ signal on halt
+ signal on syntax
diff --git a/lang/rexx-imc/pkg-descr b/lang/rexx-imc/pkg-descr
index bbebe9acada9..a97625fb3ea1 100644
--- a/lang/rexx-imc/pkg-descr
+++ b/lang/rexx-imc/pkg-descr
@@ -5,3 +5,6 @@ to call Rexx programs and to register addressing environments, Rexx
 functions, and exit handlers. 
 
 WWW: http://users.comlab.ox.ac.uk/ian.collier/Rexx/rexximc.html
+
+--
+John Merryweather Cooper <jmcoopr@webmail.bmi.net>
diff --git a/lang/rexx-imc/pkg-plist b/lang/rexx-imc/pkg-plist
index 5e5a379a0c7e..a85cc9214b67 100644
--- a/lang/rexx-imc/pkg-plist
+++ b/lang/rexx-imc/pkg-plist
@@ -1,21 +1,27 @@
 bin/rexx
-bin/rxmathfn.rxfn
-bin/rxmathfn.rxlib
 bin/rxque
 bin/rxstack
 include/rexxsaa.h
-lib/librexx.a
 lib/librexx.so
 lib/librexx.so.2
-share/doc/rexx-imc/README
-share/doc/rexx-imc/README.bugreport
-share/doc/rexx-imc/README.docs
-share/doc/rexx-imc/README.files
-share/doc/rexx-imc/README.make
-share/doc/rexx-imc/README.news
-share/doc/rexx-imc/README.platforms
-share/doc/rexx-imc/rexx.info
-share/doc/rexx-imc/rexx.ref
-share/doc/rexx-imc/rexx.summary
-share/doc/rexx-imc/rexx.tech
+lib/rxmathfn.rxfn
+lib/rxmathfn.rxlib
+%%PORTDOCS%%share/doc/rexx-imc/README
+%%PORTDOCS%%share/doc/rexx-imc/README.Y2K
+%%PORTDOCS%%share/doc/rexx-imc/README.bugreport
+%%PORTDOCS%%share/doc/rexx-imc/README.docs
+%%PORTDOCS%%share/doc/rexx-imc/README.files
+%%PORTDOCS%%share/doc/rexx-imc/README.make
+%%PORTDOCS%%share/doc/rexx-imc/README.news
+%%PORTDOCS%%share/doc/rexx-imc/README.platforms
+%%PORTDOCS%%share/doc/rexx-imc/rexx.info
+%%PORTDOCS%%share/doc/rexx-imc/rexx.ref
+%%PORTDOCS%%share/doc/rexx-imc/rexx.summary
+%%PORTDOCS%%share/doc/rexx-imc/rexx.tech
+%%PORTDOCS%%share/examples/rexx-imc/box
+%%PORTDOCS%%share/examples/rexx-imc/rexxcps.rexx
+%%PORTDOCS%%share/examples/rexx-imc/rexxtest.rexx
+%%PORTDOCS%%share/examples/rexx-imc/rxmathfn.rexx
+%%PORTDOCS%%share/examples/rexx-imc/shell.rexx
+@dirrm share/examples/rexx-imc
 @dirrm share/doc/rexx-imc