- Update to 3.8

PR:		191095

5 files changed, 29 insertions, 32 deletions

diff --git a/lang/rexx-regina/Makefile b/lang/rexx-regina/Makefile
index 9f3f72a8215c..3c83180bc04e 100644
--- a/lang/rexx-regina/Makefile
+++ b/lang/rexx-regina/Makefile
@@ -2,34 +2,41 @@
 # $FreeBSD$
 
 PORTNAME=	regina
-PORTVERSION=	3.7
+PORTVERSION=	3.8
 CATEGORIES=	lang
 MASTER_SITES=	SF/${PORTNAME}-rexx/${PORTNAME}-rexx/${PORTVERSION}
 PKGNAMEPREFIX=	rexx-
 DISTNAME=	Regina-REXX-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Rexx interpreter
+COMMENT=	Rexx interpreter
 
-CONFLICTS=	rexx-imc-* oorexx-[0-9]*
+LICENSE=	LGPL21 # (or later)
 
-USE_OPENSSL=	yes
+USES=		gmake iconv
+USE_RC_SUBR=	rxstack
 GNU_CONFIGURE=	yes
-USES=		gmake
+CONFIGURE_ENV=	ac_cv_c_char_unsigned=yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
-USE_RC_SUBR=	rxstack
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure
+DATADIR=	${PREFIX}/share/Regina-REXX
 
-post-configure:
-	@${REINPLACE_CMD} -e "s|-xchar=unsigned||g" ${WRKSRC}/Makefile
+CONFLICTS=	rexx-imc-[0-0]* oorexx-[0-9]*
 
-.include <bsd.port.pre.mk>
+BROKEN_powerpc=	Does not link on powerpc
 
-.if ${ARCH} == "powerpc"
-BROKEN=		Does not link on powerpc
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == i386
+CONFIGURE_ARGS+=	--enable-32bit
 .endif
 
-.include <bsd.port.post.mk>
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/$${CFLAGS}/s|^|#| ; \
+		 s|"-lpthread"|"-pthread"|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		'/$$(sysconfdir)/s|^|#|' ${WRKSRC}/Makefile.in
+
+.include <bsd.port.mk>
diff --git a/lang/rexx-regina/distinfo b/lang/rexx-regina/distinfo
index 706a91941dc1..041779e85441 100644
--- a/lang/rexx-regina/distinfo
+++ b/lang/rexx-regina/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Regina-REXX-3.7.tar.gz) = 133c9e0fd9e09f9adfc4108f43b727e191e4c4c01711cfa26416799d21d1e7fe
-SIZE (Regina-REXX-3.7.tar.gz) = 1156284
+SHA256 (Regina-REXX-3.8.tar.gz) = 3701d537677cb6a0c5e9fef99329615d80c144f2587d69db5cda3264b3ece309
+SIZE (Regina-REXX-3.8.tar.gz) = 1194563
diff --git a/lang/rexx-regina/files/patch-Makefile.in b/lang/rexx-regina/files/patch-Makefile.in
deleted file mode 100644
index 3b9a5bdb67e9..000000000000
--- a/lang/rexx-regina/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-+++ 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) $(DESTDIR)$(libdir)/$(LIBPRE)$(LIBFILE)$(LIBPST)
diff --git a/lang/rexx-regina/files/patch-configure b/lang/rexx-regina/files/patch-configure
index 7949e1d6f104..c2d5e7ce589d 100644
--- a/lang/rexx-regina/files/patch-configure
+++ b/lang/rexx-regina/files/patch-configure
@@ -1,6 +1,6 @@
 --- configure.orig	2012-10-16 06:34:08.000000000 +0200
 +++ configure	2013-02-04 21:07:09.000000000 +0100
-@@ -8471,7 +8471,13 @@
+@@ -8654,7 +8654,13 @@
                  SHLPRE="lib"
                  SHL_LD="ld -assert pure-text -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')'
                  ;;
@@ -12,6 +12,6 @@
 +                SHL_LD="$ac_cv_prog_CC -shared ${LDFLAGS} -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')'
 +                ;;
 +        *openbsd*)
-                 if test "$ac_cv_prog_CC" = "gcc" -o "$ac_cv_prog_CC" = "g++"; then
+                 if test "$ac_cv_prog_CC" = "gcc" -o "$ac_cv_prog_CC" = "g++" -o "$ac_cv_prog_CC" = "clang"; then
                     LD_RXLIB_A1="$ac_cv_prog_CC -shared ${LDFLAGS} -o \$(@)"
                     LD_RXLIB_A2="$ac_cv_prog_CC -shared ${LDFLAGS} -o \$(@)"
diff --git a/lang/rexx-regina/pkg-plist b/lang/rexx-regina/pkg-plist
index c20f2ad7f64d..2c271810f076 100644
--- a/lang/rexx-regina/pkg-plist
+++ b/lang/rexx-regina/pkg-plist
@@ -9,6 +9,10 @@ lib/libregina.so
 lib/libregutil.so
 lib/librxtest1.so
 lib/librxtest2.so
+man/man1/regina.1.gz
+man/man1/regina-config.1.gz
+man/man1/rxqueue.1.gz
+man/man1/rxstack.1.gz
 %%DATADIR%%/animal.rexx
 %%DATADIR%%/block.rexx
 %%DATADIR%%/dateconv.rexx
@@ -25,8 +29,4 @@ lib/librxtest2.so
 %%DATADIR%%/sv.mtb
 %%DATADIR%%/timeconv.rexx
 %%DATADIR%%/tr.mtb
-man/man1/regina-config.1.gz
-man/man1/regina.1.gz
-man/man1/rxqueue.1.gz
-man/man1/rxstack.1.gz
 @dirrm %%DATADIR%%