user-destdir support

3 files changed, 64 insertions, 9 deletions

diff --git a/devel/libstash/Makefile b/devel/libstash/Makefile
index 29176bbffa1..88707eb7035 100644
--- a/devel/libstash/Makefile
+++ b/devel/libstash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:05 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2009/07/08 16:09:00 joerg Exp $
 #
 
 DISTNAME=	libstash_s19990912a
@@ -10,6 +10,8 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.sqrl.org/sqrl/
 COMMENT=	Collection of programming support routines and useful algorithms
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--without-pthreads
 CONFIGURE_ARGS+=	--disable-shared
diff --git a/devel/libstash/distinfo b/devel/libstash/distinfo
index ffd6ef4cc29..de8df9afd15 100644
--- a/devel/libstash/distinfo
+++ b/devel/libstash/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 22:24:19 agc Exp $
+$NetBSD: distinfo,v 1.4 2009/07/08 16:09:00 joerg Exp $
 
 SHA1 (libstash_s19990912a.tar.gz) = ff9ffb3bd421be2652dced2dabfa503d7e3bbca1
 RMD160 (libstash_s19990912a.tar.gz) = fa7058a9da42b27a1094cd9ae3af204167ad093f
 Size (libstash_s19990912a.tar.gz) = 159195 bytes
-SHA1 (patch-aa) = db4b3219f1bbe8016ac83fe5b52ba33857bc29e7
+SHA1 (patch-aa) = f10654a8a95c375bf1b3af13683fe85660c4faae
 SHA1 (patch-ab) = 3c8f3932b176b4ee4730125581569c1bb3aa85f4
 SHA1 (patch-ac) = 2a2626a8df20e2dd62c565ba76b2b3fd8496c8e3
diff --git a/devel/libstash/patches/patch-aa b/devel/libstash/patches/patch-aa
index 9516c34a6b5..d50408c65ca 100644
--- a/devel/libstash/patches/patch-aa
+++ b/devel/libstash/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2000/09/24 17:32:26 hubertf Exp $
+$NetBSD: patch-aa,v 1.3 2009/07/08 16:09:00 joerg Exp $
 
---- Makefile.bsd.in.orig	Mon Sep 13 02:32:44 1999
+--- Makefile.bsd.in.orig	2009-07-08 18:05:44.000000000 +0200
 +++ Makefile.bsd.in
 @@ -101,11 +101,11 @@
  
@@ -16,12 +16,65 @@ $NetBSD: patch-aa,v 1.2 2000/09/24 17:32:26 hubertf Exp $
  
  CFLAGS := -Wall -pipe @CFLAGS@
  ST_CFLAGS := 
-@@ -296,7 +296,7 @@
+@@ -290,47 +290,47 @@ install_r : install_stat_dbg_r install_s
+ 
+ install_common : all
+ 	$(SHELL) -c \
+-	'@INSTALL@ -d @prefix@/include/libstash; \
++	'@INSTALL@ -d ${DESTDIR}@prefix@/include/libstash; \
+ 	for i in $(INCS); do \
+-	@INSTALL@ -m 0644 $$i @prefix@/include/libstash/; \
++	@INSTALL@ -m 0644 $$i ${DESTDIR}@prefix@/include/libstash/; \
  	done; \
- 	@INSTALL@ -d @prefix@/man/man3; \
+-	@INSTALL@ -d @prefix@/man/man3; \
++	@INSTALL@ -d ${DESTDIR}@prefix@/man/man3; \
  	for i in $(MANPAGES); do \
 -	@INSTALL@ -m 0644 $$i @prefix@/man/man3/; \
-+	@INSTALL@ -m 0644 $$i @prefix@/$${i%s}; \
++	@INSTALL@ -m 0644 $$i ${DESTDIR}@prefix@/$${i%s}; \
+ 	done; \
+-	@INSTALL@ -d @prefix@/lib; \
++	@INSTALL@ -d ${DESTDIR}@prefix@/lib; \
+ 	'
+ 
+ install_common_r : install_common
+ 	$(SHELL) -c \
+ 	'for i in $(INCS_R); do \
+-	@INSTALL@ -m 0644 $$i @prefix@/include/libstash/; \
++	@INSTALL@ -m 0644 $$i ${DESTDIR}@prefix@/include/libstash/; \
  	done; \
- 	@INSTALL@ -d @prefix@/lib; \
  	'
+ 
+ install_stat_dbg : stat_dbg install_common
+-	@INSTALL@ -m 0444 $(LIB_ST_D) @prefix@/lib
++	@INSTALL@ -m 0444 $(LIB_ST_D) ${DESTDIR}@prefix@/lib
+ 
+ install_stat_opt : stat_opt install_common
+-	@INSTALL@ -m 0444 $(LIB_ST_O) @prefix@/lib
++	@INSTALL@ -m 0444 $(LIB_ST_O) ${DESTDIR}@prefix@/lib
+ 
+ install_shar_opt : shar_opt install_common
+-	@INSTALL@ -m 0444 $(LIB_SH_O) @prefix@/lib
++	@INSTALL@ -m 0444 $(LIB_SH_O) ${DESTDIR}@prefix@/lib
+ 
+ install_stat_prof : stat_prof install_common
+-	@INSTALL@ -m 0444 $(LIB_ST_P) @prefix@/lib
++	@INSTALL@ -m 0444 $(LIB_ST_P) ${DESTDIR}@prefix@/lib
+ 
+ install_stat_dbg_r : stat_dbg_r install_common install_common_r
+-	@INSTALL@ -m 0444 $(LIB_ST_R_D) @prefix@/lib
++	@INSTALL@ -m 0444 $(LIB_ST_R_D) ${DESTDIR}@prefix@/lib
+ 
+ install_stat_opt_r : stat_opt_r install_common install_common_r
+-	@INSTALL@ -m 0444 $(LIB_ST_R_O) @prefix@/lib
++	@INSTALL@ -m 0444 $(LIB_ST_R_O) ${DESTDIR}@prefix@/lib
+ 
+ install_shar_opt_r : shar_opt_r install_common install_common_r
+-	@INSTALL@ -m 0444 $(LIB_SH_R_O) @prefix@/lib
++	@INSTALL@ -m 0444 $(LIB_SH_R_O) ${DESTDIR}@prefix@/lib
+ 
+ install_stat_prof_r : stat_prof_r install_common install_common_r
+-	@INSTALL@ -m 0444 $(LIB_ST_R_P) @prefix@/lib
++	@INSTALL@ -m 0444 $(LIB_ST_R_P) ${DESTDIR}@prefix@/lib
+ 
+ uninstall :
+ 	rm -f @prefix@/lib/lib$(LIB)*