diff options
32 files changed, 83 insertions, 88 deletions
diff --git a/archivers/rar/Makefile.netbsd-i386 b/archivers/rar/Makefile.netbsd-i386 index 6782c1ab499..f1e7a607050 100644 --- a/archivers/rar/Makefile.netbsd-i386 +++ b/archivers/rar/Makefile.netbsd-i386 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.netbsd-i386,v 1.1 2007/08/22 16:43:34 jlam Exp $ +# $NetBSD: Makefile.netbsd-i386,v 1.2 2007/08/23 18:20:30 jlam Exp $ DISTNAME= rarbsd PKGNAME= rar-2.02 MASTER_SITES= ftp://ftp.elf.stuba.sk/pub/pc/pack/ EXTRACT_SUFX= .sfx -NETBSD_VERSION_REQD= 1.2 +EMUL_REQD= netbsd>=1.2 WRKSRC= ${WRKDIR} EXTRACT_CMD= exec "$$extract_file" >/dev/null diff --git a/cad/lc/Makefile b/cad/lc/Makefile index 07b9bd461c9..136a92ff857 100644 --- a/cad/lc/Makefile +++ b/cad/lc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2007/07/29 05:18:37 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2007/08/23 18:20:30 jlam Exp $ DISTNAME= lc # overridden below PKGNAME= lc-2.10 @@ -26,7 +26,7 @@ EMUL_PLATFORMS= irix-mipsel irix-mipsel64 EMUL_PLATFORMS+= linux-i386 linux-x86_64 EMUL_PLATFORMS+= solaris-sparc EMUL_MODULES.linux= motif x11 -SUSE_VERSION_REQD= 9.1 +EMUL_REQD= suse>=9.1 .include "../../mk/bsd.prefs.mk" diff --git a/devel/cvsup-bin/Makefile b/devel/cvsup-bin/Makefile index e90fde81827..ab6a80f1d09 100644 --- a/devel/cvsup-bin/Makefile +++ b/devel/cvsup-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2007/08/22 18:09:12 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2007/08/23 18:20:30 jlam Exp $ DISTNAME= cvsup-static-16.1.h PKGNAME= ${DISTNAME:C/static/bin/} @@ -13,7 +13,7 @@ COMMENT= cvsup daemon and client CONFLICTS= cvsup-[0-9]* cvsup-gui-[0-9]* EMUL_PLATFORMS= netbsd-i386 -NETBSD_VERSION_REQD= 1.5 +EMUL_REQD= netbsd>=1.5 # XXX Remove the following line on the next update; see PR 25255 for details DIST_SUBDIR= cvsup-i386-1.6 diff --git a/devel/cvsup-gui-bin/Makefile b/devel/cvsup-gui-bin/Makefile index a3d24b79a68..99e75ecf5fa 100644 --- a/devel/cvsup-gui-bin/Makefile +++ b/devel/cvsup-gui-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2007/08/22 18:09:12 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2007/08/23 18:20:30 jlam Exp $ DISTNAME= cvsup-gui-static-16.1.h PKGNAME= ${DISTNAME:C/static/bin/} @@ -16,7 +16,7 @@ CVSUP_VERSION= ${DISTNAME:S/cvsup-gui-static-//} DEPENDS+= cvsup-bin>=${CVSUP_VERSION}:../../devel/cvsup-bin EMUL_PLATFORMS= netbsd-i386 -NETBSD_VERSION_REQD= 1.5 +EMUL_REQD= netbsd>=1.5 # XXX Remove the following line on next update; see PR 25255 for details DIST_SUBDIR= cvsup-i386-1.6 diff --git a/emulators/compat_netbsd/Makefile.common b/emulators/compat_netbsd/Makefile.common index 762c8a2cd57..879d636e984 100644 --- a/emulators/compat_netbsd/Makefile.common +++ b/emulators/compat_netbsd/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2007/08/23 17:31:46 jlam Exp $ +# $NetBSD: Makefile.common,v 1.4 2007/08/23 18:20:31 jlam Exp $ # # Common infrastructure for NetBSD compat* packages. # @@ -16,7 +16,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL NETBSD_PKG= yes -NETBSD_VERSION_REQD= ${NETBSD_VERSION} +EMUL_REQD= netbsd>=${NETBSD_VERSION} .include "../../mk/bsd.prefs.mk" diff --git a/emulators/suse100_linux/Makefile.common b/emulators/suse100_linux/Makefile.common index c8ac4360b2c..3c192a0be43 100644 --- a/emulators/suse100_linux/Makefile.common +++ b/emulators/suse100_linux/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.17 2007/07/29 08:55:31 jlam Exp $ +# $NetBSD: Makefile.common,v 1.18 2007/08/23 18:20:31 jlam Exp $ SUSE_PKG= yes SUSE_VERSION= 10.0 -SUSE_VERSION_REQD= ${SUSE_VERSION} +EMUL_REQD= suse>=${SUSE_VERSION} # The SuSE 10.x Linux packages are only usable on the following platforms. .if defined(SUSE_COMPAT32) diff --git a/emulators/suse91_linux/Makefile.common b/emulators/suse91_linux/Makefile.common index 81a51e3091a..1c52307a1bf 100644 --- a/emulators/suse91_linux/Makefile.common +++ b/emulators/suse91_linux/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.18 2007/07/29 08:55:39 jlam Exp $ +# $NetBSD: Makefile.common,v 1.19 2007/08/23 18:20:31 jlam Exp $ SUSE_PKG= yes SUSE_VERSION= 9.1 -SUSE_VERSION_REQD= ${SUSE_VERSION} +EMUL_REQD= suse>=${SUSE_VERSION} # The SuSE 10.x Linux packages are only usable on the following platforms. .if defined(SUSE_COMPAT32) diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile index 389378064e8..3fb542e51dc 100644 --- a/emulators/vmware3/Makefile +++ b/emulators/vmware3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2007/07/29 05:19:25 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2007/08/23 18:20:31 jlam Exp $ DISTNAME= VMware-workstation-3.2.1-2242 PKGNAME= vmware-3.2.1pl1 @@ -28,7 +28,7 @@ LICENSE= vmware-license EMUL_PLATFORMS= linux-i386 EMUL_MODULES.linux= vmware -SUSE_VERSION_REQD= 6.4nb1 +EMUL_REQD= suse>=6.4nb1 WRKSRC= ${WRKDIR}/vmware-distrib diff --git a/lang/Cg-compiler/Makefile b/lang/Cg-compiler/Makefile index e5a10626829..8ae6c37198f 100644 --- a/lang/Cg-compiler/Makefile +++ b/lang/Cg-compiler/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2007/07/29 05:19:27 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2007/08/23 18:20:31 jlam Exp $ # DISTNAME= CgLinux-1.3.0408-0400 @@ -13,7 +13,7 @@ COMMENT= NVIDIA Cg Compiler for Linux EMUL_PLATFORMS= linux-i386 EMUL_MODULES.linux= base -SUSE_VERSION_REQD= 7.3 +EMUL_REQD= suse>=7.3 WRKSRC= ${WRKDIR} BUILD_DIRS= # empty diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common index 30e698430c3..3de6dea2449 100644 --- a/lang/blackdown-jre13/Makefile.common +++ b/lang/blackdown-jre13/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.28 2007/07/29 05:19:27 jlam Exp $ +# $NetBSD: Makefile.common,v 1.29 2007/08/23 18:20:31 jlam Exp $ # RELVERSION= 1.3.1 @@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.tux.org/pub/java/${BD_SUBDIR}/ \ EMUL_PLATFORMS+= linux-i386 linux-powerpc linux-sparc EMUL_MODULES.linux+= base -SUSE_VERSION_REQD= 7.3 +EMUL_REQD= suse>=7.3 .include "../../mk/bsd.prefs.mk" diff --git a/mail/thunderbird-bin-nightly/Makefile.solaris-i386 b/mail/thunderbird-bin-nightly/Makefile.solaris-i386 index c3e9baa61c8..892e289c31f 100644 --- a/mail/thunderbird-bin-nightly/Makefile.solaris-i386 +++ b/mail/thunderbird-bin-nightly/Makefile.solaris-i386 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.solaris-i386,v 1.1 2007/07/29 05:19:34 jlam Exp $ +# $NetBSD: Makefile.solaris-i386,v 1.2 2007/08/23 18:20:31 jlam Exp $ -SOLARIS_VERSION_REQD?= 10 +EMUL_REQD= solaris>=10 DISTNAME= thunderbird-3.0a1.en-US.solaris10-nosvg-i386 EXTRACT_SUFX= .tar.bz2 diff --git a/mail/thunderbird-bin-nightly/Makefile.solaris-sparc b/mail/thunderbird-bin-nightly/Makefile.solaris-sparc index bd0c4860b87..79d5ba46ecf 100644 --- a/mail/thunderbird-bin-nightly/Makefile.solaris-sparc +++ b/mail/thunderbird-bin-nightly/Makefile.solaris-sparc @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.solaris-sparc,v 1.1 2007/07/29 05:19:35 jlam Exp $ +# $NetBSD: Makefile.solaris-sparc,v 1.2 2007/08/23 18:20:31 jlam Exp $ -SOLARIS_VERSION_REQD?= 10 +EMUL_REQD= solaris>=10 DISTNAME= thunderbird-3.0a1.en-US.solaris10-nosvg-sparc EXTRACT_SUFX= .tar.bz2 diff --git a/misc/openoffice-bin/Makefile b/misc/openoffice-bin/Makefile index ea90ee8364c..5cc3374da94 100644 --- a/misc/openoffice-bin/Makefile +++ b/misc/openoffice-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2007/07/29 05:19:35 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2007/08/23 18:20:32 jlam Exp $ DISTNAME= openoffice-bin # overridden below PKGNAME= openoffice-bin-${OO_VER} @@ -35,7 +35,7 @@ BUILD_DIRS= # empty EMUL_PLATFORMS= linux-i386 EMUL_PLATFORMS+= solaris-i386 solaris-sparc EMUL_MODULES.linux= compat x11 -SUSE_VERSION_REQD= 7.3 +EMUL_REQD= suse>=7.3 .include "../../mk/bsd.prefs.mk" diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile index ad15887437d..4c109216703 100644 --- a/misc/openoffice2-bin/Makefile +++ b/misc/openoffice2-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2007/07/29 05:19:40 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2007/08/23 18:20:32 jlam Exp $ DISTNAME= openoffice2-bin # overridden below PKGNAME= openoffice2-bin-${OO_RELEASE} @@ -31,7 +31,7 @@ PLIST_SRC+= ${WRKDIR}/PLIST EMUL_PLATFORMS= linux-i386 #EMUL_PLATFORMS+= solaris-i386 solaris-sparc EMUL_MODULES.linux= compat freetype2 x11 -SUSE_VERSION_REQD= 7.3 +EMUL_REQD= suse>=7.3 EMUL_PKG_FMT= rpm RPMFILES= ${WRKSRC}/RPMS/*.rpm diff --git a/mk/emulator/emulator.mk b/mk/emulator/emulator.mk index 6dd1a707217..b9952c3fee3 100644 --- a/mk/emulator/emulator.mk +++ b/mk/emulator/emulator.mk @@ -1,9 +1,13 @@ -# $NetBSD: emulator.mk,v 1.7 2007/08/23 17:39:47 jlam Exp $ +# $NetBSD: emulator.mk,v 1.8 2007/08/23 18:20:36 jlam Exp $ # # This file is included by bsd.pkg.mk. # # Package-settable variables: # +# EMUL_REQD +# List of required versions for different emulation types, e.g +# suse>=10.0, netbsd>=1.2, etc. +# # EMUL_MODULES.${EMUL_OPSYS} # List of modules of ${EMUL_OPSYS} that are used by the package. # diff --git a/mk/emulator/linux-suse.mk b/mk/emulator/linux-suse.mk index bc181cf4614..9529695ee48 100644 --- a/mk/emulator/linux-suse.mk +++ b/mk/emulator/linux-suse.mk @@ -1,9 +1,12 @@ -# $NetBSD: linux-suse.mk,v 1.1 2007/07/29 05:19:42 jlam Exp $ +# $NetBSD: linux-suse.mk,v 1.2 2007/08/23 18:20:32 jlam Exp $ # # SuSE Linux # # Most Linux software only need suse>=6.4. +.for _version_ in ${EMUL_REQD:Msuse>=*:S/suse>=//} +SUSE_VERSION_REQD?= ${_version_} +.endfor SUSE_VERSION_REQD?= 6.4 # When building the SuSE packages, force the Linux type to be the specific diff --git a/mk/emulator/netbsd-compat.mk b/mk/emulator/netbsd-compat.mk index 7b7e78dbd36..a88f2ad4495 100644 --- a/mk/emulator/netbsd-compat.mk +++ b/mk/emulator/netbsd-compat.mk @@ -1,4 +1,4 @@ -# $NetBSD: netbsd-compat.mk,v 1.1 2007/08/21 22:49:33 jlam Exp $ +# $NetBSD: netbsd-compat.mk,v 1.2 2007/08/23 18:20:32 jlam Exp $ # # COMPAT_* for NetBSD -- see options(4). # @@ -15,6 +15,10 @@ NATIVE_EXEC_FMT= ${_NATIVE_EXEC_FMT_cmd:sh} _NATIVE_EXEC_FMT_cmd= sh ${.CURDIR}/../../mk/scripts/shlib-type \ ${_OPSYS_SHLIB_TYPE:Q} ${MAKE:Q} +# Most NetBSD (i386) software need netbsd>=1.6 +.for _version_ in ${EMUL_REQD:Mnetbsd>=*:S/netbsd>=//} +NETBSD_VERSION_REQD?= ${_version_} +.endfor NETBSD_VERSION_REQD?= 1.6 # When building a NetBSD "compat" package, force the NetBSD type to be diff --git a/multimedia/libflashsupport/Makefile b/multimedia/libflashsupport/Makefile index b0963ab621f..135887b3c49 100644 --- a/multimedia/libflashsupport/Makefile +++ b/multimedia/libflashsupport/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2007/07/29 05:19:45 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2007/08/23 18:20:33 jlam Exp $ PKGNAME= libflashsupport-1.0.2098 DISTNAME= libflashsupport-1-0-2098-i586 @@ -13,7 +13,7 @@ COMMENT= Additional Interface Support for Linux Flash Player EMUL_PLATFORMS= linux-i386 EMUL_MODULES.linux= base openssl -SUSE_VERSION_REQD= 9.1 +EMUL_REQD= suse>=9.1 EMUL_PKG_FMT= rpm RPM2PKG_STRIP= 3 diff --git a/multimedia/ns-flash/Makefile b/multimedia/ns-flash/Makefile index 0c9e13f7dee..0763202ba21 100644 --- a/multimedia/ns-flash/Makefile +++ b/multimedia/ns-flash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2007/07/29 05:19:45 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2007/08/23 18:20:33 jlam Exp $ CATEGORIES= multimedia www MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/current/ @@ -27,7 +27,7 @@ CRYPTO= yes EMUL_PLATFORMS= linux-i386 EMUL_PLATFORMS+= solaris-sparc EMUL_MODULES.linux= compat gtk2 x11 -SUSE_VERSION_REQD= 9.0 +EMUL_REQD= suse>=9.0 .include "../../mk/bsd.prefs.mk" diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile index 56c9442d248..447271d04b1 100644 --- a/print/acroread7/Makefile +++ b/print/acroread7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/07/29 05:19:50 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2007/08/23 18:20:33 jlam Exp $ DISTNAME= acroread7 # overridden below PKGNAME= acroread7-7.0.9 @@ -26,7 +26,7 @@ BUILD_DIRS= # empty EMUL_PLATFORMS= linux-i386 EMUL_MODULES.linux= compat cups gtk2 locale -SUSE_VERSION_REQD= 10.0 +EMUL_REQD= suse>=10.0 .include "../../mk/bsd.prefs.mk" diff --git a/www/firefox-bin-nightly/Makefile.solaris-i386 b/www/firefox-bin-nightly/Makefile.solaris-i386 index 8da5668c29f..2a8710006b1 100644 --- a/www/firefox-bin-nightly/Makefile.solaris-i386 +++ b/www/firefox-bin-nightly/Makefile.solaris-i386 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.solaris-i386,v 1.1 2007/07/29 05:19:54 jlam Exp $ +# $NetBSD: Makefile.solaris-i386,v 1.2 2007/08/23 18:20:33 jlam Exp $ -SOLARIS_VERSION_REQD?= 11 +EMUL_REQD= solaris>=11 DISTNAME= firefox-3.0a7pre.en-US.solaris11-i386 EXTRACT_SUFX= .tar.bz2 diff --git a/www/firefox-bin-nightly/Makefile.solaris-sparc b/www/firefox-bin-nightly/Makefile.solaris-sparc index afad0e2ed35..d92979adf9d 100644 --- a/www/firefox-bin-nightly/Makefile.solaris-sparc +++ b/www/firefox-bin-nightly/Makefile.solaris-sparc @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.solaris-sparc,v 1.1 2007/07/29 05:19:54 jlam Exp $ +# $NetBSD: Makefile.solaris-sparc,v 1.2 2007/08/23 18:20:34 jlam Exp $ -SOLARIS_VERSION_REQD?= 11 +EMUL_REQD= solaris>=11 DISTNAME= firefox-3.0a7pre.en-US.solaris11-sparc EXTRACT_SUFX= .tar.bz2 diff --git a/www/firefox-bin/Makefile.solaris-i386 b/www/firefox-bin/Makefile.solaris-i386 index d61b949b056..85fdc492d1c 100644 --- a/www/firefox-bin/Makefile.solaris-i386 +++ b/www/firefox-bin/Makefile.solaris-i386 @@ -1,17 +1,13 @@ -# $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 +# $NetBSD: Makefile.solaris-i386,v 1.2 2007/08/23 18:20:34 jlam Exp $ # Use the Solaris 8 binaries if we're not running at least Solaris 10. -.if !empty(SOLARIS_VERSION_REQD:M1[0-9]*) +.if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*) DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris10-i386 +EMUL_REQD= solaris>=10 MOZ_GTK2= yes .else DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris8-i386-gtk1 +EMUL_REQD= solaris>=8 .endif EXTRACT_SUFX= .tar.bz2 diff --git a/www/firefox-bin/Makefile.solaris-sparc b/www/firefox-bin/Makefile.solaris-sparc index dc5407397da..f7c1e66c4b4 100644 --- a/www/firefox-bin/Makefile.solaris-sparc +++ b/www/firefox-bin/Makefile.solaris-sparc @@ -1,17 +1,13 @@ -# $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 +# $NetBSD: Makefile.solaris-sparc,v 1.2 2007/08/23 18:20:34 jlam Exp $ # Use the Solaris 8 binaries if we're not running at least Solaris 10. -.if !empty(SOLARIS_VERSION_REQD:M1[0-9]*) +.if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*) DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris10-respin-sparc +EMUL_REQD= solaris>=10 MOZ_GTK2= yes -.else +.else DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris8-respin-sparc-gtk1 +EMUL_REQD= solaris>=8 .endif EXTRACT_SUFX= .tar.bz2 diff --git a/www/firefox15-bin/Makefile.solaris-i386 b/www/firefox15-bin/Makefile.solaris-i386 index 2b6358ead86..85fdc492d1c 100644 --- a/www/firefox15-bin/Makefile.solaris-i386 +++ b/www/firefox15-bin/Makefile.solaris-i386 @@ -1,17 +1,13 @@ -# $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 +# $NetBSD: Makefile.solaris-i386,v 1.2 2007/08/23 18:20:34 jlam Exp $ # Use the Solaris 8 binaries if we're not running at least Solaris 10. -.if !empty(SOLARIS_VERSION_REQD:M1[0-9]*) +.if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*) DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris10-i386 +EMUL_REQD= solaris>=10 MOZ_GTK2= yes .else DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris8-i386-gtk1 +EMUL_REQD= solaris>=8 .endif EXTRACT_SUFX= .tar.bz2 diff --git a/www/firefox15-bin/Makefile.solaris-sparc b/www/firefox15-bin/Makefile.solaris-sparc index 130d63ff654..f7c1e66c4b4 100644 --- a/www/firefox15-bin/Makefile.solaris-sparc +++ b/www/firefox15-bin/Makefile.solaris-sparc @@ -1,17 +1,13 @@ -# $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 +# $NetBSD: Makefile.solaris-sparc,v 1.2 2007/08/23 18:20:34 jlam Exp $ # Use the Solaris 8 binaries if we're not running at least Solaris 10. -.if !empty(SOLARIS_VERSION_REQD:M1[0-9]*) +.if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*) DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris10-respin-sparc +EMUL_REQD= solaris>=10 MOZ_GTK2= yes -.else +.else DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris8-respin-sparc-gtk1 +EMUL_REQD= solaris>=8 .endif EXTRACT_SUFX= .tar.bz2 diff --git a/www/opera-acroread/Makefile.common b/www/opera-acroread/Makefile.common index fb1db9f715f..4e3942bb03a 100644 --- a/www/opera-acroread/Makefile.common +++ b/www/opera-acroread/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2007/07/29 05:20:00 jlam Exp $ +# $NetBSD: Makefile.common,v 1.9 2007/08/23 18:20:34 jlam Exp $ PKGNAME= ${DISTNAME:C|MozillaFirebird|firefox|} CATEGORIES= www print @@ -9,7 +9,7 @@ DEPENDS+= opera>=7.0:../../www/opera EMUL_PLATFORMS= linux-i386 EMUL_MODULES.linux= motif -SUSE_VERSION_REQD= 7.3 +EMUL_REQD= suse>=7.3 ACRO_PLATFORM= intellinux diff --git a/www/opera-plugins/Makefile b/www/opera-plugins/Makefile index 54e8258bc49..add80e4c07c 100644 --- a/www/opera-plugins/Makefile +++ b/www/opera-plugins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2007/07/29 05:20:00 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2007/08/23 18:20:35 jlam Exp $ DISTNAME= opera-plugins-1.0 PKGREVISION= 1 @@ -15,7 +15,7 @@ DEPENDS+= ns-flash>=5.0.47:../../multimedia/ns-flash EMUL_PLATFORMS= linux-i386 EMUL_MODULES.linux= motif -SUSE_VERSION_REQD= 7.3 +EMUL_REQD= suse>=7.3 EXTRACT_ONLY= # empty NO_CHECKSUM= YES diff --git a/www/opera/Makefile b/www/opera/Makefile index 61b46cbd790..040c35f09e7 100644 --- a/www/opera/Makefile +++ b/www/opera/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2007/08/22 14:51:03 jlam Exp $ +# $NetBSD: Makefile,v 1.74 2007/08/23 18:20:35 jlam Exp $ DISTNAME= opera-${OPERA_PKG_VERSION:S/u/pl/} PKGREVISION= 1 @@ -22,7 +22,7 @@ EMUL_PLATFORMS+= linux-i386 EMUL_PLATFORMS+= solaris-sparc EMUL_MODULES.linux= x11 -SUSE_VERSION_REQD= 7.3 +EMUL_REQD= suse>=7.3 USE_LANGUAGES= # empty BUILD_DIRS= # empty diff --git a/www/seamonkey-bin-nightly/Makefile.solaris-i386 b/www/seamonkey-bin-nightly/Makefile.solaris-i386 index 165e8f09ac6..757915683d5 100644 --- a/www/seamonkey-bin-nightly/Makefile.solaris-i386 +++ b/www/seamonkey-bin-nightly/Makefile.solaris-i386 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.solaris-i386,v 1.1 2007/07/29 05:20:03 jlam Exp $ +# $NetBSD: Makefile.solaris-i386,v 1.2 2007/08/23 18:20:35 jlam Exp $ -SOLARIS_VERSION_REQD= 10 +EMUL_REQD= solaris>=10 DISTNAME= seamonkey-1.5a.en-US.solaris10-nosvg-i386 EXTRACT_SUFX= .tar.bz2 diff --git a/www/seamonkey-bin-nightly/Makefile.solaris-sparc b/www/seamonkey-bin-nightly/Makefile.solaris-sparc index ce36f6669d0..3fd1ee88102 100644 --- a/www/seamonkey-bin-nightly/Makefile.solaris-sparc +++ b/www/seamonkey-bin-nightly/Makefile.solaris-sparc @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.solaris-sparc,v 1.1 2007/07/29 05:20:03 jlam Exp $ +# $NetBSD: Makefile.solaris-sparc,v 1.2 2007/08/23 18:20:35 jlam Exp $ -SOLARIS_VERSION_REQD= 10 +EMUL_REQD= solaris>=10 DISTNAME= seamonkey-1.5a.en-US.solaris10-nosvg-sparc EXTRACT_SUFX= .tar.bz2 diff --git a/www/seamonkey-bin/Makefile.common b/www/seamonkey-bin/Makefile.common index aa11dd6fc6c..4c056fa1b52 100644 --- a/www/seamonkey-bin/Makefile.common +++ b/www/seamonkey-bin/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2007/08/23 13:43:57 jlam Exp $ +# $NetBSD: Makefile.common,v 1.7 2007/08/23 18:20:35 jlam Exp $ DISTNAME= ${MOZILLA}${MOX_EXTRA}-bin # overridden below PKGNAME= ${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER} @@ -23,10 +23,10 @@ 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 +EMUL_REQD= suse>=9.1 .else EMUL_MODULES.linux= compat gtk -SUSE_VERSION_REQD= 7.3 +EMUL_REQD= suse>=7.3 .endif .if defined(EMUL_IS_NATIVE) |