From 33f30156fb37245b360bbc293320402ecf1aba41 Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 29 Jul 2007 05:18:36 +0000 Subject: * Add new emulator framework in pkgsrc/mk/emulator that handles all binary-only packages that require binary "emulation" on the native operating system. Please see pkgsrc/mk/emulator/README for more details. * Teach the plist framework to automatically use any existing PLIST.${EMUL_PLATFORM} as part of the default PLIST_SRC definition. * Convert all of the binary-only packages in pkgsrc to use the emulator framework. Most of them have been tested to install and deinstall correctly. This involves the following cleanup actions: * Remove use of custom PLIST code and use PLIST.${EMUL_PLATFORM} more consistently. * Simplify packages by using default INSTALL and DEINSTALL scripts instead of custom INSTALL/DEINSTALL code. * Remove "SUSE_COMPAT32" and "PKG_OPTIONS.suse" from pkgsrc. Packages only need to state exactly which emulations they support, and the framework handles any i386-on-x86_64 or sparc-on-sparc64 uses. * Remove "USE_NATIVE_LINUX" from pkgsrc. The framework will automatically detect when the package is installing on Linux. Specific changes to packages include: * Bump the PKGREVISIONs for all of the suse100* and suse91* packages due to changes in the +INSTALL/+DEINSTALL scripts used in all of the packages. * Remove pkgsrc/emulators/suse_linux, which is unused by any packages. * cad/lc -- remove custom code to create the distinfo file for all supported platforms; just use "emul-fetch" and "emul-distinfo" instead. * lang/Cg-compiler -- install the shared libraries under ${EMULDIR} instead of ${PREFIX}/lib so that compiled programs will find the shared libraries. * mail/thunderbird-bin-nightly -- update to latest binary distributions for supported platforms. * multimedia/ns-flash -- update Linux version to 9.0.48 as the older version is no longer available for interactive fetch. * security/uvscan -- set LD_LIBRARY_PATH explicitly so that it's not necessary to install library symlinks into ${EMULDIR}/usr/local/lib. * www/firefox-bin-flash -- update Linux version to 9.0.48 as the older version is no longer available for interactive fetch. --- multimedia/ns-flash/Makefile | 56 ++++++++++++++++++++------------------------ multimedia/ns-flash/distinfo | 8 +++---- 2 files changed, 29 insertions(+), 35 deletions(-) (limited to 'multimedia/ns-flash') diff --git a/multimedia/ns-flash/Makefile b/multimedia/ns-flash/Makefile index a2e88851f7f..0c9e13f7dee 100644 --- a/multimedia/ns-flash/Makefile +++ b/multimedia/ns-flash/Makefile @@ -1,33 +1,44 @@ -# $NetBSD: Makefile,v 1.23 2007/07/17 09:31:53 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2007/07/29 05:19:45 jlam Exp $ CATEGORIES= multimedia www -PKGREVISION= 2 MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/current/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.flash.com/ COMMENT= MacroMedia Flash Player Netscape plugin -ONLY_FOR_PLATFORM= *-*-i386 SunOS-*-sparc -NOT_FOR_PLATFORM= SunOS-*-i386 +# Must update communicator/navigator to at least 4.76nb1 +CONFLICTS+= communicator<=4.76nb1 +CONFLICTS+= navigator<=4.76nb1 + +LICENSE= flash-license +RESTRICTED= Redistribution not permitted +NO_SRC_ON_FTP= ${RESTRICTED} +NO_SRC_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_FTP= ${RESTRICTED} +NO_BIN_ON_CDROM= ${RESTRICTED} WRKSRC= ${WRKDIR}/${WRKNAME} +BUILD_DIRS= # empty DIST_SUBDIR= flash/${FLASH_VERS} -SUSE_COMPAT32= yes -SUSE_COMPAT32_OPT= yes +CRYPTO= yes + +EMUL_PLATFORMS= linux-i386 +EMUL_PLATFORMS+= solaris-sparc +EMUL_MODULES.linux= compat gtk2 x11 +SUSE_VERSION_REQD= 9.0 + .include "../../mk/bsd.prefs.mk" -.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") -FLASH_VERS= 9.0r31 -DEPENDS+= suse_compat>=9.0:../../emulators/${SUSE_DIR_PREFIX}_compat -DEPENDS+= suse_x11>=9.0:../../emulators/${SUSE_DIR_PREFIX}_x11 -DEPENDS+= suse_gtk2>=9.0:../../emulators/${SUSE_DIR_PREFIX}_gtk2 +.if ${EMUL_PLATFORM} == "linux-i386" +FLASH_VERS= 9.0r48 DISTUNAME= linux DISTNAME= install_flash_player_9_${DISTUNAME} WRKNAME= install_flash_player_9_${DISTUNAME} -.elif ${MACHINE_ARCH} == "sparc" && ${OPSYS} == "SunOS" +.elif ${EMUL_PLATFORM} == "solaris-sparc" FLASH_VERS= 7.0r67 +PKGREVISION= 2 DISTUNAME= solaris DISTNAME= install_flash_player_7_${DISTUNAME}_sparc WRKNAME= install_flash_player_7_${DISTUNAME} @@ -38,30 +49,13 @@ DISTNAME= flash_player .endif PKGNAME= ns-flash-${FLASH_VERS:S/r/./} -# Must update communicator/navigator to at least 4.76nb1 -CONFLICTS+= communicator<=4.76nb1 -CONFLICTS+= navigator<=4.76nb1 - -LICENSE= flash-license -RESTRICTED= Redistribution not permitted -NO_SRC_ON_FTP= ${RESTRICTED} -NO_SRC_ON_CDROM= ${RESTRICTED} -NO_BIN_ON_FTP= ${RESTRICTED} -NO_BIN_ON_CDROM= ${RESTRICTED} - -NO_CONFIGURE= yes -NO_BUILD= yes -CRYPTO= yes - NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins +.include "options.mk" + do-install: ${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR} ${INSTALL_DATA} ${WRKSRC}/flashplayer.xpt ${NS_PLUGINS_DIR} ${INSTALL_DATA} ${WRKSRC}/libflashplayer.so ${NS_PLUGINS_DIR} -.include "options.mk" -.if ${OPSYS} != "SunOS" -. include "../../emulators/suse_linux/Makefile.application" -.endif .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/ns-flash/distinfo b/multimedia/ns-flash/distinfo index 7db83544197..6da55f45c58 100644 --- a/multimedia/ns-flash/distinfo +++ b/multimedia/ns-flash/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.12 2007/02/01 13:44:14 ghen Exp $ +$NetBSD: distinfo,v 1.13 2007/07/29 05:19:45 jlam Exp $ -SHA1 (flash/9.0r31/install_flash_player_9_linux.tar.gz) = ffe59c81d28d8108112b7e372f652328d362a35b -RMD160 (flash/9.0r31/install_flash_player_9_linux.tar.gz) = bad57e9349c5b1bb0b12a7dee7dea8f24af2f764 -Size (flash/9.0r31/install_flash_player_9_linux.tar.gz) = 2609703 bytes +SHA1 (flash/9.0r48/install_flash_player_9_linux.tar.gz) = 4bba0b81462394388b4509ecdc845f469c95d6ae +RMD160 (flash/9.0r48/install_flash_player_9_linux.tar.gz) = 4eea521f45fcd42e6916ba61ba299df8694fbc14 +Size (flash/9.0r48/install_flash_player_9_linux.tar.gz) = 2608602 bytes SHA1 (flash/7.0r67/install_flash_player_7_solaris_sparc.tar.gz) = f8dc29f2eee2e91c8856ee4d1bc402021ec7c694 RMD160 (flash/7.0r67/install_flash_player_7_solaris_sparc.tar.gz) = ad5cf828d4d13bd512c106dfef73e515f4b655b0 Size (flash/7.0r67/install_flash_player_7_solaris_sparc.tar.gz) = 1074253 bytes -- cgit v1.2.3