user-destdir support

8 files changed, 52 insertions, 32 deletions

diff --git a/audio/xmms-dflowers/Makefile b/audio/xmms-dflowers/Makefile
index acd343cc151..2e82699b435 100644
--- a/audio/xmms-dflowers/Makefile
+++ b/audio/xmms-dflowers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/10/04 20:44:20 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2009/07/08 15:15:15 joerg Exp $
 #
 
 DISTNAME=	dflowers-1.2
@@ -12,7 +12,11 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 # AWOL
 COMMENT=	XMMS plugin for dual flower scope
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LIBTOOL=		YES
 
+INSTALLATION_DIRS=	lib/xmms/Visualization
+
 .include "../../audio/xmms/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dflowers/distinfo b/audio/xmms-dflowers/distinfo
index 8ac28bc62c2..86aa41df80b 100644
--- a/audio/xmms-dflowers/distinfo
+++ b/audio/xmms-dflowers/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:54 agc Exp $
+$NetBSD: distinfo,v 1.6 2009/07/08 15:15:15 joerg Exp $
 
 SHA1 (dflowers-1.2.tar.gz) = 5f7b518652a6df3677fdeaffa5014ad0171dd426
 RMD160 (dflowers-1.2.tar.gz) = 40fc89003846f180ca3b803c1ac1eade9c428e80
 Size (dflowers-1.2.tar.gz) = 47953 bytes
-SHA1 (patch-aa) = 23999676cc61311cfc69206e67653c6a01e4f1e5
+SHA1 (patch-aa) = 8d6d6d4bf513fe19f4886a4220437ccc87ea17e4
diff --git a/audio/xmms-dflowers/patches/patch-aa b/audio/xmms-dflowers/patches/patch-aa
index bfaed568310..58e5272a9c2 100644
--- a/audio/xmms-dflowers/patches/patch-aa
+++ b/audio/xmms-dflowers/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2002/09/21 01:32:23 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2009/07/08 15:15:15 joerg Exp $
 
 --- Makefile.orig	Sat Jun  9 14:37:36 2001
 +++ Makefile
@@ -49,8 +49,9 @@ $NetBSD: patch-aa,v 1.4 2002/09/21 01:32:23 jlam Exp $
 -install:
 -	install libdflowers.so $(INSTALL-DIR)
 +install: libdflowers.la
-+	${LIBTOOL} install libdflowers.la $(INSTALL-DIR)
- 	mkdir -p $(XMMS_DATADIR)/$(THEME_SUBDIR)
++	${LIBTOOL} install libdflowers.la ${DESTDIR}$(INSTALL-DIR)
+-	mkdir -p $(XMMS_DATADIR)/$(THEME_SUBDIR)
++	mkdir -p ${DESTDIR}$(XMMS_DATADIR)/$(THEME_SUBDIR)
 -	install bg_*.xpm $(XMMS_DATADIR)/$(THEME_SUBDIR)
-+	$(BSD_INSTALL_DATA) bg_*.xpm $(XMMS_DATADIR)/$(THEME_SUBDIR)
++	$(BSD_INSTALL_DATA) bg_*.xpm ${DESTDIR}$(XMMS_DATADIR)/$(THEME_SUBDIR)
 +
diff --git a/biology/gp/Makefile b/biology/gp/Makefile
index 2e33a446b96..7bac9653c3a 100644
--- a/biology/gp/Makefile
+++ b/biology/gp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/03/24 19:21:19 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/08 15:14:44 joerg Exp $
 #
 
 DISTNAME=	gp-0.26
@@ -10,6 +10,8 @@ MAINTAINER=	hdp@cs.nmsu.edu
 HOMEPAGE=	http://www.bioinformatics.org/genpak/
 COMMENT=	Manipulate DNA/RNA sequence in a Unix fashion
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/biology/gp/distinfo b/biology/gp/distinfo
index da271702d98..311fe563891 100644
--- a/biology/gp/distinfo
+++ b/biology/gp/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/22 21:28:55 agc Exp $
+$NetBSD: distinfo,v 1.5 2009/07/08 15:14:44 joerg Exp $
 
 SHA1 (gp-0.26.tgz) = 18107463df9bb33d12cc0f0fc6a6f17985492666
 RMD160 (gp-0.26.tgz) = 2195e47a09444d7454d3f1314f6b128600fc18ed
 Size (gp-0.26.tgz) = 141159 bytes
-SHA1 (patch-aa) = 7528c2809554103c7a88c1dfff506aaeb78f6607
+SHA1 (patch-aa) = bea23d059905d70af9f86158f35e3eb1f58dc39e
 SHA1 (patch-ab) = ce6ec76011f18a9a86b8c65ba5541848e298e27a
diff --git a/biology/gp/patches/patch-aa b/biology/gp/patches/patch-aa
index 234905d8e77..82c18b7d69c 100644
--- a/biology/gp/patches/patch-aa
+++ b/biology/gp/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2004/08/23 14:41:06 ben Exp $
+$NetBSD: patch-aa,v 1.4 2009/07/08 15:14:45 joerg Exp $
 
---- Makefile.orig	Thu May 17 12:27:07 2001
+--- Makefile.orig	2001-05-17 21:27:07.000000000 +0200
 +++ Makefile
 @@ -5,20 +5,20 @@
  ######################################################################
@@ -35,29 +35,37 @@ $NetBSD: patch-aa,v 1.3 2004/08/23 14:41:06 ben Exp $
  
  # documentation. 
  # If you want to install documents automagically, type:
-@@ -67,16 +67,16 @@ clean:
+@@ -67,18 +67,18 @@ clean:
  	-cd src/ ; rm $(PROGRAMS) core
  
  install: all 
 -	@if [ ! -O "$(BINDIR)" ] ; then \
 -	echo "File $(BINDIR) doesn't belong to you!" ;  exit 1 ; fi 
-+#	@if [ ! -O "$(BINDIR)" ] ; then \
-+#	echo "File $(BINDIR) doesn't belong to you!" ;  exit 1 ; fi 
- 	@cd src ; cp $(PROGRAMS) $(BINDIR)
- 
+-	@cd src ; cp $(PROGRAMS) $(BINDIR)
+-
 -	@if [ ! -O "$(MANDIR)" ] ; then \
 -	echo "File $(MANDIR) doesn't belong to you!" ;  exit 1 ; fi 
-+#	@if [ ! -O "$(MANDIR)" ] ; then \
-+#	echo "File $(MANDIR) doesn't belong to you!" ;  exit 1 ; fi 
- 	@cd man1 ; cp $(MANUALS) $(MANDIR)/man1
- 
+-	@cd man1 ; cp $(MANUALS) $(MANDIR)/man1
+-
 -	@if [ ! -O "$(DATADIR)" ] ; then \
 -	echo "File $(DATADIR) doesn't belong to you!" ;  exit 1 ; fi 
+-	-cd $(DATADIR) ; mkdir genpak ; 
+-	@cd data ; cp -i $(DATAFILES) $(DATADIR)/genpak
++#	@if [ ! -O "$(BINDIR)" ] ; then \
++#	echo "File $(BINDIR) doesn't belong to you!" ;  exit 1 ; fi 
++	@cd src ; ${BSD_INSTALL_PROGRAM} $(PROGRAMS) ${DESTDIR}$(BINDIR)
++
++#	@if [ ! -O "$(MANDIR)" ] ; then \
++#	echo "File $(MANDIR) doesn't belong to you!" ;  exit 1 ; fi 
++	@cd man1 ; ${BSD_INSTALL_MAN} $(MANUALS) ${DESTDIR}$(MANDIR)/man1
++
 +#	@if [ ! -O "$(DATADIR)" ] ; then \
 +#	echo "File $(DATADIR) doesn't belong to you!" ;  exit 1 ; fi 
- 	-cd $(DATADIR) ; mkdir genpak ; 
- 	@cd data ; cp -i $(DATAFILES) $(DATADIR)/genpak
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(DATADIR)/genpak ; 
++	@cd data ; ${BSD_INSTALL_DATA} $(DATAFILES) ${DESTDIR}$(DATADIR)/genpak
  
+ 	@echo
+ 	@echo Installation is now complete. Type 
 @@ -99,26 +99,26 @@ filelist:
  		echo "$(DATADIR)/genpak/"$$i >> FILES.TXT ; done
  
diff --git a/biology/hmmer/Makefile b/biology/hmmer/Makefile
index b64cc6350f0..a02dad9a997 100644
--- a/biology/hmmer/Makefile
+++ b/biology/hmmer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/05/16 23:28:13 zafer Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/08 15:20:04 joerg Exp $
 #
 
 DISTNAME=		hmmer-2.3.2
@@ -10,6 +10,7 @@ HOMEPAGE=		http://hmmer.janelia.org/
 COMMENT=		Implementation of profile HMM software for protein sequence analysis
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 
diff --git a/biology/hmmer/patches/patch-aa b/biology/hmmer/patches/patch-aa
index 0077f6cffd5..cd1632b55fe 100644
--- a/biology/hmmer/patches/patch-aa
+++ b/biology/hmmer/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2004/08/23 14:37:04 ben Exp $
+$NetBSD: patch-aa,v 1.4 2009/07/08 15:20:04 joerg Exp $
 
---- Makefile.in.orig	Fri Jun 13 14:05:13 2003
+--- Makefile.in.orig	2003-10-04 21:01:16.000000000 +0200
 +++ Makefile.in
 @@ -30,11 +30,12 @@ prefix      = @prefix@
  exec_prefix = @exec_prefix@
@@ -16,20 +16,24 @@ $NetBSD: patch-aa,v 1.3 2004/08/23 14:37:04 ben Exp $
  MANSUFFIX = 1
  
  # your compiler and compiler flags
-@@ -109,10 +110,10 @@ src/libhmmer.a: 
+@@ -109,13 +110,13 @@ src/libhmmer.a: 
  #          installs man pages in MANDIR/man1/  (e.g. if MANSUFFIX is 1)
  #          Creates these directories if they don't exist.
  install: 
 -	mkdir -p ${BINDIR}
 -	-mkdir -p ${MANDIR}/man${MANSUFFIX}
-+	${MKDIR} ${BINDIR}
-+	-${MKDIR} ${MANDIR}/man${MANSUFFIX}
++	${MKDIR} ${DESTDIR}${BINDIR}
++	-${MKDIR} ${DESTDIR}${MANDIR}/man${MANSUFFIX}
  	for file in $(PROGS) $(PVMPROGS); do\
 -	   cp src/$$file $(BINDIR)/;\
-+	   $(INSTBIN) src/$$file $(BINDIR)/;\
++	   $(INSTBIN) src/$$file ${DESTDIR}$(BINDIR)/;\
  	done
  	-for file in hmmer $(PROGS); do\
- 	   $(INSTMAN) documentation/man/$$file.man $(MANDIR)/man$(MANSUFFIX)/$$file.$(MANSUFFIX);\
+-	   $(INSTMAN) documentation/man/$$file.man $(MANDIR)/man$(MANSUFFIX)/$$file.$(MANSUFFIX);\
++	   $(INSTMAN) documentation/man/$$file.man ${DESTDIR}$(MANDIR)/man$(MANSUFFIX)/$$file.$(MANSUFFIX);\
+ 	done
+ 
+ # uninstall: Reverses the steps of "make install".
 @@ -133,7 +134,7 @@ uninstall: 
  #          subdir, remove everything but binaries and Makefiles.
  #
@@ -48,7 +52,7 @@ $NetBSD: patch-aa,v 1.3 2004/08/23 14:37:04 ben Exp $
  	cp ssdk/rmanprocess.pl ${BASENAME}-${RELEASE}/ssdk/
  	# 
  	# Make the configure scripts from configure.ac
-@@ -293,7 +294,7 @@ dist:	
+@@ -288,7 +289,7 @@ dist:	
  #               directory.
  #
  ftpdist: