CVS commit: pkgsrc/devel/skalibs

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/skalibs
From: "Amitai Schleier" <schmonz%netbsd.org@localhost>
Date: Tue, 8 Jul 2025 21:13:38 +0000

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Jul  8 21:13:38 UTC 2025

Modified Files:
        pkgsrc/devel/skalibs: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/devel/skalibs: shlibs.mk
Removed Files:
        pkgsrc/devel/skalibs/patches: patch-Makefile patch-configure
            patch-src_libstddjb_alarm__deadline.c
            patch-src_libstddjb_alarm__milliseconds.c
            patch-src_libstddjb_alarm__timeout.c

Log Message:
skalibs: build from git to get macOS shlibs. Bump PKGREVISION.

Other changes from the next release-to-be:

- Bugfixes.
- crc32c implementation: skalibs/crc32c.h

pkgsrc changes:

- Add shlibs.mk to simplify PLIST management (also for use by dependent
  packages that will install shlibs without libtool in the same way)


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/skalibs/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/skalibs/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/skalibs/buildlink3.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/skalibs/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/skalibs/shlibs.mk
cvs rdiff -u -r1.5 -r0 pkgsrc/devel/skalibs/patches/patch-Makefile \
    pkgsrc/devel/skalibs/patches/patch-configure
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/skalibs/patches/patch-src_libstddjb_alarm__deadline.c \
    pkgsrc/devel/skalibs/patches/patch-src_libstddjb_alarm__milliseconds.c \
    pkgsrc/devel/skalibs/patches/patch-src_libstddjb_alarm__timeout.c

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

Modified files:

Index: pkgsrc/devel/skalibs/Makefile
diff -u pkgsrc/devel/skalibs/Makefile:1.29 pkgsrc/devel/skalibs/Makefile:1.30
--- pkgsrc/devel/skalibs/Makefile:1.29  Mon May 19 14:35:37 2025
+++ pkgsrc/devel/skalibs/Makefile       Tue Jul  8 21:13:37 2025
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.29 2025/05/19 14:35:37 schmonz Exp $
+# $NetBSD: Makefile,v 1.30 2025/07/08 21:13:37 schmonz Exp $
 
-DISTNAME=              skalibs-2.14.4.0
-PKGREVISION=           1
+DISTNAME=              ${GITHUB_PROJECT}-${GITHUB_TAG}
+PKGNAME=               skalibs-2.14.4.0
+PKGREVISION=           2
 CATEGORIES=            devel
-MASTER_SITES=          ${HOMEPAGE}
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=skarnet/}
+GITHUB_PROJECT=                skalibs
+GITHUB_TAG=            5bc6d77b08b39f863a7d8767a588f839c19d3113
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              https://skarnet.org/software/skalibs/
@@ -11,10 +14,11 @@ COMMENT=            The skarnet.org C system progr
 LICENSE=               isc
 
 USE_TOOLS+=            gmake
-USE_LIBTOOL=           yes
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=       --enable-pkgconfig
+CONFIGURE_ARGS+=       --enable-shared
+CONFIGURE_ARGS+=       --disable-allstatic
 
 # for fdopendir
 CPPFLAGS.NetBSD+=      -D_NETBSD_SOURCE
@@ -28,4 +32,6 @@ SUBST_SED.solaris=    -e 's|XOPEN_SOURCE=70
 
 INSTALLATION_DIRS=     include/${PKGBASE} lib/${PKGBASE}/sysdeps
 
+.include "shlibs.mk"
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/skalibs/PLIST
diff -u pkgsrc/devel/skalibs/PLIST:1.13 pkgsrc/devel/skalibs/PLIST:1.14
--- pkgsrc/devel/skalibs/PLIST:1.13     Tue May 13 03:42:25 2025
+++ pkgsrc/devel/skalibs/PLIST  Tue Jul  8 21:13:37 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2025/05/13 03:42:25 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.14 2025/07/08 21:13:37 schmonz Exp $
 include/skalibs/alarm.h
 include/skalibs/alloc.h
 include/skalibs/allreadwrite.h
@@ -18,6 +18,7 @@ include/skalibs/cdb.h
 include/skalibs/cdbmake.h
 include/skalibs/config.h
 include/skalibs/cplz.h
+include/skalibs/crc32c.h
 include/skalibs/cspawn.h
 include/skalibs/datastruct.h
 include/skalibs/devino.h
@@ -50,6 +51,7 @@ include/skalibs/nonposix.h
 include/skalibs/nsig.h
 include/skalibs/posixishard.h
 include/skalibs/posixplz.h
+include/skalibs/prog.h
 include/skalibs/random.h
 include/skalibs/segfault.h
 include/skalibs/selfpipe.h

Index: pkgsrc/devel/skalibs/buildlink3.mk
diff -u pkgsrc/devel/skalibs/buildlink3.mk:1.12 pkgsrc/devel/skalibs/buildlink3.mk:1.13
--- pkgsrc/devel/skalibs/buildlink3.mk:1.12     Tue May 13 03:42:25 2025
+++ pkgsrc/devel/skalibs/buildlink3.mk  Tue Jul  8 21:13:37 2025
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.12 2025/05/13 03:42:25 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2025/07/08 21:13:37 schmonz Exp $
 
 BUILDLINK_TREE+=       skalibs
 
 .if !defined(SKALIBS_BUILDLINK3_MK)
 SKALIBS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.skalibs+=                skalibs>=2.14.4.0
+BUILDLINK_API_DEPENDS.skalibs+=                skalibs>=2.14.4.0nb2
 BUILDLINK_PKGSRCDIR.skalibs?=          ../../devel/skalibs
 
 SKALIBS_TOLERATE_TARGET_SKEW?=         yes
@@ -19,6 +19,8 @@ SUBST_FILES.skalibs-target=           config.mak
 SUBST_SED.skalibs-target=              -e 's|\(CROSS_COMPILE := \).*|\1|'
 .endif # SKALIBS_TOLERATE_TARGET_SKEW
 
+.include "shlibs.mk"
+
 .endif # SKALIBS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -skalibs

Index: pkgsrc/devel/skalibs/distinfo
diff -u pkgsrc/devel/skalibs/distinfo:1.27 pkgsrc/devel/skalibs/distinfo:1.28
--- pkgsrc/devel/skalibs/distinfo:1.27  Mon May 19 14:35:38 2025
+++ pkgsrc/devel/skalibs/distinfo       Tue Jul  8 21:13:37 2025
@@ -1,10 +1,5 @@
-$NetBSD: distinfo,v 1.27 2025/05/19 14:35:38 schmonz Exp $
+$NetBSD: distinfo,v 1.28 2025/07/08 21:13:37 schmonz Exp $
 
-BLAKE2s (skalibs-2.14.4.0.tar.gz) = 4a25e66862fb9d16aec817c3436a6fbfbdf58483892054e79c81544ab1ebe5fe
-SHA512 (skalibs-2.14.4.0.tar.gz) = a97c9ecd62e4d751a6613c01831bff5856c5d23f8fd295d539c3280c6ffa2379e67789c728552cb4d85aa03b30af7e2499b80cb8025b52ca6d1c1746b48102b1
-Size (skalibs-2.14.4.0.tar.gz) = 248403 bytes
-SHA1 (patch-Makefile) = f76802c2f9721a67083128ff005772edf3461b02
-SHA1 (patch-configure) = 1a89adcec51a89a4fc587b24d23c371e04b6978f
-SHA1 (patch-src_libstddjb_alarm__deadline.c) = 310532ec82d0f08b1eeaf79b1dc400282a7f252a
-SHA1 (patch-src_libstddjb_alarm__milliseconds.c) = 5e710d1bc11fde816bda65e253d1cda91bb9012d
-SHA1 (patch-src_libstddjb_alarm__timeout.c) = 4d99353f1524a2474dcf49fb8c47364eee935b4c
+BLAKE2s (skalibs-5bc6d77b08b39f863a7d8767a588f839c19d3113-5bc6d77b08b39f863a7d8767a588f839c19d3113.tar.gz) = dc0958ebc4b0f17a670dc4680754e6d713850eb1ed1083225c4147723c720190
+SHA512 (skalibs-5bc6d77b08b39f863a7d8767a588f839c19d3113-5bc6d77b08b39f863a7d8767a588f839c19d3113.tar.gz) = 
adebc8a2e1402872abcd05341cbefc01c33c07bd95bb02ce628c3d4e728ca9d54380b95793e718f0501ebdf0c969334f975deb9566e61908c22a03a39e1c935e
+Size (skalibs-5bc6d77b08b39f863a7d8767a588f839c19d3113-5bc6d77b08b39f863a7d8767a588f839c19d3113.tar.gz) = 231693 bytes

Added files:

Index: pkgsrc/devel/skalibs/shlibs.mk
diff -u /dev/null pkgsrc/devel/skalibs/shlibs.mk:1.1
--- /dev/null   Tue Jul  8 21:13:38 2025
+++ pkgsrc/devel/skalibs/shlibs.mk      Tue Jul  8 21:13:37 2025
@@ -0,0 +1,13 @@
+# $NetBSD: shlibs.mk,v 1.1 2025/07/08 21:13:37 schmonz Exp $
+
+.PHONY: post-install-skaware-shlib-fake-la-for-plist
+post-install: post-install-skaware-shlib-fake-la-for-plist
+post-install-skaware-shlib-fake-la-for-plist:
+       ${RUN} cd ${DESTDIR}${PREFIX}/lib 2>/dev/null || ${TRUE}; \
+       for libname in $$(${LS} lib*.${SHLIB_EXT} 2>/dev/null | ${CUT} -d. -f1 | ${SORT} -u); do \
+       { \
+               ${ECHO} "# not a libtool library file, but suffices for pkgsrc PLIST"; \
+               ${ECHO} "old_library='$$libname.a'"; \
+               ${ECHO} "library_names='"$$(${LS} $$libname*.${SHLIB_EXT}*)"'"; \
+       } > $$libname.la; \
+       done

Prev by Date: CVS commit: pkgsrc/doc
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