From b0ad07c4ab0368c91293eee812caba592acb42d3 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 29 Jan 2010 19:05:18 +0000 Subject: [PATCH] DESTDIR support --- devel/kscope/Makefile | 8 ++++++-- devel/ncc/Makefile | 34 ++++++++++++++++++---------------- devel/newfile/Makefile | 12 ++++++++---- devel/opencm/Makefile | 6 ++++-- devel/opencm/distinfo | 4 ++-- devel/opencm/patches/patch-ab | 6 +++--- devel/roundup/Makefile | 23 +++++++++++++---------- 7 files changed, 54 insertions(+), 39 deletions(-) diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile index ef3a0082ea50..eedb9ab077bd 100644 --- a/devel/kscope/Makefile +++ b/devel/kscope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2010/01/18 09:58:46 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2010/01/29 19:05:18 joerg Exp $ # DISTNAME= kscope-1.6.0 @@ -10,6 +10,8 @@ MAINTAINER= martijn.van.buul@gmail.com HOMEPAGE= http://kscope.sourceforge.net/ COMMENT= KDE frontend for cscope +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= cscope>=15.6:../../devel/cscope DEPENDS+= exctags>=5.5.4:../../devel/exctags @@ -19,12 +21,14 @@ USE_TOOLS+= gmake flex pkg-config USE_LIBTOOL= yes USE_LANGUAGES= c c++ +INSTALLATION_DIRS+= ${KDEDIR}/share/kde/config + post-build: sed -e "s,@LOCALBASE@,${LOCALBASE},g" \ ${FILESDIR}/kscoperc > ${WRKDIR}/kscoperc pre-install: - ${INSTALL_DATA} ${WRKDIR}/kscoperc ${KDEDIR}/share/kde/config + ${INSTALL_DATA} ${WRKDIR}/kscoperc ${DESTDIR}${KDEDIR}/share/kde/config .include "../../meta-pkgs/kde3/kde3.mk" diff --git a/devel/ncc/Makefile b/devel/ncc/Makefile index e4cceb903fd7..15d67a4cc19f 100644 --- a/devel/ncc/Makefile +++ b/devel/ncc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2009/02/09 22:56:23 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2010/01/29 19:10:00 joerg Exp $ # DISTNAME= ncc-2.8 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://students.ceid.upatras.gr/~sxanth/ncc/index.html COMMENT= Compiler that produces program analysis information +PKG_DESTDIR_SUPPORT= user-destdir + BUILD_TARGET= tout CFLAGS+= -DNOGNU='"${PREFIX}/share/ncc/nognu"' @@ -23,22 +25,22 @@ SUBST_SED.prefix= -e 's,@PREFIX@,${PREFIX},g' PYTHON_PATCH_SCRIPTS+= scripts/nccstrip2.py +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 share/ncc share/doc/ncc + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/objdir/ncc ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/nccstrip2.py ${PREFIX}/bin - ${LN} -s ncc ${PREFIX}/bin/nccar - ${LN} -s ncc ${PREFIX}/bin/nccc++ - ${LN} -s ncc ${PREFIX}/bin/nccld - ${INSTALL_PROGRAM} ${WRKSRC}/nccnav/nccnav ${PREFIX}/bin - ${LN} -s nccnav ${PREFIX}/bin/nccnavi - ${INSTALL_DATA_DIR} ${PREFIX}/share/ncc - ${INSTALL_DATA} ${WRKSRC}/doc/nognu ${PREFIX}/share/ncc - ${INSTALL_MAN} ${WRKSRC}/ncc.1 ${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ncc - ${INSTALL_DATA} ${WRKSRC}/doc/KEYS.txt ${PREFIX}/share/doc/ncc - ${INSTALL_DATA} ${WRKSRC}/doc/TROUBLES ${PREFIX}/share/doc/ncc - ${INSTALL_DATA} ${WRKSRC}/doc/hacking.* ${PREFIX}/share/doc/ncc - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ncc + ${INSTALL_PROGRAM} ${WRKSRC}/objdir/ncc ${DESTDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/nccstrip2.py ${DESTDIR}${PREFIX}/bin + ${LN} -s ncc ${DESTDIR}${PREFIX}/bin/nccar + ${LN} -s ncc ${DESTDIR}${PREFIX}/bin/nccc++ + ${LN} -s ncc ${DESTDIR}${PREFIX}/bin/nccld + ${INSTALL_PROGRAM} ${WRKSRC}/nccnav/nccnav ${DESTDIR}${PREFIX}/bin + ${LN} -s nccnav ${DESTDIR}${PREFIX}/bin/nccnavi + ${INSTALL_DATA} ${WRKSRC}/doc/nognu ${DESTDIR}${PREFIX}/share/ncc + ${INSTALL_MAN} ${WRKSRC}/ncc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_DATA} ${WRKSRC}/doc/KEYS.txt ${DESTDIR}${PREFIX}/share/doc/ncc + ${INSTALL_DATA} ${WRKSRC}/doc/TROUBLES ${DESTDIR}${PREFIX}/share/doc/ncc + ${INSTALL_DATA} ${WRKSRC}/doc/hacking.* ${DESTDIR}${PREFIX}/share/doc/ncc + ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/ncc .include "../../devel/ncurses/buildlink3.mk" .include "../../lang/python/application.mk" diff --git a/devel/newfile/Makefile b/devel/newfile/Makefile index 92f10ab65a21..efe20ecc1786 100644 --- a/devel/newfile/Makefile +++ b/devel/newfile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2007/01/07 09:13:51 rillig Exp $ +# $NetBSD: Makefile,v 1.18 2010/01/29 19:08:31 joerg Exp $ # DISTNAME= newfile-1.0.14 @@ -10,16 +10,20 @@ MAINTAINER= flynn@energyhq.es.eu.org HOMEPAGE= http://newfile.sourceforge.net/ COMMENT= Tool for creating starter files in various languages +PKG_DESTDIR_SUPPORT= user-destdir + NO_BUILD= yes GNU_CONFIGURE= yes REPLACE_RUBY= src/newfile.rb.in USE_TOOLS+= ksh +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 + post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/src/newfile.rb ${PREFIX}/bin/newfile + ${INSTALL_SCRIPT} ${WRKSRC}/src/newfile.rb ${DESTDIR}${PREFIX}/bin/newfile ${INSTALL_DATA} ${WRKSRC}/src/fileproc.rb ${WRKSRC}/src/sytab.rb \ - ${PREFIX}/share/newfile/ - ${INSTALL_MAN} ${WRKSRC}/doc/newfile.1 ${PREFIX}/${PKGMANDIR}/man1/ + ${DESTDIR}${PREFIX}/share/newfile/ + ${INSTALL_MAN} ${WRKSRC}/doc/newfile.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ .include "../../lang/ruby/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile index e84890be6404..8b430245654f 100644 --- a/devel/opencm/Makefile +++ b/devel/opencm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2010/01/17 12:02:14 wiz Exp $ +# $NetBSD: Makefile,v 1.48 2010/01/29 19:12:10 joerg Exp $ # DISTNAME= ${OPENCM_VERSION}-2-src @@ -12,6 +12,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.opencm.org/ COMMENT= Secure, high-integrity replacement for CVS +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/${OPENCM_VERSION}/base USE_TOOLS+= gmake gzip makeinfo lex GNU_CONFIGURE= YES @@ -31,7 +33,7 @@ CPPFLAGS+= -D__unix__ MAKE_ENV+= GZIP_CMD=${GZIP_CMD:Q} post-install: - gzip -d ${PREFIX}/${PKGINFODIR}/opencm.info.gz + gzip -d ${DESTDIR}${PREFIX}/${PKGINFODIR}/opencm.info.gz .include "../../devel/boehm-gc/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" diff --git a/devel/opencm/distinfo b/devel/opencm/distinfo index bd7bfd2dc88f..94cec412685b 100644 --- a/devel/opencm/distinfo +++ b/devel/opencm/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.16 2007/03/17 15:13:48 rillig Exp $ +$NetBSD: distinfo,v 1.17 2010/01/29 19:12:10 joerg Exp $ SHA1 (opencm-0.1.2alpha8-2-src.tgz) = 2befad488fd7b73f961f7f6a771acdcee921a20d RMD160 (opencm-0.1.2alpha8-2-src.tgz) = 2ec1b4c317bd90723bccd73a4245c464c337bd9d Size (opencm-0.1.2alpha8-2-src.tgz) = 1577512 bytes SHA1 (patch-aa) = eccb4254283fa554b33a65a4f93a4a98889cdaaa -SHA1 (patch-ab) = 63df5eecf9daedaf0250b4f34f6d48d93a229bfc +SHA1 (patch-ab) = 94076f1bf20435f069b684d4179ac604696b6ee0 SHA1 (patch-ac) = 9f94b2208f73fdb73fe71356382ae788552214e7 SHA1 (patch-ad) = 24efb352d728333a9fbd4d92cde35a478afaed0e SHA1 (patch-ae) = 17caf47d93ec763248792994a3cca3869a8cd8ac diff --git a/devel/opencm/patches/patch-ab b/devel/opencm/patches/patch-ab index e8e79636304e..d0770325f16e 100644 --- a/devel/opencm/patches/patch-ab +++ b/devel/opencm/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2003/01/07 13:36:33 jmmv Exp $ +$NetBSD: patch-ab,v 1.3 2010/01/29 19:12:10 joerg Exp $ --- etc/Makefile.in.orig Wed Jul 17 04:48:55 2002 +++ etc/Makefile.in @@ -9,8 +9,8 @@ $NetBSD: patch-ab,v 1.2 2003/01/07 13:36:33 jmmv Exp $ - $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/rc.d/init.d - $(INSTALL) -m 644 opencm.conf $(DESTDIR)$(sysconfdir) - $(INSTALL) -m 644 opencm.rc $(DESTDIR)$(sysconfdir)/rc.d/init.d/opencm -+ $(mkinstalldirs) $(prefix)/share/examples/opencm -+ $(INSTALL) -m 644 opencm.conf $(prefix)/share/examples/opencm/opencm.conf ++ $(mkinstalldirs) ${DESTDIR}$(prefix)/share/examples/opencm ++ $(INSTALL) -m 644 opencm.conf ${DESTDIR}$(prefix)/share/examples/opencm/opencm.conf uninstall: -rm -f $(DESTDIR)$(sysconfdir)/opencm.conf diff --git a/devel/roundup/Makefile b/devel/roundup/Makefile index 19795e68fb0c..03d07ba92718 100644 --- a/devel/roundup/Makefile +++ b/devel/roundup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2009/05/28 21:35:54 zafer Exp $ +# $NetBSD: Makefile,v 1.36 2010/01/29 19:14:00 joerg Exp $ DISTNAME= roundup-1.4.6 PKGREVISION= 1 @@ -9,6 +9,8 @@ MAINTAINER= recht@NetBSD.org HOMEPAGE= http://roundup.sourceforge.net/ COMMENT= Issue tracking system with command-line, web and email clients +PKG_DESTDIR_SUPPORT= user-destdir + PYDISTUTILSPKG= yes PY_PATCHPLIST= yes USE_LANGUAGES= @@ -28,16 +30,17 @@ PYTHON_PATCH_SCRIPTS+= tools/migrate-queries.py tools/pygettext.py ROUNDUPDOCDIR= ${PREFIX}/share/doc/roundup +INSTALLATION_DIRS+= ${ROUNDUPDOCDIR} + post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/roundup-admin.1 ${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/roundup-demo.1 ${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/roundup-mailgw.1 ${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/roundup-server.1 ${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_DATA_DIR} ${ROUNDUPDOCDIR} - ${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${ROUNDUPDOCDIR} - ${INSTALL_DATA} ${WRKSRC}/COPYING.txt ${ROUNDUPDOCDIR} - ${INSTALL_DATA} ${WRKSRC}/README.txt ${ROUNDUPDOCDIR} - cd ${WRKSRC}/doc && pax -s '/.*\.1//g' -rw -pp -pm . ${ROUNDUPDOCDIR} + ${INSTALL_MAN} ${WRKSRC}/doc/roundup-admin.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/roundup-demo.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/roundup-mailgw.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/roundup-server.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${DESTDIR}${ROUNDUPDOCDIR} + ${INSTALL_DATA} ${WRKSRC}/COPYING.txt ${DESTDIR}${ROUNDUPDOCDIR} + ${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${ROUNDUPDOCDIR} + cd ${WRKSRC}/doc && pax -s '/.*\.1//g' -rw -pp -pm . ${DESTDIR}${ROUNDUPDOCDIR} .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk"