diff options
47 files changed, 190 insertions, 128 deletions
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile index bf9b59c72a8..ba3ec315e47 100644 --- a/archivers/zip/Makefile +++ b/archivers/zip/Makefile @@ -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 @@ HOMEPAGE= http://www.info-zip.org/pub/infozip/Zip.html 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 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 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 --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile index bdfbb742153..a223cf7f108 100644 --- a/databases/py-psycopg2/Makefile +++ b/databases/py-psycopg2/Makefile @@ -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 @@ MAINTAINER= joerg@NetBSD.org 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 --git a/devel/GConf2-ui/Makefile b/devel/GConf2-ui/Makefile index 4df2e4e5684..e0a2ab92377 100644 --- a/devel/GConf2-ui/Makefile +++ b/devel/GConf2-ui/Makefile @@ -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 @@ INSTALLATION_DIRS= libexec 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 --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile index e6be83de849..7ae4eb616a6 100644 --- a/devel/GConf2/Makefile +++ b/devel/GConf2/Makefile @@ -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 @@ PRINT_PLIST_AWK+= /^@dirrm (include\/gconf|lib\/GConf|share\/gconf)$$/ \ # 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 --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common index 7c0f7a16328..699945ef361 100644 --- a/devel/GConf2/Makefile.common +++ b/devel/GConf2/Makefile.common @@ -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 @@ MAINTAINER= jmmv@NetBSD.org 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 --git a/devel/SDL/Makefile b/devel/SDL/Makefile index 47f5ae4f7df..af8394533af 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -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 @@ MAINTAINER= wiz@NetBSD.org 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 --git a/devel/apr/Makefile b/devel/apr/Makefile index 18a8b149565..5744c50917e 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -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 @@ CATEGORIES= devel 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 @@ do-configure: ${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 --git a/devel/atk/Makefile b/devel/atk/Makefile index 05312db00b8..85f41baa461 100644 --- a/devel/atk/Makefile +++ b/devel/atk/Makefile @@ -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 @@ HOMEPAGE= http://developer.gnome.org/projects/gap/ 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 --git a/devel/glib2/Makefile b/devel/glib2/Makefile index e77a8bb1e6d..11bb06b493f 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -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 @@ HOMEPAGE= http://www.gtk.org/docs/glib_toc.html 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 --git a/devel/gmake/Makefile b/devel/gmake/Makefile index a06ec6c573c..761e55983b7 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -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 @@ HOMEPAGE= http://www.gnu.org/software/make/make.html 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 @@ CONFIGURE_ARGS+= --without-libiconv .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 --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile index 4c0bdeabdf4..37b01547910 100644 --- a/fonts/Xft2/Makefile +++ b/fonts/Xft2/Makefile @@ -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 @@ COMMENT= Library for configuring and customizing font access CONFLICTS+= libXft-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/fonts/xorg-fonts100dpi/Makefile b/fonts/xorg-fonts100dpi/Makefile index 68447a02d17..c93bcc32e45 100644 --- a/fonts/xorg-fonts100dpi/Makefile +++ b/fonts/xorg-fonts100dpi/Makefile @@ -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 @@ MAINTAINER= joerg@NetBSD.org 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 --git a/fonts/xorg-fonts75dpi/Makefile b/fonts/xorg-fonts75dpi/Makefile index 73208f49866..c9041e9f8dd 100644 --- a/fonts/xorg-fonts75dpi/Makefile +++ b/fonts/xorg-fonts75dpi/Makefile @@ -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 @@ MAINTAINER= joerg@NetBSD.org 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 --git a/fonts/xorg-fontsCyrillic/Makefile b/fonts/xorg-fontsCyrillic/Makefile index affe5fa742d..2ad39539d52 100644 --- a/fonts/xorg-fontsCyrillic/Makefile +++ b/fonts/xorg-fontsCyrillic/Makefile @@ -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 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org Cyrillic bitmap fonts +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= imake DEPENDS+= xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings diff --git a/fonts/xorg-fontsEncodings/Makefile b/fonts/xorg-fontsEncodings/Makefile index 169afb55467..f54527f99be 100644 --- a/fonts/xorg-fontsEncodings/Makefile +++ b/fonts/xorg-fontsEncodings/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/06/15 15:20:20 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/10/09 12:52:35 joerg Exp $ DISTNAME= X11R${XORG_VER}-src1 PKGNAME= xorg-fontsEncodings-${XORG_VER} @@ -10,6 +10,8 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org Encoding fonts +PKG_DESTDIR_SUPPORT= user-destdir + XBUILD_DIRS= fonts/encodings XEXTRACTS= ${XBUILD_DIRS} diff --git a/fonts/xorg-fontsMisc/Makefile b/fonts/xorg-fontsMisc/Makefile index 1bf9c8bc9ee..065ac8a06e0 100644 --- a/fonts/xorg-fontsMisc/Makefile +++ b/fonts/xorg-fontsMisc/Makefile @@ -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-fontsMisc-${XORG_VER} @@ -10,6 +10,8 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org miscellaneous bitmap fonts +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= imake DEPENDS+= xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings diff --git a/fonts/xorg-fontsTruetype/Makefile b/fonts/xorg-fontsTruetype/Makefile index a56855e59d4..37ca7b484a2 100644 --- a/fonts/xorg-fontsTruetype/Makefile +++ b/fonts/xorg-fontsTruetype/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/09/22 21:53:57 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2006/10/09 12:52:35 joerg Exp $ DISTNAME= X11R${XORG_VER}-src1 PKGNAME= xorg-fontsTruetype-${XORG_VER} @@ -10,6 +10,8 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org Truetype fonts +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= imake BUILD_DEPENDS+= fontconfig-[0-9]*:../../fonts/fontconfig diff --git a/fonts/xorg-fontsType1/Makefile b/fonts/xorg-fontsType1/Makefile index 7f382942194..ab1e04e02f6 100644 --- a/fonts/xorg-fontsType1/Makefile +++ b/fonts/xorg-fontsType1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/09/22 21:53:57 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2006/10/09 12:52:35 joerg Exp $ DISTNAME= X11R${XORG_VER}-src1 PKGNAME= xorg-fontsType1-${XORG_VER} @@ -10,6 +10,8 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org Type1 fonts +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= imake DEPENDS+= xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings diff --git a/fonts/xorg-fontserver/Makefile b/fonts/xorg-fontserver/Makefile index ee40db73dca..78def838f26 100644 --- a/fonts/xorg-fontserver/Makefile +++ b/fonts/xorg-fontserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/04/12 21:53:58 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/10/09 12:52:35 joerg Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-fontserver-${XORG_VER} @@ -12,6 +12,8 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org font server +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= imake DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common index 33d1b0f2d7d..35e6c9530ed 100644 --- a/graphics/Mesa/Makefile.common +++ b/graphics/Mesa/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.52 2006/08/01 21:40:19 jlam Exp $ +# $NetBSD: Makefile.common,v 1.53 2006/10/09 12:52:35 joerg Exp $ # # This Makefile fragment is included either directly or indirectly (through # Makefile.lib) by all packages that are built from the Mesa sources. @@ -21,6 +21,8 @@ MESA_VERSION= 6.4.2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.mesa3d.org/ +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/Mesa-${MESA_VERSION} BUILDING_MESA= yes NO_CONFIGURE= yes diff --git a/graphics/Mesa/Makefile.lib b/graphics/Mesa/Makefile.lib index 4aeb06e573a..10ab059b885 100644 --- a/graphics/Mesa/Makefile.lib +++ b/graphics/Mesa/Makefile.lib @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.lib,v 1.1 2006/08/01 21:40:19 jlam Exp $ +# $NetBSD: Makefile.lib,v 1.2 2006/10/09 12:52:35 joerg Exp $ # # This Makefile fragment is included by all packages that build libraries # from the Mesa sources. @@ -48,5 +48,5 @@ Mesa-install-libs: @for lib in "" ${INSTLIBS}; do \ ${TEST} -n "$$lib" || continue; \ ${LIBTOOL} --mode=install ${INSTALL_LIB} \ - $$lib ${PREFIX}/lib; \ + $$lib ${DESTDIR}${PREFIX}/lib; \ done diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile index 881bc5baa32..c94f6475f81 100644 --- a/graphics/MesaDemos/Makefile +++ b/graphics/MesaDemos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/08/01 21:40:19 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2006/10/09 12:52:35 joerg Exp $ PKGNAME= MesaDemos-${MESA_VERSION} COMMENT= OpenGL examples and Demos @@ -21,7 +21,7 @@ pre-build: cd ${WRKSRC} && ${RM} -fr src do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir} + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir} cd ${WRKSRC}/progs && ${PAX} \ -s ',^./.*Makefile.*,,' \ -s ',^./CVS.*,,' \ @@ -29,7 +29,7 @@ do-install: -s ',^./\.libs.*,,' \ -s ',^./\.deps.*,,' \ -s ',^./.*\.orig$$,,' \ - -rw . ${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir} - ${CHMOD} -R a+rX ${PREFIX}/share/examples/${PKGNAME_NOREV} + -rw . ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir} + ${CHMOD} -R a+rX ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV} .include "../../mk/bsd.pkg.mk" diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index c04dbed36a3..02b26d828b8 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2006/08/01 21:40:20 jlam Exp $ +# $NetBSD: Makefile,v 1.51 2006/10/09 12:52:35 joerg Exp $ PKGNAME= MesaLib-${MESA_VERSION} PKGREVISION= 2 @@ -29,12 +29,12 @@ pre-build: cd ${WRKSRC} && ${RM} -fr src/glu src/glut progs do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/include/GL + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL cd ${WRKSRC}/include/GL; for hdr in \ gl.h gl_mangle.h glext.h glx.h glxext.h glx_mangle.h \ osmesa.h xmesa.h xmesa_x.h xmesa_xf86.h; \ do \ - ${INSTALL_DATA} $${hdr} ${PREFIX}/include/GL; \ + ${INSTALL_DATA} $${hdr} ${DESTDIR}${PREFIX}/include/GL; \ done .include "../../mk/bsd.pkg.mk" diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile index c637ea4831a..77465234b36 100644 --- a/graphics/aalib/Makefile +++ b/graphics/aalib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/03/31 23:56:28 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2006/10/09 12:52:35 joerg Exp $ DISTNAME= aalib-1.4rc5 PKGNAME= ${DISTNAME:S/rc5/.0.5/} @@ -11,6 +11,7 @@ HOMEPAGE= http://aa-project.sourceforge.net/aalib/ COMMENT= ASCII Art library PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR}/aalib-1.4.0 GNU_CONFIGURE= YES diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile index 94264deebc6..7c3053a5c53 100644 --- a/graphics/glut/Makefile +++ b/graphics/glut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2006/08/01 21:40:20 jlam Exp $ +# $NetBSD: Makefile,v 1.46 2006/10/09 12:52:35 joerg Exp $ PKGNAME= glut-${MESA_VERSION} COMMENT= GLUT Graphics library similar to SGI's OpenGL @@ -20,11 +20,11 @@ pre-build: cd ${WRKSRC} && ${RM} -fr src/mesa src/glu src/glw progs do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/include/GL + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL cd ${WRKSRC}/include/GL; for hdr in \ glut.h glutf90.h; \ do \ - ${INSTALL_DATA} $${hdr} ${PREFIX}/include/GL; \ + ${INSTALL_DATA} $${hdr} ${DESTDIR}${PREFIX}/include/GL; \ done .include "../../mk/bsd.pkg.mk" diff --git a/mail/archivemail/Makefile b/mail/archivemail/Makefile index 878b4ee12d5..452c32306a7 100644 --- a/mail/archivemail/Makefile +++ b/mail/archivemail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/10/09 12:46:26 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2006/10/09 12:52:35 joerg Exp $ # DISTNAME= archivemail-0.6.1 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://archivemail.sourceforge.net/ COMMENT= Tool for archiving and compressing old email in mailboxes +PKG_DESTDIR_SUPPORT= user-destdir + PYDISTUTILSPKG= yes INSTALLATION_DIRS= man/man1 share/archivemail diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile index 88219b8c0a6..355d2b4626f 100644 --- a/mail/getmail/Makefile +++ b/mail/getmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2006/10/02 01:43:58 schmonz Exp $ +# $NetBSD: Makefile,v 1.64 2006/10/09 12:52:35 joerg Exp $ DISTNAME= getmail-4.6.4 CATEGORIES= mail @@ -8,6 +8,8 @@ MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://pyropus.ca/software/getmail/ COMMENT= Secure, flexible, reliable, easy-to-use fetchmail replacement +PKG_DESTDIR_SUPPORT= user-destdir + PYTHON_VERSIONS_ACCEPTED?= 24 23 PYTHON_PATCH_SCRIPTS= *.py getmailcore/*.py PYDISTUTILSPKG= yes diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common index e6c09c62121..d6b5535e3d5 100644 --- a/meta-pkgs/xorg/Makefile.common +++ b/meta-pkgs/xorg/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.42 2006/07/24 14:11:13 joerg Exp $ +# $NetBSD: Makefile.common,v 1.43 2006/10/09 12:52:35 joerg Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -292,18 +292,18 @@ pre-configure: . if !target(do-configure) do-configure: @for dir in ${_XINCLUDE_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${IMAKE} \ + cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${IMAKE} \ -DTOPDIR=${WRKSRC} -DCURDIR=$${dir} \ -I${WRKSRC}/config/cf; \ done @for dir in ${_XINCLUDE_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${MAKE_PROGRAM} Makefiles; \ + cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} Makefiles; \ done @for dir in ${_XINCLUDE_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${MAKE_PROGRAM} includes; \ + cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} includes; \ done @for dir in include ${XBUILD_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${MAKE_PROGRAM} depend; \ + cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} depend; \ done . endif @@ -326,17 +326,17 @@ do-extract: ${WRKDIR} . if !target(do-build) do-build: @for dir in ${XBUILD_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${MAKE_PROGRAM} all; \ + cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} all; \ done . endif . if !target(do-install) do-install: @for dir in ${XINSTALL_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${MAKE_PROGRAM} install; \ + cd ${WRKSRC}/$${dir} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${MAKE_PROGRAM} install; \ done @for dir in ${XINSTALL_MAN_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${MAKE_PROGRAM} install.man; \ + cd ${WRKSRC}/$${dir} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${MAKE_PROGRAM} install.man; \ done . endif diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile index 0df5204fa5d..9ad32cba5cd 100644 --- a/multimedia/xvidcore/Makefile +++ b/multimedia/xvidcore/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/10/02 14:21:13 tron Exp $ +# $NetBSD: Makefile,v 1.22 2006/10/09 12:52:35 joerg Exp $ DISTNAME= xvidcore-1.1.0 PKGREVISION= 3 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.xvid.org/ COMMENT= ISO MPEG-4 compliant video codec +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == "i386" @@ -27,8 +29,8 @@ MAKE_ENV+= MKDIR=${MKDIR:Q} .if ${OPSYS} == "Darwin" post-install: - ${RM} -f ${PREFIX}/lib/libxvidcore.so.4 - ${MV} -f ${PREFIX}/lib/libxvidcore.so ${PREFIX}/lib/libxvidcore.dylib + ${RM} -f ${DESTDIR}${PREFIX}/lib/libxvidcore.so.4 + ${MV} -f ${DESTDIR}${PREFIX}/lib/libxvidcore.so ${DESTDIR}${PREFIX}/lib/libxvidcore.dylib .endif .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/xvidcore/distinfo b/multimedia/xvidcore/distinfo index 8f929c682ef..73c8998c75d 100644 --- a/multimedia/xvidcore/distinfo +++ b/multimedia/xvidcore/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.11 2006/01/06 17:12:18 wiz Exp $ +$NetBSD: distinfo,v 1.12 2006/10/09 12:52:35 joerg Exp $ SHA1 (xvidcore-1.1.0.tar.bz2) = f3ffc21529ab7941e423df7365de22c391d2eaeb RMD160 (xvidcore-1.1.0.tar.bz2) = 582927437970cf81534b9ed4f02173201e10f47b Size (xvidcore-1.1.0.tar.bz2) = 612101 bytes -SHA1 (patch-aa) = d0e69ecd59578b71f49205fbd102496bdcfd8e24 +SHA1 (patch-aa) = 593ae63ddb5ec646d7f531b99783de64a9d6ceb3 SHA1 (patch-ab) = 445d528602f67079bca03986c2c172af3291b15d +SHA1 (patch-ac) = b976c188dae290a87708e5f97b8a16fcddbf608b diff --git a/multimedia/xvidcore/patches/patch-aa b/multimedia/xvidcore/patches/patch-aa index 8a7721fb394..40d395fcb51 100644 --- a/multimedia/xvidcore/patches/patch-aa +++ b/multimedia/xvidcore/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2006/01/06 17:12:18 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2006/10/09 12:52:35 joerg Exp $ --- Makefile.orig 2005-12-30 14:45:30.000000000 +0000 +++ Makefile @@ -46,8 +46,8 @@ $NetBSD: patch-aa,v 1.3 2006/01/06 17:12:18 wiz Exp $ @echo " I: $(libdir)/$(SHARED_LIB)" - @$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB) + @$(BSD_INSTALL_LIB) $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB) -+ @ln -s $(libdir)/$(SHARED_LIB) $(libdir)/libxvidcore.so -+ @ln -s $(libdir)/$(SHARED_LIB) $(libdir)/libxvidcore.so.$(API_MAJOR) ++ @ln -s $(libdir)/$(SHARED_LIB) $(DESTDIR)$(libdir)/libxvidcore.so ++ @ln -s $(libdir)/$(SHARED_LIB) $(DESTDIR)$(libdir)/libxvidcore.so.$(API_MAJOR) @echo " I: $(libdir)/$(STATIC_LIB)" @$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB) @echo " D: $(includedir)" diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile index 8f7d3b003a0..cc733118d3f 100644 --- a/net/ORBit2/Makefile +++ b/net/ORBit2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2006/09/07 18:42:07 jmmv Exp $ +# $NetBSD: Makefile,v 1.50 2006/10/09 12:52:35 joerg Exp $ # DISTNAME= ORBit2-2.14.3 @@ -11,6 +11,7 @@ HOMEPAGE= http://orbit-resource.sourceforge.net/ COMMENT= High-performance CORBA ORB with C language support PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir CONFLICTS= linc>=1.1 diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index fa062ded089..7b9b32e12ab 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2006/09/27 15:18:15 joerg Exp $ +# $NetBSD: Makefile,v 1.71 2006/10/09 12:52:36 joerg Exp $ DISTNAME= xpkgwedge-1.16 CATEGORIES= pkgtools devel x11 @@ -10,6 +10,7 @@ HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html COMMENT= Allows X11 pkgs to be built and used outside of $${X11BASE} PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR} EXTRACT_ONLY= # empty @@ -93,22 +94,22 @@ SUBST_SED.foo= -e "s|\#define ExtraLoadFlags @X11TYPEFLAGS@||" .endif # X11_TYPE == native. do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/config - ${INSTALL_DATA} ${WRKSRC}/xpkgwedge.def ${PREFIX}/lib/X11/config - ${INSTALL_SCRIPT} ${WRKSRC}/pkgxmkmf ${PREFIX}/bin/pkgxmkmf + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/X11/config + ${INSTALL_DATA} ${WRKSRC}/xpkgwedge.def ${DESTDIR}${PREFIX}/lib/X11/config + ${INSTALL_SCRIPT} ${WRKSRC}/pkgxmkmf ${DESTDIR}${PREFIX}/bin/pkgxmkmf @case ${OPSYS} in \ Darwin) \ - ${INSTALL_DATA} ${X11BASE}/lib/X11/config/darwin.cf ${PREFIX}/lib/X11/config; \ - cd ${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/darwin.cf.patch; \ + ${INSTALL_DATA} ${X11BASE}/lib/X11/config/darwin.cf ${DESTDIR}${PREFIX}/lib/X11/config; \ + cd ${DESTDIR}${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/darwin.cf.patch; \ ;; \ IRIX) \ - ${INSTALL_DATA} ${X11BASE}/lib/X11/config/sgi.cf ${PREFIX}/lib/X11/config; \ + ${INSTALL_DATA} ${X11BASE}/lib/X11/config/sgi.cf ${DESTDIR}${PREFIX}/lib/X11/config; \ if [ ${OS_VERSION} -ge 6 ]; then \ - ${INSTALL_DATA} ${X11BASE}/lib/X11/config/X11.rules ${PREFIX}/lib/X11/config; \ - cd ${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/irix6.patch; \ + ${INSTALL_DATA} ${X11BASE}/lib/X11/config/X11.rules ${DESTDIR}${PREFIX}/lib/X11/config; \ + cd ${DESTDIR}${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/irix6.patch; \ else \ - ${INSTALL_DATA} ${X11BASE}/lib/X11/config/sgiLib.rules ${PREFIX}/lib/X11/config; \ - cd ${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/irix5.patch; \ + ${INSTALL_DATA} ${X11BASE}/lib/X11/config/sgiLib.rules ${DESTDIR}${PREFIX}/lib/X11/config; \ + cd ${DESTDIR}${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/irix5.patch; \ fi; \ ;; \ esac diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile index 535b06f80c4..cc25ce53dcb 100644 --- a/print/xpdf/Makefile +++ b/print/xpdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2006/05/31 07:57:17 tron Exp $ +# $NetBSD: Makefile,v 1.58 2006/10/09 12:52:36 joerg Exp $ DISTNAME= xpdf-3.01 PKGNAME= ${DISTNAME}pl2 @@ -16,6 +16,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.foolabs.com/xpdf/ COMMENT= Display tool for PDF files +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= ghostscript-fonts-[0-9]*:../../fonts/ghostscript-fonts CONFLICTS= xpdf-crypto-[0-9]* diff --git a/security/apg/Makefile b/security/apg/Makefile index 587e0b34287..e4daf95da46 100644 --- a/security/apg/Makefile +++ b/security/apg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:54 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2006/10/09 12:52:36 joerg Exp $ # DISTNAME= apg-2.2.3 @@ -9,7 +9,9 @@ MAINTAINER= zuntum@NetBSD.org HOMEPAGE= http://www.adel.nursat.kz/apg/ COMMENT= Tool set for random password generation -MAKE_ENV+= FLAGS=${CFLAGS:M*:Q} INSTALL_PREFIX=${PREFIX:Q} +PKG_DESTDIR_SUPPORT= destdir + +MAKE_ENV+= FLAGS=${CFLAGS:M*:Q} INSTALL_PREFIX=${DESTDIR:Q}${PREFIX:Q} USE_TOOLS+= perl:run REPLACE_PERL= perl/apgcli.pl @@ -20,6 +22,6 @@ CS_LIBS.SunOS+= -lnsl -lsocket MAKE_ENV+= CS_LIBS=${CS_LIBS:Q} post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/perl/apgcli.pl ${PREFIX}/bin/apgcli + ${INSTALL_SCRIPT} ${WRKSRC}/perl/apgcli.pl ${DESTDIR}${PREFIX}/bin/apgcli .include "../../mk/bsd.pkg.mk" diff --git a/security/audit-packages/Makefile b/security/audit-packages/Makefile index 4c03c7bc987..2c7d01bac02 100644 --- a/security/audit-packages/Makefile +++ b/security/audit-packages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2006/10/05 14:26:42 joerg Exp $ +# $NetBSD: Makefile,v 1.71 2006/10/09 12:52:36 joerg Exp $ DISTNAME= audit-packages-1.44 CATEGORIES= security pkgtools @@ -9,6 +9,7 @@ MAINTAINER= agc@NetBSD.org COMMENT= Tools to show vulnerabilities in installed packages PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS+= digest:run @@ -18,8 +19,8 @@ WRKSRC= ${WRKDIR} NO_CHECKSUM= yes OWN_DIRS= ${PKGVULNDIR} -MAN8DIR= ${PREFIX}/${PKGMANDIR}/man8 -CAT8DIR= ${PREFIX}/${PKGMANDIR}/cat8 +MAN8DIR= ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 +CAT8DIR= ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat8 INSTALLATION_DIRS= ${CAT8DIR} ${MAN8DIR} sbin .include "../../mk/bsd.prefs.mk" @@ -58,7 +59,7 @@ do-build: do-install: @for f in audit-packages download-vulnerability-list; do \ - ${INSTALL_SCRIPT} ${WRKSRC}/$$f ${PREFIX}/sbin; \ + ${INSTALL_SCRIPT} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/sbin; \ done ${INSTALL_MAN} ${WRKSRC}/audit-packages.0 ${CAT8DIR}/ ${INSTALL_MAN} ${WRKSRC}/audit-packages.8 ${MAN8DIR}/ diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common index 92bf4b5b32b..02a01b24a13 100644 --- a/shells/zsh/Makefile.common +++ b/shells/zsh/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.35 2006/10/04 21:58:52 wiz Exp $ +# $NetBSD: Makefile.common,v 1.36 2006/10/09 12:52:36 joerg Exp $ DISTNAME= zsh-${ZSH_VERSION} CATEGORIES= shells @@ -13,6 +13,8 @@ MAINTAINER= ${ZSH_MAINTAINER} HOMEPAGE= http://zsh.dotsrc.org/ COMMENT= The Z shell +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-etcdir=${PKG_SYSCONFDIR:Q} @@ -83,11 +85,11 @@ pre-install: @cd ${WRKSRC}/Completion; ${FIND} . -name \*.orig -exec ${RM} \{\} \; post-install: - @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zsh - @cd ${WRKSRC}/Etc; ${INSTALL_DATA} BUGS FAQ \ - ${PREFIX}/share/doc/zsh - @cd ${WRKSRC}; ${INSTALL_DATA} FEATURES NEWS \ - ${PREFIX}/share/doc/zsh + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/zsh + cd ${WRKSRC}/Etc && ${INSTALL_DATA} BUGS FAQ \ + ${DESTDIR}${PREFIX}/share/doc/zsh + cd ${WRKSRC} && ${INSTALL_DATA} FEATURES NEWS \ + ${DESTDIR}${PREFIX}/share/doc/zsh # Utilize Zsh's test framework. # Testing of dynamic shell only works after install has been done diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile index b282800fd94..48ee9f83e4b 100644 --- a/textproc/aspell/Makefile +++ b/textproc/aspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2006/10/01 08:52:01 schwarz Exp $ +# $NetBSD: Makefile,v 1.45 2006/10/09 12:52:36 joerg Exp $ # DISTNAME= aspell-0.60.4 @@ -10,6 +10,8 @@ MAINTAINER= wiz@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Spell checker with good multi-language support +PKG_DESTDIR_SUPPORT= user-destdir + CONFLICTS= libpspell-[0-9]* GNU_CONFIGURE= yes diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile index 103344a697a..26192e98962 100644 --- a/x11/Xaw3d/Makefile +++ b/x11/Xaw3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2006/03/13 00:16:23 markd Exp $ +# $NetBSD: Makefile,v 1.49 2006/10/09 12:52:36 joerg Exp $ # DISTNAME= Xaw3d-1.5E @@ -13,6 +13,7 @@ COMMENT= 3-D widgets based on the Athena Widget set CONFLICTS= Xaw-Xpm-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR}/xc/lib/Xaw3d USE_IMAKE= YES @@ -32,14 +33,14 @@ XMKMF_FLAGS+= ${IMAKE_FLAGS} PLIST_SUBST+= INCDIR=include/X11 post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Xaw3d - ${INSTALL_DATA} ${WRKSRC}/README.XAW3D ${PREFIX}/share/doc/Xaw3d + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/Xaw3d + ${INSTALL_DATA} ${WRKSRC}/README.XAW3D ${DESTDIR}${PREFIX}/share/doc/Xaw3d ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} .if ${OPSYS} == "IRIX" - ${INSTALL_DATA} /usr/lib${ABI}/libXaw3d* ${PREFIX}/lib/ + ${INSTALL_DATA} /usr/lib${ABI}/libXaw3d* ${DESTDIR}${PREFIX}/lib/ ${RM} -f /usr/lib${ABI}/libXaw3d* .endif - cd ${PREFIX} && ${LS} lib/libXaw3d* >>${PLIST_SRC} + cd ${DESTDIR}${PREFIX} && ${LS} lib/libXaw3d* >>${PLIST_SRC} .include "../../graphics/xpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xrandr-mixedcase/Makefile b/x11/Xrandr-mixedcase/Makefile index f7e93e8e3b8..ef0bee5de73 100644 --- a/x11/Xrandr-mixedcase/Makefile +++ b/x11/Xrandr-mixedcase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/07/31 21:26:12 reed Exp $ +# $NetBSD: Makefile,v 1.22 2006/10/09 12:52:36 joerg Exp $ # DISTNAME= libXrandr-1.0.2 @@ -15,6 +15,7 @@ COMMENT= X RandR extension (Library) CONFLICTS+= libXrandr-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS+= pkg-config USE_LIBTOOL= yes diff --git a/x11/Xrender/Makefile b/x11/Xrender/Makefile index a613fda8f1b..f6709a1674e 100644 --- a/x11/Xrender/Makefile +++ b/x11/Xrender/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/07/31 21:27:46 reed Exp $ +# $NetBSD: Makefile,v 1.32 2006/10/09 12:52:36 joerg Exp $ DISTNAME= libXrender-0.9.0 PKGNAME= ${DISTNAME:S/lib//} @@ -14,6 +14,7 @@ COMMENT= Client library for the X Rendering Extension protocol CONFLICTS+= libXrender-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS+= pkg-config USE_LIBTOOL= YES diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 4e77acc83f0..d3ff46b47f7 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.129 2006/10/06 18:05:56 wiz Exp $ +# $NetBSD: Makefile,v 1.130 2006/10/09 12:52:36 joerg Exp $ DISTNAME= gtk+-2.10.6 PKGNAME= ${DISTNAME:S/gtk/gtk2/} @@ -12,6 +12,8 @@ MAINTAINER= wiz@NetBSD.org HOMEPAGE= http://www.gtk.org/ COMMENT= GIMP Toolkit v2 - libraries for building X11 user interfaces +PKG_DESTDIR_SUPPORT= user-destdir + CONFLICTS= gtk2-engines<2.6.0 BUILDLINK_API_DEPENDS.cairo+= cairo>=1.2.0 @@ -73,11 +75,11 @@ USE_TOOLS+= gawk # anew in the +INSTALL script as part of the POST-INSTALL action. # post-install: - ${RM} -f ${GTK_IMMODULES_DB} - ${RM} -f ${GDK_PIXBUF_LOADERS_DB} - ${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/immodules - ${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/modules - ${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/2.10.0/filesystems + ${RM} -f ${DESTDIR}${GTK_IMMODULES_DB} + ${RM} -f ${DESTDIR}${GDK_PIXBUF_LOADERS_DB} + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/gtk-2.0/immodules + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/gtk-2.0/modules + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/gtk-2.0/2.10.0/filesystems _BUILDING_GTK2= yes .include "modules.mk" diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile index 3f39c6a12f4..983a107e914 100644 --- a/x11/xorg-clients/Makefile +++ b/x11/xorg-clients/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/09/14 17:13:58 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2006/10/09 12:52:36 joerg Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-clients-${XORG_VER} @@ -13,6 +13,8 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org client programs and related files +PKG_DESTDIR_SUPPORT= user-destdir + DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo PATCHDIR= ${.CURDIR}/../../x11/xorg-libs/patches diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile index 5c135fc000c..62cfc420074 100644 --- a/x11/xorg-imake/Makefile +++ b/x11/xorg-imake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/09/25 12:49:58 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2006/10/09 12:52:36 joerg Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-imake-${XORG_VER} @@ -12,6 +12,7 @@ HOMEPAGE= http://www.x.org/ COMMENT= Imake and other utilities from X.org PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir USE_DIRS+= xorg-1.1 INSTALL_TARGET= install install.man @@ -79,20 +80,20 @@ pre-install: ${WRKSRC}/xmakefile post-install: - ${CHMOD} ${NONBINMODE} ${X11ROOT}/lib/X11/config/host.def - @${CP} ${X11ROOT}/lib/X11/config/host.def \ - ${X11ROOT}/lib/X11/config/host.def.orig + ${CHMOD} ${NONBINMODE} ${DESTDIR}${X11ROOT}/lib/X11/config/host.def + @${CP} ${DESTDIR}${X11ROOT}/lib/X11/config/host.def \ + ${DESTDIR}${X11ROOT}/lib/X11/config/host.def.orig @${SED} -e "s|\#define ProjectRoot ${X11ROOT}||" \ - ${X11ROOT}/lib/X11/config/host.def.orig > \ - ${X11ROOT}/lib/X11/config/host.def - @${RM} ${X11ROOT}/lib/X11/config/host.def.orig + ${DESTDIR}${X11ROOT}/lib/X11/config/host.def.orig > \ + ${DESTDIR}${X11ROOT}/lib/X11/config/host.def + @${RM} ${DESTDIR}${X11ROOT}/lib/X11/config/host.def.orig @( \ ${ECHO}; \ ${ECHO} "#ifdef BeforeVendorCF"; \ ${ECHO} "#define ProjectRoot ${X11ROOT}"; \ ${ECHO} "#endif"; \ - ) >> ${X11ROOT}/lib/X11/config/host.def + ) >> ${DESTDIR}${X11ROOT}/lib/X11/config/host.def .if !empty(MACHINE_PLATFORM:MNetBSD-1.6[M-Z]*) || \ !empty(MACHINE_PLATFORM:MNetBSD-[2-9]*) diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile index 7fed7fb26a1..31977d49a7a 100644 --- a/x11/xorg-libs/Makefile +++ b/x11/xorg-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2006/09/14 17:13:58 joerg Exp $ +# $NetBSD: Makefile,v 1.45 2006/10/09 12:52:36 joerg Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-libs-${XORG_VER} @@ -13,6 +13,7 @@ HOMEPAGE= http://www.x.org/ COMMENT= X.org Libraries BUILD_DEPENDS= xorg-imake-[0-9]*:../../x11/xorg-imake +PKG_DESTDIR_SUPPORT= user-destdir .include "../../mk/bsd.prefs.mk" @@ -35,6 +36,8 @@ CONFLICTS+= libX11-[0-9]* CONFLICTS+= libXau-[0-9]* .endif +INSTALLATION_DIRS+= ${X11BASE}/lib/pkgconfig + BUILDLINK_PASSTHRU_DIRS+= ${X11ROOT}/lib XBUILD_DIRS= lib nls programs/Xserver/include \ @@ -51,19 +54,16 @@ SUBST_MESSAGE.mkstrs= Fixing path of makestrs. post-install: @${SED} ${XORG_PLIST_SED} ${PKGDIR}/PLIST > ${PLIST_SRC} -.if ${OPSYS} == "Linux" - @${LDCONFIG} ${X11ROOT}/lib || ${TRUE} -.endif pre-install: .if !exists(${X11BASE}/lib/pkgconfig) - ${INSTALL_DATA_DIR} ${X11BASE}/lib/pkgconfig + ${INSTALL_DATA_DIR} ${DESTDIR}${X11BASE}/lib/pkgconfig .endif .for f in render.pc fixesext.pc compositeext.pc @${SED} -e "s,@X11BASE@,${X11BASE},g" \ -e "s,@LOCALBASE@,${LOCALBASE},g" \ ${FILESDIR}/${f} > ${WRKSRC}/${f} - ${INSTALL_DATA} ${WRKSRC}/${f} ${X11BASE}/lib/pkgconfig/${f} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${X11BASE}/lib/pkgconfig/${f} .endfor .include "../../devel/zlib/buildlink3.mk" diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile index 28db7e6600a..ce61dc11957 100644 --- a/x11/xorg-server/Makefile +++ b/x11/xorg-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2006/09/14 17:13:58 joerg Exp $ +# $NetBSD: Makefile,v 1.47 2006/10/09 12:52:36 joerg Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-server-${XORG_VER} @@ -13,6 +13,8 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org X server and related programs +PKG_DESTDIR_SUPPORT= user-destdir + BUILD_DEPENDS= xorg-imake-[0-9]*:../../x11/xorg-imake DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo @@ -75,9 +77,9 @@ PLIST_SUBST+= IOPORT='@comment ' post-install: @${SED} ${XORG_PLIST_SED} ${PKGDIR}/PLIST > ${PLIST_SRC} .if ${OPSYS} == "Darwin" - ${CHMOD} a+r ${X11ROOT}/bin/XDarwin + ${CHMOD} a+r ${DESTDIR}${X11ROOT}/bin/XDarwin .else - ${CHMOD} a+r ${X11ROOT}/bin/Xorg + ${CHMOD} a+r ${DESTDIR}${X11ROOT}/bin/Xorg .endif .include "../../fonts/fontconfig/buildlink3.mk" diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index 2c8a9290d17..5c5b55e7223 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/06/25 19:37:44 rillig Exp $ +# $NetBSD: Makefile,v 1.31 2006/10/09 12:52:36 joerg Exp $ DISTNAME= xterm-212 CATEGORIES= x11 @@ -9,6 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://dickey.his.com/xterm/xterm.html COMMENT= Latest terminal emulator for the X Window System +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} |