pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools DESTDIR support



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5edbae9c3667
branches:  trunk
changeset: 554169:5edbae9c3667
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Feb 10 00:15:20 2009 +0000

description:
DESTDIR support

diffstat:

 pkgtools/pkg_filecheck/Makefile       |  20 +++++++++++---------
 pkgtools/pkg_rolling-replace/Makefile |   7 ++++---
 pkgtools/pkgdep/Makefile              |   6 ++++--
 pkgtools/pkgdepgraph/Makefile         |  11 ++++++-----
 pkgtools/port2pkg/Makefile            |  14 ++++++++------
 5 files changed, 33 insertions(+), 25 deletions(-)

diffs (180 lines):

diff -r 63aaf6f18b78 -r 5edbae9c3667 pkgtools/pkg_filecheck/Makefile
--- a/pkgtools/pkg_filecheck/Makefile   Tue Feb 10 00:13:34 2009 +0000
+++ b/pkgtools/pkg_filecheck/Makefile   Tue Feb 10 00:15:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/05/25 13:16:11 dillo Exp $
+# $NetBSD: Makefile,v 1.30 2009/02/10 00:15:20 joerg Exp $
 #
 
 DISTNAME=              pkg_filecheck-0.4
@@ -10,6 +10,8 @@
 #HOMEPAGE=             http://www.NetBSD.org/docs/pkgsrc/
 COMMENT=               Check for files not owned by any package
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}
 USE_TOOLS+=    perl:run
 USE_FEATURES=  fts_open
@@ -23,7 +25,8 @@
 CONF_FILES=    ${PREFIX}/share/examples/pkg_filecheck/pkg_filecheck.conf \
                ${PKG_SYSCONFDIR}/pkg_filecheck.conf
 
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \
+                       share/examples/pkg_filecheck
 
 SUBST_CLASSES+=                paths
 SUBST_FILES.paths=     builddb.pl builddb.1 pkg_filecheck.conf
@@ -47,14 +50,13 @@
                -o pkg_filecheck pkg_filecheck.c
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/builddb.pl ${PREFIX}/bin/builddb
-       ${INSTALL_PROGRAM} ${WRKSRC}/pkg_filecheck ${PREFIX}/bin/pkg_filecheck
-       ${INSTALL_MAN} ${WRKSRC}/builddb.1 ${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_MAN} ${WRKSRC}/pkg_filecheck.1 ${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_MAN} ${WRKSRC}/pkg_filecheck.conf.5 ${PREFIX}/${PKGMANDIR}/man5
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pkg_filecheck
+       ${INSTALL_SCRIPT} ${WRKSRC}/builddb.pl ${DESTDIR}${PREFIX}/bin/builddb
+       ${INSTALL_PROGRAM} ${WRKSRC}/pkg_filecheck ${DESTDIR}${PREFIX}/bin/pkg_filecheck
+       ${INSTALL_MAN} ${WRKSRC}/builddb.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${WRKSRC}/pkg_filecheck.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${WRKSRC}/pkg_filecheck.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
        ${INSTALL_DATA} ${WRKSRC}/pkg_filecheck.conf \
-               ${PREFIX}/share/examples/pkg_filecheck/pkg_filecheck.conf
+               ${DESTDIR}${PREFIX}/share/examples/pkg_filecheck/pkg_filecheck.conf
 
 
 .include "../../mk/bdb.buildlink3.mk"
diff -r 63aaf6f18b78 -r 5edbae9c3667 pkgtools/pkg_rolling-replace/Makefile
--- a/pkgtools/pkg_rolling-replace/Makefile     Tue Feb 10 00:13:34 2009 +0000
+++ b/pkgtools/pkg_rolling-replace/Makefile     Tue Feb 10 00:15:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/06/22 12:49:53 gdt Exp $
+# $NetBSD: Makefile,v 1.22 2009/02/10 00:16:01 joerg Exp $
 
 DISTNAME=      pkg_rolling-replace-0.16
 PKGREVISION=   2
@@ -13,6 +13,7 @@
 DEPENDS+=      pkg_tarup>=1.6.6:../../pkgtools/pkg_tarup
 
 PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_TOOLS+=    patch
 
@@ -53,8 +54,8 @@
 
 do-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/pkg_rolling-replace.sh \
-               ${PREFIX}/sbin/pkg_rolling-replace
+               ${DESTDIR}${PREFIX}/sbin/pkg_rolling-replace
        ${INSTALL_MAN} ${WRKSRC}/pkg_rolling-replace.8 \
-               ${PREFIX}/${PKGMANDIR}/man8/pkg_rolling-replace.8
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/pkg_rolling-replace.8
 
 .include "../../mk/bsd.pkg.mk"
diff -r 63aaf6f18b78 -r 5edbae9c3667 pkgtools/pkgdep/Makefile
--- a/pkgtools/pkgdep/Makefile  Tue Feb 10 00:13:34 2009 +0000
+++ b/pkgtools/pkgdep/Makefile  Tue Feb 10 00:15:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/09/03 00:56:30 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2009/02/10 00:17:08 joerg Exp $
 #
 
 DISTNAME=      pkgdep-1.0
@@ -9,6 +9,8 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Script for displaying dependence information on software packages
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}
 USE_TOOLS+=    perl:run
 
@@ -24,6 +26,6 @@
 #              ${FILESDIR}/pkgdep.pl > ${WRKDIR}/pkgdep
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKDIR}/pkgdep ${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKDIR}/pkgdep ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff -r 63aaf6f18b78 -r 5edbae9c3667 pkgtools/pkgdepgraph/Makefile
--- a/pkgtools/pkgdepgraph/Makefile     Tue Feb 10 00:13:34 2009 +0000
+++ b/pkgtools/pkgdepgraph/Makefile     Tue Feb 10 00:15:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/01/07 09:14:09 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2009/02/10 00:17:11 joerg Exp $
 #
 
 DISTNAME=      pkgdepgraph-2.8
@@ -10,6 +10,8 @@
 HOMEPAGE=      ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
 COMMENT=       Visual representation of installed NetBSD packages
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 # removed so that pkgdepgraph can be used on "client" machines -- @@@
 # DEPENDS+=    graphviz-[0-9]*:../../graphics/graphviz
 
@@ -17,7 +19,6 @@
 USE_TOOLS+=    perl:run
 
 EXTRACT_ONLY=  # empty
-NO_CHECKSUM=   yes
 NO_CONFIGURE=  yes
 
 DISTVER=       ${DISTNAME:S/pkgdepgraph-//}
@@ -52,8 +53,8 @@
 .endif
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/pkgdepgraph ${PREFIX}/bin/pkgdepgraph
-       ${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.0 ${PREFIX}/${PKGMANDIR}/cat1
-       ${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.1 ${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_SCRIPT} ${WRKSRC}/pkgdepgraph ${DESTDIR}${PREFIX}/bin/pkgdepgraph
+       ${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
+       ${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff -r 63aaf6f18b78 -r 5edbae9c3667 pkgtools/port2pkg/Makefile
--- a/pkgtools/port2pkg/Makefile        Tue Feb 10 00:13:34 2009 +0000
+++ b/pkgtools/port2pkg/Makefile        Tue Feb 10 00:15:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2008/02/28 11:58:49 rillig Exp $
+# $NetBSD: Makefile,v 1.34 2009/02/10 00:19:50 joerg Exp $
 #
 
 DISTNAME=      port2pkg-1.11
@@ -10,13 +10,15 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Convert from a FreeBSD port to a NetBSD package
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      pkglint-[0-9]*:../../pkgtools/pkglint
 
 WRKSRC=                ${WRKDIR}
-NO_CHECKSUM=   yes
 NO_BUILD=      yes
 USE_TOOLS+=    gtar perl:run
-AUTO_MKDIRS=                   yes
+
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
 
 do-extract:
        cd ${FILESDIR} && cp port2pkg.* ${WRKSRC}
@@ -27,8 +29,8 @@
 SUBST_SED.gtar=                -e 's|$${GTAR}|${GTAR}|g'
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/port2pkg.pl ${PREFIX}/bin/port2pkg
-       ${INSTALL_MAN} ${WRKSRC}/port2pkg.0 ${PREFIX}/${PKGMANDIR}/cat1
-       ${INSTALL_MAN} ${WRKSRC}/port2pkg.1 ${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_SCRIPT} ${WRKSRC}/port2pkg.pl ${DESTDIR}${PREFIX}/bin/port2pkg
+       ${INSTALL_MAN} ${WRKSRC}/port2pkg.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
+       ${INSTALL_MAN} ${WRKSRC}/port2pkg.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index