CVS commit: pkgsrc/net/fehqlibs

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Mar  4 15:44:51 UTC 2020

Modified Files:
        pkgsrc/net/fehqlibs: Makefile distinfo
        pkgsrc/net/fehqlibs/patches: patch-Makefile

Log Message:
Update to 14 (as 0.9.14). From the changelog:

- Added 'const' for most input arguments + updated man:
  byte, logmsg, str, pathexec. Patch contributed by Alan S.
- Added byte_fill and case_upper function (potentially for SRS).
- Included CFLAGS and LDFLAGS macros in Makefile.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/fehqlibs/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/fehqlibs/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/fehqlibs/patches/patch-Makefile

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.10 pkgsrc/net/fehqlibs/Makefile:1.11
--- pkgsrc/net/fehqlibs/Makefile:1.10   Mon Feb  3 01:11:01 2020
+++ pkgsrc/net/fehqlibs/Makefile        Wed Mar  4 15:44:50 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2020/02/03 01:11:01 schmonz Exp $
+# $NetBSD: Makefile,v 1.11 2020/03/04 15:44:50 schmonz Exp $
 
-DISTNAME=              fehQlibs-13d
+DISTNAME=              fehQlibs-14
 PKGNAME=               ${DISTNAME:S/Qlibs-/qlibs-0.9./}
 CATEGORIES=            net
 MASTER_SITES=          https://www.fehcom.de/ipnet/fehQlibs/
@@ -25,8 +25,16 @@ 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'
+
 BUILD_DEFS+=           PKG_SYSCONFBASE
 
+post-extract:
+       rm -f ${WRKSRC}/include/*.orig
+
 do-configure:
        cd ${WRKSRC};                                                           \
        ${ECHO} "LIBDIR=${DESTDIR}${PREFIX}/lib/qlibs" >> ${WRKSRC}/conf-build; \

Index: pkgsrc/net/fehqlibs/distinfo
diff -u pkgsrc/net/fehqlibs/distinfo:1.9 pkgsrc/net/fehqlibs/distinfo:1.10
--- pkgsrc/net/fehqlibs/distinfo:1.9    Mon Feb  3 01:11:01 2020
+++ pkgsrc/net/fehqlibs/distinfo        Wed Mar  4 15:44:50 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2020/02/03 01:11:01 schmonz Exp $
+$NetBSD: distinfo,v 1.10 2020/03/04 15:44:50 schmonz Exp $
 
-SHA1 (fehQlibs-13d.tgz) = fa380616c0394e26bf5aa1ba27c46cbb1bc95c41
-RMD160 (fehQlibs-13d.tgz) = 79df0b49b744183806f24735d18dceca0f15ca05
-SHA512 (fehQlibs-13d.tgz) = 3102bd014c503aea529c6e0b34e5b23a163119d2a37a170d24ad9efab65241b973675e9b280b4568f928c56434d72970af02f27184423cd30fadbf4badc78efe
-Size (fehQlibs-13d.tgz) = 79059 bytes
-SHA1 (patch-Makefile) = bdbf2dc6c0c21439434b31980d17c1c44c37577a
+SHA1 (fehQlibs-14.tgz) = ec7b7681b280d8f1e1fc34e804633c54865b11b7
+RMD160 (fehQlibs-14.tgz) = 47e4beb71730cc9ffdfb15b96543c0b229c3838d
+SHA512 (fehQlibs-14.tgz) = 112c955054aed0d056873d00200a2b7f2adae51e2c21ba36f6cb615d9c22841064cdcfd32e53cae4fa2df595105145e66e88d9a3ccb3d6fc9f04f5378b447bdb
+Size (fehQlibs-14.tgz) = 80399 bytes
+SHA1 (patch-Makefile) = a5e168aa600f49908f3e5e825fe3b649e7a84f2b
 SHA1 (patch-install) = 860256635a5a19805ec3ed97f11833a35f67d3bb

Index: pkgsrc/net/fehqlibs/patches/patch-Makefile
diff -u pkgsrc/net/fehqlibs/patches/patch-Makefile:1.2 pkgsrc/net/fehqlibs/patches/patch-Makefile:1.3
--- pkgsrc/net/fehqlibs/patches/patch-Makefile:1.2      Mon Feb  3 01:11:01 2020
+++ pkgsrc/net/fehqlibs/patches/patch-Makefile  Wed Mar  4 15:44:51 2020
@@ -1,15 +1,15 @@
-$NetBSD: patch-Makefile,v 1.2 2020/02/03 01:11:01 schmonz Exp $
+$NetBSD: patch-Makefile,v 1.3 2020/03/04 15:44:51 schmonz Exp $
 
 Link needed symbols into shared libdnsresolv.
 
---- Makefile.orig      2020-02-01 21:23:55.000000000 +0000
+--- Makefile.orig      2020-02-14 17:33:23.000000000 +0000
 +++ Makefile
 @@ -40,7 +40,7 @@ setup:
  shared: $(COMPILE) $(SHAREDLIB) $(OBJS) ./dnsstub/$(OBJS)
        @echo Building shared qlibs ...
-       $(SHAREDLIB) $(OBJS) -o libqlibs.so 
--      $(SHAREDLIB) ./dnsstub/$(OBJS) -o libdnsresolv.so
-+      $(SHAREDLIB) $(OBJS) ./dnsstub/$(OBJS) -o libdnsresolv.so
+       $(SHAREDLIB) $(LDFLAGS) $(OBJS) -o libqlibs.so 
+-      $(SHAREDLIB) $(LDFLAGS) ./dnsstub/$(OBJS) -o libdnsresolv.so
++      $(SHAREDLIB) $(LDFLAGS) $(OBJS) ./dnsstub/$(OBJS) -o libdnsresolv.so
   
  qlibs.a: obj socket.a 
-       $(MAKELIB) qlibs.a *.o 
+       $(MAKELIB) $(LDFLAGS) qlibs.a *.o