DESTDIR support

13 files changed, 73 insertions, 30 deletions

diff --git a/audio/trm/Makefile b/audio/trm/Makefile
index ea04de478c1..4df16c170a2 100644
--- a/audio/trm/Makefile
+++ b/audio/trm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/07/01 11:59:01 chris Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/01 01:50:04 joerg Exp $
 #
 
 DISTNAME=	trm-0.2.1
@@ -10,6 +10,8 @@ MAINTAINER=	chris@NetBSD.org
 HOMEPAGE=	http://www.musicbrainz.org/products/trmgen/download.html
 COMMENT=	Acoustic signature generator
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	tunepimp-[0-9]*
 
 PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -20,6 +22,8 @@ USE_LANGUAGES=		c c++
 AUTOMAKE_REQD=	1.6.3
 USE_TOOLS+=	automake aclocal autoheader autoconf
 
+INSTALLATION_DIRS+=	bin
+
 pre-configure:
 	set -e; cd ${WRKSRC}; \
 	aclocal; autoheader; automake -a --foreign -i; autoconf
diff --git a/audio/trm/distinfo b/audio/trm/distinfo
index ecd14981c1c..fdacf34d2a1 100644
--- a/audio/trm/distinfo
+++ b/audio/trm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2007/07/01 11:59:01 chris Exp $
+$NetBSD: distinfo,v 1.4 2010/02/01 01:50:04 joerg Exp $
 
 SHA1 (trm-0.2.1.tar.gz) = ea032c38ca83266026e0c10919749814282994e9
 RMD160 (trm-0.2.1.tar.gz) = fb74d692920af62a7fcbbacfb32cd0e277e56126
 Size (trm-0.2.1.tar.gz) = 131349 bytes
 SHA1 (patch-aa) = 152a7b8503ca887c641aeedfdd78f2520b88763b
 SHA1 (patch-ab) = 909c55da818a72b687c88c69a4e8d682f5a02df5
-SHA1 (patch-ac) = 980651e3f8b196575c09aa99cf33e9ce008a708f
+SHA1 (patch-ac) = a189db1a7b5b85baa0cd813e10869146045303c7
diff --git a/audio/trm/patches/patch-ac b/audio/trm/patches/patch-ac
index 5e82f0b1795..8b2a7121cfc 100644
--- a/audio/trm/patches/patch-ac
+++ b/audio/trm/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2007/07/01 11:59:01 chris Exp $
+$NetBSD: patch-ac,v 1.2 2010/02/01 01:50:04 joerg Exp $
 
 --- ./Makefile.am.orig	2007-07-01 12:27:37.000000000 +0100
 +++ ./Makefile.am
@@ -7,4 +7,4 @@ $NetBSD: patch-ac,v 1.1 2007/07/01 11:59:01 chris Exp $
  
  install:
 -	$(INSTALL) -s -m 0655 trm $(prefix)/bin	
-+	$(INSTALL) -s -m 0755 trm $(prefix)/bin	
++	$(INSTALL) -s -m 0755 trm ${DESTDIR}$(prefix)/bin	
diff --git a/audio/ubs/Makefile b/audio/ubs/Makefile
index 087f8464ad6..da230e71b75 100644
--- a/audio/ubs/Makefile
+++ b/audio/ubs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/07/04 20:54:31 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2010/02/01 01:51:50 joerg Exp $
 #
 
 DISTNAME=		ubs-0.17
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 # HOMEPAGE=		http://aboleo.net/software/ubs/
 COMMENT=		Uninterrupted Broadcasting System
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 
 RCD_SCRIPTS=		ubs
diff --git a/audio/ubs/distinfo b/audio/ubs/distinfo
index 2abcc92de2e..331ca208a12 100644
--- a/audio/ubs/distinfo
+++ b/audio/ubs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2006/07/02 09:53:00 rillig Exp $
+$NetBSD: distinfo,v 1.4 2010/02/01 01:51:50 joerg Exp $
 
 SHA1 (ubs-0.17.tar.gz) = f0f67d437e4c5c7026b2f05d1aaff53688eb3253
 RMD160 (ubs-0.17.tar.gz) = 4e0e46bb8346f0c86989b0b33973000bbb86f1aa
 Size (ubs-0.17.tar.gz) = 372222 bytes
-SHA1 (patch-aa) = 4a5690fa3e7a8dc1dc50329bf844199575a09319
+SHA1 (patch-aa) = 466b0809dfc5df30bc77282e6ea2caa6f8d46ab7
 SHA1 (patch-ab) = 88d06fca850e7bf2d38ad587021e4352c96cc89b
 SHA1 (patch-ac) = af22e0ca907b22eedb86e79ce2e81e4fb87283e9
diff --git a/audio/ubs/patches/patch-aa b/audio/ubs/patches/patch-aa
index f849cf94d5e..875d403c6df 100644
--- a/audio/ubs/patches/patch-aa
+++ b/audio/ubs/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/04/05 11:46:11 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2010/02/01 01:51:50 joerg Exp $
 
 --- Makefile.in.orig	2003-10-31 05:49:58.000000000 +0100
 +++ Makefile.in	2003-10-31 05:50:52.000000000 +0100
@@ -7,16 +7,18 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/04/05 11:46:11 xtraeme Exp $
  
  install-data-local:
 -	$(mkinstalldirs) $(prefix)/etc
- 	$(mkinstalldirs) $(prefix)/include
+-	$(mkinstalldirs) $(prefix)/include
 -	$(mkinstalldirs) $(prefix)/log
 -	$(mkinstalldirs) $(prefix)/tmp
 -	$(mkinstalldirs) $(prefix)/var
-+	$(mkinstalldirs) $(datadir)/examples/ubs
++	$(mkinstalldirs) ${DESTDIR}$(prefix)/include
++	$(mkinstalldirs) ${DESTDIR}$(datadir)/examples/ubs
  
 -	$(INSTALL_DATA) config/help.conf $(prefix)/etc
 -	$(INSTALL_DATA) config/ubs.conf.default $(prefix)/etc
-+	$(INSTALL_DATA) config/help.conf $(datadir)/examples/ubs
-+	$(INSTALL_DATA) config/ubs.conf.default $(datadir)/examples/ubs
++	$(INSTALL_DATA) config/help.conf ${DESTDIR}$(datadir)/examples/ubs
++	$(INSTALL_DATA) config/ubs.conf.default ${DESTDIR}$(datadir)/examples/ubs
  
- 	$(INSTALL_DATA) include/*.h $(prefix)/include
+-	$(INSTALL_DATA) include/*.h $(prefix)/include
++	$(INSTALL_DATA) include/*.h ${DESTDIR}$(prefix)/include
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile
index 6a176f37fd6..c409fca2045 100644
--- a/audio/wsoundprefs/Makefile
+++ b/audio/wsoundprefs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2010/01/18 09:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2010/02/01 02:00:32 joerg Exp $
 
 DISTNAME=	WSoundPrefs-1.1.1
 PKGNAME=	wsoundprefs-1.1.1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://shadowmere.student.utwente.nl/
 COMMENT=	WSoundServer configuration utility
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_IMAKE=		yes
 BROKEN_GETTEXT_DETECTION=	yes
 
diff --git a/audio/wsoundprefs/distinfo b/audio/wsoundprefs/distinfo
index 4ed08098ed2..fcb15b3f1d4 100644
--- a/audio/wsoundprefs/distinfo
+++ b/audio/wsoundprefs/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 20:39:53 agc Exp $
+$NetBSD: distinfo,v 1.8 2010/02/01 02:00:32 joerg Exp $
 
 SHA1 (WSoundPrefs-1.1.1.tar.gz) = 444571543e7a076cc49ee484dbcfd0aefc184316
 RMD160 (WSoundPrefs-1.1.1.tar.gz) = c9793dd9c6b100f9de3fa9b2771c684ac890016e
 Size (WSoundPrefs-1.1.1.tar.gz) = 32042 bytes
-SHA1 (patch-aa) = 8ae650bc0a79ee02dbbefc5519eff735a02a722b
-SHA1 (patch-ab) = 8daeb7657ba5518d730ec88ff73da5a577fd5710
+SHA1 (patch-aa) = ef58a08d3687e339502a985e106639c0702226bf
+SHA1 (patch-ab) = 336ae3b74f1b3541f180f186ea9591348eb51af1
 SHA1 (patch-ac) = 592155f98fa0b51690e766eb75bde69531313533
 SHA1 (patch-ad) = 5d37585aea3950f2d01d66333cbd6fd59d3a42c8
 SHA1 (patch-ae) = 675b6b8039016f99b7bdb744eb01747f5f5f8c31
 SHA1 (patch-af) = 9b60b779af703075058f8a88669cae70a5eecddb
 SHA1 (patch-ag) = ec0c1a3c2223b9728fa69f85547cce6b12177c06
+SHA1 (patch-ah) = 7346f4b9f65782606b61bb0e5e7b52f5134a02c5
+SHA1 (patch-ai) = 806866b0efebdd19ff6b5aedbcf0c534ab581dc4
diff --git a/audio/wsoundprefs/patches/patch-aa b/audio/wsoundprefs/patches/patch-aa
index 67520551a16..782fba74392 100644
--- a/audio/wsoundprefs/patches/patch-aa
+++ b/audio/wsoundprefs/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2001/03/12 21:19:10 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2010/02/01 02:00:32 joerg Exp $
 
---- Imakefile.orig	Fri Mar 31 16:16:47 2000
+--- Imakefile.orig	2000-03-31 14:16:47.000000000 +0000
 +++ Imakefile
-@@ -6,15 +6,16 @@
+@@ -6,15 +6,14 @@ XCOMM Specify Your Installation Prefix H
  XCOMM Installation Path: $(PREFIX)/Apps/WSoundPrefs.app
  XCOMM -------------------------------------------------
  XCOMM PREFIX = /usr/GNUstep/Local
 -PREFIX = /usr/local/GNUstep
-+XCOMM PREFIX = /usr/local/GNUstep
++PREFIX := ${PREFIX}/GNUstep
  
  
  XCOMM CDEBUGFLAGS = -Wall -ggdb -DDEBUG
@@ -18,7 +18,6 @@ $NetBSD: patch-aa,v 1.3 2001/03/12 21:19:10 wiz Exp $
  SUBDIRS = src
  
 -DESTDIR = $(PREFIX)
-+DESTDIR = $(PREFIX)/GNUstep
- 
+-
  MakeSubdirs($(SUBDIRS))
  DependSubdirs($(SUBDIRS))
diff --git a/audio/wsoundprefs/patches/patch-ab b/audio/wsoundprefs/patches/patch-ab
index 8446c456446..419d9b5bbb8 100644
--- a/audio/wsoundprefs/patches/patch-ab
+++ b/audio/wsoundprefs/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.7 2002/08/31 03:08:59 wiz Exp $
+$NetBSD: patch-ab,v 1.8 2010/02/01 02:00:32 joerg Exp $
 
---- src/Imakefile.orig	Mon Oct 18 01:35:58 1999
+--- src/Imakefile.orig	1999-10-18 08:35:58.000000000 +0000
 +++ src/Imakefile
-@@ -30,7 +30,7 @@
+@@ -7,7 +7,7 @@ ICONS = WSoundPrefs.xpm WSoundPrefs.tiff
+ 
+ CC = gcc
+ 
+-BINDIR = /Apps/WSoundPrefs.app
++BINDIR = ${PREFIX}/GNUstep/Apps/WSoundPrefs.app
+ 
+ XCOMM EFENCELIB = -lefence
+ EFENCELIB =
+@@ -30,7 +30,7 @@ LINTLIBS = $(LINTXLIB)
  SRCS = PLFunctions.c SoundEvents.c SoundPaths.c SystemInfo.c WSoundPrefs.c main.c
  OBJS = PLFunctions.o SoundEvents.o SoundPaths.o SystemInfo.o WSoundPrefs.o main.o
  
diff --git a/audio/wsoundprefs/patches/patch-ah b/audio/wsoundprefs/patches/patch-ah
new file mode 100644
index 00000000000..3f6fdcea190
--- /dev/null
+++ b/audio/wsoundprefs/patches/patch-ah
@@ -0,0 +1,10 @@
+$NetBSD: patch-ah,v 1.1 2010/02/01 02:00:32 joerg Exp $
+
+--- src/tiff/Imakefile.orig	2010-02-01 01:58:13.000000000 +0000
++++ src/tiff/Imakefile
+@@ -1,4 +1,4 @@
+-TIFFDIR = /Apps/WSoundPrefs.app/tiff/
++TIFFDIR = ${PREFIX}/GNUstep/Apps/WSoundPrefs.app/tiff/
+ 
+ TIFFS = loadset.tiff saveset.tiff
+ 
diff --git a/audio/wsoundprefs/patches/patch-ai b/audio/wsoundprefs/patches/patch-ai
new file mode 100644
index 00000000000..eae87838568
--- /dev/null
+++ b/audio/wsoundprefs/patches/patch-ai
@@ -0,0 +1,10 @@
+$NetBSD: patch-ai,v 1.1 2010/02/01 02:00:32 joerg Exp $
+
+--- src/xpm/Imakefile.orig	2010-02-01 01:58:31.000000000 +0000
++++ src/xpm/Imakefile
+@@ -1,4 +1,4 @@
+-XPMDIR = /Apps/WSoundPrefs.app/xpm/
++XPMDIR = ${PREFIX}/GNUstep/Apps/WSoundPrefs.app/xpm/
+ 
+ XPMS = loadset.xpm saveset.xpm
+ 
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 1890da3061d..8c2c5613e09 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/02/01 02:01:59 joerg Exp $
 #
 
 DISTNAME=	WSoundServer-0.4.0
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://shadowmere.student.utwente.nl/
 COMMENT=	Sound server for windowmaker
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
@@ -26,6 +28,8 @@ SUBST_MESSAGE.1x=	Changing the man page category from 1x to 1.
 SUBST_FILES.1x=		doc/*
 SUBST_SED.1x=		-e s,1x,1,g
 
+INSTALLATION_DIRS+=	${EGDIR}
+
 post-patch:
 	set -e;								\
 	cd ${WRKSRC:Q}/doc;						\
@@ -38,8 +42,7 @@ post-patch:
 		${FILESDIR:Q}/WMSound > ${WRKSRC:Q}/WMSound
 
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR:Q}
-	${INSTALL_DATA} ${WRKSRC:Q}/WMSound ${EGDIR:Q}
+	${INSTALL_DATA} ${WRKSRC:Q}/WMSound ${DESTDIR}${EGDIR}
 
 .include "../../mk/bsd.prefs.mk"