diff options
-rw-r--r-- | devel/deforaos-libsystem/Makefile | 8 | ||||
-rw-r--r-- | devel/deforaos-libsystem/PLIST | 9 | ||||
-rw-r--r-- | devel/deforaos-libsystem/distinfo | 13 | ||||
-rw-r--r-- | devel/deforaos-libsystem/patches/patch-doc_Makefile | 6 | ||||
-rw-r--r-- | devel/deforaos-libsystem/patches/patch-src_Makefile | 136 | ||||
-rw-r--r-- | devel/deforaos-libsystem/patches/patch-tests_tests.sh | 6 |
6 files changed, 157 insertions, 21 deletions
diff --git a/devel/deforaos-libsystem/Makefile b/devel/deforaos-libsystem/Makefile index 9db5eb2c149..76a997c7724 100644 --- a/devel/deforaos-libsystem/Makefile +++ b/devel/deforaos-libsystem/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2020/03/15 19:55:42 tnn Exp $ -# +# $NetBSD: Makefile,v 1.25 2022/04/12 22:02:17 khorben Exp $ -DISTNAME= libSystem-0.4.2 -PKGNAME= deforaos-libsystem-0.4.2 +DISTNAME= libSystem-0.4.3 +PKGNAME= deforaos-libsystem-0.4.3 CATEGORIES= devel MASTER_SITES= https://ftp.defora.org/pub/DeforaOS/System/src/libSystem/ @@ -13,6 +12,7 @@ LICENSE= 2-clause-bsd TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl +BUILD_DEPENDS+= libtool-[0-9]*:../../devel/libtool LDFLAGS+= ${BUILDLINK_LDADD.dl} MAKE_FLAGS+= PREFIX=${PREFIX} diff --git a/devel/deforaos-libsystem/PLIST b/devel/deforaos-libsystem/PLIST index b8811c4cb23..e148aa07e8a 100644 --- a/devel/deforaos-libsystem/PLIST +++ b/devel/deforaos-libsystem/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2019/10/09 01:58:55 khorben Exp $ +@comment $NetBSD: PLIST,v 1.10 2022/04/12 22:02:17 khorben Exp $ bin/configctl include/System.h include/System/array.h @@ -15,12 +15,11 @@ include/System/parser.h include/System/plugin.h include/System/string.h include/System/token.h +include/System/userdata.h include/System/variable.h -lib/libSystem.a -lib/libSystem.so -lib/libSystem.so.0 -lib/libSystem.so.0.0 +lib/libSystem.la lib/pkgconfig/libSystem.pc man/html1/configctl.html man/man1/configctl.1 +share/doc/libSystem/COPYING share/doc/libSystem/README.md diff --git a/devel/deforaos-libsystem/distinfo b/devel/deforaos-libsystem/distinfo index c4dd69b4ee4..f137fa00a32 100644 --- a/devel/deforaos-libsystem/distinfo +++ b/devel/deforaos-libsystem/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.15 2021/10/26 10:14:32 nia Exp $ +$NetBSD: distinfo,v 1.16 2022/04/12 22:02:17 khorben Exp $ -BLAKE2s (libSystem-0.4.2.tar.gz) = c5fc13b08e233ee0216dd4dc29d92e14f2cdc0846886aaf8d0cfbfa736694dbd -SHA512 (libSystem-0.4.2.tar.gz) = 0b67bee0287b5af7ed37342012fa489dcabe06af8d6f393862733b013c2e021c0b990937a14fbf920a69192eb28dcc72eeb469889db2c610c8fba65d419f952c -Size (libSystem-0.4.2.tar.gz) = 49555 bytes -SHA1 (patch-doc_Makefile) = 43348660bc1057c2e06f13bb5face9103a64ca30 -SHA1 (patch-tests_tests.sh) = a75251c9b9ae3cf3b54fb8afa6f152ca9601ac31 +BLAKE2s (libSystem-0.4.3.tar.gz) = b2144db7f6ea334afe89e5bd717f2230e5a253d87775c9a3c819ba6a06320790 +SHA512 (libSystem-0.4.3.tar.gz) = c8f3272532358347380a0f576ab22ca0cd9eb0fdaa8c3655afb5ee2ac9a1e7c244130b2e48f594c1cc16da3a6103eeaf5d0271da41dc90904ec2108130a36f7e +Size (libSystem-0.4.3.tar.gz) = 55770 bytes +SHA1 (patch-doc_Makefile) = 5a4553921065295e9b84d2c39c641990a88672cf +SHA1 (patch-src_Makefile) = 4094503bd8d25de0632eb0d448d1fd32de73159d +SHA1 (patch-tests_tests.sh) = 3a6066569543b01fa672fa055d492b405d227d1f diff --git a/devel/deforaos-libsystem/patches/patch-doc_Makefile b/devel/deforaos-libsystem/patches/patch-doc_Makefile index 6ac0e50c0cd..780cc72554b 100644 --- a/devel/deforaos-libsystem/patches/patch-doc_Makefile +++ b/devel/deforaos-libsystem/patches/patch-doc_Makefile @@ -1,12 +1,12 @@ -$NetBSD: patch-doc_Makefile,v 1.1 2019/10/09 01:58:56 khorben Exp $ +$NetBSD: patch-doc_Makefile,v 1.2 2022/04/12 22:02:17 khorben Exp $ Do not generate the API documentation by default. ---- doc/Makefile.orig 2019-09-28 01:45:41.000000000 +0000 +--- doc/Makefile.orig 2022-04-12 20:24:02.000000000 +0000 +++ doc/Makefile @@ -1,5 +1,5 @@ SUBDIRS = gtkdoc --TARGETS = $(OBJDIR)configctl.1 $(OBJDIR)configctl.html $(OBJDIR)configctl.xml $(OBJDIR)gtkdoc/libSystem.types $(OBJDIR)gtkdoc/tmpl.stamp $(OBJDIR)gtkdoc/sgml.stamp $(OBJDIR)gtkdoc/html.stamp +-TARGETS = $(OBJDIR)configctl.1 $(OBJDIR)configctl.html $(OBJDIR)configctl.xml $(OBJDIR)gtkdoc/html.stamp $(OBJDIR)gtkdoc/libSystem.types $(OBJDIR)gtkdoc/tmpl.stamp $(OBJDIR)gtkdoc/xml.stamp +TARGETS = $(OBJDIR)configctl.1 $(OBJDIR)configctl.html $(OBJDIR)configctl.xml OBJDIR = PREFIX = /usr/local diff --git a/devel/deforaos-libsystem/patches/patch-src_Makefile b/devel/deforaos-libsystem/patches/patch-src_Makefile new file mode 100644 index 00000000000..1797d40ac6f --- /dev/null +++ b/devel/deforaos-libsystem/patches/patch-src_Makefile @@ -0,0 +1,136 @@ +$NetBSD: patch-src_Makefile,v 1.5 2022/04/12 22:02:17 khorben Exp $ + +libtoolize. + +--- src/Makefile.orig 2022-04-12 20:24:02.000000000 +0000 ++++ src/Makefile +@@ -1,4 +1,4 @@ +-TARGETS = $(OBJDIR)libSystem.a $(OBJDIR)libSystem.so.1.0 $(OBJDIR)libSystem.so.1 $(OBJDIR)libSystem$(SOEXT) ++TARGETS = $(OBJDIR)libSystem.la + OBJDIR = + PREFIX = /usr/local + DESTDIR = +@@ -16,6 +16,7 @@ ARFLAGS = -rc + RANLIB = ranlib + CCSHARED= $(CC) -shared + SOEXT = .so ++LIBTOOL = libtool + RM = rm -f + LN = ln -f + MKDIR = mkdir -m 0755 -p +@@ -24,64 +25,54 @@ INSTALL = install + + all: $(TARGETS) + +-libSystem_OBJS = $(OBJDIR)array.o $(OBJDIR)buffer.o $(OBJDIR)config.o $(OBJDIR)error.o $(OBJDIR)event.o $(OBJDIR)file.o $(OBJDIR)hash.o $(OBJDIR)mutator.o $(OBJDIR)object.o $(OBJDIR)parser.o $(OBJDIR)plugin.o $(OBJDIR)string.o $(OBJDIR)token.o $(OBJDIR)variable.o ++libSystem_OBJS = $(OBJDIR)array.lo $(OBJDIR)buffer.lo $(OBJDIR)config.lo $(OBJDIR)error.lo $(OBJDIR)event.lo $(OBJDIR)file.lo $(OBJDIR)hash.lo $(OBJDIR)mutator.lo $(OBJDIR)object.lo $(OBJDIR)parser.lo $(OBJDIR)plugin.lo $(OBJDIR)string.lo $(OBJDIR)token.lo $(OBJDIR)variable.lo + libSystem_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) +-libSystem_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `../tools/platform.sh -O DESTDIR="$(DESTDIR)" -l dl` `../tools/platform.sh -O DESTDIR="$(DESTDIR)" -l m` ++libSystem_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `../tools/platform.sh -O DESTDIR="$(DESTDIR)" -l dl` `../tools/platform.sh -O DESTDIR="$(DESTDIR)" -l m` -version-info 1 + +-$(OBJDIR)libSystem.a: $(libSystem_OBJS) +- $(AR) $(ARFLAGS) $(OBJDIR)libSystem.a $(libSystem_OBJS) +- $(RANLIB) $(OBJDIR)libSystem.a ++$(OBJDIR)libSystem.la: $(libSystem_OBJS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $(OBJDIR)libSystem.la $(libSystem_OBJS) `../tools/platform.sh -O DESTDIR="$(DESTDIR)" -l dl` `../tools/platform.sh -O DESTDIR="$(DESTDIR)" -l m` -version-info 1 -rpath $(LIBDIR) $(libSystem_LDFLAGS) + +-$(OBJDIR)libSystem.so.1.0: $(libSystem_OBJS) +- $(CCSHARED) -o $(OBJDIR)libSystem.so.1.0 -Wl,-soname,libSystem.so.1 $(libSystem_OBJS) $(libSystem_LDFLAGS) ++$(OBJDIR)array.o $(OBJDIR)array.lo: array.c ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)array.o -c array.c + +-$(OBJDIR)libSystem.so.1: $(OBJDIR)libSystem.so.1.0 +- $(LN) -s -- libSystem.so.1.0 $(OBJDIR)libSystem.so.1 ++$(OBJDIR)buffer.o $(OBJDIR)buffer.lo: buffer.c ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)buffer.o -c buffer.c + +-$(OBJDIR)libSystem$(SOEXT): $(OBJDIR)libSystem.so.1.0 +- $(LN) -s -- libSystem.so.1.0 $(OBJDIR)libSystem$(SOEXT) ++$(OBJDIR)config.o $(OBJDIR)config.lo: config.c ../config.h ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)config.o -c config.c + +-$(OBJDIR)array.o: array.c +- $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)array.o -c array.c ++$(OBJDIR)error.o $(OBJDIR)error.lo: error.c ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)error.o -c error.c + +-$(OBJDIR)buffer.o: buffer.c +- $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)buffer.o -c buffer.c ++$(OBJDIR)event.o $(OBJDIR)event.lo: event.c ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)event.o -c event.c + +-$(OBJDIR)config.o: config.c ../config.h +- $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)config.o -c config.c ++$(OBJDIR)file.o $(OBJDIR)file.lo: file.c ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)file.o -c file.c + +-$(OBJDIR)error.o: error.c +- $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)error.o -c error.c ++$(OBJDIR)hash.o $(OBJDIR)hash.lo: hash.c ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)hash.o -c hash.c + +-$(OBJDIR)event.o: event.c +- $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)event.o -c event.c ++$(OBJDIR)mutator.o $(OBJDIR)mutator.lo: mutator.c ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)mutator.o -c mutator.c + +-$(OBJDIR)file.o: file.c +- $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)file.o -c file.c ++$(OBJDIR)object.o $(OBJDIR)object.lo: object.c ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)object.o -c object.c + +-$(OBJDIR)hash.o: hash.c +- $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)hash.o -c hash.c ++$(OBJDIR)parser.o $(OBJDIR)parser.lo: parser.c token.h ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)parser.o -c parser.c + +-$(OBJDIR)mutator.o: mutator.c +- $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)mutator.o -c mutator.c ++$(OBJDIR)plugin.o $(OBJDIR)plugin.lo: plugin.c ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)plugin.o -c plugin.c + +-$(OBJDIR)object.o: object.c +- $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)object.o -c object.c ++$(OBJDIR)string.o $(OBJDIR)string.lo: string.c ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)string.o -c string.c + +-$(OBJDIR)parser.o: parser.c token.h +- $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)parser.o -c parser.c ++$(OBJDIR)token.o $(OBJDIR)token.lo: token.c token.h ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)token.o -c token.c + +-$(OBJDIR)plugin.o: plugin.c +- $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)plugin.o -c plugin.c +- +-$(OBJDIR)string.o: string.c +- $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)string.o -c string.c +- +-$(OBJDIR)token.o: token.c token.h +- $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)token.o -c token.c +- +-$(OBJDIR)variable.o: variable.c +- $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)variable.o -c variable.c ++$(OBJDIR)variable.o $(OBJDIR)variable.lo: variable.c ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(libSystem_CFLAGS) -o $(OBJDIR)variable.o -c variable.c + + clean: + $(RM) -- $(libSystem_OBJS) +@@ -91,15 +82,10 @@ distclean: clean + + install: all + $(MKDIR) $(DESTDIR)$(LIBDIR) +- $(INSTALL) -m 0644 $(OBJDIR)libSystem.a $(DESTDIR)$(LIBDIR)/libSystem.a +- $(INSTALL) -m 0755 $(OBJDIR)libSystem.so.1.0 $(DESTDIR)$(LIBDIR)/libSystem.so.1.0 +- $(LN) -s -- libSystem.so.1.0 $(DESTDIR)$(LIBDIR)/libSystem.so.1 +- $(LN) -s -- libSystem.so.1.0 $(DESTDIR)$(LIBDIR)/libSystem$(SOEXT) ++ $(LIBTOOL) --mode=install $(INSTALL) -m 0755 $(OBJDIR)libSystem.la $(DESTDIR)$(LIBDIR)/libSystem.la ++ $(LIBTOOL) --mode=finish $(DESTDIR)$(LIBDIR) + + uninstall: +- $(RM) -- $(DESTDIR)$(LIBDIR)/libSystem.a +- $(RM) -- $(DESTDIR)$(LIBDIR)/libSystem.so.1.0 +- $(RM) -- $(DESTDIR)$(LIBDIR)/libSystem.so.1 +- $(RM) -- $(DESTDIR)$(LIBDIR)/libSystem$(SOEXT) ++ $(LIBTOOL) --mode=uninstall $(RM) -- $(DESTDIR)$(LIBDIR)/libSystem.la + + .PHONY: all clean distclean install uninstall diff --git a/devel/deforaos-libsystem/patches/patch-tests_tests.sh b/devel/deforaos-libsystem/patches/patch-tests_tests.sh index 7018986c550..28fe843b605 100644 --- a/devel/deforaos-libsystem/patches/patch-tests_tests.sh +++ b/devel/deforaos-libsystem/patches/patch-tests_tests.sh @@ -1,10 +1,10 @@ -$NetBSD: patch-tests_tests.sh,v 1.6 2019/10/09 01:58:56 khorben Exp $ +$NetBSD: patch-tests_tests.sh,v 1.7 2022/04/12 22:02:17 khorben Exp $ Avoid building the (experimental) Python binding. ---- tests/tests.sh.orig 2019-08-29 00:00:20.000000000 +0000 +--- tests/tests.sh.orig 2022-04-12 20:24:02.000000000 +0000 +++ tests/tests.sh -@@ -119,21 +119,6 @@ fi +@@ -122,21 +122,6 @@ fi tests="array buffer config error event includes parser string variable" failures= |