. update to version 3.5;

. use USE_RC_SUBR.

PR:		ports/149880
Submitted by:	bsam (me)
Approved by:	maintainer timeout (7+ weeks)

6 files changed, 49 insertions, 32 deletions

diff --git a/lang/rexx-regina/Makefile b/lang/rexx-regina/Makefile
index e5f7449be5c..326a747ecef 100644
--- a/lang/rexx-regina/Makefile
+++ b/lang/rexx-regina/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	regina
-PORTVERSION=	3.3
-PORTREVISION=	1
+PORTVERSION=	3.5
 CATEGORIES=	lang
 MASTER_SITES=	SF/${PORTNAME}-rexx/${PORTNAME}-rexx/${PORTVERSION}
 PKGNAMEPREFIX=	rexx-
@@ -19,12 +18,12 @@ COMMENT=	A Rexx interpreter
 
 CONFLICTS=	rexx-imc-* oorexx-[0-9]*
 
-WRKSRC=		${WRKDIR}/Regina-${PORTVERSION}
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
+USE_RC_SUBR=	rxstack
 
 MAN1=	regina.1
 
@@ -34,7 +33,4 @@ post-patch:
 post-configure:
 	@${REINPLACE_CMD} -e "s|-xchar=unsigned||g" ${WRKSRC}/Makefile
 
-post-install:
-	@${INSTALL_SCRIPT} ${FILESDIR}/rxstack.sh ${PREFIX}/etc/rc.d
-
 .include <bsd.port.mk>
diff --git a/lang/rexx-regina/distinfo b/lang/rexx-regina/distinfo
index 6b1e14537c4..ce78aa07900 100644
--- a/lang/rexx-regina/distinfo
+++ b/lang/rexx-regina/distinfo
@@ -1,3 +1,3 @@
-MD5 (Regina-REXX-3.3.tar.gz) = bdb85f57cbe3e7f9b45aea329cd7752e
-SHA256 (Regina-REXX-3.3.tar.gz) = 3bce9da3631dbf073b8373359fb8a2924d7b511995e7dfd34deca8c6b5d0582c
-SIZE (Regina-REXX-3.3.tar.gz) = 940352
+MD5 (Regina-REXX-3.5.tar.gz) = 914e223d882f0e4a35f4efda0a75920d
+SHA256 (Regina-REXX-3.5.tar.gz) = c895fda12bb8c07aaac99ffab69444400d9a63a747c1a608d13d3ab8a899003e
+SIZE (Regina-REXX-3.5.tar.gz) = 1139805
diff --git a/lang/rexx-regina/files/patch-Makefile.in b/lang/rexx-regina/files/patch-Makefile.in
index 1bc275da3a4..3b9a5bdb67e 100644
--- a/lang/rexx-regina/files/patch-Makefile.in
+++ b/lang/rexx-regina/files/patch-Makefile.in
@@ -1,11 +1,10 @@
---- Makefile.in.orig	Sun Nov  9 23:49:49 2003
-+++ Makefile.in	Sun Nov  9 23:50:39 2003
-@@ -849,7 +849,7 @@
- 	$(INSTALL) -m 755 -c ./rxqueue$(EXE) $(bindir)/rxqueue$(EXE)
- 	$(INSTALL) -m 755 -c ./rxstack$(EXE) $(bindir)/rxstack$(EXE)
- 	$(INSTALL) -m 755 -c ./regina-config $(bindir)/regina-config
--	-$(INSTALL) -m 755 -c ./rxstack.init.d $(sysconfdir)/rc.d/init.d/rxstack
-+#	-$(INSTALL) -m 755 -c ./rxstack.init.d $(sysconfdir)/rc.d/init.d/rxstack
++++ Makefile.in	2010-08-22 12:54:40.000000000 +0400
+@@ -990,7 +990,7 @@
+ 	$(INSTALL) -m 755 -c ./rxqueue$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/rxqueue$(binarybitprefix)$(EXE)
+ 	$(INSTALL) -m 755 -c ./rxstack$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/rxstack$(binarybitprefix)$(EXE)
+ 	$(INSTALL) -m 755 -c ./regina-config $(DESTDIR)$(bindir)/regina-config
+-	-$(INSTALL) -m 755 -c ./rxstack.init.d $(DESTDIR)$(sysconfdir)/rc.d/init.d/rxstack
++	#-$(INSTALL) -m 755 -c ./rxstack.init.d $(DESTDIR)$(sysconfdir)/rc.d/init.d/rxstack
  	@echo "The system startup/shutdown script; rxstack, may have been installed into $(sysconfdir)/rc.d/init.d"
  	@echo "You need to create the appropriate links to this script to start and stop rxstack automatically."
- 	-$(INSTALL) -m 755 -c ./$(LIBPRE)$(LIBFILE)$(LIBPST) $(libdir)/$(LIBPRE)$(LIBFILE)$(LIBPST)
+ 	-$(INSTALL) -m 755 -c ./$(LIBPRE)$(LIBFILE)$(LIBPST) $(DESTDIR)$(libdir)/$(LIBPRE)$(LIBFILE)$(LIBPST)
diff --git a/lang/rexx-regina/files/rxstack.in b/lang/rexx-regina/files/rxstack.in
new file mode 100644
index 00000000000..7b9a9b7a464
--- /dev/null
+++ b/lang/rexx-regina/files/rxstack.in
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: rxstack
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# rxstack_enable (bool):   Set to NO by default.
+#               Set it to YES to enable rxstack.
+# rxstack_flags (str):   Set to "-d" by default.
+#
+
+. /etc/rc.subr
+
+name="rxstack"
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/bin/${name}
+
+load_rc_config $name
+
+: ${rxstack_enable="NO"}
+: ${rxstack_flags="-d"}
+
+run_rc_command "$1"
diff --git a/lang/rexx-regina/files/rxstack.sh b/lang/rexx-regina/files/rxstack.sh
index 4be1f23a7ff..e69de29bb2d 100644
--- a/lang/rexx-regina/files/rxstack.sh
+++ b/lang/rexx-regina/files/rxstack.sh
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-start)
-	[ -x /usr/local/bin/rxstack ] && /usr/local/bin/rxstack -d && \
-		echo -n "Starting Regina Stack"
-	;;
-stop)
-	killall rxstack && echo -n "Shutting down Regina Stack"
-	;;
-esac
diff --git a/lang/rexx-regina/pkg-plist b/lang/rexx-regina/pkg-plist
index c5505f5fb83..aed504726d8 100644
--- a/lang/rexx-regina/pkg-plist
+++ b/lang/rexx-regina/pkg-plist
@@ -3,22 +3,26 @@ bin/regina-config
 bin/rexx
 bin/rxqueue
 bin/rxstack
-etc/rc.d/rxstack.sh
 include/rexxsaa.h
 lib/libregina.a
 lib/libregina.so
-lib/libtest1.so
-lib/libtest2.so
+lib/libregutil.so
+lib/librxtest1.so
+lib/librxtest2.so
 %%DATADIR%%/animal.rexx
 %%DATADIR%%/block.rexx
 %%DATADIR%%/dateconv.rexx
 %%DATADIR%%/de.mtb
 %%DATADIR%%/dynfunc.rexx
+%%DATADIR%%/en.mtb
 %%DATADIR%%/es.mtb
 %%DATADIR%%/newstr.rexx
 %%DATADIR%%/no.mtb
 %%DATADIR%%/pl.mtb
 %%DATADIR%%/pt.mtb
+%%DATADIR%%/regutil.rexx
 %%DATADIR%%/rexxcps.rexx
+%%DATADIR%%/sv.mtb
 %%DATADIR%%/timeconv.rexx
+%%DATADIR%%/tr.mtb
 @dirrm %%DATADIR%%