diff options
-rw-r--r-- | x11/qt4-pgsql/Makefile | 8 | ||||
-rw-r--r-- | x11/qt4-qdbus/Makefile | 14 | ||||
-rw-r--r-- | x11/qt4-sqlite3/Makefile | 8 | ||||
-rw-r--r-- | x11/qt4-tiff/Makefile | 9 | ||||
-rw-r--r-- | x11/xbanner/Makefile | 14 |
5 files changed, 32 insertions, 21 deletions
diff --git a/x11/qt4-pgsql/Makefile b/x11/qt4-pgsql/Makefile index 6f23c8bc4fe..4d9dedd4a48 100644 --- a/x11/qt4-pgsql/Makefile +++ b/x11/qt4-pgsql/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2009/06/14 06:33:44 hasso Exp $ +# $NetBSD: Makefile,v 1.8 2009/07/07 18:03:32 joerg Exp $ + +PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" @@ -17,11 +19,11 @@ do-build: cd ${WRKSRC}/src/plugins/sqldrivers/psql && env ${MAKE_ENV} ${GMAKE} SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers +INSTALLATION_DIRS= ${SQLDRVDIR} do-install: - ${INSTALL_DATA_DIR} ${SQLDRVDIR} ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlpsql.la \ - ${SQLDRVDIR} + ${DESTDIR}${SQLDRVDIR} .include "../../x11/qt4-libs/buildlink3.mk" .include "../../x11/qt4-tools/buildlink3.mk" diff --git a/x11/qt4-qdbus/Makefile b/x11/qt4-qdbus/Makefile index aa900d78c72..ff0d60ff78a 100644 --- a/x11/qt4-qdbus/Makefile +++ b/x11/qt4-qdbus/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2008/07/24 12:55:20 markd Exp $ +# $NetBSD: Makefile,v 1.5 2009/07/07 18:03:05 joerg Exp $ + +PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" @@ -21,17 +23,19 @@ do-build: cd ${WRKSRC}/src/dbus && env ${MAKE_ENV} ${GMAKE} cd ${WRKSRC}/tools/qdbus && env ${MAKE_ENV} ${GMAKE} +INSTALLATION_DIRS= ${QTPREFIX}/bin ${QTPREFIX}/lib lib/pkgconfig + do-install: ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/libQtDBus.la \ - ${QTPREFIX}/lib/ + ${DESTDIR}${QTPREFIX}/lib/ ${SED} -e "s:${WRKSRC}:${QTPREFIX}:g" \ ${WRKSRC}/lib/pkgconfig/QtDBus.pc > ${WRKDIR}/QtDBus.pc - ${INSTALL_DATA} ${WRKDIR}/QtDBus.pc ${PREFIX}/lib/pkgconfig/ - cd ${WRKSRC}/src/dbus && env ${MAKE_ENV} \ + ${INSTALL_DATA} ${WRKDIR}/QtDBus.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/ + cd ${WRKSRC}/src/dbus && env ${MAKE_ENV} DESTDIR=${DESTDIR} \ ${MAKE_PROGRAM} install_flat_headers install_targ_headers .for prog in qdbus qdbuscpp2xml qdbusviewer qdbusxml2cpp ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \ - ${QTPREFIX}/bin + ${DESTDIR}${QTPREFIX}/bin .endfor .include "../../x11/qt4-libs/buildlink3.mk" diff --git a/x11/qt4-sqlite3/Makefile b/x11/qt4-sqlite3/Makefile index 14829400080..040d32a69d7 100644 --- a/x11/qt4-sqlite3/Makefile +++ b/x11/qt4-sqlite3/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2009/06/14 06:33:44 hasso Exp $ +# $NetBSD: Makefile,v 1.3 2009/07/07 18:01:37 joerg Exp $ + +PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" @@ -17,11 +19,11 @@ do-build: cd ${WRKSRC}/src/plugins/sqldrivers/sqlite && env ${MAKE_ENV} ${GMAKE} SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers +INSTALLATION_DIRS= ${SQLDRVDIR} do-install: - ${INSTALL_DATA_DIR} ${SQLDRVDIR} ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlite.la \ - ${SQLDRVDIR} + ${DESTDIR}${SQLDRVDIR} .include "../../x11/qt4-libs/buildlink3.mk" .include "../../x11/qt4-tools/buildlink3.mk" diff --git a/x11/qt4-tiff/Makefile b/x11/qt4-tiff/Makefile index ebf4a235e0f..32d0c3ee9f2 100644 --- a/x11/qt4-tiff/Makefile +++ b/x11/qt4-tiff/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2009/06/14 06:33:44 hasso Exp $ +# $NetBSD: Makefile,v 1.3 2009/07/07 18:01:07 joerg Exp $ + +PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" @@ -17,10 +19,11 @@ do-build: IMGFMTDIR= ${QTPREFIX}/plugins/imageformats +INSTALLATION_DIRS= ${IMGFMTDIR} + do-install: - ${INSTALL_DATA_DIR} ${IMGFMTDIR} ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqtiff.la \ - ${IMGFMTDIR} + ${DESTDIR}${IMGFMTDIR} # up to 4.3.2 a builtin libtiff is used BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.3.2nb1 diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile index cd13ffd8f2c..cc9b47372a5 100644 --- a/x11/xbanner/Makefile +++ b/x11/xbanner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2008/01/19 09:16:26 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2009/07/07 18:00:16 joerg Exp $ DISTNAME= XBanner1.31 PKGNAME= xbanner-1.31 @@ -10,26 +10,26 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.hijinks.com/~spade/linux/XBanner/ COMMENT= Make XDM login screen look pretty +PKG_DESTDIR_SUPPORT= user-destdir + USE_IMAKE= YES NO_INSTALL_MANPAGES= YES DOCDIR= ${PREFIX}/share/doc/xbanner -INSTALLATION_DIRS= bin +INSTALLATION_DIRS= bin lib/X11/app-defaults ${DOCDIR} do-install: for f in freetemp random_effect xb_check xbanner; do \ - ${INSTALL_PROGRAM} ${WRKSRC}/$$f ${PREFIX}/bin; \ + ${INSTALL_PROGRAM} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/bin; \ done - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xbanner for f in Changes.txt Credits.txt Resource_Reference.html \ XBanner_Users_Manual.html email.gif fonttips.html \ index.html red_line.gif rnd_doc.html stars.gif \ xb_check.html; do \ - ${INSTALL_DATA} ${WRKSRC}/docs/$$f ${DOCDIR}; \ + ${INSTALL_DATA} ${WRKSRC}/docs/$$f ${DESTDIR}${DOCDIR}; \ done - ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/app-defaults ${INSTALL_DATA} ${WRKSRC}/samples/XBanner.ad \ - ${PREFIX}/lib/X11/app-defaults/XBanner + ${DESTDIR}${PREFIX}/lib/X11/app-defaults/XBanner .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |