From 33f30156fb37245b360bbc293320402ecf1aba41 Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 29 Jul 2007 05:18:36 +0000 Subject: * Add new emulator framework in pkgsrc/mk/emulator that handles all binary-only packages that require binary "emulation" on the native operating system. Please see pkgsrc/mk/emulator/README for more details. * Teach the plist framework to automatically use any existing PLIST.${EMUL_PLATFORM} as part of the default PLIST_SRC definition. * Convert all of the binary-only packages in pkgsrc to use the emulator framework. Most of them have been tested to install and deinstall correctly. This involves the following cleanup actions: * Remove use of custom PLIST code and use PLIST.${EMUL_PLATFORM} more consistently. * Simplify packages by using default INSTALL and DEINSTALL scripts instead of custom INSTALL/DEINSTALL code. * Remove "SUSE_COMPAT32" and "PKG_OPTIONS.suse" from pkgsrc. Packages only need to state exactly which emulations they support, and the framework handles any i386-on-x86_64 or sparc-on-sparc64 uses. * Remove "USE_NATIVE_LINUX" from pkgsrc. The framework will automatically detect when the package is installing on Linux. Specific changes to packages include: * Bump the PKGREVISIONs for all of the suse100* and suse91* packages due to changes in the +INSTALL/+DEINSTALL scripts used in all of the packages. * Remove pkgsrc/emulators/suse_linux, which is unused by any packages. * cad/lc -- remove custom code to create the distinfo file for all supported platforms; just use "emul-fetch" and "emul-distinfo" instead. * lang/Cg-compiler -- install the shared libraries under ${EMULDIR} instead of ${PREFIX}/lib so that compiled programs will find the shared libraries. * mail/thunderbird-bin-nightly -- update to latest binary distributions for supported platforms. * multimedia/ns-flash -- update Linux version to 9.0.48 as the older version is no longer available for interactive fetch. * security/uvscan -- set LD_LIBRARY_PATH explicitly so that it's not necessary to install library symlinks into ${EMULDIR}/usr/local/lib. * www/firefox-bin-flash -- update Linux version to 9.0.48 as the older version is no longer available for interactive fetch. --- mk/platform/Darwin.mk | 4 +++- mk/platform/DragonFly.mk | 5 +++-- mk/platform/FreeBSD.mk | 6 +++++- mk/platform/HPUX.mk | 4 +++- mk/platform/IRIX.mk | 4 +++- mk/platform/Linux.mk | 7 +++++-- mk/platform/NetBSD.mk | 12 +++++++++++- mk/platform/OSF1.mk | 4 +++- mk/platform/SunOS.mk | 6 +++++- 9 files changed, 41 insertions(+), 11 deletions(-) (limited to 'mk/platform') diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk index 172e6fc1bf6..a852a90088a 100644 --- a/mk/platform/Darwin.mk +++ b/mk/platform/Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: Darwin.mk,v 1.23 2007/07/02 14:03:37 joerg Exp $ +# $NetBSD: Darwin.mk,v 1.24 2007/07/29 05:19:44 jlam Exp $ # # Variable definitions for the Darwin operating system. @@ -55,6 +55,8 @@ IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6 IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX} IMAKE_MANINSTALL?= maninstall catinstall +_OPSYS_EMULDIR.darwin= # empty + .if ${OS_VERSION:R} >= 6 _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk index 8ba3c17f110..f14e118ea71 100644 --- a/mk/platform/DragonFly.mk +++ b/mk/platform/DragonFly.mk @@ -1,8 +1,7 @@ -# $NetBSD: DragonFly.mk,v 1.31 2007/07/02 14:06:22 joerg Exp $ +# $NetBSD: DragonFly.mk,v 1.32 2007/07/29 05:19:44 jlam Exp $ # # Variable definitions for the DragonFly operating system. -BRANDELF?= /usr/bin/brandelf # used by linux compat layer ECHO_N?= ${ECHO} -n IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake IMAKEOPTS+= -DBuildHtmlManPages=NO @@ -45,6 +44,8 @@ IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7 IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX} IMAKE_MANINSTALL?= maninstall catinstall +_OPSYS_EMULDIR.linux= /compat/linux + .if exists(/usr/include/netinet6) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk index 607df45bfda..7a4b830eb53 100644 --- a/mk/platform/FreeBSD.mk +++ b/mk/platform/FreeBSD.mk @@ -1,7 +1,8 @@ -# $NetBSD: FreeBSD.mk,v 1.20 2007/07/02 14:03:40 joerg Exp $ +# $NetBSD: FreeBSD.mk,v 1.21 2007/07/29 05:19:44 jlam Exp $ # # Variable definitions for the FreeBSD operating system. +BRANDELF?= /usr/bin/brandelf # used by linux compat layer ECHO_N?= ${ECHO} -n IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake IMAKEOPTS+= -DBuildHtmlManPages=NO @@ -45,6 +46,9 @@ IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7 IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX} IMAKE_MANINSTALL?= maninstall catinstall +_OPSYS_EMULDIR.freebsd= # empty +_OPSYS_EMULDIR.linux= /compat/linux + .if exists(/usr/include/netinet6) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/HPUX.mk b/mk/platform/HPUX.mk index 2c77de9af0c..20154a9a33a 100644 --- a/mk/platform/HPUX.mk +++ b/mk/platform/HPUX.mk @@ -1,4 +1,4 @@ -# $NetBSD: HPUX.mk,v 1.5 2007/04/29 11:54:25 tnn Exp $ +# $NetBSD: HPUX.mk,v 1.6 2007/07/29 05:19:44 jlam Exp $ # # Variable definitions for the HP-UX operating system. @@ -40,6 +40,8 @@ IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6 IMAKE_MANNEWSUFFIX= 1 IMAKE_MANINSTALL?= maninstall catinstall +_OPSYS_EMULDIR.hpux= # empty + .if exists(/usr/include/netinet/ip6.h) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk index fcefea5647b..119df415909 100644 --- a/mk/platform/IRIX.mk +++ b/mk/platform/IRIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: IRIX.mk,v 1.29 2007/07/02 14:03:40 joerg Exp $ +# $NetBSD: IRIX.mk,v 1.30 2007/07/29 05:19:44 jlam Exp $ # # Variable definitions for the IRIX operating system. @@ -62,6 +62,8 @@ MANZ= yes . endif .endif +_OPSYS_EMULDIR.irix= # empty + .if exists(/usr/include/netinet6) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk index 1b86f4ad36a..892e4b0b4d0 100644 --- a/mk/platform/Linux.mk +++ b/mk/platform/Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: Linux.mk,v 1.28 2007/07/02 14:03:40 joerg Exp $ +# $NetBSD: Linux.mk,v 1.29 2007/07/29 05:19:44 jlam Exp $ # # Variable definitions for the Linux operating system. @@ -46,8 +46,11 @@ IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6 IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7 IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX} IMAKE_MANINSTALL?= maninstall catinstall - IMAKE_TOOLS= gmake # extra tools required when we use imake + +_OPSYS_EMULDIR.linux= # empty +_OPSYS_EMULDIR.linux32= # empty + .if exists(/usr/include/netinet6) || exists(/usr/include/linux/in6.h) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk index 0b3fadcb905..2a37c0d2ce9 100644 --- a/mk/platform/NetBSD.mk +++ b/mk/platform/NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.mk,v 1.22 2007/07/02 14:03:40 joerg Exp $ +# $NetBSD: NetBSD.mk,v 1.23 2007/07/29 05:19:44 jlam Exp $ # # Variable definitions for the NetBSD operating system. @@ -61,6 +61,16 @@ IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6 IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7 IMAKE_MANINSTALL?= maninstall catinstall +_OPSYS_EMULDIR.freebsd= /emul/freebsd +_OPSYS_EMULDIR.hpux= /emul/hpux +_OPSYS_EMULDIR.irix= /emul/irix +_OPSYS_EMULDIR.linux= /emul/linux +_OPSYS_EMULDIR.linux32= /emul/linux32 +_OPSYS_EMULDIR.osf1= /emul/osf1 +_OPSYS_EMULDIR.solaris= /emul/svr4 +_OPSYS_EMULDIR.solaris32= /emul/svr4_32 +_OPSYS_EMULDIR.sunos= /emul/sunos + .if exists(/usr/include/netinet6) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/OSF1.mk b/mk/platform/OSF1.mk index 56b11c79848..e549a35c388 100644 --- a/mk/platform/OSF1.mk +++ b/mk/platform/OSF1.mk @@ -1,4 +1,4 @@ -# $NetBSD: OSF1.mk,v 1.17 2007/04/14 13:02:08 tnn Exp $ +# $NetBSD: OSF1.mk,v 1.18 2007/07/29 05:19:44 jlam Exp $ # # Variable definitions for the OSF1 operating system. @@ -47,6 +47,8 @@ IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6 IMAKE_MANNEWSUFFIX= 1 IMAKE_MANINSTALL?= maninstall catinstall +_OPSYS_EMULDIR.osf1= # empty + .if exists(/usr/include/netinet/ip6.h) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk index c02b41b9b39..f3d6a3cdb02 100644 --- a/mk/platform/SunOS.mk +++ b/mk/platform/SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: SunOS.mk,v 1.29 2007/07/02 14:03:41 joerg Exp $ +# $NetBSD: SunOS.mk,v 1.30 2007/07/29 05:19:44 jlam Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -48,6 +48,10 @@ IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6 IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX} IMAKE_MANINSTALL?= maninstall +_OPSYS_EMULDIR.solaris= # empty +_OPSYS_EMULDIR.solaris32= # empty +_OPSYS_EMULDIR.sunos= # empty + .if exists(/usr/include/netinet/ip6.h) _OPSYS_HAS_INET6= yes # IPv6 is standard .else -- cgit v1.2.3