Tue Feb 10 00:01:55 2009 UTC ()
DESTDIR support.


(joerg)
diff -r1.16 -r1.17 pkgsrc/archivers/nulib2/Makefile
diff -r1.9 -r1.10 pkgsrc/archivers/nulib2/distinfo
diff -r1.5 -r1.6 pkgsrc/archivers/nulib2/patches/patch-ab
cvs diff -r1.16 -r1.17 pkgsrc/archivers/nulib2/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/nulib2/Makefile 2007/03/19 16:40:26 1.16
+++ pkgsrc/archivers/nulib2/Makefile 2009/02/10 00:01:55 1.17
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1# $NetBSD: Makefile,v 1.16 2007/03/19 16:40:26 tv Exp $ 1# $NetBSD: Makefile,v 1.17 2009/02/10 00:01:55 joerg Exp $
2# 2#
3 3
4DISTNAME= nulibdist-203 4DISTNAME= nulibdist-203
5PKGNAME= nulib2-2.0.3 5PKGNAME= nulib2-2.0.3
6CATEGORIES= archivers 6CATEGORIES= archivers
7MASTER_SITES= http://www.nulib.com/downloads/ 7MASTER_SITES= http://www.nulib.com/downloads/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.nulib.com/ 10HOMEPAGE= http://www.nulib.com/
11COMMENT= Handles Apple II ShrinkIt (NuFX) file/disk archives 11COMMENT= Handles Apple II ShrinkIt (NuFX) file/disk archives
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15WRKSRC= ${WRKDIR}/${DISTNAME:S/dist/2/} 16WRKSRC= ${WRKDIR}/${DISTNAME:S/dist/2/}
16GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
17 18
18.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
19 20
20CONFIGURE_ARGS+=--cache-file=${WRKDIR}/config.cache 21CONFIGURE_ARGS+=--cache-file=${WRKDIR}/config.cache
21 22
22CFLAGS+= -D__unix__ 23CFLAGS+= -D__unix__
23 24
24.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/archivers/nulib2/distinfo (expand / switch to unified diff)

--- pkgsrc/archivers/nulib2/distinfo 2005/10/31 05:34:07 1.9
+++ pkgsrc/archivers/nulib2/distinfo 2009/02/10 00:01:55 1.10
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.9 2005/10/31 05:34:07 minskim Exp $ 1$NetBSD: distinfo,v 1.10 2009/02/10 00:01:55 joerg Exp $
2 2
3SHA1 (nulibdist-203.tar.gz) = c7a9bde218e0a115424dfc2e3d7234ee7faa9b8e 3SHA1 (nulibdist-203.tar.gz) = c7a9bde218e0a115424dfc2e3d7234ee7faa9b8e
4RMD160 (nulibdist-203.tar.gz) = 84c6eadd64749cfdc11fda74a552072bce1b04db 4RMD160 (nulibdist-203.tar.gz) = 84c6eadd64749cfdc11fda74a552072bce1b04db
5Size (nulibdist-203.tar.gz) = 394129 bytes 5Size (nulibdist-203.tar.gz) = 394129 bytes
6SHA1 (patch-aa) = a8c05f177ec5e08dc1bb8968be3febb3586d57a1 6SHA1 (patch-aa) = a8c05f177ec5e08dc1bb8968be3febb3586d57a1
7SHA1 (patch-ab) = 013f1e8681f0ac5d7f5757df7ed703bb27a3216c 7SHA1 (patch-ab) = fe70386516a18837589986143d4c0fbdd1082baa
8SHA1 (patch-ac) = 51460a4003c40f68ed19431afc02aa1607f482ef 8SHA1 (patch-ac) = 51460a4003c40f68ed19431afc02aa1607f482ef
9SHA1 (patch-ad) = e537bbc19b3edfbabac1e61859dca29b068c36e5 9SHA1 (patch-ad) = e537bbc19b3edfbabac1e61859dca29b068c36e5
10SHA1 (patch-ae) = 053d302021ea898ae72fc78e69f52660b82989ab 10SHA1 (patch-ae) = 053d302021ea898ae72fc78e69f52660b82989ab
11SHA1 (patch-af) = 681d4d1a66a70c879b85377c1b86fd2fa60666d8 11SHA1 (patch-af) = 681d4d1a66a70c879b85377c1b86fd2fa60666d8
cvs diff -r1.5 -r1.6 pkgsrc/archivers/nulib2/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/archivers/nulib2/patches/patch-ab 2004/11/29 04:50:35 1.5
+++ pkgsrc/archivers/nulib2/patches/patch-ab 2009/02/10 00:01:55 1.6
@@ -1,26 +1,37 @@ @@ -1,26 +1,37 @@
1$NetBSD: patch-ab,v 1.5 2004/11/29 04:50:35 tv Exp $ 1$NetBSD: patch-ab,v 1.6 2009/02/10 00:01:55 joerg Exp $
2 2
3--- Makefile.in.orig Mon May 22 20:42:57 2000 3--- Makefile.in.orig 2004-10-12 00:25:19.000000000 +0200
4+++ Makefile.in 4+++ Makefile.in
5@@ -69,7 +69,11 @@ 5@@ -69,14 +69,18 @@ LIB_PRODUCT = libnufx.a
6 # Build stuff 6 # Build stuff
7 # 7 #
8  8
9-all: $(PRODUCT) 9-all: $(PRODUCT)
10+# XXX - until pkgsrc has a sane way to invoke multiple "build" targets 10+# XXX - until pkgsrc has a sane way to invoke multiple "build" targets
11+../nufxlib-203/libnufx.a: 11+../nufxlib-203/libnufx.a:
12+ cd ../nufxlib-203 && $(MAKE) 12+ cd ../nufxlib-203 && $(MAKE)
13+ 13+
14+all: ../nufxlib-203/libnufx.a $(PRODUCT) 14+all: ../nufxlib-203/libnufx.a $(PRODUCT)
15 @true 15 @true
16  16
17 install: $(PRODUCT) 17 install: $(PRODUCT)
18@@ -97,7 +101,7 @@ 18- $(srcdir)/mkinstalldirs $(bindir)
 19- $(INSTALL_PROGRAM) $(PRODUCT) $(bindir)
 20- $(srcdir)/mkinstalldirs $(mandir)/man1
 21- $(INSTALL_DATA) nulib2.1 $(mandir)/man1/
 22+ $(srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
 23+ $(INSTALL_PROGRAM) $(PRODUCT) ${DESTDIR}$(bindir)
 24+ $(srcdir)/mkinstalldirs ${DESTDIR}$(mandir)/man1
 25+ $(INSTALL_DATA) nulib2.1 ${DESTDIR}$(mandir)/man1/
 26
 27 install-shared:
 28 LIB_PRODUCT="libnufx.so" $(MAKE) -e install
 29@@ -97,7 +101,7 @@ purify:
19 @$(MAKE) PURIFY_BUILD=1 30 @$(MAKE) PURIFY_BUILD=1
20  31
21 $(PRODUCT): $(OBJS) $(NUFXLIB) 32 $(PRODUCT): $(OBJS) $(NUFXLIB)
22- $(PURIFY) $(QUANTIFY) $(CC) -o $@ $(OBJS) -L$(NUFXSRCDIR) -L$(libdir) -lnufx @LIBS@ 33- $(PURIFY) $(QUANTIFY) $(CC) -o $@ $(OBJS) -L$(NUFXSRCDIR) -L$(libdir) -lnufx @LIBS@
23+ $(PURIFY) $(QUANTIFY) $(CC) -o $@ $(OBJS) -L$(NUFXSRCDIR) $(LDFLAGS) -lnufx @LIBS@ 34+ $(PURIFY) $(QUANTIFY) $(CC) -o $@ $(OBJS) -L$(NUFXSRCDIR) $(LDFLAGS) -lnufx @LIBS@
24  35
25 clean: 36 clean:
26 -rm -f *.o core 37 -rm -f *.o core