DESTDIR support

4 files changed, 14 insertions, 10 deletions

diff --git a/multimedia/libflash/Makefile b/multimedia/libflash/Makefile
index 3c57b92bf4c..06dea2f51b9 100644
--- a/multimedia/libflash/Makefile
+++ b/multimedia/libflash/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/02/11 20:01:50 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "Makefile.common"
 
 PKGNAME=	lib${DISTNAME}
@@ -12,6 +14,8 @@ BUILD_DIRS=	${WRKSRC}/Lib
 MAKE_ENV+=	LIBOSSAUDIO=${LIBOSSAUDIO:Q}
 MAKE_ENV+=	LIBSTDCPP=-lstdc++
 
+INSTALLATION_DIRS+=	lib
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libflash/distinfo b/multimedia/libflash/distinfo
index 166b340db33..6aa565ea6a9 100644
--- a/multimedia/libflash/distinfo
+++ b/multimedia/libflash/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.5 2006/06/30 21:57:45 tron Exp $
+$NetBSD: distinfo,v 1.6 2010/02/11 20:01:50 joerg Exp $
 
 SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420
 RMD160 (flash-0.4.10.tgz) = 17c04bb9fd29ab9b91fbc2954e508aead1ab7fb1
 Size (flash-0.4.10.tgz) = 358995 bytes
 SHA1 (patch-aa) = 0cda07497c07a3a6e4bc13ae099812bab4bc0424
-SHA1 (patch-ab) = 29afb4393acc2c44e622d398dba05749fb5c581d
+SHA1 (patch-ab) = 12a90daa82e54fc84c4e2033e09a531615c03e08
 SHA1 (patch-ac) = ce803268d7c85e0317c61dbd63c56028eaba82a8
 SHA1 (patch-ad) = a67db33d60bc5ce23241e5f445aabb9bdb1864c2
 SHA1 (patch-ae) = 51d94184f123596c662f3e3d7de36acb507b303c
-SHA1 (patch-af) = 7e6ab6312cf2d6a9e36abde8d5d94d627fcd9231
+SHA1 (patch-af) = 13dfbc92feada48a0062ff15577b625082dbf6e0
 SHA1 (patch-ag) = cc6277a63c4bfa54a35b74a1a66dea5923ae8637
 SHA1 (patch-ah) = d4406e8e672762b8ec474acf4923ded2301ad5a9
 SHA1 (patch-ai) = a4f927b4698e7de7b46f2496b57c83a30a57fecb
diff --git a/multimedia/libflash/patches/patch-ab b/multimedia/libflash/patches/patch-ab
index 8e0db487d48..2f0518e009d 100644
--- a/multimedia/libflash/patches/patch-ab
+++ b/multimedia/libflash/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 13:34:45 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2010/02/11 20:01:50 joerg Exp $
 
 --- Lib/Makefile.orig	Sun Jun  4 02:49:23 2000
 +++ Lib/Makefile
@@ -21,10 +21,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/01/26 13:34:45 jmmv Exp $
 +all: libflash.la
 +
 +install: libflash.la
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libflash.la ${PREFIX}/lib
-+	${BSD_INSTALL_DATA_DIR} ${PREFIX}/include/flash
++	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libflash.la ${DESTDIR}${PREFIX}/lib
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/flash
 +	for file in ${INCLUDES}; do \
-+		${BSD_INSTALL_DATA} $$file ${PREFIX}/include/flash; \
++		${BSD_INSTALL_DATA} $$file ${DESTDIR}${PREFIX}/include/flash; \
 +	done
 +
 +libflash.la: $(SWFOBJS)
diff --git a/multimedia/libflash/patches/patch-af b/multimedia/libflash/patches/patch-af
index 2b3a7aa5e05..e369ca91b4a 100644
--- a/multimedia/libflash/patches/patch-af
+++ b/multimedia/libflash/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2006/06/30 21:57:45 tron Exp $
+$NetBSD: patch-af,v 1.4 2010/02/11 20:01:50 joerg Exp $
 
 --- Player/Makefile.orig	2000-06-07 19:19:50.000000000 +0100
 +++ Player/Makefile	2006-06-30 22:53:51.000000000 +0100
@@ -19,7 +19,7 @@ $NetBSD: patch-af,v 1.3 2006/06/30 21:57:45 tron Exp $
 -clean:
 -	rm -f *~ *.o swfplayer core gmon.out
 +install: swfplayer
-+	${BSD_INSTALL_PROGRAM} swfplayer ${PREFIX}/bin
++	${BSD_INSTALL_PROGRAM} swfplayer ${DESTDIR}${PREFIX}/bin
  
 +swfplayer: main.o
 +	$(CXX) $(LDFLAGS) -o $@ main.o $(LIBS)