pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Added support for installation to DESTDIR.
details: https://anonhg.NetBSD.org/pkgsrc/rev/10e249b2a010
branches: trunk
changeset: 537116:10e249b2a010
user: heinz <heinz%pkgsrc.org@localhost>
date: Thu Jan 03 23:18:07 2008 +0000
description:
Added support for installation to DESTDIR.
diffstat:
editors/vim/Makefile | 8 +++++---
mail/mutt/Makefile | 11 ++++++-----
shells/bash2/Makefile | 7 ++++---
shells/tcsh/Makefile | 22 +++++++++++++---------
sysutils/cdrdao/Makefile | 22 ++++++++++++----------
x11/xpmroot/Makefile | 8 +++++---
6 files changed, 45 insertions(+), 33 deletions(-)
diffs (226 lines):
diff -r 95ae45af38a0 -r 10e249b2a010 editors/vim/Makefile
--- a/editors/vim/Makefile Thu Jan 03 23:17:47 2008 +0000
+++ b/editors/vim/Makefile Thu Jan 03 23:18:07 2008 +0000
@@ -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 @@
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 -r 95ae45af38a0 -r 10e249b2a010 mail/mutt/Makefile
--- a/mail/mutt/Makefile Thu Jan 03 23:17:47 2008 +0000
+++ b/mail/mutt/Makefile Thu Jan 03 23:18:07 2008 +0000
@@ -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 @@
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 @@
# 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 -r 95ae45af38a0 -r 10e249b2a010 shells/bash2/Makefile
--- a/shells/bash2/Makefile Thu Jan 03 23:17:47 2008 +0000
+++ b/shells/bash2/Makefile Thu Jan 03 23:18:07 2008 +0000
@@ -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 @@
CONFLICTS= static-bash-[0-9]*
+PKG_DESTDIR_SUPPORT= user-destdir
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_GNU_READLINE= yes
@@ -62,7 +63,7 @@
.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 -r 95ae45af38a0 -r 10e249b2a010 shells/tcsh/Makefile
--- a/shells/tcsh/Makefile Thu Jan 03 23:17:47 2008 +0000
+++ b/shells/tcsh/Makefile Thu Jan 03 23:18:07 2008 +0000
@@ -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 @@
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 @@
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 @@
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 -r 95ae45af38a0 -r 10e249b2a010 sysutils/cdrdao/Makefile
--- a/sysutils/cdrdao/Makefile Thu Jan 03 23:17:47 2008 +0000
+++ b/sysutils/cdrdao/Makefile Thu Jan 03 23:18:07 2008 +0000
@@ -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 @@
.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 -r 95ae45af38a0 -r 10e249b2a010 x11/xpmroot/Makefile
--- a/x11/xpmroot/Makefile Thu Jan 03 23:17:47 2008 +0000
+++ b/x11/xpmroot/Makefile Thu Jan 03 23:18:07 2008 +0000
@@ -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 @@
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 @@
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"
Home |
Main Index |
Thread Index |
Old Index