diff options
44 files changed, 271 insertions, 17 deletions
diff --git a/emulators/Makefile b/emulators/Makefile index c7d30a9e43c..a74db4b6283 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.159 2007/05/19 12:40:31 wiz Exp $ +# $NetBSD: Makefile,v 1.160 2007/07/29 08:55:22 jlam Exp $ # COMMENT= Emulators for other operating systems @@ -84,6 +84,27 @@ SUBDIR+= sms_sdl SUBDIR+= snes9x SUBDIR+= spim SUBDIR+= stella +SUBDIR+= suse100_32_aspell +SUBDIR+= suse100_32_base +SUBDIR+= suse100_32_compat +SUBDIR+= suse100_32_expat +SUBDIR+= suse100_32_fontconfig +SUBDIR+= suse100_32_freetype2 +SUBDIR+= suse100_32_gdk-pixbuf +SUBDIR+= suse100_32_glx +SUBDIR+= suse100_32_gtk +SUBDIR+= suse100_32_gtk2 +SUBDIR+= suse100_32_libcups +SUBDIR+= suse100_32_libjpeg +SUBDIR+= suse100_32_libpng +SUBDIR+= suse100_32_libtiff +SUBDIR+= suse100_32_libxml2 +SUBDIR+= suse100_32_locale +SUBDIR+= suse100_32_openmotif +SUBDIR+= suse100_32_openssl +SUBDIR+= suse100_32_slang +SUBDIR+= suse100_32_vmware +SUBDIR+= suse100_32_x11 SUBDIR+= suse100_aspell SUBDIR+= suse100_base SUBDIR+= suse100_compat @@ -106,6 +127,24 @@ SUBDIR+= suse100_openssl SUBDIR+= suse100_slang SUBDIR+= suse100_vmware SUBDIR+= suse100_x11 +SUBDIR+= suse91_32_aspell +SUBDIR+= suse91_32_base +SUBDIR+= suse91_32_compat +SUBDIR+= suse91_32_expat +SUBDIR+= suse91_32_fontconfig +SUBDIR+= suse91_32_freetype2 +SUBDIR+= suse91_32_gdk-pixbuf +SUBDIR+= suse91_32_glx +SUBDIR+= suse91_32_gtk +SUBDIR+= suse91_32_gtk2 +SUBDIR+= suse91_32_libjpeg +SUBDIR+= suse91_32_libpng +SUBDIR+= suse91_32_libtiff +SUBDIR+= suse91_32_locale +SUBDIR+= suse91_32_openmotif +SUBDIR+= suse91_32_slang +SUBDIR+= suse91_32_vmware +SUBDIR+= suse91_32_x11 SUBDIR+= suse91_aspell SUBDIR+= suse91_base SUBDIR+= suse91_compat diff --git a/emulators/suse100_32_aspell/Makefile b/emulators/suse100_32_aspell/Makefile new file mode 100644 index 00000000000..7b2ac826d87 --- /dev/null +++ b/emulators/suse100_32_aspell/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:23 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_base/Makefile b/emulators/suse100_32_base/Makefile new file mode 100644 index 00000000000..7b2ac826d87 --- /dev/null +++ b/emulators/suse100_32_base/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:23 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_compat/Makefile b/emulators/suse100_32_compat/Makefile new file mode 100644 index 00000000000..7b2ac826d87 --- /dev/null +++ b/emulators/suse100_32_compat/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:23 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_expat/Makefile b/emulators/suse100_32_expat/Makefile new file mode 100644 index 00000000000..d70ca70d76d --- /dev/null +++ b/emulators/suse100_32_expat/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:24 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_fontconfig/Makefile b/emulators/suse100_32_fontconfig/Makefile new file mode 100644 index 00000000000..d70ca70d76d --- /dev/null +++ b/emulators/suse100_32_fontconfig/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:24 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_freetype2/Makefile b/emulators/suse100_32_freetype2/Makefile new file mode 100644 index 00000000000..3ddb9f93294 --- /dev/null +++ b/emulators/suse100_32_freetype2/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:25 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_gdk-pixbuf/Makefile b/emulators/suse100_32_gdk-pixbuf/Makefile new file mode 100644 index 00000000000..3ddb9f93294 --- /dev/null +++ b/emulators/suse100_32_gdk-pixbuf/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:25 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_glx/Makefile b/emulators/suse100_32_glx/Makefile new file mode 100644 index 00000000000..fa98af65528 --- /dev/null +++ b/emulators/suse100_32_glx/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:26 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_gtk/Makefile b/emulators/suse100_32_gtk/Makefile new file mode 100644 index 00000000000..fa98af65528 --- /dev/null +++ b/emulators/suse100_32_gtk/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:26 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_gtk2/Makefile b/emulators/suse100_32_gtk2/Makefile new file mode 100644 index 00000000000..21275601502 --- /dev/null +++ b/emulators/suse100_32_gtk2/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:27 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_libcups/Makefile b/emulators/suse100_32_libcups/Makefile new file mode 100644 index 00000000000..21275601502 --- /dev/null +++ b/emulators/suse100_32_libcups/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:27 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_libjpeg/Makefile b/emulators/suse100_32_libjpeg/Makefile new file mode 100644 index 00000000000..21275601502 --- /dev/null +++ b/emulators/suse100_32_libjpeg/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:27 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_libpng/Makefile b/emulators/suse100_32_libpng/Makefile new file mode 100644 index 00000000000..79ee9360e5c --- /dev/null +++ b/emulators/suse100_32_libpng/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:28 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_libtiff/Makefile b/emulators/suse100_32_libtiff/Makefile new file mode 100644 index 00000000000..79ee9360e5c --- /dev/null +++ b/emulators/suse100_32_libtiff/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:28 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_libxml2/Makefile b/emulators/suse100_32_libxml2/Makefile new file mode 100644 index 00000000000..79ee9360e5c --- /dev/null +++ b/emulators/suse100_32_libxml2/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:28 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_locale/Makefile b/emulators/suse100_32_locale/Makefile new file mode 100644 index 00000000000..0ea578dbae0 --- /dev/null +++ b/emulators/suse100_32_locale/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:29 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_openmotif/Makefile b/emulators/suse100_32_openmotif/Makefile new file mode 100644 index 00000000000..0ea578dbae0 --- /dev/null +++ b/emulators/suse100_32_openmotif/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:29 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_openssl/Makefile b/emulators/suse100_32_openssl/Makefile new file mode 100644 index 00000000000..73171d56107 --- /dev/null +++ b/emulators/suse100_32_openssl/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:30 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_slang/Makefile b/emulators/suse100_32_slang/Makefile new file mode 100644 index 00000000000..73171d56107 --- /dev/null +++ b/emulators/suse100_32_slang/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:30 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_vmware/Makefile b/emulators/suse100_32_vmware/Makefile new file mode 100644 index 00000000000..73171d56107 --- /dev/null +++ b/emulators/suse100_32_vmware/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:30 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_32_x11/Makefile b/emulators/suse100_32_x11/Makefile new file mode 100644 index 00000000000..2beef264758 --- /dev/null +++ b/emulators/suse100_32_x11/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:31 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse100_linux/Makefile.common b/emulators/suse100_linux/Makefile.common index e2ebfb575dc..c8ac4360b2c 100644 --- a/emulators/suse100_linux/Makefile.common +++ b/emulators/suse100_linux/Makefile.common @@ -1,20 +1,25 @@ -# $NetBSD: Makefile.common,v 1.16 2007/07/29 05:18:54 jlam Exp $ +# $NetBSD: Makefile.common,v 1.17 2007/07/29 08:55:31 jlam Exp $ SUSE_PKG= yes SUSE_VERSION= 10.0 SUSE_VERSION_REQD= ${SUSE_VERSION} -EMUL_PLATFORMS?= linux-i386 linux-powerpc linux-x86_64 - -.include "../../mk/bsd.prefs.mk" - # The SuSE 10.x Linux packages are only usable on the following platforms. +.if defined(SUSE_COMPAT32) +EMUL_PLATFORMS?= linux-i386 +ONLY_FOR_PLATFORM+= NetBSD-3.99*-x86_64 +ONLY_FOR_PLATFORM+= NetBSD-[4-9]*-x86_64 +.else +EMUL_PLATFORMS?= linux-i386 linux-powerpc linux-x86_64 ONLY_FOR_PLATFORM+= DragonFly-*-i386 ONLY_FOR_PLATFORM+= FreeBSD-*-i386 ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-i386 ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-powerpc ONLY_FOR_PLATFORM+= NetBSD-3.99*-x86_64 ONLY_FOR_PLATFORM+= NetBSD-[4-9]*-x86_64 +.endif + +.include "../../mk/bsd.prefs.mk" # _SUSE_ARCH.* is a table of ${EMUL_ARCH} to SuSE architectures. _SUSE_ARCH.${EMUL_ARCH}= ${EMUL_ARCH} @@ -53,6 +58,11 @@ RPM2PKG_PREFIX?= ${PREFIX} RPM2PKG_SUBPREFIX?= ${EMULSUBDIR} RPM2PKG_STAGE?= do-install +SUSE_PKGSRCDIR= ${.CURDIR}/../${.CURDIR:T:S/_32_/_/} +FILESDIR= ${SUSE_PKGSRCDIR}/files +PATCHDIR= ${SUSE_PKGSRCDIR}/patches +PKGDIR= ${SUSE_PKGSRCDIR} + .if (${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64") PKGNAME:= ${DISTNAME:S/^suse_/suse32_/} COMMENT:= ${COMMENT:S/Linux/Linux 32-bit/} @@ -70,4 +80,4 @@ FILES_SUBST+= LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q} # Include an "override" SuSE-specific and architecture-specific # Makefile fragment if it exists. # -.sinclude "suse.${EMUL_ARCH}.mk" +.sinclude "${SUSE_PKGSRCDIR}/suse.${EMUL_ARCH}.mk" diff --git a/emulators/suse100_linux/emulator.mk b/emulators/suse100_linux/emulator.mk index 3b022e062ce..ce0a086ffa3 100644 --- a/emulators/suse100_linux/emulator.mk +++ b/emulators/suse100_linux/emulator.mk @@ -1,4 +1,4 @@ -# $NetBSD: emulator.mk,v 1.1 2007/07/29 05:18:55 jlam Exp $ +# $NetBSD: emulator.mk,v 1.2 2007/07/29 08:55:32 jlam Exp $ # # This file is included by linux-suse.mk in the emulator framework. # @@ -45,6 +45,6 @@ DEPENDS_suse-10.0.xml2?= suse_libxml2${_SUSE_VERSION_REQD}:../../emulators/suse1 .if (${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64") . for _mod_ in ${_LINUX_MODULES} DEPENDS_suse-10.0.${_mod_}:= \ - ${DEPENDS_suse-10.0.${_mod_}:S/^suse_/suse32_/} + ${DEPENDS_suse-10.0.${_mod_}:S/^suse_/suse32_/:S/suse100_/&32_/} . endfor .endif diff --git a/emulators/suse91_32_aspell/Makefile b/emulators/suse91_32_aspell/Makefile new file mode 100644 index 00000000000..e48ac0dc4a9 --- /dev/null +++ b/emulators/suse91_32_aspell/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:32 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_32_base/Makefile b/emulators/suse91_32_base/Makefile new file mode 100644 index 00000000000..e48ac0dc4a9 --- /dev/null +++ b/emulators/suse91_32_base/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:32 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_32_compat/Makefile b/emulators/suse91_32_compat/Makefile new file mode 100644 index 00000000000..6412153f20a --- /dev/null +++ b/emulators/suse91_32_compat/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:33 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_32_expat/Makefile b/emulators/suse91_32_expat/Makefile new file mode 100644 index 00000000000..6412153f20a --- /dev/null +++ b/emulators/suse91_32_expat/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:33 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_32_fontconfig/Makefile b/emulators/suse91_32_fontconfig/Makefile new file mode 100644 index 00000000000..6412153f20a --- /dev/null +++ b/emulators/suse91_32_fontconfig/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:33 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_32_freetype2/Makefile b/emulators/suse91_32_freetype2/Makefile new file mode 100644 index 00000000000..1e82372ed8d --- /dev/null +++ b/emulators/suse91_32_freetype2/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:34 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_32_gdk-pixbuf/Makefile b/emulators/suse91_32_gdk-pixbuf/Makefile new file mode 100644 index 00000000000..1e82372ed8d --- /dev/null +++ b/emulators/suse91_32_gdk-pixbuf/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:34 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_32_glx/Makefile b/emulators/suse91_32_glx/Makefile new file mode 100644 index 00000000000..301f95db839 --- /dev/null +++ b/emulators/suse91_32_glx/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:35 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_32_gtk/Makefile b/emulators/suse91_32_gtk/Makefile new file mode 100644 index 00000000000..301f95db839 --- /dev/null +++ b/emulators/suse91_32_gtk/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:35 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_32_gtk2/Makefile b/emulators/suse91_32_gtk2/Makefile new file mode 100644 index 00000000000..301f95db839 --- /dev/null +++ b/emulators/suse91_32_gtk2/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:35 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_32_libjpeg/Makefile b/emulators/suse91_32_libjpeg/Makefile new file mode 100644 index 00000000000..521adf2cc28 --- /dev/null +++ b/emulators/suse91_32_libjpeg/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:36 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_32_libpng/Makefile b/emulators/suse91_32_libpng/Makefile new file mode 100644 index 00000000000..521adf2cc28 --- /dev/null +++ b/emulators/suse91_32_libpng/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:36 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_32_libtiff/Makefile b/emulators/suse91_32_libtiff/Makefile new file mode 100644 index 00000000000..63d32a5075e --- /dev/null +++ b/emulators/suse91_32_libtiff/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:37 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_32_locale/Makefile b/emulators/suse91_32_locale/Makefile new file mode 100644 index 00000000000..63d32a5075e --- /dev/null +++ b/emulators/suse91_32_locale/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:37 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_32_openmotif/Makefile b/emulators/suse91_32_openmotif/Makefile new file mode 100644 index 00000000000..63d32a5075e --- /dev/null +++ b/emulators/suse91_32_openmotif/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:37 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_32_slang/Makefile b/emulators/suse91_32_slang/Makefile new file mode 100644 index 00000000000..bc08c7b2839 --- /dev/null +++ b/emulators/suse91_32_slang/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:38 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_32_vmware/Makefile b/emulators/suse91_32_vmware/Makefile new file mode 100644 index 00000000000..bc08c7b2839 --- /dev/null +++ b/emulators/suse91_32_vmware/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:38 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_32_x11/Makefile b/emulators/suse91_32_x11/Makefile new file mode 100644 index 00000000000..bc08c7b2839 --- /dev/null +++ b/emulators/suse91_32_x11/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/07/29 08:55:38 jlam Exp $ + +SUSE_COMPAT32= yes + +.include "${.CURDIR}/../${.CURDIR:T:S/_32_/_/}/Makefile" diff --git a/emulators/suse91_linux/Makefile.common b/emulators/suse91_linux/Makefile.common index f672d42f045..81a51e3091a 100644 --- a/emulators/suse91_linux/Makefile.common +++ b/emulators/suse91_linux/Makefile.common @@ -1,19 +1,24 @@ -# $NetBSD: Makefile.common,v 1.17 2007/07/29 05:19:17 jlam Exp $ +# $NetBSD: Makefile.common,v 1.18 2007/07/29 08:55:39 jlam Exp $ SUSE_PKG= yes SUSE_VERSION= 9.1 SUSE_VERSION_REQD= ${SUSE_VERSION} -EMUL_PLATFORMS?= linux-i386 linux-x86_64 - -.include "../../mk/bsd.prefs.mk" - # The SuSE 10.x Linux packages are only usable on the following platforms. +.if defined(SUSE_COMPAT32) +EMUL_PLATFORMS?= linux-i386 +ONLY_FOR_PLATFORM+= NetBSD-3.99*-x86_64 +ONLY_FOR_PLATFORM+= NetBSD-[4-9]*-x86_64 +.else +EMUL_PLATFORMS?= linux-i386 linux-x86_64 ONLY_FOR_PLATFORM+= DragonFly-*-i386 ONLY_FOR_PLATFORM+= FreeBSD-*-i386 ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-i386 ONLY_FOR_PLATFORM+= NetBSD-3.99*-x86_64 ONLY_FOR_PLATFORM+= NetBSD-[4-9]*-x86_64 +.endif + +.include "../../mk/bsd.prefs.mk" # _SUSE_ARCH.* is a table of ${EMUL_ARCH} to SuSE architectures. _SUSE_ARCH.${EMUL_ARCH}= ${EMUL_ARCH} @@ -50,6 +55,11 @@ RPM2PKG_PREFIX?= ${PREFIX} RPM2PKG_SUBPREFIX?= ${EMULSUBDIR} RPM2PKG_STAGE?= do-install +SUSE_PKGSRCDIR= ${.CURDIR}/../${.CURDIR:T:S/_32_/_/} +FILESDIR= ${SUSE_PKGSRCDIR}/files +PATCHDIR= ${SUSE_PKGSRCDIR}/patches +PKGDIR= ${SUSE_PKGSRCDIR} + .if (${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64") PKGNAME:= ${DISTNAME:S/^suse_/suse32_/} COMMENT:= ${COMMENT:S/Linux/Linux 32-bit/} @@ -67,4 +77,4 @@ FILES_SUBST+= LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q} # Include an "override" SuSE-specific and architecture-specific # Makefile fragment if it exists. # -.sinclude "suse.${EMUL_ARCH}.mk" +.sinclude "${SUSE_PKGSRCDIR}/suse.${EMUL_ARCH}.mk" diff --git a/emulators/suse91_linux/emulator.mk b/emulators/suse91_linux/emulator.mk index 1ec73cab815..687cedd3b6b 100644 --- a/emulators/suse91_linux/emulator.mk +++ b/emulators/suse91_linux/emulator.mk @@ -1,4 +1,4 @@ -# $NetBSD: emulator.mk,v 1.1 2007/07/29 05:19:17 jlam Exp $ +# $NetBSD: emulator.mk,v 1.2 2007/07/29 08:55:39 jlam Exp $ # # This file is included by linux-suse.mk in the emulator framework. # @@ -42,6 +42,6 @@ DEPENDS_suse-9.1.x11?= suse_x11${_SUSE_VERSION_REQD}:../../emulators/suse91_x11 .if (${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64") . for _mod_ in ${_LINUX_MODULES} DEPENDS_suse-9.1.${_mod_}:= \ - ${DEPENDS_suse-9.1.${_mod_}:S/^suse_/suse32_/} + ${DEPENDS_suse-9.1.${_mod_}:S/^suse_/suse32_/:S/suse91_/&32_/} . endfor .endif |