diff options
author | joerg <joerg@pkgsrc.org> | 2006-11-05 17:42:30 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-11-05 17:42:30 +0000 |
commit | 5ade59fdafbd1d4d9d91ab9ae015cd7c5d72b576 (patch) | |
tree | 255639bf9b875204654f9a90ae34e862631c9c9c /databases/db4 | |
parent | aa48c982406bf3ae2fc7616f0d5dfd0654627380 (diff) | |
download | pkgsrc-5ade59fdafbd1d4d9d91ab9ae015cd7c5d72b576.tar.gz |
DESTDIR support.
Diffstat (limited to 'databases/db4')
-rw-r--r-- | databases/db4/Makefile | 7 | ||||
-rw-r--r-- | databases/db4/distinfo | 4 | ||||
-rw-r--r-- | databases/db4/patches/patch-aa | 29 |
3 files changed, 30 insertions, 10 deletions
diff --git a/databases/db4/Makefile b/databases/db4/Makefile index 398fe60f144..d23ff6e637d 100644 --- a/databases/db4/Makefile +++ b/databases/db4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2006/10/20 13:00:35 obache Exp $ +# $NetBSD: Makefile,v 1.49 2006/11/05 17:43:59 joerg Exp $ DISTNAME= db-4.4.20 PKGNAME= ${DISTNAME:S/db/db4/} @@ -14,6 +14,7 @@ HOMEPAGE= http://www.oracle.com/database/berkeley-db/db/index.html COMMENT= Berkeley DB version 4 from Oracle PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir DIST_SUBDIR= ${PKGNAME_NOREV} USE_LANGUAGES= c c++ @@ -56,7 +57,9 @@ PTHREAD_OPTS+= native . include "../../mk/pthread.buildlink3.mk" .endif +INSTALLATION_DIRS= include/db4 lib share/doc/db4 + post-install: - chown -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/doc/db4 + chown -R ${DOCOWN}:${DOCGRP} ${DESTDIR}${PREFIX}/share/doc/db4 .include "../../mk/bsd.pkg.mk" diff --git a/databases/db4/distinfo b/databases/db4/distinfo index 2752ab77583..29a7b8b9efb 100644 --- a/databases/db4/distinfo +++ b/databases/db4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2006/10/20 13:00:35 obache Exp $ +$NetBSD: distinfo,v 1.26 2006/11/05 17:43:59 joerg Exp $ SHA1 (db4-4.4.20/db-4.4.20.tar.gz) = bb4c68a4afc14712eb2954b7991f5dc9fe93bf7b RMD160 (db4-4.4.20/db-4.4.20.tar.gz) = 5940d9244b4df4897f66f1b67d3c967081c18b85 @@ -15,6 +15,6 @@ Size (db4-4.4.20/patch.4.4.20.3) = 1366 bytes SHA1 (db4-4.4.20/patch.4.4.20.4) = 8875add3312fdc0548fbd4dedb71b4f8637dc6c9 RMD160 (db4-4.4.20/patch.4.4.20.4) = 46cf2177aee1ce00c0044817610231541722c4d3 Size (db4-4.4.20/patch.4.4.20.4) = 837 bytes -SHA1 (patch-aa) = dea422ca0265dc43a5cc9d342be6d2edd6ceeaf3 +SHA1 (patch-aa) = 7e1b32555143fae455b033452d7639b5cfa70666 SHA1 (patch-ab) = 2c0db053fb5e27ce45becdb5ec3c498ecda96348 SHA1 (patch-ac) = 9ca09880abf95f415d5dc8b2595d3da755af18d9 diff --git a/databases/db4/patches/patch-aa b/databases/db4/patches/patch-aa index 1a850340d4f..1a543b29bf0 100644 --- a/databases/db4/patches/patch-aa +++ b/databases/db4/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.10 2006/01/06 15:08:47 wiz Exp $ +$NetBSD: patch-aa,v 1.11 2006/11/05 17:43:59 joerg Exp $ ---- dist/Makefile.in.orig 2005-11-08 13:47:22.000000000 +0100 +--- dist/Makefile.in.orig 2005-11-08 12:47:22.000000000 +0000 +++ dist/Makefile.in @@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@ bindir= @bindir@ @@ -60,7 +60,26 @@ $NetBSD: patch-aa,v 1.10 2006/01/06 15:08:47 wiz Exp $ libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@ libtso_static= $(libtso_base)-$(LIBVERSION).a libtso_target= $(libtso_base)-$(LIBVERSION).la -@@ -903,11 +903,10 @@ install_utilities: +@@ -867,8 +867,7 @@ install_include: + ($(mkdir) -p $(DESTDIR)$(includedir) && \ + $(chmod) $(dmode) $(DESTDIR)$(includedir)) + @cd $(DESTDIR)$(includedir) && $(rm) -f $(INCDOT) +- @$(cp) -p $(INCDOT) $(DESTDIR)$(includedir) +- @cd $(DESTDIR)$(includedir) && $(chmod) $(fmode) $(INCDOT) ++ ${BSD_INSTALL_DATA} $(INCDOT) $(DESTDIR)$(includedir) + + uninstall_include: + @cd $(DESTDIR)$(includedir) && $(rm) -f $(INCDOT) +@@ -879,7 +878,7 @@ install_lib: + ($(mkdir) -p $(DESTDIR)$(libdir) && \ + $(chmod) $(dmode) $(DESTDIR)$(libdir)) + @cd $(DESTDIR)$(libdir) && $(rm) -f $(LIB_INSTALL_FILE_LIST) +- @$(INSTALLER) @INSTALL_LIBS@ $(DESTDIR)$(libdir) ++ @libtool --mode=install ${BSD_INSTALL_LIB} @INSTALL_LIBS@ $(DESTDIR)$(libdir) + @(cd $(DESTDIR)$(libdir) && \ + test -f $(libso) && $(ln) -s $(libso) $(libso_default); \ + test -f $(libso) && $(ln) -s $(libso) $(libso_major); \ +@@ -903,11 +902,8 @@ install_utilities: ($(mkdir) -p $(DESTDIR)$(bindir) && \ $(chmod) $(dmode) $(DESTDIR)$(bindir)) @for i in $(UTIL_PROGS); do \ @@ -70,9 +89,7 @@ $NetBSD: patch-aa,v 1.10 2006/01/06 15:08:47 wiz Exp $ - test -f $(strip) && $(strip) $(DESTDIR)$(bindir)/$$i || true; \ - $(chmod) $(emode) $(DESTDIR)$(bindir)/$$i; \ + target="${DESTDIR}${bindir}/`echo $$i | sed '${transform}'`"; \ -+ $(INSTALLER) $$i $${target}; \ -+ test -f $(strip) && $(strip) $${target} || true; \ -+ $(chmod) $(emode) $${target}; \ ++ libtool --mode=install ${BSD_INSTALL_PROGRAM} $$i $$target; \ done uninstall_utilities: |