diff options
| author | jlam <jlam@pkgsrc.org> | 2007-07-29 05:18:36 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-07-29 05:18:36 +0000 |
| commit | 33f30156fb37245b360bbc293320402ecf1aba41 (patch) | |
| tree | 45cad36d8470a568b9136017b2dd79c9efcc65bc /www | |
| parent | ffe106498e5f63e2e945d5b6b2ac8807a10ae78f (diff) | |
| download | pkgsrc-33f30156fb37245b360bbc293320402ecf1aba41.tar.gz | |
* 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.
Diffstat (limited to 'www')
68 files changed, 488 insertions, 541 deletions
diff --git a/www/communicator/DESCR b/www/communicator/DESCR index 2bbc4cac445..cda7d9b05f1 100644 --- a/www/communicator/DESCR +++ b/www/communicator/DESCR @@ -1,5 +1,5 @@ -Communicator is a WWW and ftp browser, mail client, newsgroup reader, web -page editor and address book organizer. The standalone browser is -available in pkgsrc as 'navigator'. This is the commercially distributed -version from Netscape. A freely available version of the Netscape browser -is available in pkgsrc as 'mozilla'. +Communicator is a WWW and ftp browser, mail client, newsgroup reader, +web page editor and address book organizer. + +This is the commercially distributed version from Netscape. A freely +available version of the Netscape browser is available as ``firefox''. diff --git a/www/communicator/DESCR.linux-powerpc b/www/communicator/DESCR.linux-powerpc index 60f05d2ccdc..a915bf40ae2 100644 --- a/www/communicator/DESCR.linux-powerpc +++ b/www/communicator/DESCR.linux-powerpc @@ -1,4 +1,5 @@ Communicator is a WWW and ftp browser, mail client, newsgroup reader, -web page editor and address book organizer. This is the distributed -version from linuxppc.org, not Netscape. A Newer version of the -Netscape browser is available in pkgsrc as 'mozilla'. +web page editor and address book organizer. + +This is the distributed version from linuxppc.org, not Netscape. A +newer version of the Netscape browser is available as ``seamonkey''. diff --git a/www/communicator/PLIST.pre b/www/communicator/PLIST.common index ff4a7034aad..ea0f7ce141f 100644 --- a/www/communicator/PLIST.pre +++ b/www/communicator/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.pre,v 1.1 2001/11/01 02:24:37 zuntum Exp $ +@comment $NetBSD: PLIST.common,v 1.1 2007/07/29 05:19:51 jlam Exp $ bin/${BINNAME}-${NS_VERS} bin/${BINNAME} lib/netscape/${BINNAME}-${NS_VERS}/java/classes/ifc11.jar diff --git a/www/communicator/PLIST.post b/www/communicator/PLIST.common_end index a1043104420..7a84e46553f 100644 --- a/www/communicator/PLIST.post +++ b/www/communicator/PLIST.common_end @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.post,v 1.5 2002/12/09 16:01:48 tron Exp $ +@comment $NetBSD: PLIST.common_end,v 1.1 2007/07/29 05:19:51 jlam Exp $ @dirrm lib/netscape/${BINNAME}-${NS_VERS}/spell @dirrm lib/netscape/${BINNAME}-${NS_VERS}/plugins @dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/trouble diff --git a/www/communicator/PLIST.netbsd-alpha b/www/communicator/PLIST.netbsd-alpha deleted file mode 100644 index 58e0c796bbe..00000000000 --- a/www/communicator/PLIST.netbsd-alpha +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.netbsd-alpha,v 1.1 2001/11/01 02:24:36 zuntum Exp $ -lib/netscape/communicator-${NS_VERS}/plugins/libnullplugin.so diff --git a/www/communicator/PLIST.netbsd-i386 b/www/communicator/PLIST.netbsd-i386 deleted file mode 100644 index c1aac698f3e..00000000000 --- a/www/communicator/PLIST.netbsd-i386 +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST.netbsd-i386,v 1.1 2001/11/01 02:24:37 zuntum Exp $ -lib/netscape/communicator-${NS_VERS}/libjsd.so -lib/netscape/communicator-${NS_VERS}/plugins/libnullplugin.so -lib/netscape/communicator-${NS_VERS}/netscape-dynMotif -lib/netscape/communicator-${NS_VERS}/libnullplugin-dynMotif.so diff --git a/www/communicator/PLIST.netbsd-sparc b/www/communicator/PLIST.netbsd-sparc deleted file mode 100644 index ac448c72344..00000000000 --- a/www/communicator/PLIST.netbsd-sparc +++ /dev/null @@ -1,11 +0,0 @@ -@comment $NetBSD: PLIST.netbsd-sparc,v 1.1 2001/11/01 20:46:14 zuntum Exp $ -bin/communicator-${NS_VERS}_nis -bin/netscape_nis -lib/netscape/communicator-${NS_VERS}/netscape_nis -lib/netscape/communicator-${NS_VERS}/libjsd.so.1.0 -lib/netscape/communicator-${NS_VERS}/dynfonts/libTrueDoc.so -lib/netscape/communicator-${NS_VERS}/plugins/libnullplugin.so -lib/netscape/communicator-${NS_VERS}/nls/C -lib/netscape/communicator-${NS_VERS}/nls/nls.dir -@dirrm lib/netscape/communicator-${NS_VERS}/dynfonts -@dirrm lib/netscape/communicator-${NS_VERS}/nls diff --git a/www/communicator/PLIST.osf-alpha b/www/communicator/PLIST.osf-alpha deleted file mode 100644 index 8365700d41d..00000000000 --- a/www/communicator/PLIST.osf-alpha +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.osf-alpha,v 1.1 2001/11/01 02:24:37 zuntum Exp $ -lib/netscape/${BINNAME}-${NS_VERS}/plugins/libnullplugin.so diff --git a/www/communicator/PLIST.osf1-alpha b/www/communicator/PLIST.osf1-alpha new file mode 100644 index 00000000000..69ef90cb73a --- /dev/null +++ b/www/communicator/PLIST.osf1-alpha @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST.osf1-alpha,v 1.1 2007/07/29 05:19:52 jlam Exp $ +lib/netscape/${BINNAME}-${NS_VERS}/plugins/libnullplugin.so diff --git a/www/firefox-bin-flash/Makefile b/www/firefox-bin-flash/Makefile index 3c94ca20129..80b0a6c6af9 100644 --- a/www/firefox-bin-flash/Makefile +++ b/www/firefox-bin-flash/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2006/03/29 02:16:43 markd Exp $ +# $NetBSD: Makefile,v 1.6 2007/07/29 05:19:52 jlam Exp $ + .include "Makefile.common" COMMENT= Flash Player plugin for firefox-bin DEPENDS+= firefox-bin>=0.8:../../www/firefox-bin -.include "../../emulators/suse_linux/Makefile.application" .include "../../mk/bsd.pkg.mk" diff --git a/www/firefox-bin-flash/Makefile.common b/www/firefox-bin-flash/Makefile.common index aa51a54d923..703808dfa55 100644 --- a/www/firefox-bin-flash/Makefile.common +++ b/www/firefox-bin-flash/Makefile.common @@ -1,37 +1,35 @@ -# $NetBSD: Makefile.common,v 1.18 2007/02/22 19:27:20 wiz Exp $ +# $NetBSD: Makefile.common,v 1.19 2007/07/29 05:19:52 jlam Exp $ DISTNAME= install_flash_player_9_${DISTUNAME} PKGNAME= ${MOZ_BIN}-flash-${FLASH_VERS:S/r/./} CATEGORIES= www graphics -MASTER_SITES= http://download.macromedia.com/get/flashplayer/current/ +MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/current/ MAINTAINER?= pkgsrc-users@NetBSD.org HOMEPAGE?= http://www.flash.com/ -ONLY_FOR_PLATFORM= *-*-i386 - DIST_SUBDIR= flash/${FLASH_VERS} +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} + +EMUL_PLATFORMS= linux-i386 + .include "../../mk/bsd.prefs.mk" SUB= english/${DISTUNAME}/${FLASH_VERS} -FLASH_VERS= 9.0r31 +FLASH_VERS= 9.0r48 DISTUNAME= linux WRKNAME= install_flash_player_9_${DISTUNAME} DISTINFO_FILE= ${.CURDIR}/../../www/firefox-bin-flash/distinfo -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 -CHECK_SHLIBS_SUPPORTED= no +BUILD_DIRS= # empty CRYPTO= yes MOZ_NAME?= firefox-linux diff --git a/www/firefox-bin-flash/distinfo b/www/firefox-bin-flash/distinfo index 082d24d21a3..e4db78565ac 100644 --- a/www/firefox-bin-flash/distinfo +++ b/www/firefox-bin-flash/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.8 2007/02/01 13:49:40 ghen Exp $ +$NetBSD: distinfo,v 1.9 2007/07/29 05:19:53 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 diff --git a/www/firefox-bin-nightly/Makefile b/www/firefox-bin-nightly/Makefile index f8291e5beb5..330a7ac1fcd 100644 --- a/www/firefox-bin-nightly/Makefile +++ b/www/firefox-bin-nightly/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2006/09/24 16:42:56 salo Exp $ +# $NetBSD: Makefile,v 1.6 2007/07/29 05:19:53 jlam Exp $ MOZILLA= firefox HOMEPAGE= http://www.mozilla.org/projects/firefox/ COMMENT= Lightweight gecko-based web browser (nightly binary pkg) -# see Makefile.NetBSD.i386. -ONLY_FOR_PLATFORM+= Linux-*-i386 -ONLY_FOR_PLATFORM+= SunOS-5.[89]*-sparc +EMUL_PLATFORMS= linux-i386 +EMUL_PLATFORMS+= solaris-i386 solaris-sparc .include "../../www/seamonkey-bin-nightly/Makefile.common" diff --git a/www/firefox-bin-nightly/Makefile.Linux.i386 b/www/firefox-bin-nightly/Makefile.Linux.i386 deleted file mode 100644 index 0004415f723..00000000000 --- a/www/firefox-bin-nightly/Makefile.Linux.i386 +++ /dev/null @@ -1,6 +0,0 @@ -# $NetBSD: Makefile.Linux.i386,v 1.2 2006/09/24 16:42:56 salo Exp $ - -DISTNAME= ${MOZILLA}-3.0a1.en-US.linux-i686 -EXTRACT_SUFX= .tar.bz2 -MOZ_PLATFORM= linux -MOZ_GTK2= yes diff --git a/www/firefox-bin-nightly/Makefile.NetBSD.i386 b/www/firefox-bin-nightly/Makefile.NetBSD.i386 deleted file mode 100644 index f74c1d401e6..00000000000 --- a/www/firefox-bin-nightly/Makefile.NetBSD.i386 +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: Makefile.NetBSD.i386,v 1.2 2006/09/24 16:42:56 salo Exp $ - -.if defined(MOZILLA_USE_LINUX) -DISTNAME= ${MOZILLA}-3.0a1.en-US.linux-i686 -EXTRACT_SUFX= .tar.bz2 -MOZ_PLATFORM= linux -MOZ_GTK2= yes -ONLY_FOR_PLATFORM+= NetBSD-*-i386 -.else -DISTNAME= ${MOZILLA}-i386-unknown-netbsdelf1.6 -EXTRACT_SUFX= .tar.bz2 -MOZ_PLATFORM= netbsd -ONLY_FOR_PLATFORM+= NetBSD-1.6*-i386 NetBSD-2*-i386 -.endif diff --git a/www/firefox-bin-nightly/Makefile.SunOS.sparc b/www/firefox-bin-nightly/Makefile.SunOS.sparc deleted file mode 100644 index 19c82f81967..00000000000 --- a/www/firefox-bin-nightly/Makefile.SunOS.sparc +++ /dev/null @@ -1,5 +0,0 @@ -# $NetBSD: Makefile.SunOS.sparc,v 1.1 2004/03/16 14:34:39 grant Exp $ - -DISTNAME= ${MOZILLA}-sparc-sun-solaris2.8 - -MOZ_PLATFORM= solaris diff --git a/www/firefox-bin-nightly/Makefile.linux-i386 b/www/firefox-bin-nightly/Makefile.linux-i386 new file mode 100644 index 00000000000..8a61a4eb323 --- /dev/null +++ b/www/firefox-bin-nightly/Makefile.linux-i386 @@ -0,0 +1,7 @@ +# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:19:54 jlam Exp $ + +DISTNAME= firefox-3.0a7pre.en-US.linux-i686 +EXTRACT_SUFX= .tar.bz2 + +MOZ_GTK2= yes +MOZ_PLATFORM= linux diff --git a/www/firefox-bin-nightly/Makefile.solaris-i386 b/www/firefox-bin-nightly/Makefile.solaris-i386 new file mode 100644 index 00000000000..8da5668c29f --- /dev/null +++ b/www/firefox-bin-nightly/Makefile.solaris-i386 @@ -0,0 +1,9 @@ +# $NetBSD: Makefile.solaris-i386,v 1.1 2007/07/29 05:19:54 jlam Exp $ + +SOLARIS_VERSION_REQD?= 11 + +DISTNAME= firefox-3.0a7pre.en-US.solaris11-i386 +EXTRACT_SUFX= .tar.bz2 + +MOZ_GTK2= yes +MOZ_PLATFORM= solaris diff --git a/www/firefox-bin-nightly/Makefile.solaris-sparc b/www/firefox-bin-nightly/Makefile.solaris-sparc new file mode 100644 index 00000000000..afad0e2ed35 --- /dev/null +++ b/www/firefox-bin-nightly/Makefile.solaris-sparc @@ -0,0 +1,9 @@ +# $NetBSD: Makefile.solaris-sparc,v 1.1 2007/07/29 05:19:54 jlam Exp $ + +SOLARIS_VERSION_REQD?= 11 + +DISTNAME= firefox-3.0a7pre.en-US.solaris11-sparc +EXTRACT_SUFX= .tar.bz2 + +MOZ_GTK2= yes +MOZ_PLATFORM= solaris diff --git a/www/firefox-bin/Makefile b/www/firefox-bin/Makefile index 416262e27f2..7e37075ab46 100644 --- a/www/firefox-bin/Makefile +++ b/www/firefox-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2007/07/19 18:20:58 xtraeme Exp $ +# $NetBSD: Makefile,v 1.31 2007/07/29 05:19:54 jlam Exp $ MOZILLA= firefox MOZ_VER= 2.0.0.5 @@ -8,9 +8,8 @@ HOMEPAGE= http://www.mozilla.com/en-US/firefox/ COMMENT= Lightweight gecko-based web browser (binary package) DIST_SUBDIR= ${MOZILLA}/releases/${MOZ_DIR} -# binary package is built against GTK2 -MOZ_GTK2= YES -ONLY_FOR_PLATFORM+= Linux-*-i386 +EMUL_PLATFORMS= linux-i386 +EMUL_PLATFORMS+= solaris-i386 solaris-sparc .include "../../www/seamonkey-bin/Makefile.common" diff --git a/www/firefox-bin/Makefile.Linux.i386 b/www/firefox-bin/Makefile.Linux.i386 deleted file mode 100644 index d79def91e49..00000000000 --- a/www/firefox-bin/Makefile.Linux.i386 +++ /dev/null @@ -1,5 +0,0 @@ -# $NetBSD: Makefile.Linux.i386,v 1.9 2007/05/12 13:53:12 ghen Exp $ - -DISTNAME= firefox-${MOZ_DISTVER} -MOZ_DIR= ${MOZ_DISTVER}/linux-i686/en-US -MOZ_PLATFORM= linux diff --git a/www/firefox-bin/Makefile.NetBSD.i386 b/www/firefox-bin/Makefile.NetBSD.i386 deleted file mode 100644 index f04d7f6fb2b..00000000000 --- a/www/firefox-bin/Makefile.NetBSD.i386 +++ /dev/null @@ -1,11 +0,0 @@ -# $NetBSD: Makefile.NetBSD.i386,v 1.11 2007/05/12 13:53:12 ghen Exp $ - -BUILD_DEFS+= MOZILLA_USE_LINUX - -.if defined(MOZILLA_USE_LINUX) -ONLY_FOR_PLATFORM+= NetBSD-*-i386 -. include "Makefile.Linux.i386" -.else -PKG_SKIP_REASON+= "No native pre-built NetBSD binary available." -PKG_SKIP_REASON+= "Set MOZILLA_USE_LINUX if you want to use the Linux binary." -.endif diff --git a/www/firefox-bin/Makefile.SunOS.sparc b/www/firefox-bin/Makefile.SunOS.sparc deleted file mode 100644 index 3e16ac61fbb..00000000000 --- a/www/firefox-bin/Makefile.SunOS.sparc +++ /dev/null @@ -1,5 +0,0 @@ -# $NetBSD: Makefile.SunOS.sparc,v 1.3 2005/04/18 14:24:15 wiz Exp $ - -DISTNAME= ${MOZILLA}-${MOZ_DISTVER}-sparc-sun-solaris2.8-gtk2 - -MOZ_PLATFORM= solaris diff --git a/www/firefox-bin/Makefile.linux-i386 b/www/firefox-bin/Makefile.linux-i386 new file mode 100644 index 00000000000..c12675b7ebd --- /dev/null +++ b/www/firefox-bin/Makefile.linux-i386 @@ -0,0 +1,7 @@ +# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:19:55 jlam Exp $ + +DISTNAME= firefox-${MOZ_DISTVER} +MOZ_DIR= ${MOZ_DISTVER}/linux-i686/en-US + +MOZ_GTK2= yes +MOZ_PLATFORM= linux diff --git a/www/firefox-bin/Makefile.solaris-i386 b/www/firefox-bin/Makefile.solaris-i386 new file mode 100644 index 00000000000..d61b949b056 --- /dev/null +++ b/www/firefox-bin/Makefile.solaris-i386 @@ -0,0 +1,20 @@ +# $NetBSD: Makefile.solaris-i386,v 1.1 2007/07/29 05:19:55 jlam Exp $ + +.if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*) +SOLARIS_VERSION_REQD?= 10 +.else +SOLARIS_VERSION_REQD?= 8 +.endif + +# Use the Solaris 8 binaries if we're not running at least Solaris 10. +.if !empty(SOLARIS_VERSION_REQD:M1[0-9]*) +DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris10-i386 +MOZ_GTK2= yes +.else +DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris8-i386-gtk1 +.endif + +EXTRACT_SUFX= .tar.bz2 +MOZ_DIR= ${MOZ_DISTVER}/contrib/solaris_tarball + +MOZ_PLATFORM= solaris diff --git a/www/firefox-bin/Makefile.solaris-sparc b/www/firefox-bin/Makefile.solaris-sparc new file mode 100644 index 00000000000..dc5407397da --- /dev/null +++ b/www/firefox-bin/Makefile.solaris-sparc @@ -0,0 +1,20 @@ +# $NetBSD: Makefile.solaris-sparc,v 1.1 2007/07/29 05:19:55 jlam Exp $ + +.if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*) +SOLARIS_VERSION_REQD?= 10 +.else +SOLARIS_VERSION_REQD?= 8 +.endif + +# Use the Solaris 8 binaries if we're not running at least Solaris 10. +.if !empty(SOLARIS_VERSION_REQD:M1[0-9]*) +DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris10-respin-sparc +MOZ_GTK2= yes +.else +DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris8-respin-sparc-gtk1 +.endif + +EXTRACT_SUFX= .tar.bz2 +MOZ_DIR= ${MOZ_DISTVER}/contrib/solaris_tarball + +MOZ_PLATFORM= solaris diff --git a/www/firefox-bin/distinfo b/www/firefox-bin/distinfo index 210de6e7188..7fb1277a85e 100644 --- a/www/firefox-bin/distinfo +++ b/www/firefox-bin/distinfo @@ -1,5 +1,17 @@ -$NetBSD: distinfo,v 1.27 2007/07/19 18:20:58 xtraeme Exp $ +$NetBSD: distinfo,v 1.28 2007/07/29 05:19:56 jlam Exp $ SHA1 (firefox/releases/2.0.0.5/linux-i686/en-US/firefox-2.0.0.5.tar.gz) = 6c4cea59d41584a989f4e0f25ef34ab18ed04bfa RMD160 (firefox/releases/2.0.0.5/linux-i686/en-US/firefox-2.0.0.5.tar.gz) = 3e26f5e30eed3be53dc9db22d24397cbffd278ea Size (firefox/releases/2.0.0.5/linux-i686/en-US/firefox-2.0.0.5.tar.gz) = 9671891 bytes +SHA1 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-i386.tar.bz2) = e3df86e0d371d9e30d5a40389f7252a46046ce97 +RMD160 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-i386.tar.bz2) = fc121b15b3b086316b473c330c620d60c6f28c2a +Size (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-i386.tar.bz2) = 11661329 bytes +SHA1 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-respin-sparc.tar.bz2) = 93335eebb4a1afbf54d8e9a270ba2058f3387661 +RMD160 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-respin-sparc.tar.bz2) = 189e143d59ffe658ba8843ff858a5d811f929623 +Size (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-respin-sparc.tar.bz2) = 13373878 bytes +SHA1 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-i386-gtk1.tar.bz2) = 1edbe0fdeafa2b05a79079c9f2fc8fca151da464 +RMD160 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-i386-gtk1.tar.bz2) = d7e890fae67283de2dd2a2e9293c889f197f3ba9 +Size (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-i386-gtk1.tar.bz2) = 10927989 bytes +SHA1 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = 9ca16078f11183929adc1c59f73a9fa599e88438 +RMD160 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = 9ab9f410d307adcfa9f61886076db87aa14dc1f4 +Size (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = 12867136 bytes diff --git a/www/firefox15-bin/Makefile b/www/firefox15-bin/Makefile index 17114f8b776..49eb6d3bba6 100644 --- a/www/firefox15-bin/Makefile +++ b/www/firefox15-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/05/31 07:26:46 ghen Exp $ +# $NetBSD: Makefile,v 1.3 2007/07/29 05:19:56 jlam Exp $ MOZILLA= firefox MOZ_VER= 1.5.0.12 @@ -8,9 +8,8 @@ HOMEPAGE= http://www.mozilla.com/firefox/ COMMENT= Lightweight gecko-based web browser (binary package) DIST_SUBDIR= ${MOZILLA}/releases/${MOZ_DIR} -# binary package is built against GTK2 -MOZ_GTK2= YES -ONLY_FOR_PLATFORM+= Linux-*-i386 +EMUL_PLATFORMS= linux-i386 +EMUL_PLATFORMS+= solaris-i386 solaris-sparc .include "../../www/seamonkey-bin/Makefile.common" diff --git a/www/firefox15-bin/Makefile.Linux.i386 b/www/firefox15-bin/Makefile.Linux.i386 deleted file mode 100644 index 24deedd0809..00000000000 --- a/www/firefox15-bin/Makefile.Linux.i386 +++ /dev/null @@ -1,5 +0,0 @@ -# $NetBSD: Makefile.Linux.i386,v 1.1.1.1 2007/05/12 13:56:51 ghen Exp $ - -DISTNAME= ${MOZILLA}-${MOZ_DISTVER} -MOZ_DIR= ${MOZ_VER}/linux-i686/en-US -MOZ_PLATFORM= linux diff --git a/www/firefox15-bin/Makefile.NetBSD.i386 b/www/firefox15-bin/Makefile.NetBSD.i386 deleted file mode 100644 index 6ba4ed7023c..00000000000 --- a/www/firefox15-bin/Makefile.NetBSD.i386 +++ /dev/null @@ -1,20 +0,0 @@ -# $NetBSD: Makefile.NetBSD.i386,v 1.1.1.1 2007/05/12 13:56:51 ghen Exp $ - -BUILD_DEFS+= MOZILLA_USE_LINUX - -.if defined(MOZILLA_USE_LINUX) -ONLY_FOR_PLATFORM+= NetBSD-*-i386 -. include "Makefile.Linux.i386" -. if defined(SUSE_PREFER) && !empty(SUSE_PREFER:M10.0) -DEPENDS+= suse_compat>=10.0:../../emulators/suse100_compat -. endif -.else -PKG_SKIP_REASON+= "No native pre-built NetBSD binary available." -PKG_SKIP_REASON+= "Set MOZILLA_USE_LINUX if you want to use the Linux binary." -DISTNAME= ${MOZILLA}-${MOZ_DISTVER}-i386-unknown-netbsdelf1.6 -EXTRACT_SUFX= .tar.bz2 -MOZ_PLATFORM= netbsd - -# no 1.0 build for NetBSD -#ONLY_FOR_PLATFORM+= NetBSD-1.6*-i386 NetBSD-2*-i386 -.endif diff --git a/www/firefox15-bin/Makefile.SunOS.sparc b/www/firefox15-bin/Makefile.SunOS.sparc deleted file mode 100644 index 3def42f0199..00000000000 --- a/www/firefox15-bin/Makefile.SunOS.sparc +++ /dev/null @@ -1,5 +0,0 @@ -# $NetBSD: Makefile.SunOS.sparc,v 1.1.1.1 2007/05/12 13:56:51 ghen Exp $ - -DISTNAME= ${MOZILLA}-${MOZ_DISTVER}-sparc-sun-solaris2.8-gtk2 - -MOZ_PLATFORM= solaris diff --git a/www/firefox15-bin/Makefile.linux-i386 b/www/firefox15-bin/Makefile.linux-i386 new file mode 100644 index 00000000000..1c41b0b0785 --- /dev/null +++ b/www/firefox15-bin/Makefile.linux-i386 @@ -0,0 +1,7 @@ +# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:19:57 jlam Exp $ + +DISTNAME= firefox-${MOZ_DISTVER} +MOZ_DIR= ${MOZ_VER}/linux-i686/en-US + +MOZ_GTK2= yes +MOZ_PLATFORM= linux diff --git a/www/firefox15-bin/Makefile.solaris-i386 b/www/firefox15-bin/Makefile.solaris-i386 new file mode 100644 index 00000000000..2b6358ead86 --- /dev/null +++ b/www/firefox15-bin/Makefile.solaris-i386 @@ -0,0 +1,20 @@ +# $NetBSD: Makefile.solaris-i386,v 1.1 2007/07/29 05:19:57 jlam Exp $ + +.if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*) +SOLARIS_VERSION_REQD?= 10 +.else +SOLARIS_VERSION_REQD?= 8 +.endif + +# Use the Solaris 8 binaries if we're not running at least Solaris 10. +.if !empty(SOLARIS_VERSION_REQD:M1[0-9]*) +DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris10-i386 +MOZ_GTK2= yes +.else +DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris8-i386-gtk1 +.endif + +EXTRACT_SUFX= .tar.bz2 +MOZ_DIR= ${MOZ_DISTVER}/contrib/solaris_tarball + +MOZ_PLATFORM= solaris diff --git a/www/firefox15-bin/Makefile.solaris-sparc b/www/firefox15-bin/Makefile.solaris-sparc new file mode 100644 index 00000000000..130d63ff654 --- /dev/null +++ b/www/firefox15-bin/Makefile.solaris-sparc @@ -0,0 +1,20 @@ +# $NetBSD: Makefile.solaris-sparc,v 1.1 2007/07/29 05:19:57 jlam Exp $ + +.if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*) +SOLARIS_VERSION_REQD?= 10 +.else +SOLARIS_VERSION_REQD?= 8 +.endif + +# Use the Solaris 8 binaries if we're not running at least Solaris 10. +.if !empty(SOLARIS_VERSION_REQD:M1[0-9]*) +DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris10-respin-sparc +MOZ_GTK2= yes +.else +DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris8-respin-sparc-gtk1 +.endif + +EXTRACT_SUFX= .tar.bz2 +MOZ_DIR= ${MOZ_DISTVER}/contrib/solaris_tarball + +MOZ_PLATFORM= solaris diff --git a/www/firefox15-bin/distinfo b/www/firefox15-bin/distinfo index 8d483ce3f96..55c2c66f995 100644 --- a/www/firefox15-bin/distinfo +++ b/www/firefox15-bin/distinfo @@ -1,5 +1,17 @@ -$NetBSD: distinfo,v 1.2 2007/05/31 07:26:46 ghen Exp $ +$NetBSD: distinfo,v 1.3 2007/07/29 05:19:57 jlam Exp $ SHA1 (firefox/releases/1.5.0.12/linux-i686/en-US/firefox-1.5.0.12.tar.gz) = 0de90446b22a1e175595ebd1d03a81bfedc0f235 RMD160 (firefox/releases/1.5.0.12/linux-i686/en-US/firefox-1.5.0.12.tar.gz) = e90e7795d686ba5cdabde4143c0ca2e217806f65 Size (firefox/releases/1.5.0.12/linux-i686/en-US/firefox-1.5.0.12.tar.gz) = 8536567 bytes +SHA1 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-i386.tar.bz2) = 02881f43d0712a31a0d660fe3d36c5200be0e167 +RMD160 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-i386.tar.bz2) = 78a69c6d21b298ffc8fcc4c72df423ade8bbbcfb +Size (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-i386.tar.bz2) = 10713639 bytes +SHA1 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-respin-sparc.tar.bz2) = 06af23a41e9c1ad7273436a79f75b35cffe1fba5 +RMD160 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-respin-sparc.tar.bz2) = 04a3cc83e884caa4b44be65e051450e04b662c17 +Size (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-respin-sparc.tar.bz2) = 27288 bytes +SHA1 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-i386-gtk1.tar.bz2) = 21b840872d5c482bef4e479afe2de3a779f45688 +RMD160 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-i386-gtk1.tar.bz2) = 3264b95c0280cbe61b7d10353e08e66bbfb1f9d5 +Size (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-i386-gtk1.tar.bz2) = 9972234 bytes +SHA1 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = 1577403d476f1857e2bea230d2f8585f82509932 +RMD160 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = abb1639147e6a37cee7d50ea3c58bef796d5d7ad +Size (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = 27324 bytes diff --git a/www/navigator/DESCR b/www/navigator/DESCR index 89a617112d1..5f8d1a6e8c0 100644 --- a/www/navigator/DESCR +++ b/www/navigator/DESCR @@ -1,5 +1,4 @@ -Navigator is a WWW and ftp browser. (The Netscape mail client, newsgroup -reader, web page editor and address book organizer are available in pkgsrc -as 'communicator'.) This is the commercially distributed version from -Netscape. A freely available version of the Netscape browser is available -in pkgsrc as 'mozilla'. +Navigator is a WWW and ftp browser. + +This is the commercially distributed version from Netscape. A freely +available version of the Netscape browser is available as ``firefox''. diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common index e01fa83a2bd..8585851a0ca 100644 --- a/www/navigator/Makefile.common +++ b/www/navigator/Makefile.common @@ -1,8 +1,17 @@ -# $NetBSD: Makefile.common,v 1.85 2007/02/22 19:27:20 wiz Exp $ +# $NetBSD: Makefile.common,v 1.86 2007/07/29 05:19:57 jlam Exp $ # # Common include file for communicator and navigator packages -.include "../../mk/bsd.prefs.mk" +CATEGORIES= www + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE?= http://www.netscape.com/browsers/index.html + +RESTRICTED= No re-distribution without agreement from Netscape +NO_SRC_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_CDROM= ${RESTRICTED} +NO_SRC_ON_FTP= ${RESTRICTED} +NO_BIN_ON_FTP= ${RESTRICTED} # Note - the version will be overridden for certain architectures which # do not have the latest version available (eg: SunOS sparc) @@ -16,112 +25,102 @@ MASTER_SITES= ftp://ftp.netscape.com/pub/communicator/${SUB}/ \ ftp://ftp-uk.netscape.com/pub/communicator/${SUB}/ \ ftp://sunsite.utk.edu/pub/netscape/communicator/${SUB}/ \ ftp://ftp.informatik.rwth-aachen.de/pub/mirror/ftp.netscape.com/pub/communicator/${SUB}/ -# -# Based on OPSYS and MACHINE_ARCH, define: -# PLIST_ARCH ARCH specific PLIST contents + +EMUL_PLATFORMS= bsdi-i386 +EMUL_PLATFORMS+= linux-i386 +EMUL_PLATFORMS+= osf1-alpha +EMUL_PLATFORMS+= solaris-sparc +EMUL_PLATFORMS+= sunos-sparc + +EMUL_MODULES.linux= compat x11 + +# powerpc is "unusual" +.if ${BINNAME} == "communicator" +EMUL_PLATFORMS+= linux-powerpc +.endif + +.include "../../mk/bsd.prefs.mk" + +.if (${EMUL_PLATFORM} == "linux-powerpc" ) && (${BINNAME} == "communicator") +PKG_FAIL_REASON+= "There is no navigator-only package for PowerPC" +PKG_FAIL_REASON+= "platform. Please cd to ../communicator and" +PKG_FAIL_REASON+= "install the communicator package instead." +.endif + +# Based on EMUL_PLATFORM, define: # DISTUNAME Used to determine DISTNAME (tarfile on ftp server) # DIST_DIR_NAME Directory on ftp site from which to download # WRKNAME Used to determine WRKSRC (directoryname in tarfile) -# VENDOR_NAME Only used in '128-bit key version' information message # -.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc" -PLIST_ARCH= solaris-sparc -. if !empty(OS_VERSION:M5.5.1*) || !empty(OS_VERSION:M5.[67]*) +.if ${EMUL_PLATFORM} == "solaris-sparc" +. if (${OPSYS} == "SunOS") && \ + (!empty(OS_VERSION:M5.5.1*) || !empty(OS_VERSION:M5.[67]*)) NS_VERS= 4.79 PKGNAME= ${BINNAME}-${NS_VERS} DISTUNAME= sparc-sun-solaris2.5.1 DIST_DIR_NAME= supported/sunos551 WRKNAME= sparc-sun-solaris2.5.1 -VENDOR_NAME= Solaris 2.5.1 . else DISTUNAME= sparc-sun-solaris2.8 DIST_DIR_NAME= supported/sunos58 WRKNAME= sparc-sun-solaris2.8 -VENDOR_NAME= Solaris 2.8 . endif . if !defined(NS_NO_FLASH) DEPENDS+= ns-flash>4.0:../../multimedia/ns-flash . endif -.elif ${MACHINE_ARCH} == "alpha" -. if !exists(/emul/osf1/sbin/loader) -PKG_FAIL_REASON+= "${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)" -. endif +.elif ${EMUL_PLATFORM} == "sunos-sparc" +NS_VERS= 4.61 +PKGNAME= ${BINNAME}-${NS_VERS} +NS_ENCRYPTION= export +LDAP_VERS= 30 +DISTUNAME= sparc-sun-sunos4.1.3_U1 +DIST_DIR_NAME= unsupported/sunos413 +WRKNAME= ${DISTUNAME} +MASTER_SITES= ftp://archive.netscape.com/archive/communicator/${SUB}/ + +.elif ${EMUL_PLATFORM} == "osf1-alpha" NS_VERS= 4.78 PKGNAME= ${BINNAME}-${NS_VERS} -PLIST_ARCH= osf-alpha DISTUNAME= alpha-dec-osf4.0 DIST_DIR_NAME= supported/dec_unix40 WRKNAME= alpha-dec-osf4.0 -VENDOR_NAME= Tru64 UNIX -.elif ${MACHINE_ARCH} == "i386" && defined(NS_USE_BSDI) +.elif ${EMUL_PLATFORM} == "bsdi-i386" NS_VERS= 4.75 PKGREVISION= 1 PKGNAME= ${BINNAME}-${NS_VERS} -PLIST_ARCH= bsdi-i386 DISTUNAME= x86-bsdi-bsd2 DIST_DIR_NAME= unsupported/bsdi21 WRKNAME= x86-bsdi-bsd2 -VENDOR_NAME= BSD/OS 2.1 BUILD_DEPENDS+= binpatch>=1.0:../../pkgtools/binpatch post-install: ${SH} ../../www/navigator/files/binpatch-x86-bsdi-bsd2-4.75.sh \ ${LOCALBASE} ${MOZILLA_HOME}/netscape -.elif ${MACHINE_ARCH} == "i386" + +.elif ${EMUL_PLATFORM} == "linux-i386" PKGREVISION= 1 -PLIST_ARCH= linux-i386 DISTUNAME= x86-unknown-linux2.2 DIST_DIR_NAME= supported/linux22 WRKNAME= x86-unknown-linux2.2 -VENDOR_NAME= Linux 2.2 . if !defined(NS_NO_FLASH) DEPENDS+= ns-flash>4.0:../../multimedia/ns-flash . endif - -.if ${BINNAME} == "communicator" +. if ${BINNAME} == "communicator" BUILD_DEPENDS= binpatch>=1.0:../../pkgtools/binpatch post-install: ${SH} ../../www/navigator/files/binpatch-x86-unknown-linux2.2-4.80.sh \ ${LOCALBASE} ${MOZILLA_HOME}/netscape -.endif -.elif ((${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64") && defined(NS_USE_SUNOS)) -. if !exists(/emul/sunos/usr/lib/ld.so) -PKG_FAIL_REASON+= "${PKGNAME} requires SunOS libraries - see compat_sunos(8)" . endif -NS_VERS= 4.61 -PKGNAME= ${BINNAME}-${NS_VERS} -NS_ENCRYPTION= export -LDAP_VERS= 30 -PLIST_ARCH= sunos-sparc -DISTUNAME= sparc-sun-sunos4.1.3_U1 -DIST_DIR_NAME= unsupported/sunos413 -WRKNAME= ${DISTUNAME} -VENDOR_NAME= SunOS 4.1.3 -MASTER_SITES= ftp://archive.netscape.com/archive/communicator/${SUB}/ - -.elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" -PLIST_ARCH= solaris-sparc -. if !exists(/emul/svr4/usr/lib/ld.so.1) -PKG_FAIL_REASON+= "${PKGNAME} requires Solaris libraries - see compat_svr4(8)" -. endif -NS_VERS= 4.79 -PKGNAME= ${BINNAME}-${NS_VERS} -DISTUNAME= sparc-sun-solaris2.5.1 -DIST_DIR_NAME= supported/sunos551 -WRKNAME= sparc-sun-solaris2.5.1 -VENDOR_NAME= Solaris 2.5.1 -# powerpc is "unusual" -.elif ${MACHINE_ARCH} == "powerpc" -. if ${BINNAME} == "navigator" -PKG_FAIL_REASON+= "There is no navigator-only package for PowerPC" -PKG_FAIL_REASON+= "platform. Please cd to ../communicator and" -PKG_FAIL_REASON+= "install communicator package instead." -. endif +# linux-powerpc is "special" -- this is essentially an entire package +# Makefile embedded within this Makefile.common file. This section +# doesn't really share much code with the other platform targets. +# +.elif ${EMUL_PLATFORM} == "linux-powerpc" NS_VERS= 4.73 PKGNAME= ${BINNAME}-${NS_VERS} DISTNAME= netscape-4.7-3.ppc @@ -129,57 +128,22 @@ WRKSRC= ${WRKDIR} # was: ftp://ftp.linuxppc.org/linuxppc-halloween/software/ MASTER_SITES= http://www.gmd.de/ftp/mirrors3/ftp.linuxppc.org/linuxppc-halloween/software/ EXTRACT_SUFX= .rpm + HOMEPAGE= http://lwn.net/2000/0629/a/netscape-ppc.php3 -BUILD_DEPENDS+= rpm2pkg>=1.2:../../pkgtools/rpm2pkg DESCR_SRC= ${WRKDIR}/DESCR.linux-powerpc -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC -RPM2PKG= rpm2pkg -RPM2PKGARGS= ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} -VENDOR_NAME= # empty. what should be here? +PLIST_SRC= ${RPM2PKG_PLIST} -.else -PLIST_ARCH= -.endif - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE?= http://www.netscape.com/browsers/index.html -RESTRICTED= No re-distribution without agreement from Netscape -NO_SRC_ON_CDROM= ${RESTRICTED} -NO_BIN_ON_CDROM= ${RESTRICTED} -NO_SRC_ON_FTP= ${RESTRICTED} -NO_BIN_ON_FTP= ${RESTRICTED} - -ONLY_FOR_PLATFORM= *-*-alpha *-*-i386 *-*-powerpc *-*-sparc *-*-sparc64 -CATEGORIES= www -NS_NAME= ${BINNAME}-${NS_VERS} -PKGNAME?= ${BINNAME}-${NS_VERS} -DISTNAME?= ${BINNAME}-v${NS_VERS_SHORT}-${NS_ENCRYPTION}.${DISTUNAME} - -.if (${OPSYS} != "Linux" && ((${MACHINE_ARCH} == "i386" && !defined(NS_USE_BSDI)) || ${MACHINE_ARCH} == "powerpc")) -.include "../../emulators/suse_linux/Makefile.application" - -DEPENDS+= suse_compat>=6.4:../../emulators/${SUSE_DIR_PREFIX}_compat -DEPENDS+= suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11 -.endif - -.if ${BINNAME} != "netscape" -NO_BUILD= YES - -INSTALLATION_DIRS= bin - -# powerpc is "unusual" -. if ${MACHINE_ARCH} == "powerpc" -do-extract: - ${MKDIR} ${WRKSRC} +EMUL_PKG_FMT= rpm +RPM2PKG_PREFIX= ${PREFIX} +RPM2PKG_SUBPREFIX= ${EMULSUBDIR} +RPM2PKG_STAGE= do-install do-install: ${CP} ${PKGDIR}/DESCR.linux-powerpc ${WRKDIR} - ${RM} -f ${PLIST_SRC} - ${RPM2PKG} -d ${PREFIX} -f ${PLIST_SRC} -s 1 ${RPM2PKGARGS} - - ${SED} -e 's#@BINNAME@#${BINNAME}#g' \ - -e 's#@PREFIX@#${PREFIX}#g' \ - <${FILESDIR}/${BINNAME}.sh.linux-powerpc >${WRKDIR}/${BINNAME}.sh + ${SED} -e 's#@BINNAME@#${BINNAME}#g' \ + -e 's#@PREFIX@#${PREFIX}#g' \ + ${FILESDIR}/${BINNAME}.sh.linux-powerpc \ + > ${WRKDIR}/${BINNAME}.sh ${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${NS_NAME} ${RM} -f ${PREFIX}/bin/${BINNAME} ${LN} -sf ${NS_NAME} ${PREFIX}/bin/${BINNAME} @@ -187,7 +151,16 @@ do-install: ${ECHO} bin/${NS_NAME} >> ${PLIST_SRC} ${SORT} -r ${PLIST_SRC} > ${PLIST_SRC}.sorted ${MV} ${PLIST_SRC}.sorted ${PLIST_SRC} -. else +.endif + +NS_NAME= ${BINNAME}-${NS_VERS} +PKGNAME?= ${BINNAME}-${NS_VERS} +DISTNAME?= ${BINNAME}-v${NS_VERS_SHORT}-${NS_ENCRYPTION}.${DISTUNAME} + +BUILD_DIRS= # empty + +INSTALLATION_DIRS= bin + NS_VERS_SHORT= ${NS_VERS:S/.//} SUB= english/${NS_VERS}/unix/${DIST_DIR_NAME}/${DIST_SDIR_NAME} @@ -198,27 +171,25 @@ WRKSRC= ${WRKDIR}/${BINNAME}-v${NS_VERS_SHORT}.${WRKNAME} MOZILLA_HOME= ${PREFIX}/lib/netscape/${NS_NAME} NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins -PLIST_SRC= ${PKGDIR}/PLIST.pre \ - ${PKGDIR}/PLIST.${PLIST_ARCH} \ - ${PKGDIR}/PLIST.post PLIST_SUBST+= NS_VERS=${NS_VERS:Q} LDAP_VERS=${LDAP_VERS:Q} BINNAME=${BINNAME:Q} +.if !target(do-install) do-install: ${INSTALL_DATA_DIR} ${MOZILLA_HOME}/java/classes ${INSTALL_SCRIPT} ${WRKSRC}/vreg ${MOZILLA_HOME} -. for file in ifc11.jar iiop10.jar jae40.jar java40.jar jio40.jar \ +. for file in ifc11.jar iiop10.jar jae40.jar java40.jar jio40.jar \ jsd10.jar ldap${LDAP_VERS}.jar resource.jar scd10.jar ${INSTALL_DATA} ${WRKSRC}/${file} ${MOZILLA_HOME}/java/classes -. endfor +. endfor cd ${MOZILLA_HOME} && ${GZCAT} \ ${WRKSRC}/nethelp-v${NS_VERS_SHORT}.nif | ${PAX} -r cd ${MOZILLA_HOME} && ${GZCAT} \ ${WRKSRC}/netscape-v${NS_VERS_SHORT}.nif | ${PAX} -cr \ '*libflashplayer.so' '*ShockwaveFlash.class' '*dynMotif*' \ || ${TRUE} -. if ${BINNAME} == "communicator" +. if ${BINNAME} == "communicator" cd ${MOZILLA_HOME} && ${TAR} -xpzf ${WRKSRC}/spellchk-v${NS_VERS_SHORT}.nif -. endif +. endif ${SED} -e 's#@@MOZILLA_HOME@@#${MOZILLA_HOME}#g' \ -e 's#@@NS_PLUGINS_DIR@@#${NS_PLUGINS_DIR}#g' \ @@ -227,36 +198,20 @@ do-install: ${RM} -f ${PREFIX}/bin/${BINNAME} ${LN} -sf ${NS_NAME} ${PREFIX}/bin/${BINNAME} -. if ${PLIST_ARCH} == "sunos-sparc" +. if ${EMUL_PLATFORM} == "sunos-sparc" # Bizarre magic to handle the NIS and DNS versions. Make DNS default. @${SED} -e 's#MOZILLA_HOME/netscape#MOZILLA_HOME/netscape_nis#g' \ <${WRKDIR}/${BINNAME}.sh >${WRKDIR}/${BINNAME}_nis.sh ${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}_nis.sh \ ${PREFIX}/bin/${NS_NAME}_nis -. if ${BINNAME} == "communicator" +. if ${BINNAME} == "communicator" ${LN} -sf ${NS_NAME}_nis ${PREFIX}/bin/netscape_nis -. endif +. endif ${MV} ${MOZILLA_HOME}/netscape ${MOZILLA_HOME}/netscape_nis ${MV} ${MOZILLA_HOME}/netscape_dns ${MOZILLA_HOME}/netscape -. endif +. endif ${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR} ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${MOZILLA_HOME} ${CHMOD} -R go-w ${MOZILLA_HOME} -. endif - -.endif - -.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" && !defined(NS_USE_BSDI) -NS_NEED_LINUX= yes -.elif ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc" -NS_NEED_LINUX= yes -.elif ${OPSYS} == "Linux" -NS_NEED_LINUX= yes -.endif - -.if ${BINNAME} != "netscape" -. if defined(NS_NEED_LINUX) -. include "../../emulators/suse_linux/Makefile.application" -. endif .endif diff --git a/www/navigator/PLIST.pre b/www/navigator/PLIST.common index ba259091c65..95c4b15e50b 100644 --- a/www/navigator/PLIST.pre +++ b/www/navigator/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.pre,v 1.1 2001/11/01 20:42:29 zuntum Exp $ +@comment $NetBSD: PLIST.common,v 1.1 2007/07/29 05:19:58 jlam Exp $ bin/${BINNAME} bin/${BINNAME}-${NS_VERS} lib/netscape/${BINNAME}-${NS_VERS}/LICENSE diff --git a/www/navigator/PLIST.post b/www/navigator/PLIST.common_end index 10ed2c04e63..b30c45b56e2 100644 --- a/www/navigator/PLIST.post +++ b/www/navigator/PLIST.common_end @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.post,v 1.4 2002/12/09 16:01:49 tron Exp $ +@comment $NetBSD: PLIST.common_end,v 1.1 2007/07/29 05:19:58 jlam Exp $ @dirrm lib/netscape/${BINNAME}-${NS_VERS}/plugins @dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/shared @dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/navigatr diff --git a/www/navigator/PLIST.osf-alpha b/www/navigator/PLIST.osf-alpha deleted file mode 100644 index e57cf7d4f73..00000000000 --- a/www/navigator/PLIST.osf-alpha +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.osf-alpha,v 1.1 2001/11/01 20:42:28 zuntum Exp $ -lib/netscape/${BINNAME}-${NS_VERS}/plugins/libnullplugin.so diff --git a/www/navigator/PLIST.osf1-alpha b/www/navigator/PLIST.osf1-alpha new file mode 100644 index 00000000000..753894e9d28 --- /dev/null +++ b/www/navigator/PLIST.osf1-alpha @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST.osf1-alpha,v 1.1 2007/07/29 05:19:58 jlam Exp $ +lib/netscape/${BINNAME}-${NS_VERS}/plugins/libnullplugin.so diff --git a/www/ns-plugger-common/Makefile b/www/ns-plugger-common/Makefile index 45b685d4265..a82179a6558 100644 --- a/www/ns-plugger-common/Makefile +++ b/www/ns-plugger-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:15 rillig Exp $ +# $NetBSD: Makefile,v 1.20 2007/07/29 05:19:59 jlam Exp $ DISTNAME= plugger-4.0-linux-x86-glibc PKGNAME= ns-${PLUGGERNAME}-${BINNAME}-${PLUGGERVERS} @@ -10,23 +10,22 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://fredrik.hubbe.net/plugger.html COMMENT= Streaming multimedia plugin for Netscape +CONFLICTS+= plugger-[0-9]* # obsolete all-in-one plugger package + BINNAME?= common .if ${BINNAME} != common DEPENDS+= ${BINNAME}-[0-9]*:../../www/${BINNAME} +NSNAME!= ${PKG_INFO} -e ${BINNAME} || ${ECHO} MOZILLA_HOME= ${PREFIX}/lib/netscape/${NSNAME:C/nb[0-9]+$//:S/4.80/4.8/} PLIST_SUBST+= MOZILLA_HOME=${MOZILLA_HOME:S/${PREFIX}\///} -.else -DEPENDS+= suse_base>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base .endif -CONFLICTS+= plugger-[0-9]* # obsolete all-in-one plugger package - -ONLY_FOR_PLATFORM= NetBSD-*-i386 +EMUL_PLATFORMS= linux-i386 +EMUL_MODULES.linux= base WRKSRC= ${WRKDIR}/${PLUGGERFULL} -NO_CONFIGURE= YES -NO_BUILD= YES +BUILD_DIRS= # empty PLUGGERFULL= ${DISTNAME:C/-linux-x86-glibc//} PLUGGERVERS= ${PLUGGERFULL:C/.*-//} @@ -38,21 +37,21 @@ PLIST_SUBST+= NS_PLUGINS_DIR=${NS_PLUGINS_DIR:S/${PREFIX}\///} INSTALLATION_DIRS= bin ${PKGMANDIR}/man7 -do-install: -.if ${BINNAME} != common - cd ${WRKSRC}; ${INSTALL_DATA} pluggerrc ${MOZILLA_HOME}/pluggerrc -.else +.PHONY: do-install-common do-install-pluggerrc +do-install-common: ${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR} ${DOCDIR} cd ${WRKSRC}; ${INSTALL_PROGRAM} plugger.so ${NS_PLUGINS_DIR} cd ${WRKSRC}; ${INSTALL_PROGRAM} plugger-4.0 ${PREFIX}/bin cd ${WRKSRC}; ${INSTALL_DATA} plugger.7 ${PREFIX}/${PKGMANDIR}/man7 cd ${WRKSRC}; ${INSTALL_DATA} README COPYING ${DOCDIR} -.endif -.include "../../emulators/suse_linux/Makefile.application" +do-install-pluggerrc: + cd ${WRKSRC}; ${INSTALL_DATA} pluggerrc ${MOZILLA_HOME}/pluggerrc -.if ${BINNAME} != common -NSNAME!= ${PKG_INFO} -e ${BINNAME} || ${ECHO} +.if ${BINNAME} == "common" +do-install: do-install-common +.else +do-install: do-install-common .endif .include "../../mk/bsd.pkg.mk" diff --git a/www/opera-acroread/DEINSTALL b/www/opera-acroread/DEINSTALL new file mode 100644 index 00000000000..dd9b50ced1b --- /dev/null +++ b/www/opera-acroread/DEINSTALL @@ -0,0 +1,8 @@ +# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:19:59 jlam Exp $ + +case "${STAGE}" in +DEINSTALL) + dest="${EMULDIR}/usr/lib/opera/plugins/nppdf.so" + ${RM} -f "$dest" + ;; +esac diff --git a/www/opera-acroread/INSTALL b/www/opera-acroread/INSTALL new file mode 100644 index 00000000000..a7a3ea8c50a --- /dev/null +++ b/www/opera-acroread/INSTALL @@ -0,0 +1,9 @@ +# $NetBSD: INSTALL,v 1.1 2007/07/29 05:19:59 jlam Exp $ + +case "${STAGE}" in +POST-INSTALL) + src="${PKG_PREFIX}/@ACROREAD@/@ACRO_SUBDIR@/@ACRO_PLATFORM@/nppdf.so" + dest="${EMULDIR}/usr/lib/opera/plugins/nppdf.so" + ${TEST} -f "$dest" || ${LN} -s "$src" "$dest" + ;; +esac diff --git a/www/opera-acroread/Makefile b/www/opera-acroread/Makefile index 897672404ac..41ba6b5158c 100644 --- a/www/opera-acroread/Makefile +++ b/www/opera-acroread/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:20 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2007/07/29 05:20:00 jlam Exp $ -DISTNAME= opera-acroread-1.0 -PKGREVISION= 3 +DISTNAME= opera-acroread-1.0 +PKGREVISION= 4 MAINTAINER= jschauma@NetBSD.org COMMENT= Acrobat Reader 4 plugin for opera @@ -15,3 +15,4 @@ ACROREAD= Acrobat4 ACRO_SUBDIR= Browsers .include "../../www/opera-acroread/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/www/opera-acroread/Makefile.common b/www/opera-acroread/Makefile.common index b7460344456..fb1db9f715f 100644 --- a/www/opera-acroread/Makefile.common +++ b/www/opera-acroread/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2006/07/01 20:34:11 salo Exp $ +# $NetBSD: Makefile.common,v 1.8 2007/07/29 05:20:00 jlam Exp $ PKGNAME= ${DISTNAME:C|MozillaFirebird|firefox|} CATEGORIES= www print @@ -6,26 +6,27 @@ MASTER_SITES= # empty DISTFILES= # empty DEPENDS+= opera>=7.0:../../www/opera -DEPENDS+= suse_openmotif>=7.3:../../emulators/${SUSE_DIR_PREFIX}_openmotif -ONLY_FOR_PLATFORM= Linux-*-i386 NetBSD-*-i386 -PLATFORM= intellinux +EMUL_PLATFORMS= linux-i386 +EMUL_MODULES.linux= motif +SUSE_VERSION_REQD= 7.3 + +ACRO_PLATFORM= intellinux WRKSRC= ${WRKDIR} NO_CHECKSUM= YES NO_CONFIGURE= YES -NO_BUILD= YES +BUILD_DIRS= # empty + +PLIST_SRC= ${PKGSRCDIR}/www/opera-acroread/PLIST + +FILES_SUBST+= ACROREAD=${ACROREAD:Q} +FILES_SUBST+= ACRO_SUBDIR=${ACRO_SUBDIR:Q} +FILES_SUBST+= ACRO_PLATFORM=${ACRO_PLATFORM:Q} -PLIST_SRC= ../../www/opera-acroread/PLIST -PLIST_SUBST+= ACROREAD=${ACROREAD:Q} -PLIST_SUBST+= ACRO_SUBDIR=${ACRO_SUBDIR:Q} -PLIST_SUBST+= PLATFORM=${PLATFORM:Q} -NS_PLUGINS_DIR= ${PREFIX}/emul/linux/usr/lib/opera/plugins +DEINSTALL_TEMPLATES+= ${PKGSRCDIR}/www/opera-acroread/DEINSTALL +INSTALL_TEMPLATES+= ${PKGSRCDIR}/www/opera-acroread/INSTALL -do-install: - ${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR} - ${LN} -s ${PREFIX}/${ACROREAD}/${ACRO_SUBDIR}/${PLATFORM}/nppdf.so \ - ${NS_PLUGINS_DIR}/nppdf.so +INSTALLATION_DIRS+= ${EMULDIR}/usr/lib/opera/plugins -.include "../../emulators/suse_linux/Makefile.application" -.include "../../mk/bsd.pkg.mk" +do-install: # nothing diff --git a/www/opera-acroread/PLIST b/www/opera-acroread/PLIST index 1b88d0e9452..fe58a735097 100644 --- a/www/opera-acroread/PLIST +++ b/www/opera-acroread/PLIST @@ -1,3 +1,2 @@ -@comment $NetBSD: PLIST,v 1.2 2005/04/18 16:20:25 jschauma Exp $ -@exec ${LN} -s %D/${ACROREAD}/${ACRO_SUBDIR}/${PLATFORM}/nppdf.so %D/emul/linux/usr/lib/opera/plugins/nppdf.so -emul/linux/usr/lib/opera/plugins/nppdf.so +@comment $NetBSD: PLIST,v 1.3 2007/07/29 05:20:00 jlam Exp $ +@comment this plist intentionally left empty diff --git a/www/opera-acroread5/Makefile b/www/opera-acroread5/Makefile index 6aa54c42fcf..29220eb15c6 100644 --- a/www/opera-acroread5/Makefile +++ b/www/opera-acroread5/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2007/02/22 19:27:21 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2007/07/29 05:20:00 jlam Exp $ -DISTNAME= opera-acroread5-1.0 -PKGREVISION= 3 +DISTNAME= opera-acroread5-1.0 +PKGREVISION= 4 MAINTAINER= jschauma@NetBSD.org COMMENT= Acrobat Reader 5 plugin for opera @@ -15,3 +15,4 @@ ACROREAD= Acrobat5 ACRO_SUBDIR= Browsers .include "../../www/opera-acroread/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/www/opera-acroread7/Makefile b/www/opera-acroread7/Makefile index f6a46fd84b7..f5d29d06e62 100644 --- a/www/opera-acroread7/Makefile +++ b/www/opera-acroread7/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:21 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2007/07/29 05:20:00 jlam Exp $ -DISTNAME= opera-acroread7-1.0 -PKGREVISION= 2 +DISTNAME= opera-acroread7-1.0 +PKGREVISION= 3 MAINTAINER= jschauma@NetBSD.org COMMENT= Acrobat Reader 7 plugin for opera @@ -15,3 +15,4 @@ ACROREAD= Acrobat7 ACRO_SUBDIR= Browser .include "../../www/opera-acroread/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/www/opera-plugins/Makefile b/www/opera-plugins/Makefile index db886960275..54e8258bc49 100644 --- a/www/opera-plugins/Makefile +++ b/www/opera-plugins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2007/04/19 16:11:34 xtraeme Exp $ +# $NetBSD: Makefile,v 1.13 2007/07/29 05:20:00 jlam Exp $ DISTNAME= opera-plugins-1.0 PKGREVISION= 1 @@ -12,36 +12,35 @@ COMMENT= Plugins for the Opera browser DEPENDS+= opera>=5.999.1:../../www/opera DEPENDS+= ns-flash>=5.0.47:../../multimedia/ns-flash -DEPENDS+= suse_openmotif>=7.3:../../emulators/${SUSE_DIR_PREFIX}_openmotif + +EMUL_PLATFORMS= linux-i386 +EMUL_MODULES.linux= motif +SUSE_VERSION_REQD= 7.3 EXTRACT_ONLY= # empty NO_CHECKSUM= YES NO_BUILD= YES PLIST_SRC= ${WRKDIR}/PLIST -EMULSUBDIR= emul/linux -EMULDIR= ${PREFIX}/${EMULSUBDIR} - PLUGIN_DIR= ${PREFIX}/lib/netscape/plugins + # The FlashPlayer plugin is the only one I got completely working so far. # Sun's Java Plugin fails, Acrobat and RealPlayer are not recognized by # name. If you get more plugins working add them (including dependences) # and bump the version number. +# PLUGINS= libflashplayer.so -SUSE_COMPAT32= yes - -INSTALLATION_DIRS= ${EMULSUBDIR}/usr/lib/opera/plugins +INSTALLATION_DIRS= ${EMULSUBDIRSLASH}usr/lib/opera/plugins do-install: - ${RM} -f ${PLIST_SRC} - ${TOUCH} ${PLIST_SRC} - for FILE in ${PLUGINS}; do \ - ${LN} -fs ${PLUGIN_DIR}/$$FILE \ - ${EMULDIR}/usr/lib/opera/plugins/$$FILE; \ - ${ECHO} ${EMULSUBDIR}/usr/lib/opera/plugins/$$FILE \ - >>${PLIST_SRC}; \ - done - -.include "../../emulators/suse_linux/Makefile.application" + ${RM} -f ${PLIST_SRC} + ${TOUCH} ${PLIST_SRC} + for FILE in ${PLUGINS}; do \ + ${LN} -fs ${PLUGIN_DIR}/$$FILE \ + ${EMULDIR}/usr/lib/opera/plugins/$$FILE; \ + ${ECHO} ${EMULSUBDIRSLASH}usr/lib/opera/plugins/$$FILE \ + >>${PLIST_SRC}; \ + done + .include "../../mk/bsd.pkg.mk" diff --git a/www/opera/Makefile b/www/opera/Makefile index 3f257c2a91d..365171ff54c 100644 --- a/www/opera/Makefile +++ b/www/opera/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2007/07/19 19:09:44 xtraeme Exp $ +# $NetBSD: Makefile,v 1.70 2007/07/29 05:20:00 jlam Exp $ DISTNAME= opera-${OPERA_PKG_VERSION:S/u/pl/} CATEGORIES= www @@ -14,57 +14,76 @@ MAINTAINER= jdolecek@NetBSD.org HOMEPAGE= http://www.opera.com/ COMMENT= Small, fast and customizable WWW client -ONLY_FOR_PLATFORM= NetBSD-*-i386 SunOS-*-sparc FreeBSD-*-i386 DragonFly-*-i386 - LICENSE= opera-850-license -#PKG_INSTALLATION_TYPES= overwrite pkgviews +EMUL_PLATFORMS= freebsd-i386 +EMUL_PLATFORMS+= linux-i386 +EMUL_PLATFORMS+= solaris-sparc -NO_CONFIGURE= YES -USE_LANGUAGES= # empty +EMUL_MODULES.linux= x11 +SUSE_VERSION_REQD= 7.3 -.include "../../mk/bsd.prefs.mk" +USE_LANGUAGES= # empty +BUILD_DIRS= # empty +EMUL_PKG_FMT= plain OPERA_LANG= en OPERA_VER_DATE= 20070716 OPERA_PKG_VERSION= 9.22 OPERA_PKG_VERSION_DIR= 922 -_OPERA_OPSYS?= ${OPSYS} -_OPERA_MACHINE_ARCH?= ${MACHINE_ARCH} - -.if (${_OPERA_OPSYS} == NetBSD) || (${_OPERA_OPSYS} == DragonFly) -DEPENDS+= suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11 +.include "../../mk/bsd.prefs.mk" -# we need to define DIST_SUBDIR because of the inclusion of suse's Makefile.common -DIST_SUBDIR= # empty -EXTRACT_ONLY= # empty -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC +# This package installs from an RPM directly into "/usr" on a Linux +# system, which can't be managed by pkgsrc. +# +NOT_FOR_PLATFORMS= Linux-*-* +.if ${EMUL_PLATFORM} == "linux-i386" EXTRACT_SUFX= .rpm OPERA_ARCH= .i386 OPERA_DIR= linux/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/${OPERA_ARCH:S/.//}/static OPERA_DIST_VERSION= ${OPERA_PKG_VERSION:C/beta.*//:C/u.*//}-${OPERA_VER_DATE}.1-static-qt -RPMFILES= ${DISTFILES} -RPM2PKGSTRIP= 1 +WRKSRC= ${WRKDIR} +BUILD_DIRS= # empty + +EMUL_PKG_FMT= rpm +RPM2PKG_PREFIX= ${PREFIX} +RPM2PKG_SUBPREFIX= ${EMULSUBDIR} +RPM2PKG_STAGE= do-install + +do-build: + ${SED} -e 's#@EMULDIR@#${EMULDIR}#g' \ + ${FILESDIR}/opera.sh > ${WRKDIR}/opera + +post-install: + ${INSTALL_SCRIPT} ${WRKDIR}/opera ${PREFIX}/bin + ${LN} -fs ${EMULDIR}/usr/share/man/man1/opera.1 \ + ${PREFIX}/${PKGMANDIR}/man1 + ${ECHO} "bin/opera" >> ${RPM2PKG_PLIST} + ${ECHO} "${PKGMANDIR}/man1/opera.1" >> ${RPM2PKG_PLIST} -.elif (${_OPERA_OPSYS} == FreeBSD) +.elif ${EMUL_PLATFORM} == "freebsd-i386" +ONLY_FOR_PLATFORM+= FreeBSD-*-i386 +EXTRACT_SUFX= .tar.bz2 OPERA_ARCH= .i386.freebsd OPERA_DIR= unix/freebsd/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/static OPERA_DIST_VERSION= ${OPERA_PKG_VERSION:C/u.*//}-${OPERA_VER_DATE}.1-static-qt -WRKSRC= ${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG} +WRKSRC= ${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-655 OWN_DIRS= ${PREFIX}/share/opera/plugins -.elif (${_OPERA_OPSYS} == SunOS) && (${_OPERA_MACHINE_ARCH} == sparc) +.elif ${EMUL_PLATFORM} == "solaris-sparc" +ONLY_FOR_PLATFORM+= SunOS-*-sparc* EXTRACT_SUFX= .tar.bz2 +SOLARIS_VERSION_REQD= 8 OPERA_ARCH= -sol8-sparc -OPERA_DIR= unix/solaris/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/${_OPERA_MACHINE_ARCH}/static +OPERA_DIR= unix/solaris/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/sparc/static OPERA_DIST_VERSION= ${OPERA_PKG_VERSION:C/u.*//}-${OPERA_VER_DATE}.1-static-qt -WRKSRC= ${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-641 +WRKSRC= ${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-655 BUILD_DEFS+= INSTALL_ETC_OPERARC INSTALL_ETC_OPERARC?= no @@ -76,55 +95,23 @@ CONF_FILES+= ${PREFIX}/share/opera/config/opera6rc \ CONF_FILES+= ${PREFIX}/share/opera/config/opera6rc.fixed \ /etc/opera6rc.fixed . endif +.endif + +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 PLIST_SUBST+= OPERA_VER_DATE=${OPERA_VER_DATE:Q} PLIST_SUBST+= OPERA_PKG_VERSION=${OPERA_PKG_VERSION:C/u.*//} -.endif - -.if (((${_OPERA_OPSYS} == SunOS) && (${_OPERA_MACHINE_ARCH} == sparc)) || (${_OPERA_OPSYS} == FreeBSD)) -NO_BUILD= YES - +.if ${EMUL_PKG_FMT} == "plain" SUBST_CLASSES+= opera SUBST_STAGE.opera= post-build SUBST_FILES.opera= man/opera.1 SUBST_SED.opera= -e 's,/usr/,${PREFIX}/,g' -.endif - -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 - -do-build: -.if (${_OPERA_OPSYS} == NetBSD) || (${_OPERA_OPSYS} == DragonFly) - @ ${SED} -e 's#@EMULDIR@#${EMULDIR}#g' ${FILESDIR}/opera.sh > \ - ${WRKDIR}/opera - -post-install: post-install-manpage - ${INSTALL_SCRIPT} ${WRKDIR}/opera ${PREFIX}/bin - -.include "../../emulators/suse_linux/Makefile.application" - -.if !defined(MANCOMPRESSED) -USE_TOOLS+= gzip -.endif - -.PHONY: post-install-manpage -post-install-manpage: -# The SuSE common makefile defines "MANCOMPRESSED=yes". -. if defined(MANCOMPRESSED) && !empty(MANCOMPRESSED:M[yY][eE][sS]) - ${LN} -fs ../../${EMULSUBDIR}/usr/share/man/man1/opera.1.gz \ - ${PREFIX}/${PKGMANDIR}/man1 -. else - ${GUNZIP_CMD} -c ${EMULDIR}/usr/share/man/man1/opera.1.gz > - ${PREFIX}/${PKGMANDIR}/man1/opera.1 -. endif -.endif - -.if (((${_OPERA_OPSYS} == SunOS) && (${_OPERA_MACHINE_ARCH} == sparc)) || (${_OPERA_OPSYS} == FreeBSD)) do-install: - @${ECHO} "n" > ${WRKSRC}/inst.cmd - @${ECHO} "n" >> ${WRKSRC}/inst.cmd - @cd ${WRKSRC} && ${CAT} ${WRKSRC}/inst.cmd | ./install.sh --prefix=${PREFIX:Q} + @(${ECHO} "n"; ${ECHO} "n") > ${WRKSRC}/inst.cmd + @cd ${WRKSRC} && ${CAT} ${WRKSRC}/inst.cmd | \ + ./install.sh --prefix=${PREFIX:Q} @${ECHO} "=> You can ignore any previous lines about opera6rc" @${ECHO} @@ -132,18 +119,4 @@ post-install: @${INSTALL_MAN} ${WRKSRC}/man/opera.1 ${PREFIX}/${PKGMANDIR}/man1 .endif -# regenerate distinfo for all ports supported by this package -.PHONY: opera-distinfo -opera-distinfo: - ( ${ECHO} '$$'NetBSD'$$'; \ - ${ECHO} ''; \ - _OPERA_OPSYS=NetBSD ${MAKE} distinfo 1>&2; \ - ${GREP} opera distinfo; \ - _OPERA_OPSYS=FreeBSD ${MAKE} distinfo 1>&2; \ - ${GREP} opera distinfo; \ - _OPERA_OPSYS=SunOS _OPERA_MACHINE_ARCH=sparc make distinfo 1>&2; \ - ${GREP} opera distinfo; \ - ) > distinfo.new - ${MV} -f distinfo.new distinfo - .include "../../mk/bsd.pkg.mk" diff --git a/www/opera/PLIST b/www/opera/PLIST deleted file mode 100644 index 9e5e7ce9021..00000000000 --- a/www/opera/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2005/04/30 22:25:15 tron Exp $ -bin/opera -man/man1/opera.1 diff --git a/www/opera/PLIST.FreeBSD b/www/opera/PLIST.freebsd-i386 index 5cad4879e98..178e18ec027 100644 --- a/www/opera/PLIST.FreeBSD +++ b/www/opera/PLIST.freebsd-i386 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.FreeBSD,v 1.1 2005/04/30 22:25:15 tron Exp $ +@comment $NetBSD: PLIST.freebsd-i386,v 1.1 2007/07/29 05:20:01 jlam Exp $ bin/opera man/man1/opera.1 share/doc/opera/LICENSE diff --git a/www/opera/PLIST.SunOS b/www/opera/PLIST.solaris-sparc index 009cad1e6e4..194ad44825d 100644 --- a/www/opera/PLIST.SunOS +++ b/www/opera/PLIST.solaris-sparc @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST.SunOS,v 1.6 2007/06/25 21:35:48 dmcmahill Exp $ +@comment $NetBSD: PLIST.solaris-sparc,v 1.1 2007/07/29 05:20:01 jlam Exp $ +bin/opera lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1/missingsyms.so lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1/opera lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1/spellcheck.so @@ -6,8 +7,8 @@ lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1/works lib/opera/plugins/libnpp.so lib/opera/plugins/operaplugincleaner lib/opera/plugins/operapluginwrapper +man/man1/opera.1 share/doc/opera/LICENSE -share/man/man1/opera.1 share/opera/chartables-be.bin share/opera/config/opera6rc share/opera/config/opera6rc.fixed @@ -95,7 +96,6 @@ share/opera/svg-se.dat @dirrm share/opera/images @dirrm share/opera/config @dirrm share/opera -@dirrm share/man/man1 @dirrm share/doc/opera @dirrm lib/opera/plugins @dirrm lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1 diff --git a/www/opera/distinfo b/www/opera/distinfo index 09f02c56d29..461b15239b6 100644 --- a/www/opera/distinfo +++ b/www/opera/distinfo @@ -1,5 +1,11 @@ -$NetBSD: distinfo,v 1.23 2007/07/19 19:09:44 xtraeme Exp $ +$NetBSD: distinfo,v 1.24 2007/07/29 05:20:02 jlam Exp $ +SHA1 (opera-9.22-20070716.1-static-qt.i386.freebsd-en.tar.bz2) = 98f0f101eb2c8b85f00faffe67790dd881dc9c2e +RMD160 (opera-9.22-20070716.1-static-qt.i386.freebsd-en.tar.bz2) = 925a9d010b1630426a2e4de429ec1583ea3cb099 +Size (opera-9.22-20070716.1-static-qt.i386.freebsd-en.tar.bz2) = 6546833 bytes SHA1 (opera-9.22-20070716.1-static-qt.i386-en.rpm) = bbbaf86776497dea8d25573f8cdb666e831e2881 RMD160 (opera-9.22-20070716.1-static-qt.i386-en.rpm) = 0ef0ae252497cc5c43835f590bc8dabd8ae8fa02 Size (opera-9.22-20070716.1-static-qt.i386-en.rpm) = 7282798 bytes +SHA1 (opera-9.22-20070716.1-static-qt-sol8-sparc-en.tar.bz2) = e1dc46c7d113de4716ceaab5da4594bdb43139ed +RMD160 (opera-9.22-20070716.1-static-qt-sol8-sparc-en.tar.bz2) = b9b48b4a7280f41177b274a55b0288e19a95f4f7 +Size (opera-9.22-20070716.1-static-qt-sol8-sparc-en.tar.bz2) = 8377666 bytes diff --git a/www/seamonkey-bin-flash/Makefile b/www/seamonkey-bin-flash/Makefile index 3ae9432dfa8..ebc4a9b9737 100644 --- a/www/seamonkey-bin-flash/Makefile +++ b/www/seamonkey-bin-flash/Makefile @@ -1,4 +1,5 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/02/01 14:02:32 ghen Exp $ +# $NetBSD: Makefile,v 1.2 2007/07/29 05:20:02 jlam Exp $ + .include "../../www/firefox-bin-flash/Makefile.common" COMMENT= Flash Player plugin for seamonkey-bin @@ -7,5 +8,4 @@ MOZ_NAME= seamonkey-linux DEPENDS+= seamonkey-bin>=1.0:../../www/seamonkey-bin -.include "../../emulators/suse_linux/Makefile.application" .include "../../mk/bsd.pkg.mk" diff --git a/www/seamonkey-bin-nightly/Makefile b/www/seamonkey-bin-nightly/Makefile index f44221427ab..e639216c305 100644 --- a/www/seamonkey-bin-nightly/Makefile +++ b/www/seamonkey-bin-nightly/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/09/24 16:40:50 salo Exp $ +# $NetBSD: Makefile,v 1.2 2007/07/29 05:20:02 jlam Exp $ MOZILLA= seamonkey -COMMENT= Full featured gecko-based browser (nightly binary pkg) +COMMENT= Full-featured gecko-based browser suite (nightly binary pkg) -ONLY_FOR_PLATFORM+= Linux-*-i[3-6]86 NetBSD-*-i386 +EMUL_PLATFORMS= linux-i386 +EMUL_PLATFORMS+= solaris-i386 solaris-sparc .include "../../www/seamonkey-bin-nightly/Makefile.common" diff --git a/www/seamonkey-bin-nightly/Makefile.Linux.i386 b/www/seamonkey-bin-nightly/Makefile.Linux.i386 deleted file mode 100644 index 7300da4153f..00000000000 --- a/www/seamonkey-bin-nightly/Makefile.Linux.i386 +++ /dev/null @@ -1,6 +0,0 @@ -# $NetBSD: Makefile.Linux.i386,v 1.1.1.1 2006/09/24 16:40:50 salo Exp $ - -DISTNAME= ${MOZILLA}-1.5a.en-US.${MOZ_PLATFORM}-i686 -EXTRACT_SUFX= .tar.bz2 -MOZ_PLATFORM= linux -MOZ_GTK2= yes diff --git a/www/seamonkey-bin-nightly/Makefile.NetBSD.i386 b/www/seamonkey-bin-nightly/Makefile.NetBSD.i386 deleted file mode 100644 index 78d6bab6fbf..00000000000 --- a/www/seamonkey-bin-nightly/Makefile.NetBSD.i386 +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: Makefile.NetBSD.i386,v 1.2 2007/02/22 19:01:27 wiz Exp $ - -BUILD_DEFS+= MOZILLA_USE_LINUX - -.if defined(MOZILLA_USE_LINUX) -DISTNAME= ${MOZILLA}-1.5a.en-US.${MOZ_PLATFORM}-i686 -EXTRACT_SUFX= .tar.bz2 -MOZ_PLATFORM= linux -MOZ_GTK2= yes -ONLY_FOR_PLATFORM+= NetBSD-*-i386 -.else -PKG_SKIP_REASON+= "No native pre-built NetBSD binary available." -PKG_SKIP_REASON+= "Set MOZILLA_USE_LINUX if you want to use the Linux binary." -DISTNAME= -EXTRACT_SUFX= .tar.bz2 -MOZ_PLATFORM= netbsd -ONLY_FOR_PLATFORM+= NetBSD-1.6*-i386 NetBSD-2*-i386 -.endif diff --git a/www/seamonkey-bin-nightly/Makefile.SunOS.sparc b/www/seamonkey-bin-nightly/Makefile.SunOS.sparc deleted file mode 100644 index 816e01649ce..00000000000 --- a/www/seamonkey-bin-nightly/Makefile.SunOS.sparc +++ /dev/null @@ -1,7 +0,0 @@ -# $NetBSD: Makefile.SunOS.sparc,v 1.2 2007/02/22 19:01:27 wiz Exp $ - -DISTNAME= - -MOZ_PLATFORM= solaris - -PKG_SKIP_REASON+= "No native pre-built Solaris binary available." diff --git a/www/seamonkey-bin-nightly/Makefile.linux-i386 b/www/seamonkey-bin-nightly/Makefile.linux-i386 new file mode 100644 index 00000000000..aaabc08f0d3 --- /dev/null +++ b/www/seamonkey-bin-nightly/Makefile.linux-i386 @@ -0,0 +1,7 @@ +# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:20:03 jlam Exp $ + +DISTNAME= seamonkey-2.0a1pre.en-US.linux-i686 +EXTRACT_SUFX= .tar.bz2 + +MOZ_GTK2= yes +MOZ_PLATFORM= linux diff --git a/www/seamonkey-bin-nightly/Makefile.solaris-i386 b/www/seamonkey-bin-nightly/Makefile.solaris-i386 new file mode 100644 index 00000000000..165e8f09ac6 --- /dev/null +++ b/www/seamonkey-bin-nightly/Makefile.solaris-i386 @@ -0,0 +1,9 @@ +# $NetBSD: Makefile.solaris-i386,v 1.1 2007/07/29 05:20:03 jlam Exp $ + +SOLARIS_VERSION_REQD= 10 + +DISTNAME= seamonkey-1.5a.en-US.solaris10-nosvg-i386 +EXTRACT_SUFX= .tar.bz2 + +MOZ_GTK2= yes +MOZ_PLATFORM= solaris diff --git a/www/seamonkey-bin-nightly/Makefile.solaris-sparc b/www/seamonkey-bin-nightly/Makefile.solaris-sparc new file mode 100644 index 00000000000..ce36f6669d0 --- /dev/null +++ b/www/seamonkey-bin-nightly/Makefile.solaris-sparc @@ -0,0 +1,9 @@ +# $NetBSD: Makefile.solaris-sparc,v 1.1 2007/07/29 05:20:03 jlam Exp $ + +SOLARIS_VERSION_REQD= 10 + +DISTNAME= seamonkey-1.5a.en-US.solaris10-nosvg-sparc +EXTRACT_SUFX= .tar.bz2 + +MOZ_GTK2= yes +MOZ_PLATFORM= solaris diff --git a/www/seamonkey-bin/Makefile b/www/seamonkey-bin/Makefile index d7a57f062f3..a146923b225 100644 --- a/www/seamonkey-bin/Makefile +++ b/www/seamonkey-bin/Makefile @@ -1,16 +1,14 @@ -# $NetBSD: Makefile,v 1.14 2007/07/26 08:50:17 ghen Exp $ +# $NetBSD: Makefile,v 1.15 2007/07/29 05:20:03 jlam Exp $ MOZILLA= seamonkey MOZ_VER= 1.1.3 MOZ_DISTVER= ${MOZ_VER} HOMEPAGE= http://www.mozilla.org/projects/seamonkey/ -COMMENT= Full featured gecko-based browser (binary package) +COMMENT= Full-featured gecko-based browser suite (binary package) DIST_SUBDIR= ${MOZILLA}/${MOZ_DISTDIR} -MOZ_GTK2= YES - -ONLY_FOR_PLATFORM+= Linux-*-i386 +EMUL_PLATFORMS= linux-i386 .include "../../www/seamonkey-bin/Makefile.common" diff --git a/www/seamonkey-bin/Makefile.Linux.i386 b/www/seamonkey-bin/Makefile.Linux.i386 deleted file mode 100644 index 12efd8a644c..00000000000 --- a/www/seamonkey-bin/Makefile.Linux.i386 +++ /dev/null @@ -1,7 +0,0 @@ -# $NetBSD: Makefile.Linux.i386,v 1.1.1.1 2006/03/30 19:18:20 ghen Exp $ - -DISTNAME= ${MOZILLA}-${MOZ_DISTVER}.en-US.linux-i686 -MOZ_DISTDIR= releases/${MOZ_DIR} -MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/seamonkey/${MOZ_DISTDIR}/ - -MOZ_PLATFORM= linux diff --git a/www/seamonkey-bin/Makefile.NetBSD.i386 b/www/seamonkey-bin/Makefile.NetBSD.i386 deleted file mode 100644 index 5633eec5caa..00000000000 --- a/www/seamonkey-bin/Makefile.NetBSD.i386 +++ /dev/null @@ -1,11 +0,0 @@ -# $NetBSD: Makefile.NetBSD.i386,v 1.1.1.1 2006/03/30 19:18:20 ghen Exp $ - -BUILD_DEFS+= MOZILLA_USE_LINUX - -.if defined(MOZILLA_USE_LINUX) -ONLY_FOR_PLATFORM+= NetBSD-*-i386 -. include "Makefile.Linux.i386" -.else -PKG_SKIP_REASON+= "No native pre-built NetBSD binary available." -PKG_SKIP_REASON+= "Set MOZILLA_USE_LINUX if you want to use the Linux binary." -.endif diff --git a/www/seamonkey-bin/Makefile.common b/www/seamonkey-bin/Makefile.common index e499da044f8..0529b82edc8 100644 --- a/www/seamonkey-bin/Makefile.common +++ b/www/seamonkey-bin/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.3 2006/11/25 21:38:51 jdolecek Exp $ +# $NetBSD: Makefile.common,v 1.4 2007/07/29 05:20:04 jlam Exp $ -DISTNAME= # see Makefile.${OPSYS}.${ARCH} +DISTNAME= ${MOZILLA}${MOX_EXTRA}-bin # overridden below PKGNAME= ${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER} CATEGORIES= www @@ -8,25 +8,38 @@ MAINTAINER= grant@NetBSD.org HOMEPAGE?= http://www.mozilla.org/ WRKSRC?= ${WRKDIR}/${MOZILLA} -NO_CONFIGURE= yes +BUILD_DIRS?= # empty USE_LANGUAGES= # empty FILESDIR= ${.CURDIR}/../../www/seamonkey-bin/files MOZILLA_SCRIPT?= ${FILESDIR}/mozilla.sh +.if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss]) +EMUL_MODULES.linux= compat gtk2 locale +SUSE_VERSION_REQD= 9.1 +.else +EMUL_MODULES.linux= compat gtk +SUSE_VERSION_REQD= 7.3 +.endif .include "../../mk/bsd.prefs.mk" -# everything specific to your OS/Arch goes into its own Makefile -# group together i386, i486, i586 and i686 (for Linux) -ARCH=${MACHINE_ARCH:C/i[3-6]86/i386/g} - -.if exists(${.CURDIR}/Makefile.${OPSYS}.${ARCH}) -. include "${.CURDIR}/Makefile.${OPSYS}.${ARCH}" +.if !empty(EMUL_DISTRO:Mnative-*) +. if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss]) +DEPENDS+= gtk2+>=2.2:../../x11/gtk2 +. else +DEPENDS+= gtk2+>=1.2:../../x11/gtk +. endif .endif +# Include Makefile.${EMUL_PLATFORM} to get definitions for DISTNAME +# and MOZ_PLATFORM. +# +.sinclude "${.CURDIR}/Makefile.${EMUL_PLATFORM}" + MOZILLA_SHORT= ${MOZILLA} MOZ_DIR?= ${MOZ_VER} +MOZ_PLATFORM?= ${LOWER_OPSYS} .if !defined(MASTER_SITES) _MASTER_SITES+= http://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/releases/${MOZ_DIR}/ @@ -51,45 +64,9 @@ FILES_SUBST+= MOZ_PLATFORM=${MOZ_PLATFORM:Q} MESSAGE_SUBST+= PKGBASE=${PKGBASE} PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC -# protect against MOZ_PLATFORM being undefined so we don't bomb, but -# instead use the result of ONLY_FOR_PLATFORM. -.if defined(MOZ_PLATFORM) - -. if ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "linux" +.if (${OPSYS} == "NetBSD") && (${EMUL_OPSYS} == "linux") MESSAGE_SRC+= ${.CURDIR}/../../www/seamonkey-bin/MESSAGE.compat_linux -. endif - -# Linux builds on NetBSD -. if ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "linux" -. include "../../emulators/suse_linux/Makefile.application" -. elif ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "netbsd" -# we need libstdc++.so.4 on -current. -. if !exists(/usr/lib/libstdc++.so.4) -DEPENDS+= compat16>=1.6.0:../../emulators/compat16 -_COMPAT16_LIBSTDCXX= YES -. endif -. endif - -# GTK2 builds. -. if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss]) -. if ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "netbsd" -DEPENDS+= gtk2+>=2.4:../../x11/gtk2 -. elif ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "linux" -DEPENDS+= suse_compat>=9.1:../../emulators/${SUSE_DIR_PREFIX}_compat -DEPENDS+= suse_gtk2>=9.1:../../emulators/${SUSE_DIR_PREFIX}_gtk2 -DEPENDS+= suse_locale>=9.1:../../emulators/${SUSE_DIR_PREFIX}_locale -. else -DEPENDS+= gtk2+>=2.2:../../x11/gtk2 -. endif -. elif ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "linux" -DEPENDS+= suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat -DEPENDS+= suse_gtk>=7.3:../../emulators/${SUSE_DIR_PREFIX}_gtk -. else -# default to at least gtk-1.2. -DEPENDS+= gtk+>=1.2:../../x11/gtk -. endif - -.endif # defined(MOZ_PLATFORM) +.endif INSTALLATION_DIRS= bin @@ -107,8 +84,6 @@ post-extract: @${RM} -f ${WRKSRC}/plugins/libnullplugin.so ${CP} ${MOZILLA_SCRIPT} ${WRKDIR}/${MOZILLA}.sh -do-build: - do-install: ${INSTALL_DATA_DIR} ${MOZILLA_LIB} cd ${WRKSRC} && ${PAX} -rw -pm . ${MOZILLA_LIB} @@ -123,8 +98,8 @@ do-install: # builds typically want exactly 'libgtk-1.2.so.0', etc. symlink them # into the mozilla directory. post-install: -.if ${OPSYS} != "NetBSD" -. if defined(MOZ_GTK2) && ${MOZ_GTK2} == "YES" +.if !empty(EMUL_DISTRO:Mnative-*) +. if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss]) @cd ${MOZILLA_LIB} && \ ${LN} -s ${PREFIX}/lib/libatk-1.0.*so* .; \ ${LN} -s ${X11PREFIX}/lib/libgdk-x11-2.0.*so* .; \ @@ -159,10 +134,6 @@ post-install: ${LN} -s libgmodule.so libgmodule-1.2.so.0 . endif .endif -.if defined(_COMPAT16_LIBSTDCXX) && ${_COMPAT16_LIBSTDCXX} == "YES" - @cd ${MOZILLA_LIB} && \ - ${LN} -s ${PREFIX}/emul/netbsd16/usr/lib/libstdc++.so* . -.endif @${INSTALL_DATA_DIR} ${PREFIX}/lib/mozilla-linux/plugins @${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC} @${ECHO} bin/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM} >> ${PLIST_SRC} diff --git a/www/seamonkey-bin/Makefile.linux-i386 b/www/seamonkey-bin/Makefile.linux-i386 new file mode 100644 index 00000000000..0b2174d3ae4 --- /dev/null +++ b/www/seamonkey-bin/Makefile.linux-i386 @@ -0,0 +1,8 @@ +# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:20:04 jlam Exp $ + +DISTNAME= seamonkey-${MOZ_DISTVER}.en-US.linux-i686 +MOZ_DISTDIR= releases/${MOZ_DIR} +MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/seamonkey/${MOZ_DISTDIR}/ + +MOZ_GTK2= yes +MOZ_PLATFORM= linux |