Thu Oct 27 11:47:49 2011 UTC ()
Revert last


(abs)
diff -r1.7 -r1.8 pkgsrc/multimedia/adobe-flash-plugin/Makefile
cvs diff -r1.7 -r1.8 pkgsrc/multimedia/adobe-flash-plugin/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/adobe-flash-plugin/Attic/Makefile 2011/10/27 11:46:20 1.7
+++ pkgsrc/multimedia/adobe-flash-plugin/Attic/Makefile 2011/10/27 11:47:49 1.8
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.7 2011/10/27 11:46:20 abs Exp $ 1# $NetBSD: Makefile,v 1.8 2011/10/27 11:47:49 abs Exp $
2 2
3PKGREVISION= 1 
4CATEGORIES= multimedia www 3CATEGORIES= multimedia www
5MASTER_SITES= http://download.macromedia.com/pub/labs/flashplayer10/ 4MASTER_SITES= http://download.macromedia.com/pub/labs/flashplayer10/
6MASTER_SITES+= ftp://ftp.dvo.ru/pub/Gentoo/distfiles/ 5MASTER_SITES+= ftp://ftp.dvo.ru/pub/Gentoo/distfiles/
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.adobe.com/ 8HOMEPAGE= http://www.adobe.com/
10COMMENT= Adobe Flash Player Browser plugin 9COMMENT= Adobe Flash Player Browser plugin
11LICENSE= flash-license 10LICENSE= flash-license
12 11
13RESTRICTED= Redistribution not permitted 12RESTRICTED= Redistribution not permitted
14NO_SRC_ON_FTP= ${RESTRICTED} 13NO_SRC_ON_FTP= ${RESTRICTED}
15NO_SRC_ON_CDROM= ${RESTRICTED} 14NO_SRC_ON_CDROM= ${RESTRICTED}
16NO_BIN_ON_FTP= ${RESTRICTED} 15NO_BIN_ON_FTP= ${RESTRICTED}
@@ -20,30 +19,26 @@ PKG_DESTDIR_SUPPORT= user-destdir @@ -20,30 +19,26 @@ PKG_DESTDIR_SUPPORT= user-destdir
20 19
21WRKSRC= ${WRKDIR}/${WRKNAME} 20WRKSRC= ${WRKDIR}/${WRKNAME}
22BUILD_DIRS= # empty 21BUILD_DIRS= # empty
23DIST_SUBDIR= flash/${FLASH_VERS} 22DIST_SUBDIR= flash/${FLASH_VERS}
24 23
25CRYPTO= yes 24CRYPTO= yes
26 25
27EMUL_PLATFORMS= linux-i386 26EMUL_PLATFORMS= linux-i386
28EMUL_MODULES.linux= compat gtk2 x11 27EMUL_MODULES.linux= compat gtk2 x11
29EMUL_REQD= suse>=10.0 28EMUL_REQD= suse>=10.0
30 29
31.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
32 31
33.if ${OPSYS} != "Linux" 
34DEPENDS+= libflashsupport-[0-9]*:../../multimedia/libflashsupport 
35.endif 
36 
37# Defaults so lintpkgsrc is happy 32# Defaults so lintpkgsrc is happy
38FLASH_VERS= 10.0.0.525 33FLASH_VERS= 10.0.0.525
39.if ${EMUL_PLATFORM} == "linux-i386" 34.if ${EMUL_PLATFORM} == "linux-i386"
40DISTUNAME= linux 35DISTUNAME= linux
41DISTNAME= flashplayer10_install_${DISTUNAME}_070208 36DISTNAME= flashplayer10_install_${DISTUNAME}_070208
42WRKNAME= install_flash_player_10_${DISTUNAME} 37WRKNAME= install_flash_player_10_${DISTUNAME}
43.endif 38.endif
44 39
45CONFLICTS= ns-flash-[0-9]* 40CONFLICTS= ns-flash-[0-9]*
46PKGNAME= adobe-flash-plugin-${FLASH_VERS:S/r/./} 41PKGNAME= adobe-flash-plugin-${FLASH_VERS:S/r/./}
47 42
48NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins 43NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins
49 44