pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Allow a nicer syntax for expressing needing at least a...
details: https://anonhg.NetBSD.org/pkgsrc/rev/28e8bd46163a
branches: trunk
changeset: 532575:28e8bd46163a
user: jlam <jlam%pkgsrc.org@localhost>
date: Thu Aug 23 18:20:30 2007 +0000
description:
Allow a nicer syntax for expressing needing at least a certain version
of an emulated operating system. Instead of proliferating things like
SUSE_VERSION_REQD, NETBSD_VERSION_REQD, SOLARIS_VERSION_REQD, etc., a
package can say:
EMUL_REQD= suse>=9.1 netbsd>=2.0 solaris>=10
all in one, succinct line.
diffstat:
archivers/rar/Makefile.netbsd-i386 | 4 ++--
cad/lc/Makefile | 4 ++--
devel/cvsup-bin/Makefile | 4 ++--
devel/cvsup-gui-bin/Makefile | 4 ++--
emulators/compat_netbsd/Makefile.common | 4 ++--
emulators/suse100_linux/Makefile.common | 4 ++--
emulators/suse91_linux/Makefile.common | 4 ++--
emulators/vmware3/Makefile | 4 ++--
lang/Cg-compiler/Makefile | 4 ++--
lang/blackdown-jre13/Makefile.common | 4 ++--
mail/thunderbird-bin-nightly/Makefile.solaris-i386 | 4 ++--
mail/thunderbird-bin-nightly/Makefile.solaris-sparc | 4 ++--
misc/openoffice-bin/Makefile | 4 ++--
misc/openoffice2-bin/Makefile | 4 ++--
mk/emulator/emulator.mk | 6 +++++-
mk/emulator/linux-suse.mk | 5 ++++-
mk/emulator/netbsd-compat.mk | 6 +++++-
multimedia/libflashsupport/Makefile | 4 ++--
multimedia/ns-flash/Makefile | 4 ++--
print/acroread7/Makefile | 4 ++--
www/firefox-bin-nightly/Makefile.solaris-i386 | 4 ++--
www/firefox-bin-nightly/Makefile.solaris-sparc | 4 ++--
www/firefox-bin/Makefile.solaris-i386 | 12 ++++--------
www/firefox-bin/Makefile.solaris-sparc | 14 +++++---------
www/firefox15-bin/Makefile.solaris-i386 | 12 ++++--------
www/firefox15-bin/Makefile.solaris-sparc | 14 +++++---------
www/opera-acroread/Makefile.common | 4 ++--
www/opera-plugins/Makefile | 4 ++--
www/opera/Makefile | 4 ++--
www/seamonkey-bin-nightly/Makefile.solaris-i386 | 4 ++--
www/seamonkey-bin-nightly/Makefile.solaris-sparc | 4 ++--
www/seamonkey-bin/Makefile.common | 6 +++---
32 files changed, 83 insertions(+), 88 deletions(-)
diffs (truncated from 566 to 300 lines):
diff -r 7e5394e36356 -r 28e8bd46163a archivers/rar/Makefile.netbsd-i386
--- a/archivers/rar/Makefile.netbsd-i386 Thu Aug 23 17:39:47 2007 +0000
+++ b/archivers/rar/Makefile.netbsd-i386 Thu Aug 23 18:20:30 2007 +0000
@@ -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 -r 7e5394e36356 -r 28e8bd46163a cad/lc/Makefile
--- a/cad/lc/Makefile Thu Aug 23 17:39:47 2007 +0000
+++ b/cad/lc/Makefile Thu Aug 23 18:20:30 2007 +0000
@@ -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+= 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 -r 7e5394e36356 -r 28e8bd46163a devel/cvsup-bin/Makefile
--- a/devel/cvsup-bin/Makefile Thu Aug 23 17:39:47 2007 +0000
+++ b/devel/cvsup-bin/Makefile Thu Aug 23 18:20:30 2007 +0000
@@ -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 @@
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 -r 7e5394e36356 -r 28e8bd46163a devel/cvsup-gui-bin/Makefile
--- a/devel/cvsup-gui-bin/Makefile Thu Aug 23 17:39:47 2007 +0000
+++ b/devel/cvsup-gui-bin/Makefile Thu Aug 23 18:20:30 2007 +0000
@@ -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 @@
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 -r 7e5394e36356 -r 28e8bd46163a emulators/compat_netbsd/Makefile.common
--- a/emulators/compat_netbsd/Makefile.common Thu Aug 23 17:39:47 2007 +0000
+++ b/emulators/compat_netbsd/Makefile.common Thu Aug 23 18:20:30 2007 +0000
@@ -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 @@
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 -r 7e5394e36356 -r 28e8bd46163a emulators/suse100_linux/Makefile.common
--- a/emulators/suse100_linux/Makefile.common Thu Aug 23 17:39:47 2007 +0000
+++ b/emulators/suse100_linux/Makefile.common Thu Aug 23 18:20:30 2007 +0000
@@ -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 -r 7e5394e36356 -r 28e8bd46163a emulators/suse91_linux/Makefile.common
--- a/emulators/suse91_linux/Makefile.common Thu Aug 23 17:39:47 2007 +0000
+++ b/emulators/suse91_linux/Makefile.common Thu Aug 23 18:20:30 2007 +0000
@@ -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 -r 7e5394e36356 -r 28e8bd46163a emulators/vmware3/Makefile
--- a/emulators/vmware3/Makefile Thu Aug 23 17:39:47 2007 +0000
+++ b/emulators/vmware3/Makefile Thu Aug 23 18:20:30 2007 +0000
@@ -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 @@
EMUL_PLATFORMS= linux-i386
EMUL_MODULES.linux= vmware
-SUSE_VERSION_REQD= 6.4nb1
+EMUL_REQD= suse>=6.4nb1
WRKSRC= ${WRKDIR}/vmware-distrib
diff -r 7e5394e36356 -r 28e8bd46163a lang/Cg-compiler/Makefile
--- a/lang/Cg-compiler/Makefile Thu Aug 23 17:39:47 2007 +0000
+++ b/lang/Cg-compiler/Makefile Thu Aug 23 18:20:30 2007 +0000
@@ -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 @@
EMUL_PLATFORMS= linux-i386
EMUL_MODULES.linux= base
-SUSE_VERSION_REQD= 7.3
+EMUL_REQD= suse>=7.3
WRKSRC= ${WRKDIR}
BUILD_DIRS= # empty
diff -r 7e5394e36356 -r 28e8bd46163a lang/blackdown-jre13/Makefile.common
--- a/lang/blackdown-jre13/Makefile.common Thu Aug 23 17:39:47 2007 +0000
+++ b/lang/blackdown-jre13/Makefile.common Thu Aug 23 18:20:30 2007 +0000
@@ -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 @@
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 -r 7e5394e36356 -r 28e8bd46163a mail/thunderbird-bin-nightly/Makefile.solaris-i386
--- a/mail/thunderbird-bin-nightly/Makefile.solaris-i386 Thu Aug 23 17:39:47 2007 +0000
+++ b/mail/thunderbird-bin-nightly/Makefile.solaris-i386 Thu Aug 23 18:20:30 2007 +0000
@@ -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 -r 7e5394e36356 -r 28e8bd46163a mail/thunderbird-bin-nightly/Makefile.solaris-sparc
--- a/mail/thunderbird-bin-nightly/Makefile.solaris-sparc Thu Aug 23 17:39:47 2007 +0000
+++ b/mail/thunderbird-bin-nightly/Makefile.solaris-sparc Thu Aug 23 18:20:30 2007 +0000
@@ -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 -r 7e5394e36356 -r 28e8bd46163a misc/openoffice-bin/Makefile
--- a/misc/openoffice-bin/Makefile Thu Aug 23 17:39:47 2007 +0000
+++ b/misc/openoffice-bin/Makefile Thu Aug 23 18:20:30 2007 +0000
@@ -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 @@
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 -r 7e5394e36356 -r 28e8bd46163a misc/openoffice2-bin/Makefile
--- a/misc/openoffice2-bin/Makefile Thu Aug 23 17:39:47 2007 +0000
+++ b/misc/openoffice2-bin/Makefile Thu Aug 23 18:20:30 2007 +0000
@@ -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 @@
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 -r 7e5394e36356 -r 28e8bd46163a mk/emulator/emulator.mk
--- a/mk/emulator/emulator.mk Thu Aug 23 17:39:47 2007 +0000
+++ b/mk/emulator/emulator.mk Thu Aug 23 18:20:30 2007 +0000
@@ -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 -r 7e5394e36356 -r 28e8bd46163a mk/emulator/linux-suse.mk
--- a/mk/emulator/linux-suse.mk Thu Aug 23 17:39:47 2007 +0000
+++ b/mk/emulator/linux-suse.mk Thu Aug 23 18:20:30 2007 +0000
@@ -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 -r 7e5394e36356 -r 28e8bd46163a mk/emulator/netbsd-compat.mk
--- a/mk/emulator/netbsd-compat.mk Thu Aug 23 17:39:47 2007 +0000
+++ b/mk/emulator/netbsd-compat.mk Thu Aug 23 18:20:30 2007 +0000
@@ -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_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 -r 7e5394e36356 -r 28e8bd46163a multimedia/libflashsupport/Makefile
--- a/multimedia/libflashsupport/Makefile Thu Aug 23 17:39:47 2007 +0000
+++ b/multimedia/libflashsupport/Makefile Thu Aug 23 18:20:30 2007 +0000
@@ -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 @@
EMUL_PLATFORMS= linux-i386
EMUL_MODULES.linux= base openssl
-SUSE_VERSION_REQD= 9.1
Home |
Main Index |
Thread Index |
Old Index