DESTDIR support

10 files changed, 82 insertions, 22 deletions

diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile
index 9a973926a51..e50710504c7 100644
--- a/editors/lpe/Makefile
+++ b/editors/lpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/06/30 00:07:14 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2010/01/29 19:54:17 joerg Exp $
 #
 
 DISTNAME=	lpe-1.2.6
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cdsmith.twu.net/professional/opensource/lpe.html
 COMMENT=	Small and efficient programmer's editor for UNIX systems
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_JOBS_SAFE=		no
 
 USE_PKGLOCALEDIR=	YES
diff --git a/editors/lpe/distinfo b/editors/lpe/distinfo
index 6be9045d984..3aad8b4bc65 100644
--- a/editors/lpe/distinfo
+++ b/editors/lpe/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2006/10/15 21:34:09 rillig Exp $
+$NetBSD: distinfo,v 1.4 2010/01/29 19:54:17 joerg Exp $
 
 SHA1 (lpe-1.2.6.tar.gz) = b69ef7d8ff3cee5bfb0d9709ed91182afccaf587
 RMD160 (lpe-1.2.6.tar.gz) = f177f115db6303ef91778adda9dcdd005c03cf17
 Size (lpe-1.2.6.tar.gz) = 285618 bytes
-SHA1 (patch-aa) = b10ff6ce129bb8addbad688e1fd79b8d40cefbb1
+SHA1 (patch-aa) = da6223e1dc828e3591cc6cd7e0d13d084fedf119
 SHA1 (patch-ab) = 8b258595041ff3b51f7199ec7912729bb5547332
 SHA1 (patch-ac) = 615b0445d52ed9cc6b81403c26c3a4de975e4ec8
 SHA1 (patch-ad) = e60809ef84d950035e505e984bc2e8128aadf549
@@ -15,3 +15,4 @@ SHA1 (patch-ai) = 283608e9f1cde456395d4696cf5cb52afe536b19
 SHA1 (patch-aj) = cf72e180187e3eef42323bda6421cfe74d8cf543
 SHA1 (patch-ak) = 06db8f684a0b88e8f7daeb2293c2e20c95001c81
 SHA1 (patch-al) = 3ecafa7fd047edf3e9373c6ea27f181a826d33a4
+SHA1 (patch-am) = 9336642f8b643bb4f92c97dfaba47ed0c0586cb9
diff --git a/editors/lpe/patches/patch-aa b/editors/lpe/patches/patch-aa
index 84718b12a44..6fb8622de0c 100644
--- a/editors/lpe/patches/patch-aa
+++ b/editors/lpe/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/05/15 21:02:16 salo Exp $
+$NetBSD: patch-aa,v 1.2 2010/01/29 19:54:17 joerg Exp $
 
---- man/Makefile.in.orig	2003-05-15 13:48:14.000000000 +0200
-+++ man/Makefile.in	2003-05-15 14:01:51.000000000 +0200
-@@ -102,7 +102,7 @@
+--- man/Makefile.in.orig	2001-06-20 10:22:30.000000000 +0000
++++ man/Makefile.in
+@@ -102,7 +102,7 @@ MAINTAINERCLEANFILES = lpe.1 Makefile.in
  
  man_MANS = lpe.1
  
@@ -11,3 +11,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/05/15 21:02:16 salo Exp $
  
  
  EXTRA_DIST = $(EXTRA_MANPAGES) lpe.1.en
+@@ -261,9 +261,9 @@ clean-local:
+ 
+ install-data-hook:
+ 	for m in $(EXTRA_MANPAGES); do \
+-		$(mkinstalldirs) $(mandir)/`echo $$m | sed -e "s,^.*\.1\.\(.*\)$$,\1/man1,"`; \
++		$(mkinstalldirs) ${DESTDIR}$(mandir)/`echo $$m | sed -e "s,^.*\.1\.\(.*\)$$,\1/man1,"`; \
+ 		$(INSTALL_DATA) $(top_srcdir)/man/$$m \
+-			$(mandir)/`echo $$m | sed -e "s,^\(.*\)\.1\.\(.*\)$$,\2/man1/\1.1,"`; \
++			${DESTDIR}$(mandir)/`echo $$m | sed -e "s,^\(.*\)\.1\.\(.*\)$$,\2/man1/\1.1,"`; \
+ 	done
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/editors/lpe/patches/patch-am b/editors/lpe/patches/patch-am
new file mode 100644
index 00000000000..610f20e726c
--- /dev/null
+++ b/editors/lpe/patches/patch-am
@@ -0,0 +1,25 @@
+$NetBSD: patch-am,v 1.1 2010/01/29 19:54:17 joerg Exp $
+
+--- po/Makefile.in.in.orig	2010-01-29 19:48:37.000000000 +0000
++++ po/Makefile.in.in
+@@ -111,16 +111,16 @@ install-data: install-data-@USE_NLS@
+ install-data-no: all
+ install-data-yes: all
+ 	if test -r "$(MKINSTALLDIRS)"; then \
+-	  $(MKINSTALLDIRS) $(datadir); \
++	  $(MKINSTALLDIRS) ${DESTDIR}$(datadir); \
+ 	else \
+-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
++	  $(SHELL) $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir); \
+ 	fi
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  case "$$cat" in \
+-	    *.gmo) destdir=$(gnulocaledir);; \
+-	    *)     destdir=$(localedir);; \
++	    *.gmo) destdir=${DESTDIR}$(gnulocaledir);; \
++	    *)     destdir=${DESTDIR}$(localedir);; \
+ 	  esac; \
+ 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ 	  dir=$$destdir/$$lang/LC_MESSAGES; \
diff --git a/editors/notecase/Makefile b/editors/notecase/Makefile
index b5b411acc47..935bc9c809d 100644
--- a/editors/notecase/Makefile
+++ b/editors/notecase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/08/26 19:57:25 sno Exp $
+# $NetBSD: Makefile,v 1.11 2010/01/29 19:54:39 joerg Exp $
 #
 
 DISTNAME=	notecase-1.8.8_src
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://notecase.sourceforge.net/
 COMMENT=	Hierarchical note manager
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/notecase-1.8.8
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake msgfmt pkg-config gsed
diff --git a/editors/notecase/patches/patch-ad b/editors/notecase/patches/patch-ad
index e774305abed..55f3237358f 100644
--- a/editors/notecase/patches/patch-ad
+++ b/editors/notecase/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.5 2008/05/15 19:18:07 drochner Exp $
+$NetBSD: patch-ad,v 1.6 2010/01/29 19:54:39 joerg Exp $
 
---- Makefile.orig	2008-04-24 12:10:36.000000000 +0200
+--- Makefile.orig	2008-04-24 10:10:36.000000000 +0000
 +++ Makefile
 @@ -10,7 +10,7 @@
  VERSION=1.8.8
@@ -37,7 +37,18 @@ $NetBSD: patch-ad,v 1.5 2008/05/15 19:18:07 drochner Exp $
   $(OBJ)/ProgressDlg.o $(OBJ)/DocActionPix.o $(OBJ)/DocActionFinish.o $(OBJ)/DocActionFmt.o $(OBJ)/FmtInfo.o \
   $(OBJ)/FileAttachmentDlg.o $(OBJ)/DocActionAtt.o $(OBJ)/PixPropertiesDlg.o $(OBJ)/DocActionFinishDel.o \
   $(OBJ)/ShortcutsList.o $(OBJ)/ShortcutsListDlg.o $(OBJ)/DateTimeDlg.o $(OBJ)/AboutDlg.o $(OBJ)/EditDlg.o \
-@@ -630,7 +629,7 @@ updatesrc:
+@@ -526,9 +525,7 @@ poinstall:
+ 		rm -f po/messages.mo; \
+ 		msgfmt $$i -o po/messages.mo; \
+ 		echo "Installing: $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo";\
+-		if [ "$(OSX_BUILD)" = "1" ]; then \
+-			mkdir -p $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/; \
+-		fi; \
++		mkdir -p $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/; \
+ 		$(INSTALL) -m 644 po/messages.mo "$(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo"; \
+ 	done; \
+ 	rm -f po/messages.mo; 
+@@ -630,7 +627,7 @@ updatesrc:
  	$(Q)$(SED) 's/^Version:.*/Version:        $(VERSION)/' ./docs/notecase.spec
  	$(Q)$(SED) 's/^Source:.*/Source:         $(archive)_src.tar.gz/' ./docs/notecase.spec
  	$(Q)$(SED) 's/\#define APP_VER_STR .*/\#define APP_VER_STR "$(VERSION)"/' ./src/config.h
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index d16c4b66d14..497c88281d2 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2009/06/30 00:07:14 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2010/01/29 19:56:45 joerg Exp $
 
 DISTNAME=		sam
 PKGNAME=		sam-4.3
@@ -10,6 +10,8 @@ EXTRACT_SUFX=		.msg.gz
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Unix version of Rob Pike's editor for plan9
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		libXgFonts>=1.0nb1:../../fonts/Xg
 
 MAKE_JOBS_SAFE=		no
@@ -24,6 +26,8 @@ MAKE_ENV+=		X11PREFIX=${X11PREFIX:Q}
 INSTALLATION_DIRS=	bin include lib/X11/app-defaults \
 	${PKGMANDIR}/man1 ${PKGMANDIR}/man3 ${PKGMANDIR}/man4 ${PKGMANDIR}/man6
 
+INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX} X11PREFIX=${DESTDIR}${X11PREFIX}
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
diff --git a/editors/uemacs/Makefile b/editors/uemacs/Makefile
index da9092725c3..c42228b7028 100644
--- a/editors/uemacs/Makefile
+++ b/editors/uemacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/08/25 11:56:34 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/01/29 19:59:12 joerg Exp $
 
 DISTNAME=	ue400dev
 PKGNAME=	uemacs-4.0
@@ -10,6 +10,10 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	"emacs" key sequences compatible full screen editor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+INSTALLATION_DIRS=	bin share/uemacs
+
 WRKSRC=		${WRKDIR}
 EXTRACT_OPTS_ZIP=	-Laqo
 
diff --git a/editors/uemacs/distinfo b/editors/uemacs/distinfo
index 73ea2e415c8..91c1dc9476d 100644
--- a/editors/uemacs/distinfo
+++ b/editors/uemacs/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 17:15:13 agc Exp $
+$NetBSD: distinfo,v 1.6 2010/01/29 19:59:12 joerg Exp $
 
 SHA1 (ue400dev.zip) = edbb0261cdaa1803d9f7dc7debfd4a9df3a668eb
 RMD160 (ue400dev.zip) = 75bc1b1e11035ed24d33ec4c6afad43880d5985f
 Size (ue400dev.zip) = 1179949 bytes
-SHA1 (patch-aa) = bc503d998c68d59aa297744e0b4ca9778814ec33
+SHA1 (patch-aa) = 2e81eaf2d4b09baf8a54daa675d85d9bae68fb4b
 SHA1 (patch-ab) = 996e5f094b26991ba111f635a9a02d05188628aa
 SHA1 (patch-ac) = f7aaa2514f74987a68da726a397d58089fc2d82e
 SHA1 (patch-ad) = 977e0ca09cc53ba4bb90936dd5e34a460d0ea4e8
diff --git a/editors/uemacs/patches/patch-aa b/editors/uemacs/patches/patch-aa
index 5961ba3a887..404bd82fe82 100644
--- a/editors/uemacs/patches/patch-aa
+++ b/editors/uemacs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2000/03/23 22:08:52 tron Exp $
+$NetBSD: patch-aa,v 1.3 2010/01/29 19:59:12 joerg Exp $
 
---- Makefile.orig	Wed Mar 25 14:28:24 1998
+--- /dev/null	Wed Mar 25 14:28:24 1998
 +++ Makefile	Wed Mar 25 14:41:41 1998
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,11 @@
 +#
 +# simple makefile for uemacs 
 +#
@@ -11,7 +11,6 @@ $NetBSD: patch-aa,v 1.2 2000/03/23 22:08:52 tron Exp $
 +	(cd netbsd; make emacs)
 +
 +install:	all
-+	${BSD_INSTALL_PROGRAM} netbsd/emacs ${PREFIX}/bin/uemacs
-+	mkdir -p ${PREFIX}/share/uemacs
-+	${BSD_INSTALL_DATA} cmd/* ${PREFIX}/share/uemacs
-+	mv ${PREFIX}/share/uemacs/emacs.rc ${PREFIX}/share/uemacs/.emacsrc
++	${BSD_INSTALL_PROGRAM} netbsd/emacs ${DESTDIR}${PREFIX}/bin/uemacs
++	${BSD_INSTALL_DATA} cmd/* ${DESTDIR}${PREFIX}/share/uemacs
++	mv ${DESTDIR}${PREFIX}/share/uemacs/emacs.rc ${DESTDIR}${PREFIX}/share/uemacs/.emacsrc