Thu Feb 11 20:01:51 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.10 -r1.11 pkgsrc/multimedia/flashplayer/Makefile
diff -r1.8 -r1.9 pkgsrc/multimedia/libflash/Makefile
diff -r1.5 -r1.6 pkgsrc/multimedia/libflash/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/multimedia/libflash/patches/patch-ab
diff -r1.3 -r1.4 pkgsrc/multimedia/libflash/patches/patch-af
cvs diff -r1.10 -r1.11 pkgsrc/multimedia/flashplayer/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/flashplayer/Makefile 2010/01/18 09:59:16 1.10
+++ pkgsrc/multimedia/flashplayer/Makefile 2010/02/11 20:01:50 1.11
@@ -1,24 +1,28 @@ @@ -1,24 +1,28 @@
1# $NetBSD: Makefile,v 1.10 2010/01/18 09:59:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.11 2010/02/11 20:01:50 joerg Exp $
2# 2#
3 3
 4PKG_DESTDIR_SUPPORT= user-destdir
 5
4.include "../../multimedia/libflash/Makefile.common" 6.include "../../multimedia/libflash/Makefile.common"
5 7
6PKGNAME= ${DISTNAME:C/-/player-/} 8PKGNAME= ${DISTNAME:C/-/player-/}
7PKGREVISION= 6 9PKGREVISION= 6
8COMMENT= Standalone open source Flash(tm) player 10COMMENT= Standalone open source Flash(tm) player
9 11
10BUILD_DIRS= ${WRKSRC}/Player 12BUILD_DIRS= ${WRKSRC}/Player
11CPPFLAGS+= -DDEV_DSP="\"${DEVOSSSOUND}\"" 13CPPFLAGS+= -DDEV_DSP="\"${DEVOSSSOUND}\""
12 14
13.include "../../mk/compiler.mk" 15.include "../../mk/compiler.mk"
14 16
15.if !empty(CC_VERSION:Mgcc-3.*) 17.if !empty(CC_VERSION:Mgcc-3.*)
16MAKE_ENV+= LIBSTDCPP=-lstdc++ 18MAKE_ENV+= LIBSTDCPP=-lstdc++
17.else 19.else
18MAKE_ENV+= LIBSTDCPP= 20MAKE_ENV+= LIBSTDCPP=
19.endif 21.endif
20 22
 23INSTALLATION_DIRS+= bin
 24
21.include "../../multimedia/libflash/buildlink3.mk" 25.include "../../multimedia/libflash/buildlink3.mk"
22.include "../../x11/libXext/buildlink3.mk" 26.include "../../x11/libXext/buildlink3.mk"
23.include "../../x11/xextproto/buildlink3.mk" 27.include "../../x11/xextproto/buildlink3.mk"
24.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/multimedia/libflash/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/libflash/Makefile 2010/01/18 09:59:17 1.8
+++ pkgsrc/multimedia/libflash/Makefile 2010/02/11 20:01:50 1.9
@@ -1,17 +1,21 @@ @@ -1,17 +1,21 @@
1# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:17 wiz Exp $ 1# $NetBSD: Makefile,v 1.9 2010/02/11 20:01:50 joerg Exp $
2# 2#
3 3
 4PKG_DESTDIR_SUPPORT= user-destdir
 5
4.include "Makefile.common" 6.include "Makefile.common"
5 7
6PKGNAME= lib${DISTNAME} 8PKGNAME= lib${DISTNAME}
7PKGREVISION= 8 9PKGREVISION= 8
8COMMENT= Open source Flash(tm) library 10COMMENT= Open source Flash(tm) library
9 11
10USE_LIBTOOL= yes 12USE_LIBTOOL= yes
11BUILD_DIRS= ${WRKSRC}/Lib 13BUILD_DIRS= ${WRKSRC}/Lib
12MAKE_ENV+= LIBOSSAUDIO=${LIBOSSAUDIO:Q} 14MAKE_ENV+= LIBOSSAUDIO=${LIBOSSAUDIO:Q}
13MAKE_ENV+= LIBSTDCPP=-lstdc++ 15MAKE_ENV+= LIBSTDCPP=-lstdc++
14 16
 17INSTALLATION_DIRS+= lib
 18
15.include "../../devel/zlib/buildlink3.mk" 19.include "../../devel/zlib/buildlink3.mk"
16.include "../../graphics/jpeg/buildlink3.mk" 20.include "../../graphics/jpeg/buildlink3.mk"
17.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/multimedia/libflash/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/libflash/distinfo 2006/06/30 21:57:45 1.5
+++ pkgsrc/multimedia/libflash/distinfo 2010/02/11 20:01:50 1.6
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.5 2006/06/30 21:57:45 tron Exp $ 1$NetBSD: distinfo,v 1.6 2010/02/11 20:01:50 joerg Exp $
2 2
3SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420 3SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420
4RMD160 (flash-0.4.10.tgz) = 17c04bb9fd29ab9b91fbc2954e508aead1ab7fb1 4RMD160 (flash-0.4.10.tgz) = 17c04bb9fd29ab9b91fbc2954e508aead1ab7fb1
5Size (flash-0.4.10.tgz) = 358995 bytes 5Size (flash-0.4.10.tgz) = 358995 bytes
6SHA1 (patch-aa) = 0cda07497c07a3a6e4bc13ae099812bab4bc0424 6SHA1 (patch-aa) = 0cda07497c07a3a6e4bc13ae099812bab4bc0424
7SHA1 (patch-ab) = 29afb4393acc2c44e622d398dba05749fb5c581d 7SHA1 (patch-ab) = 12a90daa82e54fc84c4e2033e09a531615c03e08
8SHA1 (patch-ac) = ce803268d7c85e0317c61dbd63c56028eaba82a8 8SHA1 (patch-ac) = ce803268d7c85e0317c61dbd63c56028eaba82a8
9SHA1 (patch-ad) = a67db33d60bc5ce23241e5f445aabb9bdb1864c2 9SHA1 (patch-ad) = a67db33d60bc5ce23241e5f445aabb9bdb1864c2
10SHA1 (patch-ae) = 51d94184f123596c662f3e3d7de36acb507b303c 10SHA1 (patch-ae) = 51d94184f123596c662f3e3d7de36acb507b303c
11SHA1 (patch-af) = 7e6ab6312cf2d6a9e36abde8d5d94d627fcd9231 11SHA1 (patch-af) = 13dfbc92feada48a0062ff15577b625082dbf6e0
12SHA1 (patch-ag) = cc6277a63c4bfa54a35b74a1a66dea5923ae8637 12SHA1 (patch-ag) = cc6277a63c4bfa54a35b74a1a66dea5923ae8637
13SHA1 (patch-ah) = d4406e8e672762b8ec474acf4923ded2301ad5a9 13SHA1 (patch-ah) = d4406e8e672762b8ec474acf4923ded2301ad5a9
14SHA1 (patch-ai) = a4f927b4698e7de7b46f2496b57c83a30a57fecb 14SHA1 (patch-ai) = a4f927b4698e7de7b46f2496b57c83a30a57fecb
15SHA1 (patch-aj) = d37351360b7e703747b4742e0378f89c528bdef7 15SHA1 (patch-aj) = d37351360b7e703747b4742e0378f89c528bdef7
16SHA1 (patch-ak) = c1af17f7bdf427894ed23893aad708ad0cdd51ed 16SHA1 (patch-ak) = c1af17f7bdf427894ed23893aad708ad0cdd51ed
17SHA1 (patch-al) = 8fdf2b0f9655c19e7cd8ff4aeb23c42c32e9a136 17SHA1 (patch-al) = 8fdf2b0f9655c19e7cd8ff4aeb23c42c32e9a136
18SHA1 (patch-am) = 65afd3a402415a2cf9675fd107ed4caf192a9648 18SHA1 (patch-am) = 65afd3a402415a2cf9675fd107ed4caf192a9648
cvs diff -r1.1.1.1 -r1.2 pkgsrc/multimedia/libflash/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/multimedia/libflash/patches/patch-ab 2004/01/26 13:34:45 1.1.1.1
+++ pkgsrc/multimedia/libflash/patches/patch-ab 2010/02/11 20:01:50 1.2
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 13:34:45 jmmv Exp $ 1$NetBSD: patch-ab,v 1.2 2010/02/11 20:01:50 joerg Exp $
2 2
3--- Lib/Makefile.orig Sun Jun 4 02:49:23 2000 3--- Lib/Makefile.orig Sun Jun 4 02:49:23 2000
4+++ Lib/Makefile 4+++ Lib/Makefile
5@@ -1,6 +1,5 @@ 5@@ -1,6 +1,5 @@
6-CPPFLAGS=-I../Jpeg -I../Zlib 6-CPPFLAGS=-I../Jpeg -I../Zlib
7 # Comment out the following line if you use egcs : 7 # Comment out the following line if you use egcs :
8-CXXFLAGS=-O3 -Wall -fno-rtti -fno-exceptions 8-CXXFLAGS=-O3 -Wall -fno-rtti -fno-exceptions
9+CXXFLAGS+=-Wall -fno-rtti -fno-exceptions 9+CXXFLAGS+=-Wall -fno-rtti -fno-exceptions
10  10
11 INCLUDES= adpcm.h cxform.h graphic.h script.h sqrt.h\ 11 INCLUDES= adpcm.h cxform.h graphic.h script.h sqrt.h\
12 bitmap.h displaylist.h matrix.h shape.h swf.h\ 12 bitmap.h displaylist.h matrix.h shape.h swf.h\
13@@ -34,7 +33,20 @@ 13@@ -34,7 +33,20 @@
14 # bitstream.o 14 # bitstream.o
15 # dump.o 15 # dump.o
16  16
17-all: libflash.a 17-all: libflash.a
18+.cc.o: 18+.cc.o:
19+ ${LIBTOOL} --mode=compile ${CXX} -c ${CPPFLAGS} ${CXXFLAGS} $< 19+ ${LIBTOOL} --mode=compile ${CXX} -c ${CPPFLAGS} ${CXXFLAGS} $<
20+ 20+
21+all: libflash.la 21+all: libflash.la
22+ 22+
23+install: libflash.la 23+install: libflash.la
24+ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libflash.la ${PREFIX}/lib 24+ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libflash.la ${DESTDIR}${PREFIX}/lib
25+ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/include/flash 25+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/flash
26+ for file in ${INCLUDES}; do \ 26+ for file in ${INCLUDES}; do \
27+ ${BSD_INSTALL_DATA} $$file ${PREFIX}/include/flash; \ 27+ ${BSD_INSTALL_DATA} $$file ${DESTDIR}${PREFIX}/include/flash; \
28+ done 28+ done
29+ 29+
30+libflash.la: $(SWFOBJS) 30+libflash.la: $(SWFOBJS)
31+ ${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${SWFOBJS:.o=.lo} -rpath ${PREFIX}/lib -ljpeg -lz ${LIBSTDCPP} ${LIBOSSAUDIO} -version-info 0:4 31+ ${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${SWFOBJS:.o=.lo} -rpath ${PREFIX}/lib -ljpeg -lz ${LIBSTDCPP} ${LIBOSSAUDIO} -version-info 0:4
32  32
33 libflash.a: $(SWFOBJS)  33 libflash.a: $(SWFOBJS)
34 ar rcs $@ $(SWFOBJS) 34 ar rcs $@ $(SWFOBJS)
cvs diff -r1.3 -r1.4 pkgsrc/multimedia/libflash/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/multimedia/libflash/patches/patch-af 2006/06/30 21:57:45 1.3
+++ pkgsrc/multimedia/libflash/patches/patch-af 2010/02/11 20:01:50 1.4
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: patch-af,v 1.3 2006/06/30 21:57:45 tron Exp $ 1$NetBSD: patch-af,v 1.4 2010/02/11 20:01:50 joerg Exp $
2 2
3--- Player/Makefile.orig 2000-06-07 19:19:50.000000000 +0100 3--- Player/Makefile.orig 2000-06-07 19:19:50.000000000 +0100
4+++ Player/Makefile 2006-06-30 22:53:51.000000000 +0100 4+++ Player/Makefile 2006-06-30 22:53:51.000000000 +0100
5@@ -1,14 +1,13 @@ 5@@ -1,14 +1,13 @@
6-FLASH=../Lib 6-FLASH=../Lib
7-CPPFLAGS=-I$(FLASH) 7-CPPFLAGS=-I$(FLASH)
8-CFLAGS=-O3 8-CFLAGS=-O3
9-LIBS = $(FLASH)/libflash.a ../Zlib/libz.a ../Jpeg/libjpeg.a -L/usr/X11R6/lib -lX11 -lXext -lm 9-LIBS = $(FLASH)/libflash.a ../Zlib/libz.a ../Jpeg/libjpeg.a -L/usr/X11R6/lib -lX11 -lXext -lm
10-CC=gcc 10-CC=gcc
11-LDFLAGS= 11-LDFLAGS=
12+LIBS = -lflash -ljpeg -lz ${LIBOSSAUDIO} -lX11 -lXext -lm $(LIBSTDCPP) 12+LIBS = -lflash -ljpeg -lz ${LIBOSSAUDIO} -lX11 -lXext -lm $(LIBSTDCPP)
13+CFLAGS+= -I${PREFIX}/include/flash 13+CFLAGS+= -I${PREFIX}/include/flash
14  14
15-swfplayer: main.o $(FLASH)/libflash.a ../Zlib/libz.a ../Jpeg/libjpeg.a 15-swfplayer: main.o $(FLASH)/libflash.a ../Zlib/libz.a ../Jpeg/libjpeg.a
16- $(CC) $(LDFLAGS) -o $@ main.o $(LIBS) 16- $(CC) $(LDFLAGS) -o $@ main.o $(LIBS)
17+all: swfplayer 17+all: swfplayer
18  18
19-clean: 19-clean:
20- rm -f *~ *.o swfplayer core gmon.out 20- rm -f *~ *.o swfplayer core gmon.out
21+install: swfplayer 21+install: swfplayer
22+ ${BSD_INSTALL_PROGRAM} swfplayer ${PREFIX}/bin 22+ ${BSD_INSTALL_PROGRAM} swfplayer ${DESTDIR}${PREFIX}/bin
23  23
24+swfplayer: main.o 24+swfplayer: main.o
25+ $(CXX) $(LDFLAGS) -o $@ main.o $(LIBS) 25+ $(CXX) $(LDFLAGS) -o $@ main.o $(LIBS)
26  26
27+clean: 27+clean:
28+ rm -f *~ *.o swfplayer core gmon.out 28+ rm -f *~ *.o swfplayer core gmon.out