Thu May 6 09:15:55 2010 UTC ()
honor PKGMANDIR


(sbd)
diff -r1.17 -r1.18 pkgsrc/databases/gdbm_primitive/Makefile
diff -r1.4 -r1.5 pkgsrc/databases/gdbm_primitive/distinfo
diff -r1.3 -r1.4 pkgsrc/databases/gdbm_primitive/patches/patch-aa
cvs diff -r1.17 -r1.18 pkgsrc/databases/gdbm_primitive/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/gdbm_primitive/Makefile 2010/01/29 17:00:26 1.17
+++ pkgsrc/databases/gdbm_primitive/Makefile 2010/05/06 09:15:55 1.18
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1# $NetBSD: Makefile,v 1.17 2010/01/29 17:00:26 joerg Exp $ 1# $NetBSD: Makefile,v 1.18 2010/05/06 09:15:55 sbd Exp $
2# 2#
3 3
4DISTNAME= gdbm-prim-1.15 4DISTNAME= gdbm-prim-1.15
5PKGNAME= ${DISTNAME:S/-prim/_primitive/} 5PKGNAME= ${DISTNAME:S/-prim/_primitive/}
6PKGREVISION= 2 6PKGREVISION= 2
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_LOCAL} 8MASTER_SITES= ${MASTER_SITE_LOCAL}
9EXTRACT_SUFX= .tar.gz-link.gz 9EXTRACT_SUFX= .tar.gz-link.gz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= # http://homepage.mac.com/leffert/FileSharing.html 12HOMEPAGE= # http://homepage.mac.com/leffert/FileSharing.html
13COMMENT= Shell primitives for working with GDBMs 13COMMENT= Shell primitives for working with GDBMs
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17EXTRACT_OPTS= -f tar 17EXTRACT_OPTS= -f tar
18MAKE_ENV+= BUILDLINK_LDFLAGS=${BUILDLINK_LDFLAGS:Q} 18MAKE_ENV+= BUILDLINK_LDFLAGS=${BUILDLINK_LDFLAGS:Q}
 19MAKE_ENV+= PKGMANDIR=${PKGMANDIR:Q}
19WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 20WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
20 21
21.include "../../databases/gdbm/buildlink3.mk" 22.include "../../databases/gdbm/buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/databases/gdbm_primitive/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/gdbm_primitive/distinfo 2010/01/29 17:00:26 1.4
+++ pkgsrc/databases/gdbm_primitive/distinfo 2010/05/06 09:15:55 1.5
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.4 2010/01/29 17:00:26 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2010/05/06 09:15:55 sbd Exp $
2 2
3SHA1 (gdbm-prim-1.15.tar.gz-link.gz) = 40c8802ccd8fa66b858ff5059771780b1e28f43a 3SHA1 (gdbm-prim-1.15.tar.gz-link.gz) = 40c8802ccd8fa66b858ff5059771780b1e28f43a
4RMD160 (gdbm-prim-1.15.tar.gz-link.gz) = 89b0f140c4205a9b22b4c420a51bc0133fd1f749 4RMD160 (gdbm-prim-1.15.tar.gz-link.gz) = 89b0f140c4205a9b22b4c420a51bc0133fd1f749
5Size (gdbm-prim-1.15.tar.gz-link.gz) = 10532 bytes 5Size (gdbm-prim-1.15.tar.gz-link.gz) = 10532 bytes
6SHA1 (patch-aa) = 929e776082aed7c55bae39562ef60d21589393ce 6SHA1 (patch-aa) = e87eaf22d525d4dfadd72067fa7c0f819f16a1c3
cvs diff -r1.3 -r1.4 pkgsrc/databases/gdbm_primitive/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/databases/gdbm_primitive/patches/patch-aa 2010/01/29 17:00:26 1.3
+++ pkgsrc/databases/gdbm_primitive/patches/patch-aa 2010/05/06 09:15:55 1.4
@@ -1,27 +1,45 @@ @@ -1,27 +1,45 @@
1$NetBSD: patch-aa,v 1.3 2010/01/29 17:00:26 joerg Exp $ 1$NetBSD: patch-aa,v 1.4 2010/05/06 09:15:55 sbd Exp $
2 2
3--- Makefile.orig Thu Nov 30 07:44:57 2000 3--- Makefile.orig 2000-11-30 06:44:57.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -9,17 +9,19 @@ 5@@ -9,17 +9,19 @@
6 # Copyright (c) 2000 Jonathan B. Leffert <jonathan@leffert.net> 6 # Copyright (c) 2000 Jonathan B. Leffert <jonathan@leffert.net>
7 # All rights reserved. 7 # All rights reserved.
8  8
9+prefix = ${PREFIX} 9+prefix = ${PREFIX}
10+ 10+
11 VERSION=1.15 11 VERSION=1.15
12 PKG=gdbm_primitive 12 PKG=gdbm_primitive
13  13
14 CC = gcc 14 CC = gcc
15-CFLAGS = -O2 -pedantic -Wall -I/opt/include -DVERSION=$(VERSION) 15-CFLAGS = -O2 -pedantic -Wall -I/opt/include -DVERSION=$(VERSION)
16+CFLAGS = -O2 -pedantic -Wall -DVERSION=$(VERSION) ${BUILDLINK_CPPFLAGS} 16+CFLAGS = -O2 -pedantic -Wall -DVERSION=$(VERSION) ${BUILDLINK_CPPFLAGS}
17  17
18 PROGS = gdbm-clear gdbm-create gdbm-dump gdbm-exists gdbm-keys gdbm-load \ 18 PROGS = gdbm-clear gdbm-create gdbm-dump gdbm-exists gdbm-keys gdbm-load \
19 gdbm-get gdbm-put gdbm-remove gdbm-revget 19 gdbm-get gdbm-put gdbm-remove gdbm-revget
20-LIBS = -L/opt/lib -lgdbm 20-LIBS = -L/opt/lib -lgdbm
21+LIBS = ${BUILDLINK_LDFLAGS} -lgdbm 21+LIBS = ${BUILDLINK_LDFLAGS} -lgdbm
22  22
23-INSTALL_PREFIX=/opt/pkgs/gdbm_primitive-$(VERSION) 23-INSTALL_PREFIX=/opt/pkgs/gdbm_primitive-$(VERSION)
24+INSTALL_PREFIX=${DESTDIR}${prefix} 24+INSTALL_PREFIX=${DESTDIR}${prefix}
25  25
26 .c.o: 26 .c.o:
27 $(CC) $(CFLAGS) -c $< 27 $(CC) $(CFLAGS) -c $<
 28@@ -33,13 +35,13 @@ clean:
 29
 30 install: all
 31 mkdir -p $(INSTALL_PREFIX)/bin
 32- mkdir -p $(INSTALL_PREFIX)/man/man1
 33+ mkdir -p $(INSTALL_PREFIX)/$(PKGMANDIR)/man1
 34 strip $(PROGS)
 35 cp $(PROGS) $(INSTALL_PREFIX)/bin
 36- cp doc/gdbm_primitive.1 $(INSTALL_PREFIX)/man/man1
 37+ cp doc/gdbm_primitive.1 $(INSTALL_PREFIX)/$(PKGMANDIR)/man1
 38 for file in $(PROGS);\
 39- do ln -sf $(INSTALL_PREFIX)/man/man1/gdbm_primitive.1\
 40- $(INSTALL_PREFIX)/man/man1/$${file}.1;\
 41+ do ln -sf $(INSTALL_PREFIX)/$(PKGMANDIR)/man1/gdbm_primitive.1\
 42+ $(INSTALL_PREFIX)/$(PKGMANDIR)/man1/$${file}.1;\
 43 done
 44
 45 gdbm-clear: gdbm-clear.o db.o