diff options
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/nulib2/Makefile | 8 | ||||
| -rw-r--r-- | archivers/nulib2/distinfo | 12 | ||||
| -rw-r--r-- | archivers/nulib2/patches/patch-aa | 4 | ||||
| -rw-r--r-- | archivers/nulib2/patches/patch-ab | 16 | ||||
| -rw-r--r-- | archivers/nulib2/patches/patch-ac | 14 |
5 files changed, 28 insertions, 26 deletions
diff --git a/archivers/nulib2/Makefile b/archivers/nulib2/Makefile index fb6b3851fe1..9c68fb3f08c 100644 --- a/archivers/nulib2/Makefile +++ b/archivers/nulib2/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:02 jmmv Exp $ +# $NetBSD: Makefile,v 1.6 2003/07/15 09:36:45 agc Exp $ # DISTNAME= nulibdist -PKGNAME= nulib2-1.0.1 -WRKSRC= ${WRKDIR}/nulib2-101 +PKGNAME= nulib2-2.0.0 +WRKSRC= ${WRKDIR}/nulib2-200 CATEGORIES= archivers MASTER_SITES= http://www.nulib.com/downloads/ @@ -15,6 +15,8 @@ USE_BUILDLINK2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --cache-file=${WRKDIR}/config.cache +DIST_SUBDIR= ${PKGNAME_NOREV} + .include "../../mk/bsd.pkg.mk" # nulib2 needs this to identify a Unixlike system diff --git a/archivers/nulib2/distinfo b/archivers/nulib2/distinfo index 6d80ffc77c6..0b77ba75d10 100644 --- a/archivers/nulib2/distinfo +++ b/archivers/nulib2/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2002/08/25 21:49:18 jlam Exp $ +$NetBSD: distinfo,v 1.5 2003/07/15 09:36:45 agc Exp $ -SHA1 (nulibdist.tar.gz) = c3b351663444c20cd5e2f82763e1522298033280 -Size (nulibdist.tar.gz) = 280311 bytes -SHA1 (patch-aa) = c6f629810a94376cf5150b3bff233e37bcb2bc44 -SHA1 (patch-ab) = 35c2cea8fc6c19d4ba759cbdce07fa85149808cb -SHA1 (patch-ac) = 7d2de2035c5b16492dc93c040e4bfe2bcaf95ca5 +SHA1 (nulib2-2.0.0/nulibdist.tar.gz) = 28161027b618c872b961d69fd0e2152b03c8e459 +Size (nulib2-2.0.0/nulibdist.tar.gz) = 352217 bytes +SHA1 (patch-aa) = f1b27fddc92f84ca8ab1404fb3fe75861ba10eda +SHA1 (patch-ab) = ad760bbe9eb4ced32089f9e7b0c249a8c4cc6c23 +SHA1 (patch-ac) = 07c64805720413366871c152b3f06657f102c2da diff --git a/archivers/nulib2/patches/patch-aa b/archivers/nulib2/patches/patch-aa index 63b51ccf8b1..7318c29c27b 100644 --- a/archivers/nulib2/patches/patch-aa +++ b/archivers/nulib2/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/03/11 03:01:02 tv Exp $ +$NetBSD: patch-aa,v 1.2 2003/07/15 09:36:46 agc Exp $ --- configure.orig Sat Mar 10 21:41:17 2001 +++ configure Sat Mar 10 21:42:16 2001 @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/11 03:01:02 tv Exp $ # gives unlimited permission to copy, distribute and modify it. +# XXX - until pkgsrc has a sane way to invoke multiple "configure" scripts -+(cd ../nufxlib-101 && ./configure ${1+$@}) ++(cd ../nufxlib-200 && ./configure ${1+$@}) + # Defaults: ac_help= diff --git a/archivers/nulib2/patches/patch-ab b/archivers/nulib2/patches/patch-ab index 644ec882f3d..77ae3bfbc37 100644 --- a/archivers/nulib2/patches/patch-ab +++ b/archivers/nulib2/patches/patch-ab @@ -1,26 +1,26 @@ -$NetBSD: patch-ab,v 1.3 2002/08/25 21:49:18 jlam Exp $ +$NetBSD: patch-ab,v 1.4 2003/07/15 09:36:46 agc Exp $ --- Makefile.in.orig Mon May 22 20:42:57 2000 +++ Makefile.in -@@ -64,7 +64,11 @@ +@@ -69,7 +69,11 @@ # Build stuff # -all: $(PRODUCT) +# XXX - until pkgsrc has a sane way to invoke multiple "build" targets -+../nufxlib-101/libnufx.a: -+ cd ../nufxlib-101 && $(MAKE) ++../nufxlib-200/libnufx.a: ++ cd ../nufxlib-200 && $(MAKE) + -+all: ../nufxlib-101/libnufx.a $(PRODUCT) ++all: ../nufxlib-200/libnufx.a $(PRODUCT) @true install: $(PRODUCT) -@@ -90,7 +94,7 @@ +@@ -97,7 +101,7 @@ @$(MAKE) PURIFY_BUILD=1 $(PRODUCT): $(OBJS) $(NUFXLIB) -- $(PURIFY) $(QUANTIFY) $(CC) -o $@ $(OBJS) -L$(NUFXSRCDIR) -L$(libdir) -lnufx @DMALLOC@ -+ $(PURIFY) $(QUANTIFY) $(CC) -o $@ $(OBJS) -L$(NUFXSRCDIR) $(LDFLAGS) -lnufx @DMALLOC@ +- $(PURIFY) $(QUANTIFY) $(CC) -o $@ $(OBJS) -L$(NUFXSRCDIR) -L$(libdir) -lnufx @LIBS@ ++ $(PURIFY) $(QUANTIFY) $(CC) -o $@ $(OBJS) -L$(NUFXSRCDIR) $(LDFLAGS) -lnufx @LIBS@ clean: -rm -f *.o core diff --git a/archivers/nulib2/patches/patch-ac b/archivers/nulib2/patches/patch-ac index dadafff4f1b..e6e11f3d8c0 100644 --- a/archivers/nulib2/patches/patch-ac +++ b/archivers/nulib2/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.2 2002/08/25 21:49:19 jlam Exp $ +$NetBSD: patch-ac,v 1.3 2003/07/15 09:36:46 agc Exp $ ---- ../nufxlib-101/Makefile.in.orig Mon May 22 20:15:37 2000 -+++ ../nufxlib-101/Makefile.in -@@ -76,10 +76,10 @@ - - # the build date is approximate, the build flags are accurate +--- ../nufxlib-200/Makefile.in.orig Mon May 22 20:15:37 2000 ++++ ../nufxlib-200/Makefile.in +@@ -88,10 +88,10 @@ + # The build date is approximate, the build flags are accurate so long + # as they were changed by touching the makefile. Version.c: Version.c.in Makefile - (sed -e "s/BUILT/`date`/" -e "s/OPTFLAGS/$(OPT)/" < Version.c.in > Version.c) + (sed -e "s|BUILT|`date`|" -e "s|OPTFLAGS|$(OPT)|" < Version.c.in > Version.c) @@ -15,7 +15,7 @@ $NetBSD: patch-ac,v 1.2 2002/08/25 21:49:19 jlam Exp $ -rm -f *.o core -rm -f $(SHARED_PRODUCT) $(STATIC_PRODUCT) -@@ -89,7 +89,7 @@ +@@ -101,7 +101,7 @@ @#ctags *.[ch] distclean: clean |