- Switch to options helpers

- Regenerate patches with `make makepatch`

10 files changed, 32 insertions, 28 deletions

diff --git a/lang/rexx-imc/Makefile b/lang/rexx-imc/Makefile
index f2d12cce814c..ebeccaf70e1a 100644
--- a/lang/rexx-imc/Makefile
+++ b/lang/rexx-imc/Makefile
@@ -41,12 +41,16 @@ do-install:
 	${INSTALL_LIB} ${WRKSRC}/librexx.so.2 ${WRKSRC}/rxmathfn.rxfn \
 		${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/rxmathfn.rxlib ${STAGEDIR}${PREFIX}/lib
-	@${LN} -sf librexx.so.2 ${STAGEDIR}${PREFIX}/lib/librexx.so
+	${LN} -sf librexx.so.2 ${STAGEDIR}${PREFIX}/lib/librexx.so
 	(cd ${WRKSRC} && ${INSTALL_MAN} rexx.1 rxstack.1 rxque.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1)
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${RMEFILES} \
 		${STAGEDIR}${DOCSDIR})
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC} && ${INSTALL_SCRIPT} box rexxcps.rexx rexxtest.rexx \
 		rxmathfn.rexx shell.rexx ${STAGEDIR}${EXAMPLESDIR})
diff --git a/lang/rexx-imc/files/patch-Make b/lang/rexx-imc/files/patch-Make
index e6a3548e5cdb..1854ab25dee4 100644
--- a/lang/rexx-imc/files/patch-Make
+++ b/lang/rexx-imc/files/patch-Make
@@ -1,6 +1,6 @@
---- Make.orig	2002-02-26 07:29:20.000000000 -0500
-+++ Make	2007-12-19 21:18:32.000000000 -0500
-@@ -18,7 +18,7 @@
+--- Make.orig	2002-02-26 12:29:20 UTC
++++ Make
+@@ -18,7 +18,7 @@ CC=gcc                     # compiler an
  LD=ld                      # linker for shared objects
  COMPILEFLAG=""             # general compilation flags for cc
  LINKFLAG=""                # general linker flags *for cc*
@@ -9,7 +9,7 @@
                             # (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 @@
+@@ -98,6 +98,9 @@ if [ "x$PREFIX" = "x" ]; then
          SunOS:5.*)
              PREFIX="/opt/REXXimc"
              ;;
@@ -19,7 +19,7 @@
          *|unknown)
              PREFIX="/usr/local"
              ;;
-@@ -386,14 +389,14 @@
+@@ -386,14 +389,14 @@ case $UNAME_S:$UNAME_R in
          esac
          egrep -q tm_gmtoff /usr/include/time.h && CCFLAG="$CCFLAG -DHAS_GMTOFF"
          ;;
@@ -36,7 +36,7 @@
  #       Uncomment above line if you have problems with LD_LIBRARY_PATH
          case $CC in
              gcc)
-@@ -407,6 +410,48 @@
+@@ -407,6 +410,48 @@ case $UNAME_S:$UNAME_R in
                  ;;
          esac
          ;;
diff --git a/lang/rexx-imc/files/patch-Makefile.REXXimc b/lang/rexx-imc/files/patch-Makefile.REXXimc
index f45cd234481e..b435f31cfe1e 100644
--- a/lang/rexx-imc/files/patch-Makefile.REXXimc
+++ b/lang/rexx-imc/files/patch-Makefile.REXXimc
@@ -1,5 +1,5 @@
---- Makefile.REXXimc	Thu Feb 11 07:05:44 1999
-+++ Makefile.REXXimc.new	Fri Sep  7 18:53:43 2001
+--- Makefile.REXXimc.orig	1999-02-11 15:05:44 UTC
++++ Makefile.REXXimc
 @@ -1,7 +1,7 @@
  #Makefile for REXX/imc
  
@@ -9,7 +9,7 @@
  
  DATE = -DDAY=$(RXDAY) -DMONTH=$(RXMONTH) -DYEAR=$(RXYEAR)
  
-@@ -35,11 +35,13 @@
+@@ -35,11 +35,13 @@ install-pgm: all
  
  install-fn: $(MATH)
  	$(VERBOSE) "install-fn:"
@@ -25,7 +25,7 @@
  	cp -p rexx.1 $(SRC)/rxque.1 $(SRC)/rxstack.1 $(MANDIR)
  
  uninstall: uninstall-pgm uninstall-fn uninstall-man
-@@ -69,8 +71,7 @@
+@@ -69,8 +71,7 @@ $(LIBDIR)/$(SONAME): $(LIBFILES)
  
  $(LIBDIR)/$(SO): $(LIBDIR)/$(SONAME)
  	$(VERBOSE) "$(LIBDIR)/$(SO):"
diff --git a/lang/rexx-imc/files/patch-box b/lang/rexx-imc/files/patch-box
index 8e3d69f1f51e..9ce95bf081c7 100644
--- a/lang/rexx-imc/files/patch-box
+++ b/lang/rexx-imc/files/patch-box
@@ -1,5 +1,5 @@
---- box	Sat Jan 23 16:51:19 1999
-+++ box.new	Fri Sep  7 15:01:36 2001
+--- box.orig	1999-01-24 00:51:19 UTC
++++ box
 @@ -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 */
diff --git a/lang/rexx-imc/files/patch-rexx.c b/lang/rexx-imc/files/patch-rexx.c
index 8d66b43ec373..b1c9d90e51d5 100644
--- a/lang/rexx-imc/files/patch-rexx.c
+++ b/lang/rexx-imc/files/patch-rexx.c
@@ -1,6 +1,6 @@
---- rexx.c.upper	Tue Feb 26 12:29:20 2002
-+++ rexx.c	Thu Jun 20 16:33:44 2002
-@@ -1366,6 +1366,39 @@
+--- rexx.c.orig	2002-02-26 12:29:20 UTC
++++ rexx.c
+@@ -1366,6 +1366,39 @@ signal:        while(pstacklev&&((stype=
                 if(write(rxstacksock,pull,8)<8||
                    (len>0&&write(rxstacksock,exp,len)<len)) die(Esys);
                 break;
diff --git a/lang/rexx-imc/files/patch-rexxcps.rexx b/lang/rexx-imc/files/patch-rexxcps.rexx
index 917123df037d..6f3b54a0d742 100644
--- a/lang/rexx-imc/files/patch-rexxcps.rexx
+++ b/lang/rexx-imc/files/patch-rexxcps.rexx
@@ -1,5 +1,5 @@
---- rexxcps.rexx	Fri Jun 25 05:14:43 1993
-+++ rexxcps.rexx.new	Fri Sep  7 15:10:03 2001
+--- rexxcps.rexx.orig	1993-06-25 12:14:43 UTC
++++ rexxcps.rexx
 @@ -1,4 +1,4 @@
 -/* ReXX */
 +/*usr/bin/true;exec rexx -x "$0" "$@";exit# ReXX */
diff --git a/lang/rexx-imc/files/patch-rexxtest.rexx b/lang/rexx-imc/files/patch-rexxtest.rexx
index 593dc6f19556..d934f94eac0c 100644
--- a/lang/rexx-imc/files/patch-rexxtest.rexx
+++ b/lang/rexx-imc/files/patch-rexxtest.rexx
@@ -1,5 +1,5 @@
---- rexxtest.rexx	Thu Jan 21 16:11:44 1999
-+++ rexxtest.rexx.new	Fri Sep  7 15:04:39 2001
+--- rexxtest.rexx.orig	1999-01-22 00:11:44 UTC
++++ rexxtest.rexx
 @@ -1,4 +1,4 @@
 -/* test program for interpreter */
 +/*usr/bin/true;exec rexx -x "$0" "$@";exit# test program for interpreter */
diff --git a/lang/rexx-imc/files/patch-rxmathfn.rexx b/lang/rexx-imc/files/patch-rxmathfn.rexx
index fb55b0b82685..643f7b0e2aee 100644
--- a/lang/rexx-imc/files/patch-rxmathfn.rexx
+++ b/lang/rexx-imc/files/patch-rxmathfn.rexx
@@ -1,5 +1,5 @@
---- rxmathfn.rexx	Thu Nov 19 10:25:43 1992
-+++ rxmathfn.rexx.new	Fri Sep  7 15:06:45 2001
+--- rxmathfn.rexx.orig	1992-11-19 18:25:43 UTC
++++ rxmathfn.rexx
 @@ -1,4 +1,5 @@
 -/* Example Rexx program to provide mathematical functions */
 +/*usr/bin/true;exec rexx -x "$0" "$@";exit# Example Rexx program */
diff --git a/lang/rexx-imc/files/patch-shell.rexx b/lang/rexx-imc/files/patch-shell.rexx
index 6cd0f32de05c..10f0f0dec653 100644
--- a/lang/rexx-imc/files/patch-shell.rexx
+++ b/lang/rexx-imc/files/patch-shell.rexx
@@ -1,5 +1,5 @@
---- shell.rexx	Wed Feb 10 14:42:33 1999
-+++ shell.rexx.new	Fri Sep  7 15:08:23 2001
+--- shell.rexx.orig	1999-02-10 22:42:33 UTC
++++ shell.rexx
 @@ -1,4 +1,4 @@
 -/* small shell program. */
 +/*usr/bin/true;exec rexx -x "$0" "$@";exit# small shell program. */
diff --git a/lang/rexx-imc/files/patch-util.c b/lang/rexx-imc/files/patch-util.c
index aec63e831648..fc875b8dc96d 100644
--- a/lang/rexx-imc/files/patch-util.c
+++ b/lang/rexx-imc/files/patch-util.c
@@ -1,6 +1,6 @@
---- util.c	Tue Feb 26 12:29:20 2002
-+++ util.c.new	Thu Jun 20 14:50:03 2002
-@@ -1404,7 +1404,7 @@
+--- util.c.orig	2002-02-26 12:29:20 UTC
++++ util.c
+@@ -1404,7 +1404,7 @@ int line1;           /* if nonzero, the 
              else token=0;
           }
           else if(token>=Command&&start){ /* at the start must be a "command" */
@@ -9,7 +9,7 @@
              else if(token==ARG||token==PULL)
                 prgptr++[0]=PARSE,
                 prgptr++[0]=UPPER,
-@@ -1415,7 +1415,7 @@
+@@ -1415,7 +1415,7 @@ int line1;           /* if nonzero, the 
           if(!token); /* no need to check if there is no token */
           else if(token==VALUE)if(last==ADDRESS||last==FORM||last==TRACE
                                 ||last==PARSE||last==SIGNAL);else token=0;