diff options
| -rw-r--r-- | devel/ucl/Makefile | 7 | ||||
| -rw-r--r-- | devel/xmake/Makefile | 5 | ||||
| -rw-r--r-- | editors/ex/Makefile | 4 | ||||
| -rw-r--r-- | editors/ex/distinfo | 4 | ||||
| -rw-r--r-- | editors/ex/patches/patch-aa | 30 | ||||
| -rw-r--r-- | editors/gate/Makefile | 7 |
6 files changed, 36 insertions, 21 deletions
diff --git a/devel/ucl/Makefile b/devel/ucl/Makefile index 9db7a62b1ad..7599d1ebd04 100644 --- a/devel/ucl/Makefile +++ b/devel/ucl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2010/01/16 17:57:38 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2010/01/29 19:31:33 joerg Exp $ # DISTNAME= ucl-1.03 @@ -11,6 +11,7 @@ HOMEPAGE= http://www.oberhumer.com/opensource/ucl/ COMMENT= Portable lossless data compression library PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir USE_LIBTOOL= YES GNU_CONFIGURE= YES @@ -26,8 +27,8 @@ INSTALLATION_DIRS= bin share/examples/ucl post-install: for i in simple.c lutil.h uclpack.c; do \ - ${INSTALL_DATA} ${WRKSRC}/examples/$$i ${PREFIX}/share/examples/ucl;\ + ${INSTALL_DATA} ${WRKSRC}/examples/$$i ${DESTDIR}${PREFIX}/share/examples/ucl;\ done; - cd ${WRKSRC}/examples && libtool --mode=install ${INSTALL_PROGRAM} uclpack ${PREFIX}/bin + cd ${WRKSRC}/examples && libtool --mode=install ${INSTALL_PROGRAM} uclpack ${DESTDIR}${PREFIX}/bin .include "../../mk/bsd.pkg.mk" diff --git a/devel/xmake/Makefile b/devel/xmake/Makefile index 91f8a035a46..65b9b9f317f 100644 --- a/devel/xmake/Makefile +++ b/devel/xmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/01/07 09:13:52 rillig Exp $ +# $NetBSD: Makefile,v 1.3 2010/01/29 19:32:59 joerg Exp $ # DISTNAME= xmake-1.06 @@ -11,9 +11,12 @@ HOMEPAGE= http://apollo.backplane.com/xmake/ COMMENT= Portable make utility PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR}/xmake INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 +INSTALL_MAKE_FLAGS+= IBDIR=${DESTDIR}${PREFIX}/bin \ + IMDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/editors/ex/Makefile b/editors/ex/Makefile index 650a9c45661..458a601dd57 100644 --- a/editors/ex/Makefile +++ b/editors/ex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2009/12/15 23:24:33 zafer Exp $ +# $NetBSD: Makefile,v 1.7 2010/01/29 19:39:24 joerg Exp $ # DISTNAME= ex-040103 @@ -11,4 +11,6 @@ HOMEPAGE= http://ex-vi.sourceforge.net/ COMMENT= Berkeley vi 3.7 LICENSE= original-bsd +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../mk/bsd.pkg.mk" diff --git a/editors/ex/distinfo b/editors/ex/distinfo index c192e7e3d19..e1700ae2ed5 100644 --- a/editors/ex/distinfo +++ b/editors/ex/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.11 2006/07/22 04:23:29 minskim Exp $ +$NetBSD: distinfo,v 1.12 2010/01/29 19:39:24 joerg Exp $ SHA1 (ex-040103.tar.gz) = 51fa1d613b37a4f3aed1ef2968be691465cdff09 RMD160 (ex-040103.tar.gz) = 5fc3f222dde5a8d00e1b233281ccf210affdbdf1 Size (ex-040103.tar.gz) = 284130 bytes -SHA1 (patch-aa) = 134513a18d1a5192818eccd456d91857fda82860 +SHA1 (patch-aa) = be450377abc260617a6dd42bbcb626a5d4ca75a4 SHA1 (patch-ab) = 5bac9911e71b7fe787023568a7a46d1e87fb4d0e SHA1 (patch-ac) = 0401448724a4aba59b4aeb07a4cb00982bb52d98 SHA1 (patch-ad) = 31bafb04f553ca286baf90505da450964fea9954 diff --git a/editors/ex/patches/patch-aa b/editors/ex/patches/patch-aa index f13f1986511..fff56d57048 100644 --- a/editors/ex/patches/patch-aa +++ b/editors/ex/patches/patch-aa @@ -1,15 +1,19 @@ -$NetBSD: patch-aa,v 1.5 2005/11/08 21:46:03 rillig Exp $ +$NetBSD: patch-aa,v 1.6 2010/01/29 19:39:24 joerg Exp $ ---- Makefile.orig Sat Jan 3 15:22:47 2004 -+++ Makefile Tue Nov 8 22:41:34 2005 -@@ -83,13 +83,15 @@ - BINDIR = bin - LIBEXECDIR = libexec - MANDIR = man +--- Makefile.orig 2004-01-03 14:22:47.000000000 +0000 ++++ Makefile +@@ -80,16 +80,16 @@ + # located below $(DESTDIR). $(PRESERVEDIR) is used for recovery files. It + # will get mode 1777. + # +-BINDIR = bin +-LIBEXECDIR = libexec +-MANDIR = man -DESTDIR = /usr/local -PRESERVEDIR = /var/preserve -+#DESTDIR = /usr/local -+DESTDIR = ${PREFIX} ++BINDIR = ${PREFIX}/bin ++LIBEXECDIR = ${PREFIX}/libexec ++MANDIR = ${PREFIX}/${PKGMANDIR} +PRESERVEDIR = /var/tmp/vi.recover # @@ -21,7 +25,7 @@ $NetBSD: patch-aa,v 1.5 2005/11/08 21:46:03 rillig Exp $ # # Compiler and linker flags. -@@ -140,9 +142,9 @@ +@@ -140,9 +140,9 @@ FEATURES = -DLISPCODE -DCHDIR -DFASTTAG # advanced multibyte character support etc. which might not be present # on your system. # @@ -34,7 +38,7 @@ $NetBSD: patch-aa,v 1.5 2005/11/08 21:46:03 rillig Exp $ # # These settings should be correct for any modern Unix. -@@ -182,7 +184,7 @@ +@@ -182,7 +182,7 @@ OSTYPE = -DVMUNIX -DPOSIX_1 # On System V, the terminfo library may be more accurate than the termcap # file. To use it, link against the curses library. # @@ -43,7 +47,7 @@ $NetBSD: patch-aa,v 1.5 2005/11/08 21:46:03 rillig Exp $ # # You may also get terminfo access by using the ncurses library. # -@@ -191,7 +193,7 @@ +@@ -191,7 +191,7 @@ OSTYPE = -DVMUNIX -DPOSIX_1 # The preferred choice for ex on Linux and other systems that provide a good # termcap file is the 2.11BSD termcap library included here. # @@ -52,7 +56,7 @@ $NetBSD: patch-aa,v 1.5 2005/11/08 21:46:03 rillig Exp $ # # Since ex uses sbrk() internally, a conflict with the libc's version of -@@ -297,7 +299,7 @@ +@@ -297,7 +297,7 @@ install: all install-man mv $(DESTDIR)/$(BINDIR)/ex $(DESTDIR)/$(BINDIR)/ex.old.$$$$; \ rm -f $(DESTDIR)/$(BINDIR)/ex.old.$$$$; \ fi diff --git a/editors/gate/Makefile b/editors/gate/Makefile index 00ff913b9ed..7229cc8462f 100644 --- a/editors/gate/Makefile +++ b/editors/gate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/12/06 22:42:25 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2010/01/29 19:37:48 joerg Exp $ # DISTNAME= gate-2.06 @@ -9,7 +9,12 @@ MAINTAINER= hugor@users.sourceforge.net HOMEPAGE= http://www.unixpapa.com/gate.html COMMENT= Lightweight text editor +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes BUILD_TARGET= # empty +INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \ + mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} + .include "../../mk/bsd.pkg.mk" |