Add DESTDIR support.

13 files changed, 50 insertions, 31 deletions

diff --git a/editors/beav/Makefile b/editors/beav/Makefile
index 3f40a45bac6..16d5d5b905f 100644
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/11/25 12:15:52 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/06/20 01:09:17 joerg Exp $
 
 DISTNAME=	beav_1.40.orig
 PKGNAME=	beav-1.40.18
@@ -12,6 +12,10 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	bad@NetBSD.org
 COMMENT=	Binary Editor And Viewer, a full featured binary file editor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
 WRKSRC=		${WRKDIR}/beav-140
 MAKE_ENV+=	SED=${SED:Q}
 BUILD_TARGET=	beav
diff --git a/editors/beav/distinfo b/editors/beav/distinfo
index 66da438de18..800339f36a9 100644
--- a/editors/beav/distinfo
+++ b/editors/beav/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2007/12/16 15:53:44 yyamano Exp $
+$NetBSD: distinfo,v 1.8 2008/06/20 01:09:17 joerg Exp $
 
 SHA1 (beav_1.40-18.diff.gz) = 9cd82a3b8de391e1f001d241be1c2c3fadb3efb9
 RMD160 (beav_1.40-18.diff.gz) = 0e7b19fdc7ea16e1e24e8302d81dfb247e947603
@@ -6,7 +6,7 @@ Size (beav_1.40-18.diff.gz) = 14218 bytes
 SHA1 (beav_1.40.orig.tar.gz) = c610a0c3581c681c26726c8e1e19bf7e38ca8a6a
 RMD160 (beav_1.40.orig.tar.gz) = 621df359860a8ec9205413520961d4366b1ad8ea
 Size (beav_1.40.orig.tar.gz) = 128103 bytes
-SHA1 (patch-aa) = 95fcc3806fa57ad380b4c16089c3bcf7cfd6a6dc
+SHA1 (patch-aa) = 59a2043fa5da8c326dc0732701b3377ed7422a44
 SHA1 (patch-ab) = 629db527f0718de30bdc67cb8387c4488d9f9437
 SHA1 (patch-ac) = 6c575aa6e69fc4281956310176c12a086c6ae400
 SHA1 (patch-ad) = 4cb29fa7dab5d5fc7ccff1dff090b189146e32c8
diff --git a/editors/beav/patches/patch-aa b/editors/beav/patches/patch-aa
index 87527ff488f..7e220c1aa2a 100644
--- a/editors/beav/patches/patch-aa
+++ b/editors/beav/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2007/11/25 12:15:53 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2008/06/20 01:09:17 joerg Exp $
 
 --- Makefile.orig	2007-11-25 12:10:44.000000000 +0000
 +++ Makefile
@@ -18,10 +18,10 @@ $NetBSD: patch-aa,v 1.2 2007/11/25 12:15:53 wiz Exp $
 +	$(CC) $(CFLAGS) $(OFILES) -ltermcap -o beav
 +
 +install: beav beav.1
-+	$(BSD_INSTALL_PROGRAM) beav $(PREFIX)/bin
-+	mkdir -p $(PREFIX)/share/doc/beav
-+	$(BSD_INSTALL_DATA) beav140.txt $(PREFIX)/share/doc/beav/beav.txt
-+	$(BSD_INSTALL_MAN) beav.1 $(PREFIX)/man/man1
++	$(BSD_INSTALL_PROGRAM) beav ${DESTDIR}$(PREFIX)/bin
++	mkdir -p ${DESTDIR}$(PREFIX)/share/doc/beav
++	$(BSD_INSTALL_DATA) beav140.txt ${DESTDIR}$(PREFIX)/share/doc/beav/beav.txt
++	$(BSD_INSTALL_MAN) beav.1 ${DESTDIR}$(PREFIX)/man/man1
  
  clean:
  	rm -f *.o beav
diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile
index 13bfd73ef7e..4460262391e 100644
--- a/editors/beaver/Makefile
+++ b/editors/beaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:55 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2008/06/20 01:09:17 joerg Exp $
 #
 
 DISTNAME=	beaver-0.2.6
@@ -10,8 +10,12 @@ MAINTAINER=	vincent.derrien@ahoup.net
 HOMEPAGE=	http://www.nongnu.org/beaver/
 COMMENT=	Lightweight GTK+ text editor with syntax highlighting
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_DIRS+=	xdg-1.1
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/pixmaps
+
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/beaver/distinfo b/editors/beaver/distinfo
index d9afbe194ef..235796c3369 100644
--- a/editors/beaver/distinfo
+++ b/editors/beaver/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 17:15:10 agc Exp $
+$NetBSD: distinfo,v 1.3 2008/06/20 01:09:17 joerg Exp $
 
 SHA1 (beaver-0.2.6.tar.gz) = 608231b84871d26133eb8c20b3ce0ec6b754434c
 RMD160 (beaver-0.2.6.tar.gz) = 1db93234f9b47c10667b16f26a8d1d61f6c8d8f0
 Size (beaver-0.2.6.tar.gz) = 133938 bytes
-SHA1 (patch-aa) = 8c83e5a7be01d71e1a3501840c657210b6ff8423
+SHA1 (patch-aa) = ffe1817995d7e14e7137b59f5ea520a52cc5a77e
diff --git a/editors/beaver/patches/patch-aa b/editors/beaver/patches/patch-aa
index d1f364344cb..f4cd65721f8 100644
--- a/editors/beaver/patches/patch-aa
+++ b/editors/beaver/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/04/19 08:36:39 salo Exp $
+$NetBSD: patch-aa,v 1.2 2008/06/20 01:09:17 joerg Exp $
 
 --- Makefile.orig	2002-07-18 15:20:32.000000000 +0200
 +++ Makefile	2003-04-19 10:14:12.000000000 +0200
-@@ -7,11 +7,11 @@
+@@ -7,11 +7,10 @@
  
  ############## Public section. Modify according to your needs.  ###############
  
@@ -14,7 +14,6 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/04/19 08:36:39 salo Exp $
 +#CP      = cp
  
 -DESTDIR = /usr/local
-+DESTDIR = ${PREFIX}
  IPATH   = 
  LPATH   = 
  OPTI    = -O3 -funroll-loops -fomit-frame-pointer #-mcpu=i686
@@ -75,11 +74,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/04/19 08:36:39 salo Exp $
 -	@echo ",----------------------------------."
 -	@echo "| Beaver succesfully installed ^_^ |"
 -	@echo "\`----------------------------------'"
-+	${BSD_INSTALL_PROGRAM} beaver $(DESTDIR)/bin
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)/share/beaver/bl
-+	${BSD_INSTALL_DATA} ../bl/* $(DESTDIR)/share/beaver/bl
-+	${BSD_INSTALL_DATA} ../pixmaps/beaver.png $(DESTDIR)/share/pixmaps
-+	${BSD_INSTALL_MAN} ../beaver.1x $(DESTDIR)/man/man1/beaver.1
++	${BSD_INSTALL_PROGRAM} beaver $(DESTDIR)${PREFIX}/bin
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)${PREFIX}/share/beaver/bl
++	${BSD_INSTALL_DATA} ../bl/* $(DESTDIR)${PREFIX}/share/beaver/bl
++	${BSD_INSTALL_DATA} ../pixmaps/beaver.png $(DESTDIR)${PREFIX}/share/pixmaps
++	${BSD_INSTALL_MAN} ../beaver.1x $(DESTDIR)${PREFIX}/man/man1/beaver.1
  
  .PHONY: clean re
  
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index 11d8f0eea8c..45f8adadb15 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2008/04/29 19:11:44 drochner Exp $
+# $NetBSD: Makefile,v 1.61 2008/06/20 01:09:17 joerg Exp $
 #
 
 DISTNAME=		gconf-editor-2.22.0
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Editor for the GConf configuration system
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.1 gnome2-1.5
 USE_LIBTOOL=		YES
diff --git a/editors/obby/Makefile b/editors/obby/Makefile
index c273620043f..46fbaa38b16 100644
--- a/editors/obby/Makefile
+++ b/editors/obby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/03/06 14:53:50 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:17 joerg Exp $
 #
 
 DISTNAME=	obby-0.4.4
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gobby.0x539.de/
 COMMENT=	Library for distributed editing
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index a2814f6c959..59b4da54bf4 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:40 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2008/06/20 01:09:17 joerg Exp $
 #
 
 DISTNAME=		tea-16.0.5
@@ -12,6 +12,8 @@ HOMEPAGE=		http://tea-editor.sourceforge.net/
 #HOMEPAGE=		http://tea.linux.kiev.ua/
 COMMENT=		Powerful, easy-to-use text editor for Gtk2
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config msgfmt
diff --git a/editors/vilearn/Makefile b/editors/vilearn/Makefile
index 27f209e6d53..39866a4305e 100644
--- a/editors/vilearn/Makefile
+++ b/editors/vilearn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/11/25 11:46:59 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/06/20 01:09:17 joerg Exp $
 #
 
 DISTNAME=	vilearn-1.0
@@ -10,6 +10,10 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://vilearn.org/
 COMMENT=	Online vi tutorial, from basic to advanced
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EXTRACT_CMD=	${GZCAT} ${DOWNLOADED_DISTFILE} | ${SED} '1,/^wes$$/d' | ${SH}
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vilearn/distinfo b/editors/vilearn/distinfo
index f7585f31473..be00e7e5494 100644
--- a/editors/vilearn/distinfo
+++ b/editors/vilearn/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:15:13 agc Exp $
+$NetBSD: distinfo,v 1.5 2008/06/20 01:09:17 joerg Exp $
 
 SHA1 (vilearn-1.0.shar.Z) = 08aed424df46f30c93c604f3dc79d2affe1ec70e
 RMD160 (vilearn-1.0.shar.Z) = 081d6c4055d7de7e6739e217501ca1fa7054e2fc
 Size (vilearn-1.0.shar.Z) = 25787 bytes
-SHA1 (patch-aa) = 8410d97ecf7d764af139878476663a4e484a8352
+SHA1 (patch-aa) = 7ddff60dc58e7d866e5d81a91a792553a47912ef
diff --git a/editors/vilearn/patches/patch-aa b/editors/vilearn/patches/patch-aa
index df5322cd785..bcaee82feef 100644
--- a/editors/vilearn/patches/patch-aa
+++ b/editors/vilearn/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2003/09/25 12:56:34 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2008/06/20 01:09:17 joerg Exp $
 
 --- Makefile.orig	Wed Sep 24 16:22:05 2003
 +++ Makefile	Wed Sep 24 16:26:08 2003
@@ -31,16 +31,16 @@ $NetBSD: patch-aa,v 1.2 2003/09/25 12:56:34 jmmv Exp $
  
  install : all
 -	-mkdir ${TUTORIALS}
-+	${BSD_INSTALL_DATA_DIR} ${TUTORIALS}
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${TUTORIALS}
  	for i in ${TUTS} ; do \
 -	    rm -f ${TUTORIALS}/$$i; \
 -	    install -c -m 444 $$i ${TUTORIALS}/$$i ; \
-+	    ${BSD_INSTALL_DATA} $$i ${TUTORIALS}/$$i ; \
++	    ${BSD_INSTALL_DATA} $$i ${DESTDIR}${TUTORIALS}/$$i ; \
  	done
 -	install -m 755 vilearn ${BINDIR}/vilearn
 -	install -m 444 vilearn.${SEC} ${MANDIR}/man${SEC}/vilearn.${SEC}
-+	${BSD_INSTALL_SCRIPT} vilearn ${BINDIR}/vilearn
-+	${BSD_INSTALL_MAN} vilearn.${SEC} ${MANDIR}/man${SEC}/vilearn.${SEC}
++	${BSD_INSTALL_SCRIPT} vilearn ${DESTDIR}${BINDIR}/vilearn
++	${BSD_INSTALL_MAN} vilearn.${SEC} ${DESTDIR}${MANDIR}/man${SEC}/vilearn.${SEC}
  
  clean :
  	rm -f vilearn vilearn.${SEC}
diff --git a/editors/vim-lang/Makefile b/editors/vim-lang/Makefile
index 416d2d71b09..d9710599a04 100644
--- a/editors/vim-lang/Makefile
+++ b/editors/vim-lang/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2008/01/09 13:47:43 martti Exp $
+# $NetBSD: Makefile,v 1.14 2008/06/20 01:09:18 joerg Exp $
 
 PKGNAME=	vim-lang-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=	1
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../editors/vim-share/Makefile.common"
 
 COMMENT=	Language files for the vim editor (vi clone)