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/0a596f74c512
branches:  trunk
changeset: 521143:0a596f74c512
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Nov 05 17:06:43 2006 +0000

description:
DESTDIR support.

diffstat:

 archivers/lzo/Makefile                    |   3 ++-
 archivers/p5-Archive-Tar/Makefile         |   3 ++-
 audio/esound/Makefile                     |   3 ++-
 audio/libaudiofile/Makefile               |   8 +++++---
 audio/libmad/Makefile                     |   5 +++--
 mail/p5-MIME-tools/Makefile               |   4 +++-
 mail/p5-MailTools/Makefile                |   7 ++++---
 mail/spamassassin/Makefile                |  31 ++++++++++++++++---------------
 sysutils/dbus-glib/Makefile               |   4 +++-
 sysutils/dbus/Makefile                    |   4 +++-
 sysutils/fam/Makefile                     |   3 ++-
 sysutils/gnome-vfs2/Makefile              |   4 +++-
 textproc/gtkspell/Makefile                |   4 +++-
 textproc/intltool/Makefile                |   3 ++-
 textproc/libcroco/Makefile                |   4 +++-
 textproc/libxslt/Makefile                 |   3 ++-
 textproc/p5-Text-Diff/Makefile            |   4 +++-
 textproc/p5-Text-Template/Makefile        |   4 +++-
 textproc/p5-XML-NamespaceSupport/Makefile |   3 ++-
 textproc/p5-XML-Parser/Makefile           |   3 ++-
 textproc/p5-XML-Simple/Makefile           |   4 +++-
 textproc/py-docutils/Makefile             |   3 ++-
 textproc/py-xml/Makefile                  |   4 +++-
 textproc/texi2html/Makefile               |   3 ++-
 24 files changed, 78 insertions(+), 43 deletions(-)

diffs (truncated from 512 to 300 lines):

diff -r e79fbccac046 -r 0a596f74c512 archivers/lzo/Makefile
--- a/archivers/lzo/Makefile    Sun Nov 05 17:02:18 2006 +0000
+++ b/archivers/lzo/Makefile    Sun Nov 05 17:06:43 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/03/04 21:28:53 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2006/11/05 17:10:43 joerg Exp $
 #
 
 DISTNAME=      lzo-2.02
@@ -11,6 +11,7 @@
 COMMENT=       Portable lossless data compression library
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE= YES
 USE_LIBTOOL=   YES
diff -r e79fbccac046 -r 0a596f74c512 archivers/p5-Archive-Tar/Makefile
--- a/archivers/p5-Archive-Tar/Makefile Sun Nov 05 17:02:18 2006 +0000
+++ b/archivers/p5-Archive-Tar/Makefile Sun Nov 05 17:06:43 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/10 20:41:41 heinz Exp $
+# $NetBSD: Makefile,v 1.24 2006/11/05 17:10:43 joerg Exp $
 
 DISTNAME=              Archive-Tar-1.29
 PKGNAME=               p5-${DISTNAME}
@@ -15,6 +15,7 @@
 DEPENDS+=              p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 MAKE_PARAMS+=          "-d"    # Text::Diff is a prerequisite
 USE_LANGUAGES=         # empty
diff -r e79fbccac046 -r 0a596f74c512 audio/esound/Makefile
--- a/audio/esound/Makefile     Sun Nov 05 17:02:18 2006 +0000
+++ b/audio/esound/Makefile     Sun Nov 05 17:06:43 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2006/08/26 15:25:26 joerg Exp $
+# $NetBSD: Makefile,v 1.64 2006/11/05 17:14:19 joerg Exp $
 
 DISTNAME=              esound-0.2.36
 PKGREVISION=           1
@@ -11,6 +11,7 @@
 COMMENT=               The Enlightened sound daemon
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_LIBTOOL=           YES
 PKGCONFIG_OVERRIDE=    esound.pc.in
diff -r e79fbccac046 -r 0a596f74c512 audio/libaudiofile/Makefile
--- a/audio/libaudiofile/Makefile       Sun Nov 05 17:02:18 2006 +0000
+++ b/audio/libaudiofile/Makefile       Sun Nov 05 17:06:43 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/04/11 21:44:53 tv Exp $
+# $NetBSD: Makefile,v 1.40 2006/11/05 17:14:19 joerg Exp $
 
 DISTNAME=              audiofile-0.2.6
 PKGNAME=               lib${DISTNAME}
@@ -13,6 +13,7 @@
 COMMENT=               Sound library for SGI audio file
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         YES
 USE_LIBTOOL=           YES
@@ -20,8 +21,9 @@
 
 DOCDIR=                        ${PREFIX}/share/doc/libaudiofile
 
+INSTALLATION_DIRS=     ${DOCDIR}
+
 post-install:
-       ${INSTALL_DATA_DIR} ${DOCDIR}
-       cd ${WRKSRC}/docs; ${INSTALL_DATA} af* sf* ${DOCDIR}
+       cd ${WRKSRC}/docs; ${INSTALL_DATA} af* sf* ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff -r e79fbccac046 -r 0a596f74c512 audio/libmad/Makefile
--- a/audio/libmad/Makefile     Sun Nov 05 17:02:18 2006 +0000
+++ b/audio/libmad/Makefile     Sun Nov 05 17:06:43 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:48 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/11/05 17:14:20 joerg Exp $
 #
 
 DISTNAME=      libmad-0.15.1b
@@ -14,6 +14,7 @@
 CONFLICTS=     mad<0.15
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         YES
 USE_LIBTOOL=           YES
@@ -30,6 +31,6 @@
                < ${FILESDIR}/mad.pc.in > ${WRKDIR}/mad.pc
 
 post-install:
-       ${INSTALL_DATA} ${WRKDIR}/mad.pc ${PREFIX}/lib/pkgconfig
+       ${INSTALL_DATA} ${WRKDIR}/mad.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
 
 .include "../../mk/bsd.pkg.mk"
diff -r e79fbccac046 -r 0a596f74c512 mail/p5-MIME-tools/Makefile
--- a/mail/p5-MIME-tools/Makefile       Sun Nov 05 17:02:18 2006 +0000
+++ b/mail/p5-MIME-tools/Makefile       Sun Nov 05 17:06:43 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/05/17 21:53:00 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2006/11/05 17:15:54 joerg Exp $
 #
 
 DISTNAME=      MIME-tools-5.420
@@ -11,6 +11,8 @@
 HOMEPAGE=      http://search.cpan.org/dist/MIME-tools/
 COMMENT=       Perl5 modules for encoding and decoding MIME messages
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      p5-IO-stringy-[0-9]*:../../devel/p5-IO-stringy
 DEPENDS+=      p5-MIME-Base64>=3.03:../../converters/p5-MIME-Base64
 DEPENDS+=      p5-MailTools-[0-9]*:../../mail/p5-MailTools
diff -r e79fbccac046 -r 0a596f74c512 mail/p5-MailTools/Makefile
--- a/mail/p5-MailTools/Makefile        Sun Nov 05 17:02:18 2006 +0000
+++ b/mail/p5-MailTools/Makefile        Sun Nov 05 17:06:43 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/05/17 21:52:38 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2006/11/05 17:15:54 joerg Exp $
 
 DISTNAME=      MailTools-1.74
 PKGNAME=       p5-${DISTNAME}
@@ -10,9 +10,10 @@
 HOMEPAGE=      http://search.cpan.org/dist/MailTools/
 COMMENT=       Perl5 modules related to mail applications
 
-BUILD_DEPENDS+=        p5-Net>=1.09:../../net/p5-Net
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
-PKG_INSTALLATION_TYPES=        overwrite pkgviews
+BUILD_DEPENDS+=        p5-Net>=1.09:../../net/p5-Net
 
 USE_LANGUAGES=         # empty
 PERL5_PACKLIST=                auto/Mail/.packlist
diff -r e79fbccac046 -r 0a596f74c512 mail/spamassassin/Makefile
--- a/mail/spamassassin/Makefile        Sun Nov 05 17:02:18 2006 +0000
+++ b/mail/spamassassin/Makefile        Sun Nov 05 17:06:43 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2006/10/10 18:39:27 heinz Exp $
+# $NetBSD: Makefile,v 1.77 2006/11/05 17:15:54 joerg Exp $
 
 DISTNAME=      Mail-SpamAssassin-3.1.7
 PKGNAME=       spamassassin-3.1.7
@@ -10,6 +10,9 @@
 HOMEPAGE=      http://spamassassin.apache.org/
 COMMENT=       Mail filter to identify spam
 
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 DEPENDS+=      p5-Net-DNS>=0.34:../../net/p5-Net-DNS
@@ -26,8 +29,6 @@
 
 CONFLICTS=             p5-Mail-SpamAssassin-[1-9]*
 
-PKG_INSTALLATION_TYPES=        overwrite pkgviews
-
 WRKSRC=                        ${WRKDIR}/${DISTNAME}
 
 PKG_SYSCONFSUBDIR=     spamassassin
@@ -135,18 +136,18 @@
                spamc/README.qmail                                      \
                sample-nonspam.txt sample-spam.txt spamd/README         \
                spamd/README.vpopmail
-       @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f}
+       @${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f}
        @${ECHO} "${DOC_SUBDIR}/${f}" >> ${PLIST_ADD}
 .endfor
 .for f in STATISTICS-set0.txt STATISTICS-set1.txt STATISTICS-set2.txt  \
          STATISTICS-set3.txt
-       @${INSTALL_DATA} ${WRKSRC}/rules/${f} ${DOCDIR}
+       @${INSTALL_DATA} ${WRKSRC}/rules/${f} ${DESTDIR}${DOCDIR}
        @${ECHO} "${DOC_SUBDIR}/${f}" >> ${PLIST_ADD}
 .endfor
 .for dir in masses sql ldap tools
        @cd ${WRKSRC};                                                  \
        for d in `${FIND} ${dir} -type d -print`; do                    \
-               ${INSTALL_DATA_DIR} ${DOCDIR}/$$d;                      \
+               ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/$$d;                    \
        done;                                                           \
        for f in `${FIND} ${dir} -type f -print`; do                    \
                if ${TEST} -x $$f ; then                                \
@@ -154,9 +155,9 @@
                                > $${f}.fixed &&                        \
                        ${MV} $${f}.fixed $$f &&                        \
                        ${CHMOD} +x $$f &&                              \
-                       ${INSTALL_SCRIPT} $$f ${DOCDIR}/$$f;            \
+                       ${INSTALL_SCRIPT} $$f ${DESTDIR}${DOCDIR}/$$f;          \
                else                                                    \
-                       ${INSTALL_DATA} $$f ${DOCDIR}/$$f;              \
+                       ${INSTALL_DATA} $$f ${DESTDIR}${DOCDIR}/$$f;            \
                fi;                                                     \
                ${ECHO} "${DOC_SUBDIR}/$$f" >> ${PLIST_ADD};            \
        done;                                                           \
@@ -169,16 +170,16 @@
                ${ECHO} "${RULE_SUBDIR}/$$f" >> ${PLIST_ADD};           \
        done;                                                           \
        for f in ${PRE_FILES}; do                                       \
-               ${INSTALL_DATA} $$f ${EGDIR} &&                         \
+               ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR} &&                               \
                ${ECHO} ${EG_SUBDIR}/$$f >> ${PLIST_ADD};               \
        done
        @# examples are in the static PLIST
-       @${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${EGDIR}
-       @${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${EGDIR}
-       @${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${EGDIR}
-       @${CHOWN} ${SHAREOWN} ${RULESDIR}/*
-       @${CHGRP} ${SHAREGRP} ${RULESDIR}/*
-       @${CHMOD} a=r ${RULESDIR}/*
+       @${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${DESTDIR}${EGDIR}
+       @${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${DESTDIR}${EGDIR}
+       @${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${DESTDIR}${EGDIR}
+       @${CHOWN} ${SHAREOWN} ${DESTDIR}${RULESDIR}/*
+       @${CHGRP} ${SHAREGRP} ${DESTDIR}${RULESDIR}/*
+       @${CHMOD} a=r ${DESTDIR}${RULESDIR}/*
        @{ for d in ${INSTALLATION_DIRS}; do                            \
                ${ECHO} "@dirrm $$d";                                   \
        done; } | ${SORT} -r >> ${PLIST_ADD};
diff -r e79fbccac046 -r 0a596f74c512 sysutils/dbus-glib/Makefile
--- a/sysutils/dbus-glib/Makefile       Sun Nov 05 17:02:18 2006 +0000
+++ b/sysutils/dbus-glib/Makefile       Sun Nov 05 17:06:43 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/08/23 09:45:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2006/11/05 17:09:00 joerg Exp $
 #
 
 DISTNAME=      dbus-glib-0.71
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://www.freedesktop.org/Software/dbus
 COMMENT=       GLib bindings for the D-BUS message bus system
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         YES
 USE_TOOLS+=            gmake msgfmt pkg-config
 USE_LIBTOOL=           YES
diff -r e79fbccac046 -r 0a596f74c512 sysutils/dbus/Makefile
--- a/sysutils/dbus/Makefile    Sun Nov 05 17:02:18 2006 +0000
+++ b/sysutils/dbus/Makefile    Sun Nov 05 17:06:43 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/11/04 00:42:30 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2006/11/05 17:09:00 joerg Exp $
 #
 
 DISTNAME=      dbus-0.92
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://www.freedesktop.org/Software/dbus
 COMMENT=       Message bus system
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONFLICTS+=    dbus-glib<0.71
 CONFLICTS+=    py*-dbus<0.71
 
diff -r e79fbccac046 -r 0a596f74c512 sysutils/fam/Makefile
--- a/sysutils/fam/Makefile     Sun Nov 05 17:02:18 2006 +0000
+++ b/sysutils/fam/Makefile     Sun Nov 05 17:06:43 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/10/02 21:45:05 rillig Exp $
+# $NetBSD: Makefile,v 1.34 2006/11/05 17:09:00 joerg Exp $
 #
 
 DISTNAME=              fam-2.7.0
@@ -15,6 +15,7 @@
 COMMENT=               File Alteration Monitor
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 # fam is bundled with IRIX
 NOT_FOR_PLATFORM=      IRIX-*-*
diff -r e79fbccac046 -r 0a596f74c512 sysutils/gnome-vfs2/Makefile
--- a/sysutils/gnome-vfs2/Makefile      Sun Nov 05 17:02:18 2006 +0000
+++ b/sysutils/gnome-vfs2/Makefile      Sun Nov 05 17:06:43 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2006/09/16 15:36:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.67 2006/11/05 17:09:00 joerg Exp $
 
 PKGREVISION=           1
 
@@ -20,6 +20,8 @@
 
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.9.3
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "Makefile.common"



Home | Main Index | Thread Index | Old Index