summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
Diffstat (limited to 'emulators')
-rw-r--r--emulators/suse100_aspell/Makefile6
-rw-r--r--emulators/suse100_base/INSTALL4
-rw-r--r--emulators/suse100_base/Makefile18
-rw-r--r--emulators/suse100_base/PLIST4
-rw-r--r--emulators/suse100_compat/Makefile6
-rw-r--r--emulators/suse100_expat/Makefile6
-rw-r--r--emulators/suse100_fontconfig/Makefile6
-rw-r--r--emulators/suse100_freetype2/Makefile6
-rw-r--r--emulators/suse100_gdk-pixbuf/Makefile6
-rw-r--r--emulators/suse100_glx/Makefile6
-rw-r--r--emulators/suse100_gtk/Makefile6
-rw-r--r--emulators/suse100_gtk2/Makefile8
-rw-r--r--emulators/suse100_libcups/Makefile6
-rw-r--r--emulators/suse100_libjpeg/Makefile6
-rw-r--r--emulators/suse100_libpng/Makefile6
-rw-r--r--emulators/suse100_libtiff/Makefile6
-rw-r--r--emulators/suse100_libxml2/Makefile6
-rw-r--r--emulators/suse100_linux/Makefile.common47
-rw-r--r--emulators/suse100_locale/Makefile6
-rw-r--r--emulators/suse100_openmotif/Makefile6
-rw-r--r--emulators/suse100_openssl/Makefile6
-rw-r--r--emulators/suse100_slang/Makefile8
-rw-r--r--emulators/suse100_x11/Makefile8
-rw-r--r--emulators/suse_linux/Makefile.application4
24 files changed, 88 insertions, 109 deletions
diff --git a/emulators/suse100_aspell/Makefile b/emulators/suse100_aspell/Makefile
index e9754c61ff2..67a20c31a90 100644
--- a/emulators/suse100_aspell/Makefile
+++ b/emulators/suse100_aspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/06/30 16:20:23 salo Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/19 15:30:20 xtraeme Exp $
DISTNAME= suse_aspell-${SUSE_VERSION}
PKGREVISION= 1
@@ -18,9 +18,7 @@ EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_base/INSTALL b/emulators/suse100_base/INSTALL
index 928f5a6e057..ed22f89412e 100644
--- a/emulators/suse100_base/INSTALL
+++ b/emulators/suse100_base/INSTALL
@@ -1,8 +1,8 @@
-# $NetBSD: INSTALL,v 1.3 2006/06/23 15:48:50 jlam Exp $
+# $NetBSD: INSTALL,v 1.4 2007/04/19 15:30:20 xtraeme Exp $
case "${STAGE}" in
POST-INSTALL)
- emulsubdir=linux
+ emulsubdir="@OPSYS_EMULSUBDIR@"
emuldir="@OPSYS_EMULDIR@"
pkgemuldir="${PKG_PREFIX}/emul/$emulsubdir"
diff --git a/emulators/suse100_base/Makefile b/emulators/suse100_base/Makefile
index 2a8182c4f91..2a6ee4703f2 100644
--- a/emulators/suse100_base/Makefile
+++ b/emulators/suse100_base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/03/02 10:35:04 sketch Exp $
+# $NetBSD: Makefile,v 1.9 2007/04/19 15:30:20 xtraeme Exp $
DISTNAME= suse_base-${SUSE_VERSION}
PKGREVISION= 3
@@ -18,11 +18,10 @@ CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/etc/ld.so.cache
EXTRACT_ONLY= # empty
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} LINUX_LIB=${LINUX_LIB:Q}
+PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} LINUX_LIB=${LINUX_LIB:Q} \
+ SUSE_COMPAT32_SUFFIX=${SUSE_COMPAT32_SUFFIX:Q}
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+.include "../../mk/bsd.prefs.mk"
RPMIGNOREPATH= ./etc/bash.bashrc ./etc/bash_completion.d \
./etc/cron.daily ./etc/csh.cshrc ./etc/csh.login \
@@ -34,10 +33,10 @@ RPMIGNOREPATH= ./etc/bash.bashrc ./etc/bash_completion.d \
LINUX_LDD= ${PREFIX}/${EMULSUBDIR}/usr/bin/ldd
LINUX_LIB?= lib
-.include "../../mk/bsd.prefs.mk"
-
INSTALLATION_DIRS= sbin
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
+
do-build:
@for FILE in ${FILESDIR}/SuSE-release ${FILESDIR}/*.sh; do \
${SED} -e 's#@@EMULDIR@@#${EMULDIR}#g' \
@@ -49,9 +48,8 @@ do-build:
done
do-install:
- for FILE in ${WRKDIR}/*.sh; do \
- ${INSTALL_SCRIPT} $$FILE ${PREFIX}/sbin/`basename $$FILE .sh`; \
- done
+ ${INSTALL_SCRIPT} ${FILESDIR}/linux-mkpwd.sh \
+ ${PREFIX}/sbin/linux${SUSE_COMPAT32_SUFFIX}-mkpwd
${INSTALL_DATA_DIR} ${EMULDIR}/dev
${INSTALL_DATA} /dev/MAKEDEV ${EMULDIR}/dev
if [ -f /dev/MAKEDEV.subr ]; then \
diff --git a/emulators/suse100_base/PLIST b/emulators/suse100_base/PLIST
index 232a2a70acb..7f94deb4cf5 100644
--- a/emulators/suse100_base/PLIST
+++ b/emulators/suse100_base/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/03/09 20:34:10 tonio Exp $
-sbin/linux-mkpwd
+@comment $NetBSD: PLIST,v 1.2 2007/04/19 15:30:20 xtraeme Exp $
+sbin/linux${SUSE_COMPAT32_SUFFIX}-mkpwd
@unexec ${RM} -f %D/${EMULSUBDIR}/etc/ld.so.cache
${EMULSUBDIR}/etc/SuSE-release
${EMULSUBDIR}/etc/mtab
diff --git a/emulators/suse100_compat/Makefile b/emulators/suse100_compat/Makefile
index fbee5e1e304..3dfad8f1709 100644
--- a/emulators/suse100_compat/Makefile
+++ b/emulators/suse100_compat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/03/24 21:52:04 salo Exp $
+# $NetBSD: Makefile,v 1.6 2007/04/19 15:30:20 xtraeme Exp $
DISTNAME= suse_compat-${SUSE_VERSION}
PKGREVISION= 2
@@ -16,9 +16,7 @@ EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_expat/Makefile b/emulators/suse100_expat/Makefile
index 0305f68cb93..0a2d158c24e 100644
--- a/emulators/suse100_expat/Makefile
+++ b/emulators/suse100_expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:20 xtraeme Exp $
DISTNAME= suse_expat-${SUSE_VERSION}
PKGREVISION= 1
@@ -17,9 +17,7 @@ NO_BUILD= YES
LIBTOOLIZE_PLIST= NO
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_fontconfig/Makefile b/emulators/suse100_fontconfig/Makefile
index 18b96144a5c..61b4cd6269b 100644
--- a/emulators/suse100_fontconfig/Makefile
+++ b/emulators/suse100_fontconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/06/30 16:20:23 salo Exp $
+# $NetBSD: Makefile,v 1.5 2007/04/19 15:30:20 xtraeme Exp $
DISTNAME= suse_fontconfig-${SUSE_VERSION}
PKGREVISION= 2
@@ -17,9 +17,7 @@ EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_freetype2/Makefile b/emulators/suse100_freetype2/Makefile
index 79cdc229e04..0124e4f4ca8 100644
--- a/emulators/suse100_freetype2/Makefile
+++ b/emulators/suse100_freetype2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/08/02 14:26:13 salo Exp $
+# $NetBSD: Makefile,v 1.6 2007/04/19 15:30:20 xtraeme Exp $
DISTNAME= suse_freetype2-${SUSE_VERSION}
PKGREVISION= 3
@@ -16,9 +16,7 @@ EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_gdk-pixbuf/Makefile b/emulators/suse100_gdk-pixbuf/Makefile
index 81d8acc4245..dbcd44b5a7d 100644
--- a/emulators/suse100_gdk-pixbuf/Makefile
+++ b/emulators/suse100_gdk-pixbuf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $
DISTNAME= suse_gdk-pixbuf-${SUSE_VERSION}
PKGREVISION= 2
@@ -16,9 +16,7 @@ EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_glx/Makefile b/emulators/suse100_glx/Makefile
index 7d31ec5d4f8..9d3b39044e8 100644
--- a/emulators/suse100_glx/Makefile
+++ b/emulators/suse100_glx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $
DISTNAME= suse_glx-${SUSE_VERSION}
PKGREVISION= 2
@@ -17,9 +17,7 @@ NO_BUILD= YES
LIBTOOLIZE_PLIST= NO
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_gtk/Makefile b/emulators/suse100_gtk/Makefile
index 56284e82035..d5bf3da247b 100644
--- a/emulators/suse100_gtk/Makefile
+++ b/emulators/suse100_gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/06/30 16:20:23 salo Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/19 15:30:21 xtraeme Exp $
DISTNAME= suse_gtk-${SUSE_VERSION}
PKGREVISION= 1
@@ -16,9 +16,7 @@ EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_gtk2/Makefile b/emulators/suse100_gtk2/Makefile
index d075fe2fa13..4406d208e1c 100644
--- a/emulators/suse100_gtk2/Makefile
+++ b/emulators/suse100_gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/03/24 21:52:51 salo Exp $
+# $NetBSD: Makefile,v 1.8 2007/04/19 15:30:21 xtraeme Exp $
DISTNAME= suse_gtk2-${SUSE_VERSION}
PKGREVISION= 3
@@ -26,11 +26,7 @@ FILES_SUBST+= EMULDIR=${EMULDIR:Q}
FILES_SUBST+= BINSUFFIX=${BINSUFFIX:Q}
PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q}
-.include "../../mk/bsd.prefs.mk"
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_libcups/Makefile b/emulators/suse100_libcups/Makefile
index 9bd0c33debb..e21682eea09 100644
--- a/emulators/suse100_libcups/Makefile
+++ b/emulators/suse100_libcups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/03/24 21:52:51 salo Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $
DISTNAME= suse_libcups-${SUSE_VERSION}
PKGREVISION= 2
@@ -16,9 +16,7 @@ EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_libjpeg/Makefile b/emulators/suse100_libjpeg/Makefile
index 4c4d8a51146..4e0a265d59f 100644
--- a/emulators/suse100_libjpeg/Makefile
+++ b/emulators/suse100_libjpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $
DISTNAME= suse_libjpeg-${SUSE_VERSION}
PKGREVISION= 1
@@ -17,9 +17,7 @@ NO_BUILD= YES
LIBTOOLIZE_PLIST= NO
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_libpng/Makefile b/emulators/suse100_libpng/Makefile
index aa917679d3e..9e7529b92ea 100644
--- a/emulators/suse100_libpng/Makefile
+++ b/emulators/suse100_libpng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/12/06 10:35:58 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/04/19 15:30:21 xtraeme Exp $
DISTNAME= suse_libpng-${SUSE_VERSION}
PKGREVISION= 2
@@ -16,9 +16,7 @@ EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_libtiff/Makefile b/emulators/suse100_libtiff/Makefile
index eedd5fbfff3..f7758f65ddd 100644
--- a/emulators/suse100_libtiff/Makefile
+++ b/emulators/suse100_libtiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/08/02 14:26:13 salo Exp $
+# $NetBSD: Makefile,v 1.6 2007/04/19 15:30:21 xtraeme Exp $
DISTNAME= suse_libtiff-${SUSE_VERSION}
PKGREVISION= 3
@@ -16,9 +16,7 @@ EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_libxml2/Makefile b/emulators/suse100_libxml2/Makefile
index 53afa86de2d..85a2cd7e8ba 100644
--- a/emulators/suse100_libxml2/Makefile
+++ b/emulators/suse100_libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/06/30 16:20:23 salo Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/19 15:30:21 xtraeme Exp $
DISTNAME= suse_libxml2-${SUSE_VERSION}
PKGREVISION= 1
@@ -16,9 +16,7 @@ EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_linux/Makefile.common b/emulators/suse100_linux/Makefile.common
index 736ddc529d2..027aebb4915 100644
--- a/emulators/suse100_linux/Makefile.common
+++ b/emulators/suse100_linux/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.12 2006/10/02 16:00:38 rillig Exp $
+# $NetBSD: Makefile.common,v 1.13 2007/04/19 15:30:21 xtraeme Exp $
.include "../../emulators/suse100_linux/vars.mk"
.include "../../emulators/suse100_linux/arch.mk"
+.include "../../emulators/suse100_linux/compat32.mk"
ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-i386 NetBSD-3.99*-x86_64 \
NetBSD-[2-9]*-powerpc \
@@ -24,7 +25,9 @@ MASTER_SITE_SUSE100?= \
ftp://mirror.karneval.cz/pub/opensuse/${_SUSE_FTP_SUBDIR:S,distribution/,,} \
ftp://ftp.suse.com/pub/${_SUSE_FTP_SUBDIR_UPD}
+.ifndef SUSE_COMPAT32
DIST_SUBDIR?= suse${SUSE_VERSION:S/.//}/${SUSE_ARCH}
+.endif
WRKSRC?= ${WRKDIR}
MANCOMPRESSED?= yes
@@ -32,18 +35,27 @@ MANCOMPRESSED?= yes
# Don't check any script interpreter, as long as nobody complains.
CHECK_INTERPRETER_SKIP= *
-EMULSUBDIR= emul/linux
+EMULSUBDIR= emul/linux${SUSE_COMPAT32_SUFFIX}
EMULDIR= ${PREFIX}/${EMULSUBDIR}
# Set location of OPSYS-specific emulation directory
.if ${OPSYS} == "NetBSD"
+. ifndef SUSE_COMPAT32
OPSYS_EMULDIR= /${EMULSUBDIR}
+. else
+OPSYS_EMULDIR= ${EMULSUBDIR}
+. endif
.elif (${OPSYS} == "FreeBSD") || (${OPSYS} == "DragonFly")
OPSYS_EMULDIR= /compat/${EMULSUBDIR:T}
.else
OPSYS_EMULDIR= /${EMULSUBDIR}
.endif
-FILES_SUBST+= OPSYS_EMULDIR=${OPSYS_EMULDIR:Q}
+FILES_SUBST+= OPSYS_EMULDIR=${OPSYS_EMULDIR:Q} \
+ OPSYS_EMULSUBDIR=${OPSYS_EMULSUBDIR:Q}
+
+.ifdef SUSE_COMPAT32
+PLIST_SUBST+= ${FILES_SUBST}
+.endif
RPM2PKG= ${PREFIX}/sbin/rpm2pkg
BUILD_DEPENDS+= rpm2pkg>=2.1:../../pkgtools/rpm2pkg
@@ -56,17 +68,19 @@ BUILD_DEFS+= RPMIGNOREPATH
# The SuSE Linux packages have circular dependencies.
LDD?= ${TRUE}
+.ifndef SUSE_COMPAT32
RPM2PKGSTRIP?= 1
RPM2PKGARGS?= -d ${PREFIX} -f ${PLIST_SRC} -p ${EMULSUBDIR}
-.if empty(RPM2PKGSTRIP:M0)
+. if empty(RPM2PKGSTRIP:M0)
RPM2PKGARGS+= -s ${RPM2PKGSTRIP}
-.endif
-.for TEMP in ${RPMIGNOREPATH}
+. endif
+. for TEMP in ${RPMIGNOREPATH}
RPM2PKGARGS+= -i ${TEMP}
-.endfor
-.for TEMP in ${RPMFILES}
+. endfor
+. for TEMP in ${RPMFILES}
RPM2PKGARGS+= ${DISTDIR}/${DIST_SUBDIR}/${TEMP}
-.endfor
+. endfor
+.endif
# regenerate distinfo for all platforms supported by the suse100_* packages
suse100-distinfo:
@@ -81,7 +95,14 @@ suse100-distinfo:
) > distinfo.new
${MV} -f distinfo.new distinfo
-.if !target(do-install)
+.ifdef SUSE_COMPAT32_SUFFIX
+LOCAL_ARCH= i386
+.else
+LOCAL_ARCH= ${MACHINE_ARCH}
+.endif
+
+.if empty(${.CURDIR:Msuse100_base}) && !defined(SUSE_COMPAT32)
+. if !target(do-install)
do-install:
@if [ -f ${PKGDIR}/PLIST ]; then \
${CP} ${PKGDIR}/PLIST ${PLIST_SRC}; \
@@ -89,8 +110,9 @@ do-install:
${RM} -f ${PLIST_SRC}; \
${CP} ${PKGSRCDIR}/emulators/suse_linux/PLIST_dynamic ${PLIST_SRC} ; \
fi
- @if [ -f ${PKGDIR}/PLIST_rpmfix.${MACHINE_ARCH} ]; then \
- ${SED} -e 's,^/,${EMULSUBDIR}/,' ${PKGDIR}/PLIST_rpmfix.${MACHINE_ARCH} >> ${PLIST_SRC}; \
+ @if [ -f ${PKGDIR}/PLIST_rpmfix.${LOCAL_ARCH} ]; then \
+ ${SED} -e 's,^/,${EMULSUBDIR}/,' \
+ ${PKGDIR}/PLIST_rpmfix.${LOCAL_ARCH} >> ${PLIST_SRC}; \
fi
${RPM2PKG} ${RPM2PKGARGS}
@if ${GREP} -q 'lib.*\.so' ${PLIST_SRC}; then \
@@ -103,4 +125,5 @@ do-install:
${GREP} '^@dirrm' ${PLIST_SRC}.old >>${PLIST_SRC} || ${TRUE}; \
${RM} -f ${PLIST_SRC}.old; \
fi
+. endif
.endif
diff --git a/emulators/suse100_locale/Makefile b/emulators/suse100_locale/Makefile
index f290433e09d..71a4a30e311 100644
--- a/emulators/suse100_locale/Makefile
+++ b/emulators/suse100_locale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $
DISTNAME= suse_locale-${SUSE_VERSION}
PKGREVISION= 1
@@ -18,9 +18,7 @@ EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_openmotif/Makefile b/emulators/suse100_openmotif/Makefile
index f500e5b7835..74adf372e2c 100644
--- a/emulators/suse100_openmotif/Makefile
+++ b/emulators/suse100_openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/06/30 16:20:23 salo Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/19 15:30:22 xtraeme Exp $
DISTNAME= suse_openmotif-${SUSE_VERSION}
PKGREVISION= 1
@@ -16,9 +16,7 @@ EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_openssl/Makefile b/emulators/suse100_openssl/Makefile
index 85d5982b077..45781473145 100644
--- a/emulators/suse100_openssl/Makefile
+++ b/emulators/suse100_openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/03/24 21:52:51 salo Exp $
+# $NetBSD: Makefile,v 1.5 2007/04/19 15:30:22 xtraeme Exp $
DISTNAME= suse_openssl-${SUSE_VERSION}
PKGREVISION= 3
@@ -16,9 +16,7 @@ EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_slang/Makefile b/emulators/suse100_slang/Makefile
index 84597bbe3a3..5b48a342908 100644
--- a/emulators/suse100_slang/Makefile
+++ b/emulators/suse100_slang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:24 salo Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:22 xtraeme Exp $
DISTNAME= suse_slang-${SUSE_VERSION}
PKGREVISION= 2
@@ -17,12 +17,10 @@ NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q}
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
post-install:
- cd ${PREFIX}/${EMULSUBDIR}/usr/lib/ && \
+ cd ${PREFIX}/${EMULSUBDIR}/usr/lib && \
${LN} -sf libslang-utf8.so.1 libslang.so.1
.include "../../emulators/suse100_linux/Makefile.common"
diff --git a/emulators/suse100_x11/Makefile b/emulators/suse100_x11/Makefile
index 923f0b1742b..34ceee39817 100644
--- a/emulators/suse100_x11/Makefile
+++ b/emulators/suse100_x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/06/30 16:20:24 salo Exp $
+# $NetBSD: Makefile,v 1.5 2007/04/19 15:30:22 xtraeme Exp $
DISTNAME= suse_x11-${SUSE_VERSION}
PKGREVISION= 2
@@ -16,11 +16,7 @@ EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../mk/bsd.prefs.mk"
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_linux/Makefile.application b/emulators/suse_linux/Makefile.application
index 5da1a4e1957..45a82846424 100644
--- a/emulators/suse_linux/Makefile.application
+++ b/emulators/suse_linux/Makefile.application
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.application,v 1.23 2006/06/26 19:24:05 salo Exp $
+# $NetBSD: Makefile.application,v 1.24 2007/04/19 15:30:22 xtraeme Exp $
.include "../../mk/bsd.prefs.mk"
@@ -17,7 +17,7 @@
. include "../../emulators/suse_linux/unavailable.mk"
. endif
-. if defined(RPMFILES)
+. if defined(RPMFILES) || defined(SUSE_COMPAT32)
. include "../../emulators/${SUSE_DIR_PREFIX}_linux/Makefile.common"
. endif