CVS commit: pkgsrc/net/fehqlibs

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Jul 10 11:20:02 UTC 2019

Modified Files:
        pkgsrc/net/fehqlibs: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/net/fehqlibs/patches: patch-Makefile

Log Message:
Build and install shared libs. Bump BUILDLINK_API_DEPENDS and PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/fehqlibs/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/fehqlibs/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/fehqlibs/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/fehqlibs/distinfo
cvs rdiff -u -r0 -r1.1 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.5 pkgsrc/net/fehqlibs/Makefile:1.6
--- pkgsrc/net/fehqlibs/Makefile:1.5    Wed Jul 10 10:35:11 2019
+++ pkgsrc/net/fehqlibs/Makefile        Wed Jul 10 11:20:02 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2019/07/10 10:35:11 schmonz Exp $
+# $NetBSD: Makefile,v 1.6 2019/07/10 11:20:02 schmonz Exp $
 
 DISTNAME=              fehQlibs-10
 PKGNAME=               ${DISTNAME:S/Qlibs-/qlibs-0.9./:S/10/12.10/}
+PKGREVISION=           1
 CATEGORIES=            net
 MASTER_SITES=          https://www.fehcom.de/ipnet/fehQlibs/
 EXTRACT_SUFX=          .tgz
@@ -13,7 +14,7 @@ LICENSE=              public-domain
 
 MAKE_JOBS_SAFE=                no
 
-BUILD_TARGET=          libs
+BUILD_TARGET=          libs shared
 
 SUBST_CLASSES+=                echo
 SUBST_STAGE.echo=      pre-configure
@@ -33,4 +34,13 @@ do-configure:
        ${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}; \
+       done
+.      endif
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/fehqlibs/PLIST
diff -u pkgsrc/net/fehqlibs/PLIST:1.1 pkgsrc/net/fehqlibs/PLIST:1.2
--- pkgsrc/net/fehqlibs/PLIST:1.1       Sun Oct  7 12:53:54 2018
+++ pkgsrc/net/fehqlibs/PLIST   Wed Jul 10 11:20:02 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2018/10/07 12:53:54 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/07/10 11:20:02 schmonz Exp $
 include/qlibs/alloc.h
 include/qlibs/base64.h
 include/qlibs/buffer.h
@@ -56,7 +56,9 @@ lib/qlibs/getln.a
 lib/qlibs/getopt.a
 lib/qlibs/ip.a
 lib/qlibs/libdnsresolv.a
+lib/qlibs/libdnsresolv.so
 lib/qlibs/libqlibs.a
+lib/qlibs/libqlibs.so
 lib/qlibs/lock.a
 lib/qlibs/logmsg.a
 lib/qlibs/ndelay.a

Index: pkgsrc/net/fehqlibs/buildlink3.mk
diff -u pkgsrc/net/fehqlibs/buildlink3.mk:1.2 pkgsrc/net/fehqlibs/buildlink3.mk:1.3
--- pkgsrc/net/fehqlibs/buildlink3.mk:1.2       Fri Dec 14 22:51:32 2018
+++ pkgsrc/net/fehqlibs/buildlink3.mk   Wed Jul 10 11:20:02 2019
@@ -1,13 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2018/12/14 22:51:32 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2019/07/10 11:20:02 schmonz Exp $
 
 BUILDLINK_TREE+=       fehqlibs
 
 .if !defined(FEHQLIBS_BUILDLINK3_MK)
 FEHQLIBS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.fehqlibs+=fehqlibs>=0.9.10
+BUILDLINK_API_DEPENDS.fehqlibs+=fehqlibs>=0.9.12.10
 BUILDLINK_PKGSRCDIR.fehqlibs?= ../../net/fehqlibs
-BUILDLINK_DEPMETHOD.fehqlibs?= build
 .endif # FEHQLIBS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -fehqlibs

Index: pkgsrc/net/fehqlibs/distinfo
diff -u pkgsrc/net/fehqlibs/distinfo:1.4 pkgsrc/net/fehqlibs/distinfo:1.5
--- pkgsrc/net/fehqlibs/distinfo:1.4    Wed Jul 10 10:35:11 2019
+++ pkgsrc/net/fehqlibs/distinfo        Wed Jul 10 11:20:02 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2019/07/10 10:35:11 schmonz Exp $
+$NetBSD: distinfo,v 1.5 2019/07/10 11:20:02 schmonz Exp $
 
 SHA1 (fehQlibs-10.tgz) = 13c64b1fdf23ffab1fe6cffd47323855118124a6
 RMD160 (fehQlibs-10.tgz) = b00b4cd5c66369654c0da75484f84d64c67969ba
 SHA512 (fehQlibs-10.tgz) = cb5af7a976ba272288493ab797d5710e30e2cc54827dff35189941653f5e6220a5fdf83f7dfc89264ddda6692ab55ad5e2880d3da10b548f060f69c0486ab914
 Size (fehQlibs-10.tgz) = 75859 bytes
+SHA1 (patch-Makefile) = 3b66babb3bc2cac27a17281f44bcae3a8fface14

Added files:

Index: pkgsrc/net/fehqlibs/patches/patch-Makefile
diff -u /dev/null pkgsrc/net/fehqlibs/patches/patch-Makefile:1.1
--- /dev/null   Wed Jul 10 11:20:02 2019
+++ pkgsrc/net/fehqlibs/patches/patch-Makefile  Wed Jul 10 11:20:02 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2019/07/10 11:20:02 schmonz Exp $
+
+Link needed symbols into shared libdnsresolv.
+
+--- Makefile.orig      2018-12-14 13:09:29.000000000 +0000
++++ Makefile
+@@ -40,7 +40,7 @@ setup:
+ shared: $(COMPILE) $(SCHARDLIB) $(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
+  
+ qlibs.a: obj socket.a 
+       $(MAKELIB) qlibs.a *.o