diff options
author | joerg <joerg@pkgsrc.org> | 2010-01-29 19:43:36 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2010-01-29 19:43:36 +0000 |
commit | 3a2b3ebb27b03a5894d8899d3056933a0cb86975 (patch) | |
tree | f96e2b9208214b60919e3b089639838c058b1f6c | |
parent | b23eb8c4f49ae298ffb0055d6cc2223458182545 (diff) | |
download | pkgsrc-3a2b3ebb27b03a5894d8899d3056933a0cb86975.tar.gz |
DESTDIR support
-rw-r--r-- | editors/ce-doc/Makefile | 7 | ||||
-rw-r--r-- | editors/ce-x11/Makefile | 8 | ||||
-rw-r--r-- | editors/ce/Makefile | 6 | ||||
-rw-r--r-- | editors/ce/distinfo | 4 | ||||
-rw-r--r-- | editors/ce/patches/patch-aa | 41 | ||||
-rw-r--r-- | editors/hexedit/Makefile | 6 | ||||
-rw-r--r-- | editors/hexedit/distinfo | 4 | ||||
-rw-r--r-- | editors/hexedit/patches/patch-ac | 6 | ||||
-rw-r--r-- | editors/jed/Makefile | 5 | ||||
-rw-r--r-- | editors/jed/Makefile.common | 11 | ||||
-rw-r--r-- | editors/jove/Makefile | 7 |
11 files changed, 72 insertions, 33 deletions
diff --git a/editors/ce-doc/Makefile b/editors/ce-doc/Makefile index de061b30fdd..d791cf02515 100644 --- a/editors/ce-doc/Makefile +++ b/editors/ce-doc/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.8 2006/10/03 05:30:04 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2010/01/29 19:43:37 joerg Exp $ # +PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../editors/ce/Makefile.common" PKGNAME= ce-doc-${VERSION} PKGREVISION= 2 COMMENT+= , documentation -PKG_INSTALLATION_TYPES= overwrite pkgviews - NO_BUILD= yes USE_LANGUAGES= c diff --git a/editors/ce-x11/Makefile b/editors/ce-x11/Makefile index 942915064fb..552d0c24f0e 100644 --- a/editors/ce-x11/Makefile +++ b/editors/ce-x11/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.18 2007/01/30 22:52:07 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2010/01/29 19:43:37 joerg Exp $ # +PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../editors/ce/Makefile.common" PKGNAME= ce-x11-${VERSION} PKGREVISION= 1 COMMENT+= , X11 version -PKG_INSTALLATION_TYPES= overwrite pkgviews - - BUILD_TARGET= xce INSTALL_TARGET= install-x11 man-install-x11 diff --git a/editors/ce/Makefile b/editors/ce/Makefile index 6638e580c68..fe62ac13b76 100644 --- a/editors/ce/Makefile +++ b/editors/ce/Makefile @@ -1,11 +1,13 @@ -# $NetBSD: Makefile,v 1.17 2007/01/07 09:13:52 rillig Exp $ +# $NetBSD: Makefile,v 1.18 2010/01/29 19:43:36 joerg Exp $ # +PKG_DESTDIR_SUPPORT= user-destdir +PKG_INSTALLATION_TYPES= overwrite pkgviews + .include "Makefile.common" COMMENT+= , tty version -PKG_INSTALLATION_TYPES= overwrite pkgviews REPLACE_INTERPRETER+= bash REPLACE.bash.old= .*/bin/bash diff --git a/editors/ce/distinfo b/editors/ce/distinfo index 17bd9d8cf5f..afc99731bf4 100644 --- a/editors/ce/distinfo +++ b/editors/ce/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.7 2006/03/09 14:50:31 ghen Exp $ +$NetBSD: distinfo,v 1.8 2010/01/29 19:43:36 joerg Exp $ SHA1 (ce-4.6.tar.gz) = 94d7ef6db3e9baf60205e922038d040380b67879 RMD160 (ce-4.6.tar.gz) = 9a9f55d639f5bae7a4f9a18b4480333bfe400785 Size (ce-4.6.tar.gz) = 287489 bytes -SHA1 (patch-aa) = 50322176da6a8dc2460aadf649a7f4dd2979a047 +SHA1 (patch-aa) = 4d41f468071052a968c1547122a0639e56d4551f SHA1 (patch-ab) = d41e4ece57025fe0c65a7897e55e34b51717f659 diff --git a/editors/ce/patches/patch-aa b/editors/ce/patches/patch-aa index 35244c86fea..d74ff3c0b14 100644 --- a/editors/ce/patches/patch-aa +++ b/editors/ce/patches/patch-aa @@ -1,26 +1,49 @@ -$NetBSD: patch-aa,v 1.3 2006/01/13 10:10:46 schmonz Exp $ +$NetBSD: patch-aa,v 1.4 2010/01/29 19:43:37 joerg Exp $ ---- Makefile.in.orig 2003-11-06 16:36:36.000000000 -0500 +--- Makefile.in.orig 2003-11-06 21:36:36.000000000 +0000 +++ Makefile.in +@@ -72,8 +72,8 @@ TEACHCE = teach-ce + BACKUP = ce.bak + + LINTFLAGS= -chx +-DESTDIR= $(bindir) +-MANDIR= $(man1dir) ++BINDIR= ${DESTDIR}$(bindir) ++MANDIR= ${DESTDIR}$(man1dir) + + # + # Systems like the NeXT that cannot use a non-libc malloc should comment +@@ -81,7 +81,7 @@ MANDIR= $(man1dir) + # + + # DOCDIR must agree with the definition for LIBDIR in the source (see ce.h) +-DOCDIR= $(libdir)/ce ++DOCDIR= ${DESTDIR}$(libdir)/ce + + CFILES= basic.c bind.c buffer.c bug.c cinfo.c cmode.c \ + complete.c dir.c display.c file.c fileio.c fio.c func.c \ @@ -233,29 +233,31 @@ backup: depend: makedepend -- $(CCFLAGS) -- $(CFILES) -installdirs: -+install: ${PROG} - @${SHELL} $(SUPPORT_SRC)/mkdirs $(DESTDIR) +- @${SHELL} $(SUPPORT_SRC)/mkdirs $(DESTDIR) - @${SHELL} $(SUPPORT_SRC)/mkdirs $(MANDIR) - @${SHELL} $(SUPPORT_SRC)/mkdirs $(DOCDIR) - -install: ${PROG} ${XPROG} installdirs - -$(MV) ${DESTDIR}/${PROG} ${DESTDIR}/${PROG}.${OLDEXT} - -$(MV) ${DESTDIR}/${XPROG} ${DESTDIR}/${XPROG}.${OLDEXT} - $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)/${PROG} +- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)/${PROG} +- $(INSTALL_PROGRAM) $(XPROG) $(DESTDIR)/${XPROG} +- $(INSTALL_SCRIPT) $(TEACHCE) $(DESTDIR)/$(TEACHCE) ++install: ${PROG} ++ @${SHELL} $(SUPPORT_SRC)/mkdirs $(BINDIR) ++ $(INSTALL_PROGRAM) $(PROG) $(BINDIR)/${PROG} + +install-x11: ${XPROG} -+ @${SHELL} $(SUPPORT_SRC)/mkdirs $(DESTDIR) - $(INSTALL_PROGRAM) $(XPROG) $(DESTDIR)/${XPROG} -- $(INSTALL_SCRIPT) $(TEACHCE) $(DESTDIR)/$(TEACHCE) ++ @${SHELL} $(SUPPORT_SRC)/mkdirs $(BINDIR) ++ $(INSTALL_PROGRAM) $(XPROG) $(BINDIR)/${XPROG} install-strip: $(MAKE) $(MFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \ @@ -32,7 +55,7 @@ $NetBSD: patch-aa,v 1.3 2006/01/13 10:10:46 schmonz Exp $ ${INSTALL_DATA} ${DOC_SRC}/TUTORIAL $(DOCDIR)/TUTORIAL ${INSTALL_DATA} ${DOC_SRC}/ce.help $(DOCDIR)/ce.help ${INSTALL_DATA} ${DOC_SRC}/FUNCTIONS $(DOCDIR)/FUNCTIONS -+ $(INSTALL_SCRIPT) $(TEACHCE) $(DESTDIR)/$(TEACHCE) ++ $(INSTALL_SCRIPT) $(TEACHCE) $(BINDIR)/$(TEACHCE) -man-install: installdirs +man-install: diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile index ee2cd492a45..e466b059c25 100644 --- a/editors/hexedit/Makefile +++ b/editors/hexedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2008/11/06 19:06:32 snj Exp $ +# $NetBSD: Makefile,v 1.29 2010/01/29 19:45:03 joerg Exp $ DISTNAME= hexedit-1.2.12 CATEGORIES= editors @@ -9,8 +9,12 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://merd.sourceforge.net/pixel/hexedit.html COMMENT= To view and edit files in hexadecimal or ASCII +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/hexedit GNU_CONFIGURE= yes +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 + .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/hexedit/distinfo b/editors/hexedit/distinfo index f3f0811aa91..faeee842cb7 100644 --- a/editors/hexedit/distinfo +++ b/editors/hexedit/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.9 2008/11/06 19:06:32 snj Exp $ +$NetBSD: distinfo,v 1.10 2010/01/29 19:45:03 joerg Exp $ SHA1 (hexedit-1.2.12.src.tgz) = fee89e390945045fe6b74b5f07600a8e664c8b21 RMD160 (hexedit-1.2.12.src.tgz) = 76f30d62e5c4b18fdba60cf7852641ba2b547dbb Size (hexedit-1.2.12.src.tgz) = 65802 bytes -SHA1 (patch-ac) = 969c8f19692e63eb817f917f35b8ff871e689ed9 +SHA1 (patch-ac) = 348afc4a215a026df59ee9a1923d3b92dba7eb51 SHA1 (patch-ae) = 49627dd5704fb9cd7b6ac08d01d3324ff2d2babd diff --git a/editors/hexedit/patches/patch-ac b/editors/hexedit/patches/patch-ac index 55f4d9fe6e1..9f462b9d6ec 100644 --- a/editors/hexedit/patches/patch-ac +++ b/editors/hexedit/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.6 2002/01/18 22:59:31 mjl Exp $ +$NetBSD: patch-ac,v 1.7 2010/01/29 19:45:03 joerg Exp $ --- Makefile.in.orig Thu Oct 25 00:00:51 2001 +++ Makefile.in @@ -10,5 +10,5 @@ $NetBSD: patch-ac,v 1.6 2002/01/18 22:59:31 mjl Exp $ - $(INSTALL) -s -m 755 $(PRODUCT) $(bindir) - $(INSTALL) -d -m 755 $(mandir)/man1 - $(INSTALL) -m 644 $(PRODUCT).1 $(mandir)/man1 -+ $(BSD_INSTALL_PROGRAM) $(PRODUCT) $(bindir) -+ $(BSD_INSTALL_DATA) $(PRODUCT).1 $(mandir)/man1/ ++ $(BSD_INSTALL_PROGRAM) $(PRODUCT) ${DESTDIR}$(bindir) ++ $(BSD_INSTALL_DATA) $(PRODUCT).1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ diff --git a/editors/jed/Makefile b/editors/jed/Makefile index 2ce57778125..91607831336 100644 --- a/editors/jed/Makefile +++ b/editors/jed/Makefile @@ -1,7 +1,10 @@ -# $NetBSD: Makefile,v 1.26 2006/02/05 23:08:56 joerg Exp $ +# $NetBSD: Makefile,v 1.27 2010/01/29 19:46:20 joerg Exp $ # PKGNAME= jed-0.99.16 PKGREVISION= 2 + +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../editors/jed/Makefile.common" COMMENT= Extensible folding editor with Emacs/WordStar/EDT emulations diff --git a/editors/jed/Makefile.common b/editors/jed/Makefile.common index c712872cc62..1f58148e43a 100644 --- a/editors/jed/Makefile.common +++ b/editors/jed/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2009/06/30 00:07:14 joerg Exp $ +# $NetBSD: Makefile.common,v 1.8 2010/01/29 19:46:20 joerg Exp $ # DISTNAME= jed-0.99-16 CATEGORIES= editors @@ -19,10 +19,11 @@ GNU_CONFIGURE= yes EGDIR= ${PREFIX}/share/examples/jed CONF_FILES= ${EGDIR}/jed.conf ${PREFIX}/etc/jed.conf +INSTALLATION_DIRS+= ${EGDIR} + post-install: - ${RMDIR} ${PREFIX}/share/jed/bin - ${RMDIR} ${PREFIX}/share/jed/lib/tm - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/lib/jed.conf ${EGDIR} + ${RMDIR} ${DESTDIR}${PREFIX}/share/jed/bin + ${RMDIR} ${DESTDIR}${PREFIX}/share/jed/lib/tm + ${INSTALL_DATA} ${WRKSRC}/lib/jed.conf ${DESTDIR}${EGDIR} .include "../../devel/libslang/buildlink3.mk" diff --git a/editors/jove/Makefile b/editors/jove/Makefile index e0efd0b0357..b3e932bc635 100644 --- a/editors/jove/Makefile +++ b/editors/jove/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2007/02/16 18:28:25 rpaulo Exp $ +# $NetBSD: Makefile,v 1.14 2010/01/29 19:47:01 joerg Exp $ # DISTNAME= jove4.16.0.70 @@ -10,6 +10,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Small emacs-style editor, but lacks the LISP engine +PKG_DESTDIR_SUPPORT= user-destdir + NO_CONFIGURE= yes USE_TOOLS+= nroff @@ -17,4 +19,7 @@ MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP:Q} MAKE_ENV+= ROOT_USER=${ROOT_USER:Q} MAKE_FLAGS+= NROFF=${NROFF:Q} +INSTALL_MAKE_FLAGS+= JOVEHOME=${DESTDIR}${PREFIX} +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 + .include "../../mk/bsd.pkg.mk" |