pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Flag a number of packages I use as supporting (user-)d...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/96d44b69ddb6
branches:  trunk
changeset: 519772:96d44b69ddb6
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Oct 09 12:52:34 2006 +0000

description:
Flag a number of packages I use as supporting (user-)destdir.
apg is a bit special as it has some hardcoded ownership, so
mark that as "destdir".

diffstat:

 archivers/zip/Makefile               |  13 +++++++------
 databases/py-psycopg2/Makefile       |   4 +++-
 devel/GConf2-ui/Makefile             |   4 ++--
 devel/GConf2/Makefile                |   4 ++--
 devel/GConf2/Makefile.common         |   4 +++-
 devel/SDL/Makefile                   |   4 +++-
 devel/apr/Makefile                   |  20 +++++++++++---------
 devel/atk/Makefile                   |   3 ++-
 devel/glib2/Makefile                 |   3 ++-
 devel/gmake/Makefile                 |   9 +++++----
 fonts/Xft2/Makefile                  |   3 ++-
 fonts/xorg-fonts100dpi/Makefile      |   4 +++-
 fonts/xorg-fonts75dpi/Makefile       |   4 +++-
 fonts/xorg-fontsCyrillic/Makefile    |   4 +++-
 fonts/xorg-fontsEncodings/Makefile   |   4 +++-
 fonts/xorg-fontsMisc/Makefile        |   4 +++-
 fonts/xorg-fontsTruetype/Makefile    |   4 +++-
 fonts/xorg-fontsType1/Makefile       |   4 +++-
 fonts/xorg-fontserver/Makefile       |   4 +++-
 graphics/Mesa/Makefile.common        |   4 +++-
 graphics/Mesa/Makefile.lib           |   4 ++--
 graphics/MesaDemos/Makefile          |   8 ++++----
 graphics/MesaLib/Makefile            |   6 +++---
 graphics/aalib/Makefile              |   3 ++-
 graphics/glut/Makefile               |   6 +++---
 mail/archivemail/Makefile            |   4 +++-
 mail/getmail/Makefile                |   4 +++-
 meta-pkgs/xorg/Makefile.common       |  16 ++++++++--------
 multimedia/xvidcore/Makefile         |   8 +++++---
 multimedia/xvidcore/distinfo         |   5 +++--
 multimedia/xvidcore/patches/patch-aa |   6 +++---
 net/ORBit2/Makefile                  |   3 ++-
 pkgtools/xpkgwedge/Makefile          |  23 ++++++++++++-----------
 print/xpdf/Makefile                  |   4 +++-
 security/apg/Makefile                |   8 +++++---
 security/audit-packages/Makefile     |   9 +++++----
 shells/zsh/Makefile.common           |  14 ++++++++------
 textproc/aspell/Makefile             |   4 +++-
 x11/Xaw3d/Makefile                   |  11 ++++++-----
 x11/Xrandr-mixedcase/Makefile        |   3 ++-
 x11/Xrender/Makefile                 |   3 ++-
 x11/gtk2/Makefile                    |  14 ++++++++------
 x11/xorg-clients/Makefile            |   4 +++-
 x11/xorg-imake/Makefile              |  17 +++++++++--------
 x11/xorg-libs/Makefile               |  12 ++++++------
 x11/xorg-server/Makefile             |   8 +++++---
 x11/xterm/Makefile                   |   4 +++-
 47 files changed, 190 insertions(+), 128 deletions(-)

diffs (truncated from 1136 to 300 lines):

diff -r 17b48addb2e8 -r 96d44b69ddb6 archivers/zip/Makefile
--- a/archivers/zip/Makefile    Mon Oct 09 12:50:38 2006 +0000
+++ b/archivers/zip/Makefile    Mon Oct 09 12:52:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/09/09 02:41:54 obache Exp $
+# $NetBSD: Makefile,v 1.52 2006/10/09 12:52:34 joerg Exp $
 
 DISTNAME=      zip232
 PKGNAME=       zip-2.32
@@ -14,6 +14,7 @@
 COMMENT=       Create/update ZIP files compatible with pkzip
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 MAKE_FILE=     unix/Makefile
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
@@ -43,11 +44,11 @@
 
 do-install:
        cd ${WRKSRC} && \
-           ${INSTALL_PROGRAM} zip zipnote zipsplit zipcloak ${PREFIX}/bin
+           ${INSTALL_PROGRAM} zip zipnote zipsplit zipcloak ${DESTDIR}${PREFIX}/bin
        cd ${WRKSRC}/man && \
-           ${INSTALL_MAN} zip.1 ${PREFIX}/${PKGMANDIR}/man1
-       ${LN} -f -s zip.1 ${PREFIX}/${PKGMANDIR}/man1/zipcloak.1
-       ${LN} -f -s zip.1 ${PREFIX}/${PKGMANDIR}/man1/zipnote.1
-       ${LN} -f -s zip.1 ${PREFIX}/${PKGMANDIR}/man1/zipsplit.1
+           ${INSTALL_MAN} zip.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${LN} -f -s zip.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/zipcloak.1
+       ${LN} -f -s zip.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/zipnote.1
+       ${LN} -f -s zip.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/zipsplit.1
 
 .include "../../mk/bsd.pkg.mk"
diff -r 17b48addb2e8 -r 96d44b69ddb6 databases/py-psycopg2/Makefile
--- a/databases/py-psycopg2/Makefile    Mon Oct 09 12:50:38 2006 +0000
+++ b/databases/py-psycopg2/Makefile    Mon Oct 09 12:52:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/09/02 14:15:13 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/10/09 12:52:34 joerg Exp $
 #
 
 DISTNAME=      psycopg2-2.0.5.1
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://initd.org/software/psycopg2/
 COMMENT=       PostgreSQL database adapter for Python
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 PYDISTUTILSPKG=        yes
 PYTHON_VERSIONS_ACCEPTED= 24 23
 
diff -r 17b48addb2e8 -r 96d44b69ddb6 devel/GConf2-ui/Makefile
--- a/devel/GConf2-ui/Makefile  Mon Oct 09 12:50:38 2006 +0000
+++ b/devel/GConf2-ui/Makefile  Mon Oct 09 12:52:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/04/17 13:46:09 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2006/10/09 12:52:34 joerg Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
@@ -17,7 +17,7 @@
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/gconf/.libs/gconf-sanity-check-2 \
-               ${PREFIX}/libexec
+               ${DESTDIR}${PREFIX}/libexec
 
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff -r 17b48addb2e8 -r 96d44b69ddb6 devel/GConf2/Makefile
--- a/devel/GConf2/Makefile     Mon Oct 09 12:50:38 2006 +0000
+++ b/devel/GConf2/Makefile     Mon Oct 09 12:52:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/03/30 20:50:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.39 2006/10/09 12:52:34 joerg Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
@@ -23,7 +23,7 @@
 #      But we have to wait until a public identifier is choosen for it.
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/gconf/schemas
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/gconf/schemas
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
diff -r 17b48addb2e8 -r 96d44b69ddb6 devel/GConf2/Makefile.common
--- a/devel/GConf2/Makefile.common      Mon Oct 09 12:50:38 2006 +0000
+++ b/devel/GConf2/Makefile.common      Mon Oct 09 12:52:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2006/04/13 18:23:30 jlam Exp $
+# $NetBSD: Makefile.common,v 1.40 2006/10/09 12:52:34 joerg Exp $
 #
 
 GCONF2_VERSION=                2.14.0
@@ -12,6 +12,8 @@
 HOMEPAGE=              http://www.gnome.org/projects/gconf/
 COMMENT=               Configuration database system used by GNOME (v2)
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 # not ready yet.  .schemas are installed in the depot.
 #PKG_INSTALLATION_TYPES= overwrite pkgviews
 
diff -r 17b48addb2e8 -r 96d44b69ddb6 devel/SDL/Makefile
--- a/devel/SDL/Makefile        Mon Oct 09 12:50:38 2006 +0000
+++ b/devel/SDL/Makefile        Mon Oct 09 12:52:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2006/08/04 22:12:28 markd Exp $
+# $NetBSD: Makefile,v 1.74 2006/10/09 12:52:34 joerg Exp $
 
 DISTNAME=      SDL-1.2.11
 PKGREVISION=   1
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://www.libsdl.org/
 COMMENT=       Simple DirectMedia Layer, a cross-platform multimedia library
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake
diff -r 17b48addb2e8 -r 96d44b69ddb6 devel/apr/Makefile
--- a/devel/apr/Makefile        Mon Oct 09 12:50:38 2006 +0000
+++ b/devel/apr/Makefile        Mon Oct 09 12:52:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/10/05 17:05:59 tron Exp $
+# $NetBSD: Makefile,v 1.47 2006/10/09 12:52:34 joerg Exp $
 
 .include "../../www/apache2/Makefile.common"
 
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://apr.apache.org/
 COMMENT=       Apache Portable Runtime
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 # Don't bump this when apache upgrades; it is only apache2-2.0.45 and
 # under that includes its own apr.  apr was split out in 2.0.45nb1.
 CONFLICTS=             apache2<=2.0.45
@@ -53,14 +55,14 @@
                ${APU_CONFIGURE_ARGS}
 
 post-install:
-       ${RM} ${PREFIX}/libexec/apr/libtool
-       ${INSTALL_SCRIPT} ${PKG_LIBTOOL} ${PREFIX}/libexec/apr/libtool
-       ${INSTALL_DATA_DIR} ${PREFIX}/include/apr-0/arch/unix
-       ${INSTALL_DATA} ${WRKSRC}/apr/include/arch/*.h ${PREFIX}/include/apr-0/arch
-       ${INSTALL_DATA} ${WRKSRC}/apr/include/arch/unix/*.h ${PREFIX}/include/apr-0/arch/unix/
-       ${CHMOD} ${SHAREMODE} ${PREFIX}/include/apr-0/*.h
-       ${CHMOD} ${PKGDIRMODE} ${PREFIX}/include/apr-0
-       ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/include/apr-0/
+       ${RM} ${DESTDIR}${PREFIX}/libexec/apr/libtool
+       ${INSTALL_SCRIPT} ${PKG_LIBTOOL} ${DESTDIR}${PREFIX}/libexec/apr/libtool
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/apr-0/arch/unix
+       ${INSTALL_DATA} ${WRKSRC}/apr/include/arch/*.h ${DESTDIR}${PREFIX}/include/apr-0/arch
+       ${INSTALL_DATA} ${WRKSRC}/apr/include/arch/unix/*.h ${DESTDIR}${PREFIX}/include/apr-0/arch/unix/
+       ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/apr-0/*.h
+       ${CHMOD} ${PKGDIRMODE} ${DESTDIR}${PREFIX}/include/apr-0
+       ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/include/apr-0/
 
 .include "../../converters/libiconv/buildlink3.mk"
 
diff -r 17b48addb2e8 -r 96d44b69ddb6 devel/atk/Makefile
--- a/devel/atk/Makefile        Mon Oct 09 12:50:38 2006 +0000
+++ b/devel/atk/Makefile        Mon Oct 09 12:52:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2006/10/06 06:01:25 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2006/10/09 12:52:34 joerg Exp $
 #
 
 DISTNAME=              atk-1.12.3
@@ -11,6 +11,7 @@
 COMMENT=               Set of interfaces for accessibility
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_TOOLS+=            gmake pkg-config msgfmt
 GNU_CONFIGURE=         yes
diff -r 17b48addb2e8 -r 96d44b69ddb6 devel/glib2/Makefile
--- a/devel/glib2/Makefile      Mon Oct 09 12:50:38 2006 +0000
+++ b/devel/glib2/Makefile      Mon Oct 09 12:52:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2006/10/06 18:05:21 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2006/10/09 12:52:34 joerg Exp $
 
 DISTNAME=              glib-2.12.4
 PKGNAME=               ${DISTNAME:S/glib/glib2/}
@@ -13,6 +13,7 @@
 COMMENT=               Some useful routines for C programming (glib2)
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake msgfmt perl:run pkg-config
diff -r 17b48addb2e8 -r 96d44b69ddb6 devel/gmake/Makefile
--- a/devel/gmake/Makefile      Mon Oct 09 12:50:38 2006 +0000
+++ b/devel/gmake/Makefile      Mon Oct 09 12:52:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2006/07/06 12:45:50 joerg Exp $
+# $NetBSD: Makefile,v 1.69 2006/10/09 12:52:34 joerg Exp $
 
 DISTNAME=      make-3.81
 PKGNAME=       g${DISTNAME}
@@ -10,6 +10,7 @@
 COMMENT=       GNU version of 'make' utility
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         yes
 TEXINFO_REQD+=         4.0
@@ -50,10 +51,10 @@
 .endif
 
 post-install:
-       ${CHMOD} g-s ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
-       ${CHGRP} ${BINGRP} ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
+       ${CHMOD} g-s ${DESTDIR}${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
+       ${CHGRP} ${BINGRP} ${DESTDIR}${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
 .if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
-       ${LN} -sf ${GNU_PROGRAM_PREFIX}make ${PREFIX}/bin/gmake
+       ${LN} -sf ${GNU_PROGRAM_PREFIX}make ${DESTDIR}${PREFIX}/bin/gmake
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff -r 17b48addb2e8 -r 96d44b69ddb6 fonts/Xft2/Makefile
--- a/fonts/Xft2/Makefile       Mon Oct 09 12:50:38 2006 +0000
+++ b/fonts/Xft2/Makefile       Mon Oct 09 12:52:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/07/31 21:39:56 reed Exp $
+# $NetBSD: Makefile,v 1.48 2006/10/09 12:52:34 joerg Exp $
 
 DISTNAME=      libXft-2.1.7
 PKGNAME=       Xft2-2.1.7
@@ -14,6 +14,7 @@
 CONFLICTS+=    libXft-[0-9]*
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         YES
 USE_LIBTOOL=           YES
diff -r 17b48addb2e8 -r 96d44b69ddb6 fonts/xorg-fonts100dpi/Makefile
--- a/fonts/xorg-fonts100dpi/Makefile   Mon Oct 09 12:50:38 2006 +0000
+++ b/fonts/xorg-fonts100dpi/Makefile   Mon Oct 09 12:52:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/09/22 21:53:57 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/10/09 12:52:34 joerg Exp $
 
 DISTNAME=      X11R${XORG_VER}-src1
 PKGNAME=       xorg-fonts100dpi-${XORG_VER}
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://www.x.org/
 COMMENT=       X.org 100dpi bitmap fonts
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=    imake
 
 DEPENDS+=      xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
diff -r 17b48addb2e8 -r 96d44b69ddb6 fonts/xorg-fonts75dpi/Makefile
--- a/fonts/xorg-fonts75dpi/Makefile    Mon Oct 09 12:50:38 2006 +0000
+++ b/fonts/xorg-fonts75dpi/Makefile    Mon Oct 09 12:52:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/09/22 21:53:57 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/10/09 12:52:34 joerg Exp $
 
 DISTNAME=      X11R${XORG_VER}-src1
 PKGNAME=       xorg-fonts75dpi-${XORG_VER}
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://www.x.org/
 COMMENT=       X.org 75dpi bitmap fonts
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=    imake
 
 DEPENDS+=      xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
diff -r 17b48addb2e8 -r 96d44b69ddb6 fonts/xorg-fontsCyrillic/Makefile
--- a/fonts/xorg-fontsCyrillic/Makefile Mon Oct 09 12:50:38 2006 +0000
+++ b/fonts/xorg-fontsCyrillic/Makefile Mon Oct 09 12:52:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/09/22 21:53:57 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/10/09 12:52:35 joerg Exp $
 
 DISTNAME=      X11R${XORG_VER}-src1
 PKGNAME=       xorg-fontsCyrillic-${XORG_VER}
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://www.x.org/
 COMMENT=       X.org Cyrillic bitmap fonts
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=    imake
 



Home | Main Index | Thread Index | Old Index