diff options
author | jlam <jlam> | 2002-08-25 21:48:57 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-08-25 21:48:57 +0000 |
commit | 02526271b78c18a0c07b3ea8be04d2a61b0bf8e7 (patch) | |
tree | c8d09a03adeac7a950080d8040f6c9ceb10ef9d2 /archivers/nulib2 | |
parent | 521a29ec203c35a133d1b565a410d027176ebfc9 (diff) | |
download | pkgsrc-02526271b78c18a0c07b3ea8be04d2a61b0bf8e7.tar.gz |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'archivers/nulib2')
-rw-r--r-- | archivers/nulib2/Makefile | 8 | ||||
-rw-r--r-- | archivers/nulib2/distinfo | 5 | ||||
-rw-r--r-- | archivers/nulib2/patches/patch-ab | 11 | ||||
-rw-r--r-- | archivers/nulib2/patches/patch-ac | 26 |
4 files changed, 34 insertions, 16 deletions
diff --git a/archivers/nulib2/Makefile b/archivers/nulib2/Makefile index 9dd48b19ef7..278a92a846c 100644 --- a/archivers/nulib2/Makefile +++ b/archivers/nulib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/08/01 02:31:21 jschauma Exp $ +# $NetBSD: Makefile,v 1.4 2002/08/25 21:49:17 jlam Exp $ # DISTNAME= nulibdist @@ -12,9 +12,9 @@ COMMENT= Handles Apple II ShrinkIt (NuFX) file/disk archives WRKSRC= ${WRKDIR}/nulib2-101 -USE_BUILDLINK_ONLY= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --cache-file=${WRKDIR}/config.cache +USE_BUILDLINK2= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --cache-file=${WRKDIR}/config.cache .include "../../mk/bsd.pkg.mk" diff --git a/archivers/nulib2/distinfo b/archivers/nulib2/distinfo index 6f949a03462..6d80ffc77c6 100644 --- a/archivers/nulib2/distinfo +++ b/archivers/nulib2/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2001/07/16 10:09:45 jlam Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 21:49:18 jlam Exp $ SHA1 (nulibdist.tar.gz) = c3b351663444c20cd5e2f82763e1522298033280 Size (nulibdist.tar.gz) = 280311 bytes SHA1 (patch-aa) = c6f629810a94376cf5150b3bff233e37bcb2bc44 -SHA1 (patch-ab) = 8b2aeaff89498614841fbae1dad1465469c5d254 +SHA1 (patch-ab) = 35c2cea8fc6c19d4ba759cbdce07fa85149808cb +SHA1 (patch-ac) = 7d2de2035c5b16492dc93c040e4bfe2bcaf95ca5 diff --git a/archivers/nulib2/patches/patch-ab b/archivers/nulib2/patches/patch-ab index 7ea9c607c69..644ec882f3d 100644 --- a/archivers/nulib2/patches/patch-ab +++ b/archivers/nulib2/patches/patch-ab @@ -1,16 +1,7 @@ -$NetBSD: patch-ab,v 1.2 2001/07/16 10:09:45 jlam Exp $ +$NetBSD: patch-ab,v 1.3 2002/08/25 21:49:18 jlam Exp $ --- Makefile.in.orig Mon May 22 20:42:57 2000 +++ Makefile.in -@@ -38,7 +38,7 @@ - #OPT = @CFLAGS@ -DDEBUG_MSGS - #OPT = @CFLAGS@ -DDEBUG_VERBOSE - GCC_FLAGS = -Wall -Wwrite-strings -Wstrict-prototypes -Wpointer-arith -Wshadow --CFLAGS = @BUILD_FLAGS@ -I. -I$(NUFXSRCDIR) -I$(includedir) @DEFS@ -+CFLAGS = @BUILD_FLAGS@ -I. -I$(NUFXSRCDIR) @DEFS@ - - #ifdef PURIFY_BUILD - # PURIFY = purify @@ -64,7 +64,11 @@ # Build stuff # diff --git a/archivers/nulib2/patches/patch-ac b/archivers/nulib2/patches/patch-ac new file mode 100644 index 00000000000..dadafff4f1b --- /dev/null +++ b/archivers/nulib2/patches/patch-ac @@ -0,0 +1,26 @@ +$NetBSD: patch-ac,v 1.2 2002/08/25 21:49:19 jlam 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 + 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) + + clean: +- (cd samples; make clean) ++ (cd samples; ${MAKE} clean) + -rm -f *.o core + -rm -f $(SHARED_PRODUCT) $(STATIC_PRODUCT) + +@@ -89,7 +89,7 @@ + @#ctags *.[ch] + + distclean: clean +- (cd samples; make distclean) ++ (cd samples; ${MAKE} distclean) + -rm -f Version.c + -rm -f Makefile Makefile.bak + -rm -f config.log config.cache config.status config.h |