DESTDIR support

13 files changed, 144 insertions, 26 deletions

diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index b885ab9d177..f0e6f0fbde4 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:36 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2010/01/30 00:02:54 joerg Exp $
 #
 
 DISTNAME=	x48_041
@@ -11,19 +11,21 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://home.earthlink.net/~rmmlgetz/
 COMMENT=	HP48 emulator
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_IMAKE=	YES
 
+INSTALLATION_DIRS+=	share/doc/x48/romdump
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/x48
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/x48/romdump
 	cd ${WRKSRC}/doc && \
 		${INSTALL_MAN} CARDS.doc INSTALLING ROMDump.doc \
-			${PREFIX}/share/doc/x48
+			${DESTDIR}${PREFIX}/share/doc/x48
 	cd ${WRKSRC}/romdump && \
-		${INSTALL_MAN} README ${PREFIX}/share/doc/x48/romdump && \
+		${INSTALL_MAN} README ${DESTDIR}${PREFIX}/share/doc/x48/romdump && \
 		${INSTALL_DATA} ROMDump ROMDump.s \
-			${PREFIX}/share/doc/x48/romdump
+			${DESTDIR}${PREFIX}/share/doc/x48/romdump
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
diff --git a/emulators/x48/distinfo b/emulators/x48/distinfo
index c3cbde2416c..9a38470fb1a 100644
--- a/emulators/x48/distinfo
+++ b/emulators/x48/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2005/12/03 17:16:52 joerg Exp $
+$NetBSD: distinfo,v 1.4 2010/01/30 00:02:54 joerg Exp $
 
 SHA1 (x48_041.tar.gz) = 7b166ab4a7570b0617a0d8d01d0938b6ae372ab6
 RMD160 (x48_041.tar.gz) = e41b32bd2b38c4163e4a1aae0776048b0c372637
 Size (x48_041.tar.gz) = 193864 bytes
 SHA1 (patch-aa) = 75af6f30b4e43d09212a50972957655f5bb4c837
-SHA1 (patch-ab) = 8053d3173be2b68f7ddb18b4bdebfe384f0336e2
+SHA1 (patch-ab) = 5bc7609bcaaa555ad29cb5cc3a8b53d83e7e6da5
 SHA1 (patch-ac) = ee5784614db4bf00c047e819aaa0f272d3bf9bce
 SHA1 (patch-ad) = c1f98b7672fe96ab8e203081dfedd6cf96075cfa
 SHA1 (patch-ae) = 29ec4f1495ab23d520883eebd51356b394c7143f
diff --git a/emulators/x48/patches/patch-ab b/emulators/x48/patches/patch-ab
index d6a1fe01a70..92b7020cdbe 100644
--- a/emulators/x48/patches/patch-ab
+++ b/emulators/x48/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/04/27 14:56:27 agc Exp $
+$NetBSD: patch-ab,v 1.2 2010/01/30 00:02:54 joerg Exp $
 
 --- src/Imakefile.orig	Sun Feb  4 18:31:52 2001
 +++ src/Imakefile
@@ -42,10 +42,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/04/27 14:56:27 agc Exp $
 +NormalProgramTarget(checkrom, $(OBJS3),,,)
 +NormalProgramTarget(mkcard, $(OBJS4),,,)
 +
-+InstallProgram(x48, $(BINDIR))
-+InstallProgram(dump2rom, $(BINDIR))
-+InstallProgram(checkrom, $(BINDIR))
-+InstallProgram(mkcard, $(BINDIR))
++InstallProgram(x48,$(BINDIR))
++InstallProgram(dump2rom,$(BINDIR))
++InstallProgram(checkrom,$(BINDIR))
++InstallProgram(mkcard,$(BINDIR))
  
  InstallAppDefaults(X48)
  
diff --git a/graphics/wmphoto/Makefile b/graphics/wmphoto/Makefile
index 040da49f401..a0499ee08d6 100644
--- a/graphics/wmphoto/Makefile
+++ b/graphics/wmphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:38 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/01/29 23:50:26 joerg Exp $
 #
 
 DISTNAME=	wmphoto-0.3a
@@ -10,15 +10,18 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.dcc.uchile.cl/~amartoq/wmphoto/
 COMMENT=	Dock-app that can show you a photo
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_DIRS=	wmphoto
 USE_X11BASE=	YES
 USE_TOOLS+=	gmake
 MAKE_ENV+=	X11PREFIX=${X11PREFIX:Q} X11BASE=${X11BASE:Q}
 
+INSTALLATION_DIRS+=	bin share/doc/wmphoto
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmphoto
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmphoto
-	${INSTALL_DATA} ${WRKSRC}/HINTS ${PREFIX}/share/doc/wmphoto
+	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/HINTS \
+	    ${DESTDIR}${PREFIX}/share/doc/wmphoto
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/graphics/wmphoto/distinfo b/graphics/wmphoto/distinfo
index 830110686e7..f2fbf3778a2 100644
--- a/graphics/wmphoto/distinfo
+++ b/graphics/wmphoto/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/11/03 22:12:36 rillig Exp $
+$NetBSD: distinfo,v 1.4 2010/01/29 23:50:26 joerg Exp $
 
 SHA1 (wmphoto-0.3a.tar.gz) = dbec1ddd49671bc915b6e9ce37462247557f7fb9
 RMD160 (wmphoto-0.3a.tar.gz) = 64b0006b90d187ec01da32f1bc9b7607d19f4330
 Size (wmphoto-0.3a.tar.gz) = 19320 bytes
-SHA1 (patch-aa) = 952c53a00cb6a73e4b780e9d643144c394c7d6af
+SHA1 (patch-aa) = fc65409f609cf4484abf13a72437dd8e7fe77e5b
diff --git a/graphics/wmphoto/patches/patch-aa b/graphics/wmphoto/patches/patch-aa
index 6421e111609..ae101d16bca 100644
--- a/graphics/wmphoto/patches/patch-aa
+++ b/graphics/wmphoto/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2005/11/03 22:12:36 rillig Exp $
+$NetBSD: patch-aa,v 1.3 2010/01/29 23:50:26 joerg Exp $
 
 --- wmphoto/Makefile.orig	Wed Mar 28 10:09:18 2001
 +++ wmphoto/Makefile	Wed Mar 28 10:15:59 2001
@@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.2 2005/11/03 22:12:36 rillig Exp $
 -	cp $(APP) $(INSTALL)
 -	chown root.root $(APP)
 -	chmod 755 $(APP)
-+	install -s -c $(APP) ${X11PREFIX}/bin
++	${BSD_INSTALL_PROGRAM} $(APP) ${DESTDIR}${X11PREFIX}/bin
  
  clean::
  	for i in $(OBJS) ; do \
diff --git a/graphics/xplot-devel/Makefile b/graphics/xplot-devel/Makefile
index 21fad56b3b3..2c43e5e67cd 100644
--- a/graphics/xplot-devel/Makefile
+++ b/graphics/xplot-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/02/01 16:08:21 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/01/29 23:54:31 joerg Exp $
 
 DISTNAME=	xplot-0.90.8
 PKGREVISION=	1
@@ -9,16 +9,21 @@ HOMEPAGE=	http://www.xplot.org/
 MAINTAINER=	gdt@NetBSD.org
 COMMENT=	Plotting program (development snapshot)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 
 DOCFILES=	ANNOUNCE README README.tcp_plots \
 		demo.0 demo.1 demo.2 demo.3 demo.4 demo.5 demo.6 demo.7
 
+INSTALLATION_DIRS+=	share/doc/xplot
+INSTALL_MAKE_FLAGS+=	bindir=${DESTDIR}${PREFIX}/bin \
+			mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 \
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xplot
 .for file in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/xplot
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/share/doc/xplot
 .endfor
 
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/ham/tlf/Makefile b/ham/tlf/Makefile
index dce8f9abd0a..2a840380294 100644
--- a/ham/tlf/Makefile
+++ b/ham/tlf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/12/27 06:47:30 wulf Exp $
+# $NetBSD: Makefile,v 1.15 2010/01/29 23:54:50 joerg Exp $
 #
 
 DISTNAME=	tlf-0.9.30
@@ -9,6 +9,8 @@ MAINTAINER=	wulf@NetBSD.org
 HOMEPAGE=	http://home.iae.nl/users/reinc/TLF-0.2.html
 COMMENT=	Advanced hamradio logging and contest program
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_NCURSES=	yes
 USE_TOOLS+=	gmake msgfmt
 GNU_CONFIGURE=	yes
@@ -17,6 +19,8 @@ PTHREAD_AUTO_VARS=	yes
 
 CONFIGURE_ARGS+=	--enable-hamlib
 
+INSTALLATION_DIRS+=	share/tlf
+
 post-patch:
 	${ECHO} SC_DEVICE=/dev/tty00 >> ${WRKSRC:Q}/share/logcfg.dat
 
diff --git a/ham/tlf/distinfo b/ham/tlf/distinfo
index 0ddd75cfb77..c03399e804d 100644
--- a/ham/tlf/distinfo
+++ b/ham/tlf/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.5 2006/12/27 06:40:29 wulf Exp $
+$NetBSD: distinfo,v 1.6 2010/01/29 23:54:50 joerg Exp $
 
 SHA1 (tlf-0.9.30.tar.gz) = 11e5d694c1b73c746b0d15b3e975f05fd55b7754
 RMD160 (tlf-0.9.30.tar.gz) = d7b952fa202dbe1a3061f653b1eb698ea36188e6
 Size (tlf-0.9.30.tar.gz) = 390608 bytes
 SHA1 (patch-aa) = 0587a3f36bf0a6620c70a5d3290d6d5384c8c092
+SHA1 (patch-ab) = 4cb7a8ed026d2a9bfed5dbe3ea6ce3d275ffc621
+SHA1 (patch-ac) = dca763b7c9da4ed936fe686972d93f139d99c2e7
+SHA1 (patch-ad) = 8d980f329644f91c2a2b33bd7af9f7f1f75e22c5
+SHA1 (patch-ae) = 4b9203a3e20bba5a074c681dc6b02f827aceca75
diff --git a/ham/tlf/patches/patch-ab b/ham/tlf/patches/patch-ab
new file mode 100644
index 00000000000..ad701c0fb32
--- /dev/null
+++ b/ham/tlf/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2010/01/29 23:54:51 joerg Exp $
+
+--- scripts/Makefile.in.orig	2010-01-29 23:48:05.000000000 +0000
++++ scripts/Makefile.in
+@@ -284,7 +284,7 @@ uninstall-am: uninstall-info-am
+ 
+ 
+ install-exec-local:
+-	install soundlog $(bindir)
++	install soundlog ${DESTDIR}$(bindir)
+ 
+ uninstall:
+ 	rm -f $(bindir)/soundlog
diff --git a/ham/tlf/patches/patch-ac b/ham/tlf/patches/patch-ac
new file mode 100644
index 00000000000..4d2fe3ea450
--- /dev/null
+++ b/ham/tlf/patches/patch-ac
@@ -0,0 +1,27 @@
+$NetBSD: patch-ac,v 1.1 2010/01/29 23:54:51 joerg Exp $
+
+--- share/Makefile.in.orig	2010-01-29 23:48:53.000000000 +0000
++++ share/Makefile.in
+@@ -286,14 +286,14 @@ uninstall-am: uninstall-info-am
+ 
+ 
+ install-data-local:
+-	install -m 0644 callmaster $(pkgdatadir)
+-	install -m 0644 cty.dat $(pkgdatadir)
+-	install -m 0644 logcfg.dat $(pkgdatadir)
+-	install -m 0644 arrlsections $(pkgdatadir)
+-	install -m 0644 ea_sections $(pkgdatadir)
+-	install -m 0644 paccmults $(pkgdatadir)
+-	install -m 0644 spdxmults $(pkgdatadir)
+-	install -m 0644 ssamults $(pkgdatadir)
++	install -m 0644 callmaster ${DESTDIR}$(pkgdatadir)
++	install -m 0644 cty.dat ${DESTDIR}$(pkgdatadir)
++	install -m 0644 logcfg.dat ${DESTDIR}$(pkgdatadir)
++	install -m 0644 arrlsections ${DESTDIR}$(pkgdatadir)
++	install -m 0644 ea_sections ${DESTDIR}$(pkgdatadir)
++	install -m 0644 paccmults ${DESTDIR}$(pkgdatadir)
++	install -m 0644 spdxmults ${DESTDIR}$(pkgdatadir)
++	install -m 0644 ssamults ${DESTDIR}$(pkgdatadir)
+ 
+ uninstall:
+ 	rm -rf $(pkgdatadir)
diff --git a/ham/tlf/patches/patch-ad b/ham/tlf/patches/patch-ad
new file mode 100644
index 00000000000..0e0d5fd0294
--- /dev/null
+++ b/ham/tlf/patches/patch-ad
@@ -0,0 +1,45 @@
+$NetBSD: patch-ad,v 1.1 2010/01/29 23:54:51 joerg Exp $
+
+--- rules/Makefile.in.orig	2010-01-29 23:51:09.000000000 +0000
++++ rules/Makefile.in
+@@ -445,23 +445,23 @@ uninstall-info: uninstall-info-recursive
+ 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(pkgdatadir)/rules
+-	install -m 0644 arrldx_dx $(pkgdatadir)/rules
+-	install -m 0644 arrldx_usa $(pkgdatadir)/rules
+-	install -m 0644 arrlfd $(pkgdatadir)/rules
+-	install -m 0644 arrlss $(pkgdatadir)/rules
+-	install -m 0644 cqww $(pkgdatadir)/rules
+-	install -m 0644 dxped $(pkgdatadir)/rules
+-	install -m 0644 eusprint $(pkgdatadir)/rules
+-	install -m 0644 lzdx $(pkgdatadir)/rules
+-	install -m 0644 pacc_pa $(pkgdatadir)/rules
+-	install -m 0644 pacc_dx $(pkgdatadir)/rules
+-	install -m 0644 qso $(pkgdatadir)/rules
+-	install -m 0644 spdx_dx $(pkgdatadir)/rules
+-	install -m 0644 spdx_sp $(pkgdatadir)/rules
+-	install -m 0644 ssa_mt $(pkgdatadir)/rules
+-	install -m 0644 template $(pkgdatadir)/rules
+-	install -m 0644 wpx $(pkgdatadir)/rules
++	$(mkinstalldirs) ${DESTDIR}$(pkgdatadir)/rules
++	install -m 0644 arrldx_dx ${DESTDIR}$(pkgdatadir)/rules
++	install -m 0644 arrldx_usa ${DESTDIR}$(pkgdatadir)/rules
++	install -m 0644 arrlfd ${DESTDIR}$(pkgdatadir)/rules
++	install -m 0644 arrlss ${DESTDIR}$(pkgdatadir)/rules
++	install -m 0644 cqww ${DESTDIR}$(pkgdatadir)/rules
++	install -m 0644 dxped ${DESTDIR}$(pkgdatadir)/rules
++	install -m 0644 eusprint ${DESTDIR}$(pkgdatadir)/rules
++	install -m 0644 lzdx ${DESTDIR}$(pkgdatadir)/rules
++	install -m 0644 pacc_pa ${DESTDIR}$(pkgdatadir)/rules
++	install -m 0644 pacc_dx ${DESTDIR}$(pkgdatadir)/rules
++	install -m 0644 qso ${DESTDIR}$(pkgdatadir)/rules
++	install -m 0644 spdx_dx ${DESTDIR}$(pkgdatadir)/rules
++	install -m 0644 spdx_sp ${DESTDIR}$(pkgdatadir)/rules
++	install -m 0644 ssa_mt ${DESTDIR}$(pkgdatadir)/rules
++	install -m 0644 template ${DESTDIR}$(pkgdatadir)/rules
++	install -m 0644 wpx ${DESTDIR}$(pkgdatadir)/rules
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/ham/tlf/patches/patch-ae b/ham/tlf/patches/patch-ae
new file mode 100644
index 00000000000..949e0705c92
--- /dev/null
+++ b/ham/tlf/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2010/01/29 23:54:51 joerg Exp $
+
+--- doc/Makefile.in.orig	2010-01-29 23:52:01.000000000 +0000
++++ doc/Makefile.in
+@@ -285,8 +285,8 @@ uninstall-am: uninstall-info-am
+ 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(pkgdatadir)/doc
+-	install -m 0644 README $(pkgdatadir)/doc
++	$(mkinstalldirs) ${DESTDIR}$(pkgdatadir)/doc
++	install -m 0644 README ${DESTDIR}$(pkgdatadir)/doc
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: