CVS commit: pkgsrc/net/fehqlibs

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/fehqlibs
From: "Amitai Schleier" <schmonz%netbsd.org@localhost>
Date: Mon, 15 Apr 2024 16:24:52 +0000

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Apr 15 16:24:52 UTC 2024

Modified Files:
        pkgsrc/net/fehqlibs: Makefile PLIST distinfo
        pkgsrc/net/fehqlibs/patches: patch-Makefile
Added Files:
        pkgsrc/net/fehqlibs/patches: patch-configure patch-dnsstub_Makefile
Removed Files:
        pkgsrc/net/fehqlibs/patches: patch-install

Log Message:
fehqlibs: libtoolize for portability. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/fehqlibs/Makefile \
    pkgsrc/net/fehqlibs/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/fehqlibs/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/fehqlibs/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/net/fehqlibs/patches/patch-configure \
    pkgsrc/net/fehqlibs/patches/patch-dnsstub_Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/net/fehqlibs/patches/patch-install

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/fehqlibs/Makefile
diff -u pkgsrc/net/fehqlibs/Makefile:1.23 pkgsrc/net/fehqlibs/Makefile:1.24
--- pkgsrc/net/fehqlibs/Makefile:1.23   Wed Apr  3 03:30:28 2024
+++ pkgsrc/net/fehqlibs/Makefile        Mon Apr 15 16:24:52 2024
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2024/04/03 03:30:28 schmonz Exp $
+# $NetBSD: Makefile,v 1.24 2024/04/15 16:24:52 schmonz Exp $
 
 DISTNAME=              fehQlibs-23
 PKGNAME=               ${DISTNAME:S/Qlibs-/qlibs-/}
+PKGREVISION=           1
 CATEGORIES=            net
 MASTER_SITES=          https://www.fehcom.de/ipnet/fehQlibs/
 EXTRACT_SUFX=          .tgz
@@ -12,9 +13,12 @@ COMMENT=             State-of-the-art C routines fo
 LICENSE=               public-domain
 
 MAKE_JOBS_SAFE=                no
+USE_LIBTOOL=           yes
 
 BUILD_TARGET=          libs shared
 
+REPLACE_SH=            configure install
+
 SUBST_CLASSES+=                echo
 SUBST_STAGE.echo=      pre-configure
 SUBST_FILES.echo=      configure install
@@ -26,29 +30,24 @@ SUBST_STAGE.etc=    do-configure
 SUBST_FILES.etc=       dnsstub/dns_rcrw.c
 SUBST_SED.etc=         -e 's|/etc/dnsrewrite|${PKG_SYSCONFBASE}/dnsrewrite|g'
 
-SUBST_CLASSES+=                ldflags
-SUBST_STAGE.ldflags=   pre-configure
-SUBST_FILES.ldflags=   Makefile
-SUBST_SED.ldflags=     -e 's|\$$(MAKELIB) \$$(LDFLAGS) |$$(MAKELIB) |g'
+SUBST_CLASSES+=                libtool
+SUBST_STAGE.libtool=   pre-configure
+SUBST_FILES.libtool=   Makefile
+SUBST_SED.libtool=     -e 's|\$$(MAKELIB) \$$(LDFLAGS) |$$(MAKELIB) |g'
+SUBST_SED.libtool+=    -e 's|\.o|\.lo|g'
 
 BUILD_DEFS+=           PKG_SYSCONFBASE
 
-post-extract:
-       rm -f ${WRKSRC}/include/*.orig
-
 do-configure:
        cd ${WRKSRC};                                                           \
        ${ECHO} "LIBDIR=${DESTDIR}${PREFIX}/lib/qlibs" >> ${WRKSRC}/conf-build; \
        ${ECHO} "HDRDIR=${DESTDIR}${PREFIX}/include/qlibs" >> ${WRKSRC}/conf-build; \
        ${MAKE} check
 
-.include "../../mk/bsd.prefs.mk"
-
-post-build:
-.if ${OPSYS} == Darwin
-       cd ${WRKSRC} && for lib in *.so; do \
-         install_name_tool -id ${PREFIX}/lib/qlibs/$${lib} $${lib}; \
+post-install:
+       cd ${WRKSRC} && for lib in *.la; do \
+               ${LIBTOOL} --mode=install ${INSTALL_LIB} $${lib} \
+                       ${DESTDIR}${PREFIX}/lib/qlibs; \
        done
-.endif
 
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/fehqlibs/distinfo
diff -u pkgsrc/net/fehqlibs/distinfo:1.23 pkgsrc/net/fehqlibs/distinfo:1.24
--- pkgsrc/net/fehqlibs/distinfo:1.23   Wed Apr  3 03:30:28 2024
+++ pkgsrc/net/fehqlibs/distinfo        Mon Apr 15 16:24:52 2024
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.23 2024/04/03 03:30:28 schmonz Exp $
+$NetBSD: distinfo,v 1.24 2024/04/15 16:24:52 schmonz Exp $
 
 BLAKE2s (fehQlibs-23.tgz) = de9ac2a4af2e76cb321b3569ddc95e311929706a9e6aab1d2efd497514d9b277
 SHA512 (fehQlibs-23.tgz) = 676b8e57cac2f6700cdf4643d72c55df2beca42a893dd7428cebfbb2844f3643608ab25205f8b36cf35741847476df862773dd8a14a604d25dc69bec3a5b5999
 Size (fehQlibs-23.tgz) = 87995 bytes
-SHA1 (patch-Makefile) = a5e168aa600f49908f3e5e825fe3b649e7a84f2b
-SHA1 (patch-install) = 860256635a5a19805ec3ed97f11833a35f67d3bb
+SHA1 (patch-Makefile) = 538147923d27c039b48711453a5b3deb775c36d2
+SHA1 (patch-configure) = 2d38e849e3cc684477831a6a1565860bc4c0e57f
+SHA1 (patch-dnsstub_Makefile) = 5eb9f77dd72c73126fe984d1cf626a9c28e932d2

Index: pkgsrc/net/fehqlibs/PLIST
diff -u pkgsrc/net/fehqlibs/PLIST:1.4 pkgsrc/net/fehqlibs/PLIST:1.5
--- pkgsrc/net/fehqlibs/PLIST:1.4       Sat Apr  3 19:33:28 2021
+++ pkgsrc/net/fehqlibs/PLIST   Mon Apr 15 16:24:52 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2021/04/03 19:33:28 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.5 2024/04/15 16:24:52 schmonz Exp $
 include/qlibs/alloc.h
 include/qlibs/base64.h
 include/qlibs/buffer.h
@@ -60,9 +60,9 @@ lib/qlibs/getln.a
 lib/qlibs/getopt.a
 lib/qlibs/ip.a
 lib/qlibs/libdnsresolv.a
-lib/qlibs/libdnsresolv.so
+lib/qlibs/libdnsresolv.la
 lib/qlibs/libqlibs.a
-lib/qlibs/libqlibs.so
+lib/qlibs/libqlibs.la
 lib/qlibs/lock.a
 lib/qlibs/logmsg.a
 lib/qlibs/ndelay.a

Index: pkgsrc/net/fehqlibs/patches/patch-Makefile
diff -u pkgsrc/net/fehqlibs/patches/patch-Makefile:1.3 pkgsrc/net/fehqlibs/patches/patch-Makefile:1.4
--- pkgsrc/net/fehqlibs/patches/patch-Makefile:1.3      Wed Mar  4 15:44:51 2020
+++ pkgsrc/net/fehqlibs/patches/patch-Makefile  Mon Apr 15 16:24:52 2024
@@ -1,15 +1,72 @@
-$NetBSD: patch-Makefile,v 1.3 2020/03/04 15:44:51 schmonz Exp $
+$NetBSD: patch-Makefile,v 1.4 2024/04/15 16:24:52 schmonz Exp $
 
-Link needed symbols into shared libdnsresolv.
+Libtoolize for portable shared libraries.
 
---- Makefile.orig      2020-02-14 17:33:23.000000000 +0000
+--- Makefile.orig      2021-04-02 21:24:02.000000000 +0000
 +++ Makefile
-@@ -40,7 +40,7 @@ setup:
+@@ -5,8 +5,11 @@ SHELL=/bin/sh
+ # static flags - DO NOT EDIT!
+ CCFLAGS=-Iinclude
+ 
+-SRCS=*.c
+-OBJS=*.o
++.SUFFIXES: .lo
++.c.lo:
++      $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CCFLAGS) -c -o $@ $<
++
++OBJS=*.lo
+ COMPILE=./compile
+ MAKELIB=./makelib
+ SHAREDLIB=./sharedlib
+@@ -25,13 +28,11 @@ clean:
+ core: alloc.a buffer.a case.a cdb.a constmap.a env.a \
+ fd.a fs.a getln.a getopt.a lock.a logmsg.a ndelay.a open.a \
+ seek.a sig.a str.a stralloc.a time.a wait.a \
+-ip.a socket.a dnsresolv.a 
+-
+-libs: obj core qlibs.a dnsresolv.a
++ip.a socket.a dnsresolv.a \
++base64.o pathexec.o prot.o readclose.o \
++uint128p.o uint16p.o uint32p.o uint64p.o uint8p.o
+ 
+-obj:
+-      @echo Making all in qlibs ...
+-      $(COMPILE) $(CCFLAGS) $(CFLAGS) $(SRCS)
++libs: core qlibs.a dnsresolv.a
+ 
+ install: setup
+ 
+@@ -40,23 +41,26 @@ setup:
+ 
  shared: $(COMPILE) $(SHAREDLIB) $(OBJS) ./dnsstub/$(OBJS)
        @echo Building shared qlibs ...
-       $(SHAREDLIB) $(LDFLAGS) $(OBJS) -o libqlibs.so 
+-      $(SHAREDLIB) $(LDFLAGS) $(OBJS) -o libqlibs.so 
 -      $(SHAREDLIB) $(LDFLAGS) ./dnsstub/$(OBJS) -o libdnsresolv.so
-+      $(SHAREDLIB) $(LDFLAGS) $(OBJS) ./dnsstub/$(OBJS) -o libdnsresolv.so
++      $(SHAREDLIB) libqlibs.la $(OBJS) \
++              -version-info 0:0:0 -rpath $(PREFIX)/lib/qlibs
++      $(SHAREDLIB) libdnsresolv.la ./dnsstub/$(OBJS) \
++              -version-info 0:0:0 -rpath $(PREFIX)/lib/qlibs
   
- qlibs.a: obj socket.a 
-       $(MAKELIB) $(LDFLAGS) qlibs.a *.o 
+-qlibs.a: obj socket.a 
+-      $(MAKELIB) $(LDFLAGS) qlibs.a *.o 
++qlibs.a: $(OBJS) socket.a 
++      $(MAKELIB) $(LDFLAGS) qlibs.a $(OBJS)
+       ln -sf qlibs.a libqlibs.a
+ 
+ dnsresolv.a:
+       @echo "Building @dnsresolv lib ..."
+-      @cd dnsstub ; make
++      @cd dnsstub ; $(MAKE) dnsresolv.a
+       @cp dnsstub/dnsresolv.a dnsresolv.a
+       ln -sf dnsresolv.a libdnsresolv.a
+ 
+-socket.a: ip.a
++socket.a: socket_if.o socket_bind.o socket_connect.o \
++socket_info.o socket_recv.o socket_send.o socket_setup.o socket_tcp.o socket_udp.o ip.a 
+       @echo "Building socket lib ..."
+       $(MAKELIB) $(LDFLAGS) socket.a socket_if.o socket_bind.o socket_connect.o \
+-      socket_info.o socket_setup.o socket_tcp.o socket_udp.o ip.a 
++      socket_info.o socket_recv.o socket_send.o socket_setup.o socket_tcp.o socket_udp.o ip.a 
+ 
+ # build each file separately (backwards compat) - better use recipe qlibs.a
+ alloc.a: alloc.o

Added files:

Index: pkgsrc/net/fehqlibs/patches/patch-configure
diff -u /dev/null pkgsrc/net/fehqlibs/patches/patch-configure:1.1
--- /dev/null   Mon Apr 15 16:24:52 2024
+++ pkgsrc/net/fehqlibs/patches/patch-configure Mon Apr 15 16:24:52 2024
@@ -0,0 +1,33 @@
+$NetBSD: patch-configure,v 1.1 2024/04/15 16:24:52 schmonz Exp $
+
+Libtoolize for portable shared libraries.
+
+--- configure.orig     2021-09-22 09:36:02.000000000 +0000
++++ configure
+@@ -47,23 +47,20 @@ echo " found!"
+ echo -n "Checking for compile ... "
+ CC="cc"
+ ( echo '#!/bin/sh'
+-  echo exec "$CC" "$CFLAGS" -c '${1+"$@"}' ) > compile
++  echo exec libtool --tag=CC --mode=compile "$CC" "$CFLAGS" -c '${1+"$@"}' ) > compile
+ chmod 755 compile
+ echo " created!"
+ 
+ echo -n "Checking for makelib ... "
+ ( echo '#!/bin/sh' ;
+   echo "" ;
+-  echo 'main="$1"; shift' ; \
+-  echo 'rm -f "$main"' ; \
+-  echo 'ar cr "$main" ${1+"$@"}' ; \
+-  echo 'ranlib "$main"') > makelib
++  echo exec libtool --tag=CC --mode=link "$CC" "$LDFLAGS" -o '${1+"$@"}' ) > makelib
+ chmod 755 makelib
+ echo " created!"
+ 
+ echo -n "Checking for sharedlib ... "
+ CC="cc"
+ ( echo '#!/bin/sh'
+-  echo exec "$CC" -shared '${1+"$@"}' ) > sharedlib
++  echo exec libtool --tag=CC --mode=link "$CC" "$LDFLAGS" -shared -o '${1+"$@"}' ) > sharedlib
+ chmod 755 sharedlib
+ echo " created!"
Index: pkgsrc/net/fehqlibs/patches/patch-dnsstub_Makefile
diff -u /dev/null pkgsrc/net/fehqlibs/patches/patch-dnsstub_Makefile:1.1
--- /dev/null   Mon Apr 15 16:24:52 2024
+++ pkgsrc/net/fehqlibs/patches/patch-dnsstub_Makefile  Mon Apr 15 16:24:52 2024
@@ -0,0 +1,41 @@
+$NetBSD: patch-dnsstub_Makefile,v 1.1 2024/04/15 16:24:52 schmonz Exp $
+
+Libtoolize for portable shared libraries.
+
+--- dnsstub/Makefile.orig      2022-07-07 20:34:43.000000000 +0000
++++ dnsstub/Makefile
+@@ -1,7 +1,17 @@
+ 
++SHELL=/bin/sh
++
++CCFLAGS=-I../include
++
++.SUFFIXES: .lo
++.c.lo:
++      $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CCFLAGS) -c -o $@ $<
++
++OBJS=dns_cname.lo dns_dfd.lo dns_domain.lo dns_dtda.lo dns_ip.lo dns_ipq.lo \
++     dns_mx.lo dns_name.lo dns_nd.lo dns_packet.lo dns_random.lo dns_rcip.lo \
++     dns_rcrw.lo dns_resolve.lo dns_sortip.lo dns_transmit.lo dns_txt.lo
+ COMPILE=../compile
+ MAKELIB=../makelib
+-CCFLAGS=-I../include
+ 
+ default: clean check dnsresolv.a
+ 
+@@ -11,13 +21,5 @@ check:
+ clean:
+       rm -f `cat TARGETS`
+ 
+-dnsresolv.a: \
+-dns_domain.c dns_dtda.c dns_ip.c dns_ipq.c dns_name.c \
+-dns_nd.c dns_packet.c dns_random.c dns_rcip.c dns_rcrw.c dns_resolve.c \
+-dns_sortip.c dns_transmit.c dns_txt.c
+-      $(COMPILE) $(CCFLAGS) dns_domain.c dns_dfd.c dns_dtda.c dns_ip.c dns_ipq.c \
+-      dns_mx.c dns_name.c dns_nd.c dns_packet.c dns_random.c dns_rcip.c \
+-      dns_rcrw.c dns_resolve.c dns_sortip.c dns_transmit.c dns_txt.c dns_cname.c 
+-      $(MAKELIB) dnsresolv.a dns_domain.o dns_dfd.o dns_dtda.o dns_ip.o dns_ipq.o \
+-      dns_mx.o dns_name.o dns_nd.o dns_packet.o dns_random.o dns_rcip.o \
+-      dns_rcrw.o dns_resolve.o dns_sortip.o dns_transmit.o dns_txt.o dns_cname.o 
++dnsresolv.a: $(OBJS)
++      $(MAKELIB) dnsresolv.a $(OBJS)

Prev by Date: Re: CVS commit: pkgsrc/devel/py-pydantic-core
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index