pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang/rexx-regina
Module Name: pkgsrc
Committed By: rhialto
Date: Tue Apr 2 18:08:37 UTC 2024
Modified Files:
pkgsrc/lang/rexx-regina: Makefile PLIST distinfo
pkgsrc/lang/rexx-regina/patches: patch-aa patch-ab
Log Message:
lang/rexx-regina: update to 3.9.5
Changes since 3.0.1 (2002-2022) are too many to list but are given in the
source archive: README.31 ... README.395.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/rexx-regina/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/rexx-regina/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/rexx-regina/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/rexx-regina/patches/patch-aa \
pkgsrc/lang/rexx-regina/patches/patch-ab
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/rexx-regina/Makefile
diff -u pkgsrc/lang/rexx-regina/Makefile:1.15 pkgsrc/lang/rexx-regina/Makefile:1.16
--- pkgsrc/lang/rexx-regina/Makefile:1.15 Sun Jan 26 05:26:25 2020
+++ pkgsrc/lang/rexx-regina/Makefile Tue Apr 2 18:08:37 2024
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2020/01/26 05:26:25 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2024/04/02 18:08:37 rhialto Exp $
#
-DISTNAME= regina301
-PKGNAME= rexx-regina-3.0.1
-PKGREVISION= 1
+DISTNAME= regina395
+PKGNAME= rexx-regina-3.9.5
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=regina-rexx/}
EXTRACT_SUFX= .zip
@@ -11,6 +10,9 @@ EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://regina-rexx.sourceforge.io/
COMMENT= Implementation of the REXX language
+LICENSE= gnu-lgpl-v2 # or higher
+
+CONFLICTS= rexx-imc-[0-9]* oorexx-[0-9]*
MAKE_JOBS_SAFE= no
@@ -18,10 +20,19 @@ WRKSRC= ${WRKDIR}
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
-CONFLICTS= rexx-imc-[0-9]*
+CONF_FILES+= share/regina/examples/rxstack.conf ${PKG_SYSCONFDIR}/rxstack.conf
+
+INSTALL_MAKE_FLAGS+= sharedir=${PREFIX}/share/regina
-INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \
- mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} \
- sharedir=${DESTDIR}${PREFIX}/share/regina
+REPLACE_INTERPRETER+= regina
+REPLACE.regina.old= regina
+REPLACE.regina.new= ${PREFIX}/bin/regina
+REPLACE_FILES.regina= demo/*.rexx regutil/*.rexx
+
+SUBST_CLASSES+= etc
+SUBST_STAGE.etc= pre-configure
+SUBST_MESSAGE.etc= Fixing etc directory path
+SUBST_FILES.etc= rxstack.c
+SUBST_SED.etc= -e 's;/etc/;${PKG_SYSCONFDIR}/;'
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/lang/rexx-regina/PLIST
diff -u pkgsrc/lang/rexx-regina/PLIST:1.2 pkgsrc/lang/rexx-regina/PLIST:1.3
--- pkgsrc/lang/rexx-regina/PLIST:1.2 Sun Jun 14 18:03:40 2009
+++ pkgsrc/lang/rexx-regina/PLIST Tue Apr 2 18:08:37 2024
@@ -1,25 +1,39 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:03:40 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/04/02 18:08:37 rhialto Exp $
bin/regina
bin/regina-config
bin/rexx
bin/rxqueue
bin/rxstack
-bin/tregina
-bin/trexx
include/rexxsaa.h
lib/libregina.a
lib/libregina.so
-lib/libtest1.so
-lib/libtest2.so
+lib/pkgconfig/libregina.pc
+lib/regina-rexx/${PKGVERSION}/libregutil.so
+lib/regina-rexx/${PKGVERSION}/librxtest1.so
+lib/regina-rexx/${PKGVERSION}/librxtest2.so
+lib/regina-rexx/addons/libregutil.so
+lib/regina-rexx/addons/librxtest1.so
+lib/regina-rexx/addons/librxtest2.so
+man/man1/regina-config.1
man/man1/regina.1
-share/regina/animal.rexx
-share/regina/block.rexx
-share/regina/dateconv.rexx
+man/man1/rexx.1
+man/man1/rxqueue.1
+man/man1/rxstack.1
share/regina/de.mtb
-share/regina/dynfunc.rexx
+share/regina/en.mtb
share/regina/es.mtb
-share/regina/newstr.rexx
+share/regina/examples/animal.rexx
+share/regina/examples/block.rexx
+share/regina/examples/dateconv.rexx
+share/regina/examples/dynfunc.rexx
+share/regina/examples/getline.rexx
+share/regina/examples/newstr.rexx
+share/regina/examples/regutil.rexx
+share/regina/examples/rexxcps.rexx
+share/regina/examples/rxstack.conf
+share/regina/examples/timeconv.rexx
share/regina/no.mtb
+share/regina/pl.mtb
share/regina/pt.mtb
-share/regina/rexxcps.rexx
-share/regina/timeconv.rexx
+share/regina/sv.mtb
+share/regina/tr.mtb
Index: pkgsrc/lang/rexx-regina/distinfo
diff -u pkgsrc/lang/rexx-regina/distinfo:1.8 pkgsrc/lang/rexx-regina/distinfo:1.9
--- pkgsrc/lang/rexx-regina/distinfo:1.8 Thu May 5 13:49:41 2022
+++ pkgsrc/lang/rexx-regina/distinfo Tue Apr 2 18:08:37 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2022/05/05 13:49:41 nia Exp $
+$NetBSD: distinfo,v 1.9 2024/04/02 18:08:37 rhialto Exp $
-BLAKE2s (regina301.zip) = 527b9e194f531297f70eae2af5d83f31ea03a4d8d68d05ff5eb1cc21fe073239
-SHA512 (regina301.zip) = ddf984c4a777728bd1043ab6357c3d5f2a7bc6828312afa6e39562499b9e08e2bc203e95bbef9965691553a6e5a37124521f1a27dfb5d06816255c53d4f23167
-Size (regina301.zip) = 871017 bytes
-SHA1 (patch-aa) = 83e2f07c5d936607ff764eb6a5ff960078d03c03
-SHA1 (patch-ab) = 7cc785ea3b37d67a5ccecea64b63787c7b0f2ff6
+BLAKE2s (regina395.zip) = fa88612a86ebd94c71dab0520478ffd0872514c2bf5c13c9f31b47e0931013ed
+SHA512 (regina395.zip) = 6ad493b7dc63cd110b19f3d25d6bbd96d145a78b7c15c8586ac83e0327ebe9d264ec4fc49848f1630d18141e1c636fe283da6ff5986f07a734b25f0d2e3737de
+Size (regina395.zip) = 2949434 bytes
+SHA1 (patch-aa) = 130d61a03d73bc431008ba54863554ad701de1a3
+SHA1 (patch-ab) = 2975ea1dabe871650a153cd294a0f23d1f3120a0
Index: pkgsrc/lang/rexx-regina/patches/patch-aa
diff -u pkgsrc/lang/rexx-regina/patches/patch-aa:1.3 pkgsrc/lang/rexx-regina/patches/patch-aa:1.4
--- pkgsrc/lang/rexx-regina/patches/patch-aa:1.3 Thu May 5 13:49:41 2022
+++ pkgsrc/lang/rexx-regina/patches/patch-aa Tue Apr 2 18:08:37 2024
@@ -1,43 +1,73 @@
-$NetBSD: patch-aa,v 1.3 2022/05/05 13:49:41 nia Exp $
+$NetBSD: patch-aa,v 1.4 2024/04/02 18:08:37 rhialto Exp $
-Don't use the root /etc. XXX: it shouldn't use the etc in PREFIX either...
+- try to defang the building for 32 bits
+- use our $LDFLAGS
+- portability fix of `test ==`
---- configure.orig 2002-05-19 10:06:07.000000000 +0000
+--- configure.orig 2022-08-10 05:33:51.000000000 +0000
+++ configure
-@@ -3360,10 +3360,10 @@ return(0);
- }
- EOF
- if { (eval echo configure:3363: \"$mh_compile\") 1>&5; (eval $mh_compile) 2>&5; } && test -s conftest.o; then
-- mh_dyn_link='ld -shared -o conftest.so.1.0 conftest.o -lc 1>&5'
-+ mh_dyn_link='${CC} ${LDFLAGS} -shared -o conftest.so.1.0 conftest.o -lc 1>&5'
- # mh_dyn_link='${CC} -Wl,-shared -o conftest.so.1.0 conftest.o -lc 1>&AC_FD_CC'
- if { (eval echo configure:3366: \"$mh_dyn_link\") 1>&5; (eval $mh_dyn_link) 2>&5; } && test -s conftest.so.1.0; then
-- SHL_LD="ld -shared -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')'" -lc"
-+ SHL_LD="${CC} ${LDFLAGS} -shared -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')'" -lc"
- # SHL_LD="${CC} -Wl,-shared -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')'" -lc"
- else
- mh_dyn_link='ld -G -o conftest.so.1.0 conftest.o 1>&5'
-@@ -3421,11 +3421,11 @@ return(0);
- }
- EOF
- if { (eval echo configure:3424: \"$mh_compile\") 1>&5; (eval $mh_compile) 2>&5; } && test -s conftest.o; then
-- mh_dyn_link='ld -shared -o conftest.rxlib conftest.o -lc 1>&5'
-+ mh_dyn_link='${CC} ${LDFLAGS} -shared -o conftest.rxlib conftest.o -lc 1>&5'
- # mh_dyn_link='${CC} -Wl,-shared -o conftest.rxlib conftest.o -lc 1>&AC_FD_CC'
- if { (eval echo configure:3427: \"$mh_dyn_link\") 1>&5; (eval $mh_dyn_link) 2>&5; } && test -s conftest.rxlib; then
-- LD_RXLIB_A1="ld -shared"
-- LD_RXLIB_A2="ld -shared"
-+ LD_RXLIB_A1="${CC} ${LDFLAGS} -shared"
-+ LD_RXLIB_A2="${CC} ${LDFLAGS} -shared"
- # LD_RXLIB1="${CC} -Wl,-shared"
- LD_RXLIB_B1="-L. -l${SHLFILE}"
- LD_RXLIB_B2="-L. -l${SHLFILE}"
-@@ -3598,7 +3598,7 @@ cat >> confdefs.h <<\EOF
- EOF
-
-
--STARTUPDIR="/etc"
-+STARTUPDIR="${exec_prefix}/etc"
- if test -d /etc/rc.d/init.d; then
- STARTUPDIR="/etc/rc.d/init.d"
- else
+@@ -3507,8 +3507,8 @@ fi
+ #
+ # Now do platform specific tests
+ #
+-gcc_64bit="-m64"
+-gcc_32bit="-m32"
++gcc_64bit="" # "-m64"
++gcc_32bit="-mfail:nosuchoption" # "-m32"
+ on_osx="no"
+ osis64bit=no
+ bitflag="32"
+@@ -3564,7 +3564,7 @@ case "$target" in
+ MACH_ARCH="`cat /etc/apk/arch`"
+ fi
+ ;;
+- *-freebsd* | *-openbsd*)
++ *-freebsd* | *-openbsd* | *-netbsd*)
+ mach="`uname -m`"
+ if test "$mach" = "amd64"; then
+ bitflag="64"
+@@ -9252,13 +9252,13 @@ if { { eval echo "\"\$as_me\":${as_linen
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest.o; then
+- mh_dyn_link='ld -shared -o conftest.so.1.0 conftest.o -lc 1>&5'
++ mh_dyn_link='${CC} ${LDFLAGS} -shared -o conftest.so.1.0 conftest.o -lc 1>&5'
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$mh_dyn_link\""; } >&5
+ (eval $mh_dyn_link) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest.so.1.0; then
+- SHL_LD="ld -shared -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')'" -lc"
++ SHL_LD="${CC} ${LDFLAGS} -shared -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')'" -lc"
+ else
+ mh_dyn_link='ld -G -o conftest.so.1.0 conftest.o 1>&5'
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$mh_dyn_link\""; } >&5
+@@ -9340,15 +9340,15 @@ if { { eval echo "\"\$as_me\":${as_linen
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest.o; then
+- mh_dyn_link='ld -shared -o conftest.rxlib conftest.o -lc 1>&5'
++ mh_dyn_link='${CC} ${LDFLAGS} -shared -o conftest.rxlib conftest.o -lc 1>&5'
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$mh_dyn_link\""; } >&5
+ (eval $mh_dyn_link) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest.rxlib; then
+- LD_RXLIB_A1="ld -shared -o \$(@)"
+- LD_RXLIB_A2="ld -shared -o \$(@)"
+- LD_RXLIB_UTILA="ld -shared -o \$(@)"
++ LD_RXLIB_A1="${CC} ${LDFLAGS} -shared -o \$(@)"
++ LD_RXLIB_A2="${CC} ${LDFLAGS} -shared -o \$(@)"
++ LD_RXLIB_UTILA="${CC} ${LDFLAGS} -shared -o \$(@)"
+ LD_RXLIB_B1="-L. -l${SHLFILE}"
+ LD_RXLIB_B2="-L. -l${SHLFILE}"
+ LD_RXLIB_UTILB="-L. -l${SHLFILE}"
+@@ -9934,7 +9934,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking getting PACKAGE_RELEASE value" >&5
+ $as_echo_n "checking getting PACKAGE_RELEASE value... " >&6; }
+ PACKAGE_RELEASE=`echo $PACKAGE_RELEASE`
+-if test x"$PACKAGE_RELEASE" == "x"; then
++if test x"$PACKAGE_RELEASE" = "x"; then
+ PACKAGE_RELEASE=`date +%y%m%d.%H%M`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_RELEASE" >&5
Index: pkgsrc/lang/rexx-regina/patches/patch-ab
diff -u pkgsrc/lang/rexx-regina/patches/patch-ab:1.3 pkgsrc/lang/rexx-regina/patches/patch-ab:1.4
--- pkgsrc/lang/rexx-regina/patches/patch-ab:1.3 Tue Dec 29 23:34:54 2015
+++ pkgsrc/lang/rexx-regina/patches/patch-ab Tue Apr 2 18:08:37 2024
@@ -1,35 +1,32 @@
-$NetBSD: patch-ab,v 1.3 2015/12/29 23:34:54 dholland Exp $
+$NetBSD: patch-ab,v 1.4 2024/04/02 18:08:37 rhialto Exp $
Set rpaths.
XXX: should honor COMPILER_RPATH_FLAG.
Honor pkgsrc LDFLAGS.
-Don't install the rc script. XXX: revisit this.
---- Makefile.in.orig Wed May 15 11:11:12 2002
+--- Makefile.in.orig 2022-08-24 05:38:36.000000000 +0000
+++ Makefile.in
-@@ -73,9 +73,9 @@ SHLIBS = @SHLIBS@ @DLFCNLIBDIR@
- BOTHLIBS = @BOTHLIBS@ @MH_MT_LIBS@ $(SHLIBS)
+@@ -121,10 +121,10 @@ SHL_NAME_RXTEST2 = @SHL_NAME_RXTEST2@
LD_RXLIB_A1 = @LD_RXLIB_A1@
LD_RXLIB_A2 = @LD_RXLIB_A2@
+ LD_RXLIB_UTILA = @LD_RXLIB_UTILA@
-LD_RXLIB_B1 = @LD_RXLIB_B1@
-LD_RXLIB_B2 = @LD_RXLIB_B2@
+-LD_RXLIB_UTILB = @LD_RXLIB_UTILB@
-DYNAMIC_LDFLAGS = @DYNAMIC_LDFLAGS@
+LD_RXLIB_B1 = @LD_RXLIB_B1@ -R$(PREFIX)/lib
+LD_RXLIB_B2 = @LD_RXLIB_B2@ -R$(PREFIX)/lib
-+DYNAMIC_LDFLAGS = $(LDFLAGS) @DYNAMIC_LDFLAGS@
- SHL_LD = @SHL_LD@ $(BOTHLIBS)
++LD_RXLIB_UTILB = @LD_RXLIB_UTILB@ -R$(PREFIX)/lib
++DYNAMIC_LDFLAGS = @DYNAMIC_LDFLAGS@ -R$(PREFIX)/lib
+ SHL_LD = @SHL_LD@
SHL_TARGETS = @SHL_TARGETS@
OTHER_INSTALLS = @OTHER_INSTALLS@
-@@ -819,9 +819,9 @@ installbase: all
- $(INSTALL) -m 755 -c ./rxstack$(EXE) $(bindir)/rxstack$(EXE)
- $(INSTALL) -m 755 -c ./trexx$(EXE) $(bindir)/trexx$(EXE)
- $(INSTALL) -m 755 -c ./regina-config $(bindir)/$(SHLFILE)-config
-- -$(INSTALL) -m 755 -c ./rxstack.init.d $(STARTUPDIR)/rxstack
-- echo "The system startup/shutdown script; rxstack, may have been installed into $(STARTUPDIR)"
-- echo "You need to create the appropriate links to this script to start and stop rxstack automatically."
-+ #-$(INSTALL) -m 755 -c ./rxstack.init.d $(STARTUPDIR)/rxstack
-+ #echo "The system startup/shutdown script; rxstack, may have been installed into $(STARTUPDIR)"
-+ #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)
- -$(RANLIB) $(libdir)/$(LIBPRE)$(LIBFILE)$(LIBPST)
- $(INSTALL) -m 744 -c $(srcdir)/regina.1 $(mandir)/man1/regina.1
+@@ -1056,7 +1056,7 @@ installbase: all
+ $(INSTALL) -s -m 755 -c ./rexx$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/rexx$(binarybitprefix)$(EXE)
+ $(INSTALL) -s -m 755 -c ./rxqueue$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/rxqueue$(binarybitprefix)$(EXE)
+ $(INSTALL) -s -m 755 -c ./rxstack$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/rxstack$(binarybitprefix)$(EXE)
+- $(INSTALL) -m 644 -c $(srcdir)/rxstack.conf.etc $(DESTDIR)$(sysconfdir)/rxstack.conf
++ $(INSTALL) -m 644 -c $(srcdir)/rxstack.conf.etc $(DESTDIR)$(examplesdir)/rxstack.conf
+ $(INSTALL) -m 755 -c ./regina-config $(DESTDIR)$(bindir)/regina-config
+ $(INSTALL) -m 755 -c ./libregina.pc $(DESTDIR)$(libdir)/pkgconfig/libregina.pc
+ -$(INSTALL) -m 644 -c ./$(LIBPRE)$(LIBFILE)$(LIBPST) $(DESTDIR)$(libdir)/$(LIBPRE)$(LIBFILE)$(LIBPST)
Home |
Main Index |
Thread Index |
Old Index