diff options
| -rw-r--r-- | editors/vim/Makefile | 8 | ||||
| -rw-r--r-- | mail/mutt/Makefile | 11 | ||||
| -rw-r--r-- | shells/bash2/Makefile | 7 | ||||
| -rw-r--r-- | shells/tcsh/Makefile | 22 | ||||
| -rw-r--r-- | sysutils/cdrdao/Makefile | 22 | ||||
| -rw-r--r-- | x11/xpmroot/Makefile | 8 |
6 files changed, 45 insertions, 33 deletions
diff --git a/editors/vim/Makefile b/editors/vim/Makefile index ad930b30d86..10ab8794f50 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -1,10 +1,12 @@ -# $NetBSD: Makefile,v 1.65 2006/03/02 10:41:41 martti Exp $ +# $NetBSD: Makefile,v 1.66 2008/01/03 23:20:50 heinz Exp $ PKGNAME= vim-${VIM_VERSION}.${VIM_PATCHLEVEL} #PKGREVISION= 1 COMMENT= Vim editor (vi clone) without GUI +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../editors/vim-share/Makefile.common" DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share @@ -21,8 +23,8 @@ TEST_TARGET= check post-install: .for f in rvim rview - ${RM} -f ${PREFIX:Q}/bin/${f:Q} - ${LN} -s vim ${PREFIX:Q}/bin/${f:Q} + ${RM} -f ${DESTDIR:Q}${PREFIX:Q}/bin/${f:Q} + ${LN} -s vim ${DESTDIR:Q}${PREFIX:Q}/bin/${f:Q} .endfor .include "../../devel/ncurses/buildlink3.mk" diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 2516a65dc74..58b3b988eb6 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.151 2007/12/02 11:19:56 wiz Exp $ +# $NetBSD: Makefile,v 1.152 2008/01/03 23:20:10 heinz Exp $ DISTNAME= mutt-1.4.2.3 CATEGORIES= mail @@ -10,6 +10,7 @@ MAINTAINER= tron@NetBSD.org HOMEPAGE= http://www.mutt.org/ COMMENT= Text-based MIME mail client with PGP support +PKG_DESTDIR_SUPPORT= user-destdir PKG_INSTALLATION_TYPES= overwrite pkgviews .include "../../mk/bsd.prefs.mk" @@ -91,10 +92,10 @@ INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR} # process. # pre-install: - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA_DIR} ${DOCDIR} - ${RM} -f ${DOCDIR}/samples - ${LN} -sf ${EGDIR} ${DOCDIR}/samples + ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} + ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} + ${RM} -f ${DESTDIR}${DOCDIR}/samples + ${LN} -sf ${DESTDIR}${EGDIR} ${DESTDIR}${DOCDIR}/samples post-install: .if (${PKG_INSTALLATION_TYPE} == "pkgviews") diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index 12222b36728..3079e94f8ef 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2007/01/18 09:42:14 rillig Exp $ +# $NetBSD: Makefile,v 1.76 2008/01/03 23:18:39 heinz Exp $ # DISTNAME= bash-2.05b @@ -18,6 +18,7 @@ COMMENT= The GNU Bourne Again Shell CONFLICTS= static-bash-[0-9]* +PKG_DESTDIR_SUPPORT= user-destdir PKG_INSTALLATION_TYPES= overwrite pkgviews USE_GNU_READLINE= yes @@ -62,7 +63,7 @@ BUILDLINK_API_DEPENDS.readline+= readline>=4.3 .include "../../devel/readline/buildlink3.mk" post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile index 23484518660..0bdd74a72ff 100644 --- a/shells/tcsh/Makefile +++ b/shells/tcsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2007/04/25 13:21:43 obache Exp $ +# $NetBSD: Makefile,v 1.59 2008/01/03 23:21:41 heinz Exp $ # DISTNAME= tcsh-6.15.00 @@ -11,6 +11,8 @@ MAINTAINER= kim@tac.nyc.ny.us HOMEPAGE= http://www.tcsh.org/Welcome COMMENT= Extended C-shell with many useful features +PKG_DESTDIR_SUPPORT= user-destdir + CONFLICTS?= static-tcsh-[0-9]* GNU_CONFIGURE= yes @@ -29,16 +31,18 @@ LOWER_OPSYS= solaris${OS_VER_cmd:sh} PKG_SHELL?= bin/tcsh +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 + post-install: @${ECHO} "Installing message catalogues" cp ${PKGDIR:Q}/PLIST ${PLIST_SRC:Q} set -e; \ if [ -f ${WRKSRC:Q}/tcsh.C.cat ]; \ then \ - [ -d ${PREFIX:Q}/${NLSDIR:Q}/C ] || \ - ${INSTALL_DATA_DIR} ${PREFIX:Q}/${NLSDIR:Q}/C; \ + [ -d ${DESTDIR}${PREFIX:Q}/${NLSDIR:Q}/C ] || \ + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/${NLSDIR:Q}/C;\ ${INSTALL_DATA} ${WRKSRC:Q}/tcsh.C.cat \ - ${PREFIX}/${NLSDIR:Q}/C/tcsh.cat; \ + ${DESTDIR}${PREFIX}/${NLSDIR:Q}/C/tcsh.cat; \ ${ECHO} ${NLSDIR:Q}/C/tcsh.cat >> ${PLIST_SRC:Q}; \ for i in \ et:ISO_8859-15:et:EE \ @@ -65,16 +69,16 @@ post-install: while [ $$# -gt 0 ]; \ do \ d=${NLSDIR:Q}/$${c}_$$1.$${s}; \ - [ -d ${PREFIX}/$$d ] || \ - ${INSTALL_DATA_DIR} ${PREFIX}/$$d; \ + [ -d ${DESTDIR}${PREFIX}/$$d ] || \ + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/$$d; \ if [ -z "$$o" ]; \ then \ o="$$d"; \ ${INSTALL_DATA} ${WRKSRC}/tcsh.$${l}.cat \ - ${PREFIX}/$${d}/tcsh.cat; \ + ${DESTDIR}${PREFIX}/$${d}/tcsh.cat; \ else \ - ${LN} -f ${PREFIX}/$${o}/tcsh.cat \ - ${PREFIX}/$${d}; \ + ${LN} -f ${DESTDIR}${PREFIX}/$${o}/tcsh.cat \ + ${DESTDIR}${PREFIX}/$${d}; \ fi; \ ${ECHO} $${d}/tcsh.cat >> ${PLIST_SRC}; \ shift 1; \ diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile index a2bfccf6da1..cb9cf718b58 100644 --- a/sysutils/cdrdao/Makefile +++ b/sysutils/cdrdao/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.32 2006/06/30 01:44:55 joerg Exp $ +# $NetBSD: Makefile,v 1.33 2008/01/03 23:18:07 heinz Exp $ + +PKG_DESTDIR_SUPPORT= user-destdir .include "../../sysutils/cdrdao/Makefile.common" @@ -13,26 +15,26 @@ CONFIGURE_ARGS+= --without-posix-threads .endif post-install: - ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/cdrdao + ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/doc/cdrdao ${INSTALL_MAN} ${WRKSRC}/README \ ${WRKSRC}/README.PlexDAE \ - ${PREFIX}/share/doc/cdrdao - ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/cdrdao/testtocs + ${DESTDIR}${PREFIX}/share/doc/cdrdao + ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/doc/cdrdao/testtocs ${INSTALL_MAN} ${WRKSRC}/testtocs/*.toc \ - ${PREFIX}/share/doc/cdrdao/testtocs - ${INSTALL_MAN_DIR} ${PREFIX}/share/examples/cdrdao + ${DESTDIR}${PREFIX}/share/doc/cdrdao/testtocs + ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/examples/cdrdao ${INSTALL_MAN} ${WRKSRC}/contrib/mp32dao/mp32dao.pl \ - ${PREFIX}/share/examples/cdrdao - ${INSTALL_MAN_DIR} ${PREFIX}/share/examples/cdrdao/psxcopy + ${DESTDIR}${PREFIX}/share/examples/cdrdao + ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/examples/cdrdao/psxcopy ${INSTALL_MAN} ${WRKSRC}/contrib/psxcopy-0.2/Makefile \ ${WRKSRC}/contrib/psxcopy-0.2/README \ ${WRKSRC}/contrib/psxcopy-0.2/cdjob.c \ ${WRKSRC}/contrib/psxcopy-0.2/psxdump.c \ ${WRKSRC}/contrib/psxcopy-0.2/read-psx \ ${WRKSRC}/contrib/psxcopy-0.2/write-psx \ - ${PREFIX}/share/examples/cdrdao/psxcopy + ${DESTDIR}${PREFIX}/share/examples/cdrdao/psxcopy ${INSTALL_MAN} ${WRKSRC}/contrib/wav2dao/wav2dao.pl \ - ${PREFIX}/share/examples/cdrdao + ${DESTDIR}${PREFIX}/share/examples/cdrdao .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile index c65acc153a2..15586b109ee 100644 --- a/x11/xpmroot/Makefile +++ b/x11/xpmroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2007/10/30 19:31:43 martti Exp $ +# $NetBSD: Makefile,v 1.58 2008/01/03 23:19:17 heinz Exp $ # DISTNAME= fvwm-${PKG_VERSION} @@ -12,6 +12,8 @@ HOMEPAGE= http://www.fvwm.org/documentation/manpages/stable/xpmroot.php COMMENT= Sets the root window to an Xpm pixmap #LICENSE= gnu-gpl-v2 +PKG_DESTDIR_SUPPORT= user-destdir + PKG_VERSION= 2.4.20 USE_X11BASE= YES GNU_CONFIGURE= YES @@ -28,9 +30,9 @@ do-build: env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} xpmroot) do-install: - ${INSTALL_PROGRAM} ${WRKSRC:Q}/utils/xpmroot ${PREFIX:Q}/bin + ${INSTALL_PROGRAM} ${WRKSRC:Q}/utils/xpmroot ${DESTDIR}${PREFIX:Q}/bin ${INSTALL_MAN} ${WRKSRC:Q}/utils/xpmroot.1 \ - ${PREFIX:Q}/${PKGMANDIR:Q}/man1 + ${DESTDIR}${PREFIX:Q}/${PKGMANDIR:Q}/man1 .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" |