pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc DESTDIR support.
details: https://anonhg.NetBSD.org/pkgsrc/rev/9578849123ac
branches: trunk
changeset: 521008:9578849123ac
user: joerg <joerg%pkgsrc.org@localhost>
date: Fri Nov 03 19:14:25 2006 +0000
description:
DESTDIR support.
diffstat:
archivers/unzip/Makefile | 17 +++++++++--------
devel/cvsync/Makefile | 14 +++++++-------
devel/cvsync/distinfo | 4 +++-
devel/cvsync/patches/patch-aa | 15 +++++++++++++++
devel/cvsync/patches/patch-ab | 13 +++++++++++++
devel/pcre/Makefile | 3 ++-
fonts/ghostscript-fonts/Makefile | 15 ++++++++-------
mail/courier-maildir/Makefile | 34 ++++++++++++++++++----------------
sysutils/cdrtools/Makefile | 23 ++++++++++++-----------
sysutils/estd/Makefile | 6 +++++-
sysutils/estd/distinfo | 4 ++--
sysutils/estd/patches/patch-aa | 12 ++++++------
textproc/docbook-xml/Makefile | 13 +++++++------
textproc/docbook-xsl/Makefile | 22 +++++++++++-----------
www/neon/Makefile | 3 ++-
15 files changed, 120 insertions(+), 78 deletions(-)
diffs (truncated from 465 to 300 lines):
diff -r cd40ba067d2c -r 9578849123ac archivers/unzip/Makefile
--- a/archivers/unzip/Makefile Fri Nov 03 19:11:59 2006 +0000
+++ b/archivers/unzip/Makefile Fri Nov 03 19:14:25 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2006/11/03 07:53:55 rillig Exp $
+# $NetBSD: Makefile,v 1.67 2006/11/03 19:14:25 joerg Exp $
DISTNAME= unzip552
PKGNAME= unzip-5.52
@@ -11,6 +11,7 @@
COMMENT= List, test and extract compressed files in a ZIP archive
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
DIST_SUBDIR= ${PKGNAME_NOREV} # Remove on next update.
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
@@ -32,16 +33,16 @@
TEST_TARGET= check
do-install:
- cd ${WRKSRC} && ${INSTALL_PROGRAM} unzip funzip unzipsfx ${PREFIX}/bin
- ${LN} -sf unzip ${PREFIX}/bin/zipinfo
- cd ${WRKSRC}/unix && ${INSTALL_SCRIPT} zipgrep ${PREFIX}/bin
+ cd ${WRKSRC} && ${INSTALL_PROGRAM} unzip funzip unzipsfx ${DESTDIR}${PREFIX}/bin
+ ${LN} -sf unzip ${DESTDIR}${PREFIX}/bin/zipinfo
+ cd ${WRKSRC}/unix && ${INSTALL_SCRIPT} zipgrep ${DESTDIR}${PREFIX}/bin
cd ${WRKSRC}/man && ${INSTALL_MAN} funzip.1 unzip.1 unzipsfx.1 \
- zipgrep.1 zipinfo.1 ${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unzip
+ zipgrep.1 zipinfo.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/unzip
cd ${WRKSRC} && ${INSTALL_DATA} BUGS LICENSE README WHERE \
- ${PREFIX}/share/doc/unzip
+ ${DESTDIR}${PREFIX}/share/doc/unzip
cd ${WRKSRC} && ${INSTALL_DATA} COPYING.OLD \
- ${PREFIX}/share/doc/unzip/COPYING
+ ${DESTDIR}${PREFIX}/share/doc/unzip/COPYING
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r cd40ba067d2c -r 9578849123ac devel/cvsync/Makefile
--- a/devel/cvsync/Makefile Fri Nov 03 19:11:59 2006 +0000
+++ b/devel/cvsync/Makefile Fri Nov 03 19:14:25 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2006/02/05 23:08:41 joerg Exp $
+# $NetBSD: Makefile,v 1.82 2006/11/03 19:22:55 joerg Exp $
#
DISTNAME= cvsync-0.24.19
@@ -11,9 +11,10 @@
COMMENT= Portable incremental cvs repository syncer
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= gmake
-INSTALLATION_DIRS= bin man/man1
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/cvsync
MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} BINMODE=${BINMODE:Q}
MAKE_ENV+= MANMODE=${MANMODE:Q}
@@ -55,11 +56,10 @@
.endif
post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/samples/cvsync.conf ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/samples/cvsyncd-FreeBSD.conf ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/samples/cvsyncd-NetBSD.conf ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/samples/cvsyncd-OpenBSD.conf ${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/samples/cvsync.conf ${DESTDIR}${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/samples/cvsyncd-FreeBSD.conf ${DESTDIR}${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/samples/cvsyncd-NetBSD.conf ${DESTDIR}${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/samples/cvsyncd-OpenBSD.conf ${DESTDIR}${EGDIR}
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff -r cd40ba067d2c -r 9578849123ac devel/cvsync/distinfo
--- a/devel/cvsync/distinfo Fri Nov 03 19:11:59 2006 +0000
+++ b/devel/cvsync/distinfo Fri Nov 03 19:14:25 2006 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.64 2005/10/20 17:37:04 wiz Exp $
+$NetBSD: distinfo,v 1.65 2006/11/03 19:22:55 joerg Exp $
SHA1 (cvsync-0.24.19.tar.gz) = a3c0673bf0f3b81b1eb45ac828a527d2a4e6d2f6
RMD160 (cvsync-0.24.19.tar.gz) = f98530cfa25d75647af7a4baed7e6184f01207ec
Size (cvsync-0.24.19.tar.gz) = 139695 bytes
+SHA1 (patch-aa) = 6848abba52d055737f13a36fefa2edc67578049e
+SHA1 (patch-ab) = 290332d24c0abf4113d25058275e180a267700aa
diff -r cd40ba067d2c -r 9578849123ac devel/cvsync/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cvsync/patches/patch-aa Fri Nov 03 19:14:25 2006 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.5 2006/11/03 19:22:55 joerg Exp $
+
+--- mk/prog.mk.orig 2006-11-03 15:53:01.000000000 +0000
++++ mk/prog.mk
+@@ -65,8 +65,8 @@ distclean: clean
+ $(RM) .depend ../mk/defaults.mk *.core *.d *.stackdump
+
+ install: all
+- ${INSTALL} ${INSTALL_BIN_OPTS} ${PROG} ${BINDIR}/${PROG}
+- ${INSTALL} ${INSTALL_MAN_OPTS} ${MAN} ${MANDIR}/man1/${MAN}
++ ${INSTALL} ${INSTALL_BIN_OPTS} ${PROG} ${DESTDIR}${BINDIR}/${PROG}
++ ${INSTALL} ${INSTALL_MAN_OPTS} ${MAN} ${DESTDIR}${MANDIR}/man1/${MAN}
+
+ uninstall:
+ $(RM) ${BINDIR}/${PROG} ${MANDIR}/man1/${MAN}
diff -r cd40ba067d2c -r 9578849123ac devel/cvsync/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cvsync/patches/patch-ab Fri Nov 03 19:14:25 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2006/11/03 19:22:55 joerg Exp $
+
+--- mk/base.mk.orig 2006-11-03 15:57:04.000000000 +0000
++++ mk/base.mk
+@@ -92,7 +92,7 @@ endif # SunOS
+
+ PREFIX ?= /usr/local
+ BINDIR ?= ${PREFIX}/bin
+-MANDIR ?= ${PREFIX}/man
++MANDIR ?= ${PREFIX}/${PKGMANDIR}
+
+ BINOWN ?= root
+ BINGRP ?= wheel
diff -r cd40ba067d2c -r 9578849123ac devel/pcre/Makefile
--- a/devel/pcre/Makefile Fri Nov 03 19:11:59 2006 +0000
+++ b/devel/pcre/Makefile Fri Nov 03 19:14:25 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/10/04 20:23:46 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2006/11/03 19:22:55 joerg Exp $
DISTNAME= pcre-6.7
CATEGORIES= devel
@@ -11,6 +11,7 @@
COMMENT= Perl Compatible Regular Expressions library
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
diff -r cd40ba067d2c -r 9578849123ac fonts/ghostscript-fonts/Makefile
--- a/fonts/ghostscript-fonts/Makefile Fri Nov 03 19:11:59 2006 +0000
+++ b/fonts/ghostscript-fonts/Makefile Fri Nov 03 19:14:25 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:39 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/11/03 19:18:38 joerg Exp $
DISTNAME= ghostscript-fonts-8.11
CATEGORIES= fonts
@@ -10,6 +10,8 @@
HOMEPAGE= http://gs-fonts.sourceforge.net/
COMMENT= Postscript fonts for Aladdin Ghostscript
+PKG_DESTDIR_SUPPORT= user-destdir
+
# Note: the following two are special files. In the 5.50 directory
# on the FTP site, there are symlinks:
# ghostscript-fonts-other-5.50.tar.gz ->
@@ -30,19 +32,18 @@
WRKSRC= ${WRKDIR}/fonts
FONTS_DIR= ${PREFIX}/share/ghostscript/fonts
+INSTALLATION_DIRS= share/ghostscript/fonts
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/ghostscript
- ${INSTALL_DATA_DIR} ${FONTS_DIR}
for ext in afm gsf pfa pfb pfm; \
do \
for f in ${WRKSRC}/*.$${ext}; \
do \
- ${INSTALL_DATA} $${f} ${FONTS_DIR}; \
+ ${INSTALL_DATA} $${f} ${DESTDIR}${FONTS_DIR}; \
done; \
done
- ${INSTALL_DATA} ${WRKSRC}/fonts.dir ${FONTS_DIR}
- ${INSTALL_DATA} ${WRKSRC}/fonts.scale ${FONTS_DIR}
- ${INSTALL_DATA} ${FILESDIR}/fonts.alias ${FONTS_DIR}
+ ${INSTALL_DATA} ${WRKSRC}/fonts.dir ${DESTDIR}${FONTS_DIR}
+ ${INSTALL_DATA} ${WRKSRC}/fonts.scale ${DESTDIR}${FONTS_DIR}
+ ${INSTALL_DATA} ${FILESDIR}/fonts.alias ${DESTDIR}${FONTS_DIR}
.include "../../mk/bsd.pkg.mk"
diff -r cd40ba067d2c -r 9578849123ac mail/courier-maildir/Makefile
--- a/mail/courier-maildir/Makefile Fri Nov 03 19:11:59 2006 +0000
+++ b/mail/courier-maildir/Makefile Fri Nov 03 19:14:25 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/06/09 22:11:42 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/11/03 19:23:55 joerg Exp $
DISTNAME= courier-${COURIER_VERSION}
PKGNAME= ${DISTNAME:S/-/-maildir-/}
@@ -12,6 +12,8 @@
CONFLICTS= courier-maildirmake-[0-9]*
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_TOOLS+= gmake perl:run
USE_LANGUAGES= c c++
@@ -70,37 +72,37 @@
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/maildir/deliverquota \
- ${PREFIX}/bin/deliverquota
+ ${DESTDIR}${PREFIX}/bin/deliverquota
${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildiracl \
- ${PREFIX}/bin/courier-maildiracl
+ ${DESTDIR}${PREFIX}/bin/courier-maildiracl
${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildirkw \
- ${PREFIX}/bin/courier-maildirkw
+ ${DESTDIR}${PREFIX}/bin/courier-maildirkw
${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildirmake \
- ${PREFIX}/bin/courier-maildirmake
+ ${DESTDIR}${PREFIX}/bin/courier-maildirmake
${INSTALL_MAN} ${WRKSRC}/maildir/maildiracl.1 \
- ${PREFIX}/${PKGMANDIR}/man1/courier-maildiracl.1
+ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/courier-maildiracl.1
${INSTALL_MAN} ${WRKSRC}/maildir/maildirkw.1 \
- ${PREFIX}/${PKGMANDIR}/man1/courier-maildirkw.1
+ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/courier-maildirkw.1
${INSTALL_MAN} ${WRKSRC}/maildir/maildirmake.1 \
- ${PREFIX}/${PKGMANDIR}/man1/courier-maildirmake.1
+ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/courier-maildirmake.1
${INSTALL_MAN} ${WRKSRC}/maildir/maildir.5 \
- ${PREFIX}/${PKGMANDIR}/man5/courier-maildir.5
+ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/courier-maildir.5
${INSTALL_MAN} ${WRKSRC}/maildir/maildirquota.7 \
- ${PREFIX}/${PKGMANDIR}/man7/maildirquota.7
+ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/maildirquota.7
${INSTALL_MAN} ${WRKSRC}/maildir/deliverquota.8 \
- ${PREFIX}/${PKGMANDIR}/man8/deliverquota.8
+ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/deliverquota.8
${INSTALL_DATA} ${WRKSRC}/maildir/quotawarnmsg \
- ${EGDIR}/quotawarnmsg
+ ${DESTDIR}${EGDIR}/quotawarnmsg
${INSTALL_SCRIPT} ${WRKSRC}/maildir/sharedindexinstall \
- ${PREFIX}/sbin/sharedindexinstall
+ ${DESTDIR}${PREFIX}/sbin/sharedindexinstall
${INSTALL_SCRIPT} ${WRKSRC}/maildir/sharedindexsplit \
- ${PREFIX}/sbin/sharedindexsplit
+ ${DESTDIR}${PREFIX}/sbin/sharedindexsplit
${INSTALL_SCRIPT} ${WRKDIR}/sharedindexupdate.sh \
- ${EGDIR}/sharedindexupdate
+ ${DESTDIR}${EGDIR}/sharedindexupdate
grep "^${DOCDIR:S/${PREFIX}\///}" ${PKGDIR}/PLIST | \
while read file; do \
src=${WRKSRC:Q}/maildir/`basename $$file`; \
- dst=${PREFIX:Q}"/$$file"; \
+ dst=${DESTDIR}${PREFIX:Q}"/$$file"; \
${INSTALL_DATA} "$$src" "$$dst"; \
done
diff -r cd40ba067d2c -r 9578849123ac sysutils/cdrtools/Makefile
--- a/sysutils/cdrtools/Makefile Fri Nov 03 19:11:59 2006 +0000
+++ b/sysutils/cdrtools/Makefile Fri Nov 03 19:14:25 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/08/28 13:56:22 dsainty Exp $
+# $NetBSD: Makefile,v 1.9 2006/11/03 19:15:45 joerg Exp $
DISTNAME= cdrtools-2.01
PKGREVISION= 4
@@ -13,6 +13,7 @@
CONFLICTS= mkisofs-[0-9]* cdrtools-ossdvd-[0-9]* cdrecord-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
.include "../../mk/bsd.prefs.mk"
@@ -74,22 +75,22 @@
do-install:
cd ${WRKSRC}/cdda2wav; \
- ${INSTALL_PROGRAM} OBJ/*/cdda2wav ${PREFIX}/bin; \
- ${INSTALL_MAN} cdda2wav.1 ${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_PROGRAM} OBJ/*/cdda2wav ${DESTDIR}${PREFIX}/bin; \
+ ${INSTALL_MAN} cdda2wav.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
cd ${WRKSRC}/cdrecord; \
- ${INSTALL_PROGRAM} OBJ/*/cdrecord ${PREFIX}/bin; \
- ${INSTALL_MAN} cdrecord.1 ${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_PROGRAM} OBJ/*/cdrecord ${DESTDIR}${PREFIX}/bin; \
+ ${INSTALL_MAN} cdrecord.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
cd ${WRKSRC}/mkisofs; \
- ${INSTALL_PROGRAM} OBJ/*/mkisofs ${PREFIX}/bin; \
- ${INSTALL_MAN} mkisofs.8 ${PREFIX}/${PKGMANDIR}/man8
+ ${INSTALL_PROGRAM} OBJ/*/mkisofs ${DESTDIR}${PREFIX}/bin; \
+ ${INSTALL_MAN} mkisofs.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
cd ${WRKSRC}/mkisofs/diag; \
for f in devdump isodump isoinfo isovfy; do \
- ${INSTALL_PROGRAM} OBJ/*/$$f ${PREFIX}/bin; \
- ${INSTALL_MAN} isoinfo.8 ${PREFIX}/${PKGMANDIR}/man8/$$f.8; \
+ ${INSTALL_PROGRAM} OBJ/*/$$f ${DESTDIR}${PREFIX}/bin; \
+ ${INSTALL_MAN} isoinfo.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/$$f.8; \
done
cd ${WRKSRC}/readcd; \
Home |
Main Index |
Thread Index |
Old Index