CVS commit: pkgsrc/lang/rexx-regina

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sat Dec  7 19:42:15 UTC 2024

Modified Files:
        pkgsrc/lang/rexx-regina: Makefile PLIST distinfo
        pkgsrc/lang/rexx-regina/patches: patch-aa

Log Message:
Restore versioned symlinks to the shlib,

which were not created on *BSD.
Contributed by Periklis Akritidis.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/rexx-regina/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/rexx-regina/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/rexx-regina/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/rexx-regina/patches/patch-aa

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.16 pkgsrc/lang/rexx-regina/Makefile:1.17
--- pkgsrc/lang/rexx-regina/Makefile:1.16       Tue Apr  2 18:08:37 2024
+++ pkgsrc/lang/rexx-regina/Makefile    Sat Dec  7 19:42:15 2024
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2024/04/02 18:08:37 rhialto Exp $
+# $NetBSD: Makefile,v 1.17 2024/12/07 19:42:15 rhialto Exp $
 #
 
 DISTNAME=      regina395
+PKGREVISION=   1
 PKGNAME=       rexx-regina-3.9.5
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=regina-rexx/}

Index: pkgsrc/lang/rexx-regina/PLIST
diff -u pkgsrc/lang/rexx-regina/PLIST:1.3 pkgsrc/lang/rexx-regina/PLIST:1.4
--- pkgsrc/lang/rexx-regina/PLIST:1.3   Tue Apr  2 18:08:37 2024
+++ pkgsrc/lang/rexx-regina/PLIST       Sat Dec  7 19:42:15 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2024/04/02 18:08:37 rhialto Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/12/07 19:42:15 rhialto Exp $
 bin/regina
 bin/regina-config
 bin/rexx
@@ -7,6 +7,8 @@ bin/rxstack
 include/rexxsaa.h
 lib/libregina.a
 lib/libregina.so
+lib/libregina.so.3
+lib/libregina.so.3.9
 lib/pkgconfig/libregina.pc
 lib/regina-rexx/${PKGVERSION}/libregutil.so
 lib/regina-rexx/${PKGVERSION}/librxtest1.so

Index: pkgsrc/lang/rexx-regina/distinfo
diff -u pkgsrc/lang/rexx-regina/distinfo:1.9 pkgsrc/lang/rexx-regina/distinfo:1.10
--- pkgsrc/lang/rexx-regina/distinfo:1.9        Tue Apr  2 18:08:37 2024
+++ pkgsrc/lang/rexx-regina/distinfo    Sat Dec  7 19:42:15 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2024/04/02 18:08:37 rhialto Exp $
+$NetBSD: distinfo,v 1.10 2024/12/07 19:42:15 rhialto Exp $
 
 BLAKE2s (regina395.zip) = fa88612a86ebd94c71dab0520478ffd0872514c2bf5c13c9f31b47e0931013ed
 SHA512 (regina395.zip) = 6ad493b7dc63cd110b19f3d25d6bbd96d145a78b7c15c8586ac83e0327ebe9d264ec4fc49848f1630d18141e1c636fe283da6ff5986f07a734b25f0d2e3737de
 Size (regina395.zip) = 2949434 bytes
-SHA1 (patch-aa) = 130d61a03d73bc431008ba54863554ad701de1a3
+SHA1 (patch-aa) = 45f8c23796ca013c03b81334dbf0913cf581d689
 SHA1 (patch-ab) = 2975ea1dabe871650a153cd294a0f23d1f3120a0

Index: pkgsrc/lang/rexx-regina/patches/patch-aa
diff -u pkgsrc/lang/rexx-regina/patches/patch-aa:1.4 pkgsrc/lang/rexx-regina/patches/patch-aa:1.5
--- pkgsrc/lang/rexx-regina/patches/patch-aa:1.4        Tue Apr  2 18:08:37 2024
+++ pkgsrc/lang/rexx-regina/patches/patch-aa    Sat Dec  7 19:42:15 2024
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2024/04/02 18:08:37 rhialto Exp $
+$NetBSD: patch-aa,v 1.5 2024/12/07 19:42:15 rhialto Exp $
 
 - try to defang the building for 32 bits
 - use our $LDFLAGS
 - portability fix of `test ==`
+- enable version numbered shared library on {Net,Open,Free}BSD
 
---- configure.orig     2022-08-10 05:33:51.000000000 +0000
-+++ configure
-@@ -3507,8 +3507,8 @@ fi
+--- configure.orig     2022-08-10 13:33:51.000000000 +0800
++++ configure  2024-12-06 11:33:48.217867627 +0800
+@@ -3507,8 +3507,8 @@
  #
  # Now do platform specific tests
  #
@@ -17,7 +18,7 @@ $NetBSD: patch-aa,v 1.4 2024/04/02 18:08
  on_osx="no"
  osis64bit=no
  bitflag="32"
-@@ -3564,7 +3564,7 @@ case "$target" in
+@@ -3564,7 +3564,7 @@
           MACH_ARCH="`cat /etc/apk/arch`"
        fi
        ;;
@@ -26,7 +27,37 @@ $NetBSD: patch-aa,v 1.4 2024/04/02 18:08
        mach="`uname -m`"
        if test "$mach" = "amd64"; then
           bitflag="64"
-@@ -9252,13 +9252,13 @@ if { { eval echo "\"\$as_me\":${as_linen
+@@ -9040,21 +9040,14 @@
+       SHLPRE="lib"
+       SHL_LD="ld -assert pure-text -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')'
+       ;;
+-   *-freebsd* | *openbsd*)
+-      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 \$(@)"
+-         LD_RXLIB_UTILA="$ac_cv_prog_CC -shared ${LDFLAGS} -o \$(@)"
+-         SHL_LD="$ac_cv_prog_CC -shared ${LDFLAGS} -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')'
+-      else
+-         LD_RXLIB_A1="ld -Bdynamic -Bshareable ${LDFLAGS} -o \$(@)"
+-         LD_RXLIB_A2="ld -Bdynamic -Bshareable ${LDFLAGS} -o \$(@)"
+-         LD_RXLIB_UTILA="ld -Bdynamic -Bshareable ${LDFLAGS} -o \$(@)"
+-         LD_RXLIB_B1="-lc -L. -l${SHLFILE}"
+-         LD_RXLIB_B2="-lc -L. -l${SHLFILE}"
+-         LD_RXLIB_UTILB="-lc -L. -l${SHLFILE}"
+-         SHL_LD="ld -Bdynamic -Bshareable ${LDFLAGS} -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')'
+-      fi
++   *-freebsd* | *-openbsd* | *-netbsd*)
++      LD_RXLIB_A1="${CC} -shared ${LDFLAGS} -o \$(@)"
++      LD_RXLIB_A2="${CC} -shared ${LDFLAGS} -o \$(@)"
++      LD_RXLIB_UTILA="${CC} -shared ${LDFLAGS} -o \$(@)"
++      SHL_LD="${CC} -o ${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI) -shared ${SHL_SCRIPT} -Wl,-soname=${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI_MAJOR) \$(SHOFILES) -lc"
++      SHL_BASE="${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI)"
++      OTHER_INSTALLS="installabilib"
++      USE_ABI="yes"
+       STATIC_LDFLAGS="-static"
+       SHLPRE="lib"
+       ;;
+@@ -9252,13 +9245,13 @@
    ac_status=$?
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; } && test -s conftest.o; then
@@ -42,7 +73,7 @@ $NetBSD: patch-aa,v 1.4 2024/04/02 18:08
     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
+@@ -9340,15 +9333,15 @@
    ac_status=$?
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; } && test -s conftest.o; then
@@ -62,7 +93,7 @@ $NetBSD: patch-aa,v 1.4 2024/04/02 18:08
        LD_RXLIB_B1="-L. -l${SHLFILE}"
        LD_RXLIB_B2="-L. -l${SHLFILE}"
        LD_RXLIB_UTILB="-L. -l${SHLFILE}"
-@@ -9934,7 +9934,7 @@ fi
+@@ -9934,7 +9927,7 @@
  { $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`