Add x86_64 files to SUSE emulation packages to make it easier

for COMPAT_LINUX testers to play with.  Untested in run-time.

59 files changed, 236 insertions, 55 deletions

diff --git a/emulators/suse91_aspell/Makefile b/emulators/suse91_aspell/Makefile
index f163c3d5d0c..a471c07d333 100644
--- a/emulators/suse91_aspell/Makefile
+++ b/emulators/suse91_aspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/12/12 14:43:23 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/08 16:53:21 salo Exp $
 
 DISTNAME=		suse_aspell-${SUSE_VERSION}
 PKGREVISION=		1
@@ -10,18 +10,18 @@ MAINTAINER=		jdolecek@NetBSD.org
 HOMEPAGE=		http://www.suse.com/
 COMMENT=		Linux compatibility package for Aspell library
 
-RPMFILES=		aspell-0.50.5-38.4.${SUSE_ARCH}.rpm
-
 .include "../../emulators/suse_linux/Makefile.application"
 
 .if !defined(USE_NATIVE_LINUX)
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse91_base
 .endif
 
-ONLY_FOR_PLATFORM=      *-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
+.if exists(Makefile.${MACHINE_ARCH})
+.include "Makefile.${MACHINE_ARCH}"
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_aspell/Makefile.i386 b/emulators/suse91_aspell/Makefile.i386
new file mode 100644
index 00000000000..b4dd2849563
--- /dev/null
+++ b/emulators/suse91_aspell/Makefile.i386
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		aspell-0.50.5-38.4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_aspell/Makefile.x86_64 b/emulators/suse91_aspell/Makefile.x86_64
new file mode 100644
index 00000000000..523d98c7265
--- /dev/null
+++ b/emulators/suse91_aspell/Makefile.x86_64
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		aspell-0.50.5-38.4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_aspell/distinfo b/emulators/suse91_aspell/distinfo
index 73eeeb8adeb..d055a803b42 100644
--- a/emulators/suse91_aspell/distinfo
+++ b/emulators/suse91_aspell/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/11/06 14:52:43 salo Exp $
+$NetBSD: distinfo,v 1.4 2006/01/08 16:53:21 salo Exp $
 
 SHA1 (suse91/i586/aspell-0.50.5-38.4.i586.rpm) = cffd30f8176afb8f3ad51fb50c09fbd34413d74e
 RMD160 (suse91/i586/aspell-0.50.5-38.4.i586.rpm) = 5244e5a391a01373ded4b866a0eb2f8e133dde96
 Size (suse91/i586/aspell-0.50.5-38.4.i586.rpm) = 566009 bytes
+SHA1 (suse91/x86_64/aspell-0.50.5-38.4.x86_64.rpm) = 1547b1d379b1fa8bbeac998004dcfcba99002c2f
+RMD160 (suse91/x86_64/aspell-0.50.5-38.4.x86_64.rpm) = 43ae8d83b0a89261b8ad53ce80671fe7b399bcce
+Size (suse91/x86_64/aspell-0.50.5-38.4.x86_64.rpm) = 575917 bytes
diff --git a/emulators/suse91_compat/Makefile b/emulators/suse91_compat/Makefile
index 12796eb70a2..3f7c8b7fd7c 100644
--- a/emulators/suse91_compat/Makefile
+++ b/emulators/suse91_compat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/12/12 14:43:23 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/01/08 16:53:21 salo Exp $
 
 DISTNAME=		suse_compat-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -15,7 +15,9 @@ EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-RPMFILES=		compat-2004.4.2-3.${SUSE_ARCH}.rpm
+.if exists(Makefile.${MACHINE_ARCH})
+.include "Makefile.${MACHINE_ARCH}"
+.endif
 
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_compat/Makefile.i386 b/emulators/suse91_compat/Makefile.i386
new file mode 100644
index 00000000000..c91f756b2ad
--- /dev/null
+++ b/emulators/suse91_compat/Makefile.i386
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		compat-2004.4.2-3.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_compat/Makefile.x86_64 b/emulators/suse91_compat/Makefile.x86_64
new file mode 100644
index 00000000000..1c784525b32
--- /dev/null
+++ b/emulators/suse91_compat/Makefile.x86_64
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		compat-2004.4.2-2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_compat/distinfo b/emulators/suse91_compat/distinfo
index 43aa81d6b70..646f4416f94 100644
--- a/emulators/suse91_compat/distinfo
+++ b/emulators/suse91_compat/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:20 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/01/08 16:53:21 salo Exp $
 
 SHA1 (suse91/i586/compat-2004.4.2-3.i586.rpm) = 837f2272da26f8efe242e33724370d45cc2c5a74
 RMD160 (suse91/i586/compat-2004.4.2-3.i586.rpm) = a18f61b6fd3c3eb63600b37d8324a3f2fe0b4043
 Size (suse91/i586/compat-2004.4.2-3.i586.rpm) = 1806417 bytes
+SHA1 (suse91/x86_64/compat-2004.4.2-2.x86_64.rpm) = 27d7075068b73ee2c915510c1f74a60d140af494
+RMD160 (suse91/x86_64/compat-2004.4.2-2.x86_64.rpm) = ddbe20362065fc0385a17a9148b80c1458a5ab0a
+Size (suse91/x86_64/compat-2004.4.2-2.x86_64.rpm) = 139427 bytes
diff --git a/emulators/suse91_expat/Makefile b/emulators/suse91_expat/Makefile
index 91dac346d33..60bfa6de865 100644
--- a/emulators/suse91_expat/Makefile
+++ b/emulators/suse91_expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/12/12 14:43:23 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/01/08 16:53:21 salo Exp $
 
 DISTNAME=		suse_expat-${SUSE_VERSION}
 PKGREVISION=		1
@@ -17,7 +17,9 @@ NO_BUILD=		YES
 LIBTOOLIZE_PLIST=	NO
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-RPMFILES=		expat-1.95.7-37.${SUSE_ARCH}.rpm
+.if exists(Makefile.${MACHINE_ARCH})
+.include "Makefile.${MACHINE_ARCH}"
+.endif
 
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_expat/Makefile.i386 b/emulators/suse91_expat/Makefile.i386
new file mode 100644
index 00000000000..385044ba27f
--- /dev/null
+++ b/emulators/suse91_expat/Makefile.i386
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		expat-1.95.7-37.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_expat/Makefile.x86_64 b/emulators/suse91_expat/Makefile.x86_64
new file mode 100644
index 00000000000..b29da228bdc
--- /dev/null
+++ b/emulators/suse91_expat/Makefile.x86_64
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		expat-1.95.7-31.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_expat/distinfo b/emulators/suse91_expat/distinfo
index 0dbbbfcb929..7d6ac8c3544 100644
--- a/emulators/suse91_expat/distinfo
+++ b/emulators/suse91_expat/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:20 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/01/08 16:53:21 salo Exp $
 
 SHA1 (suse91/i586/expat-1.95.7-37.i586.rpm) = 2f32f41ef922591f053dfac51d356b52a17c2fa4
 RMD160 (suse91/i586/expat-1.95.7-37.i586.rpm) = 158276d4653092129342a47e78785c5f55f8cccd
 Size (suse91/i586/expat-1.95.7-37.i586.rpm) = 176293 bytes
+SHA1 (suse91/x86_64/expat-1.95.7-31.x86_64.rpm) = 128de07016acd1d00d64cd6ed30287a9eb4535c5
+RMD160 (suse91/x86_64/expat-1.95.7-31.x86_64.rpm) = f9494e49ff07da6ae7ee333f63699d9ba29af705
+Size (suse91/x86_64/expat-1.95.7-31.x86_64.rpm) = 162352 bytes
diff --git a/emulators/suse91_fontconfig/Makefile b/emulators/suse91_fontconfig/Makefile
index a75e904ac19..4f794cf634a 100644
--- a/emulators/suse91_fontconfig/Makefile
+++ b/emulators/suse91_fontconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/12/12 14:43:23 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/08 16:53:21 salo Exp $
 
 DISTNAME=		suse_fontconfig-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -15,7 +15,9 @@ EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-RPMFILES=		fontconfig-2.2.92.20040221-28.${SUSE_ARCH}.rpm
+.if exists(Makefile.${MACHINE_ARCH})
+.include "Makefile.${MACHINE_ARCH}"
+.endif
 
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_fontconfig/Makefile.i386 b/emulators/suse91_fontconfig/Makefile.i386
new file mode 100644
index 00000000000..430ee8a916d
--- /dev/null
+++ b/emulators/suse91_fontconfig/Makefile.i386
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		fontconfig-2.2.92.20040221-28.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_fontconfig/Makefile.x86_64 b/emulators/suse91_fontconfig/Makefile.x86_64
new file mode 100644
index 00000000000..d8374752a9c
--- /dev/null
+++ b/emulators/suse91_fontconfig/Makefile.x86_64
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		fontconfig-2.2.92.20040221-24.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_fontconfig/distinfo b/emulators/suse91_fontconfig/distinfo
index a1151e309c5..bc26d93fc16 100644
--- a/emulators/suse91_fontconfig/distinfo
+++ b/emulators/suse91_fontconfig/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:20 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/01/08 16:53:21 salo Exp $
 
 SHA1 (suse91/i586/fontconfig-2.2.92.20040221-28.i586.rpm) = d96b6cf2291861fb23475e33ff7bcfb6f59e4fc5
 RMD160 (suse91/i586/fontconfig-2.2.92.20040221-28.i586.rpm) = 672beecb32b100aa2d5a9b4f47f5e2c4bbd64a71
 Size (suse91/i586/fontconfig-2.2.92.20040221-28.i586.rpm) = 164006 bytes
+SHA1 (suse91/x86_64/fontconfig-2.2.92.20040221-24.x86_64.rpm) = 5bc77a8ad127922b3a7cb5e11342712b0c8bd2f4
+RMD160 (suse91/x86_64/fontconfig-2.2.92.20040221-24.x86_64.rpm) = 1885233e427d2b9721dcd4d9e9d85ff050090ad4
+Size (suse91/x86_64/fontconfig-2.2.92.20040221-24.x86_64.rpm) = 170930 bytes
diff --git a/emulators/suse91_freetype2/Makefile b/emulators/suse91_freetype2/Makefile
index 569e1625464..4615fcc1e4b 100644
--- a/emulators/suse91_freetype2/Makefile
+++ b/emulators/suse91_freetype2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/12/12 14:43:23 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/01/08 16:53:21 salo Exp $
 
 DISTNAME=		suse_freetype2-${SUSE_VERSION}
 PKGREVISION=		1
@@ -16,7 +16,9 @@ EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-RPMFILES=		freetype2-2.1.7-53.6.${SUSE_ARCH}.rpm
+.if exists(Makefile.${MACHINE_ARCH})
+.include "Makefile.${MACHINE_ARCH}"
+.endif
 
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_freetype2/Makefile.i386 b/emulators/suse91_freetype2/Makefile.i386
new file mode 100644
index 00000000000..f1c2ac608af
--- /dev/null
+++ b/emulators/suse91_freetype2/Makefile.i386
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		freetype2-2.1.7-53.6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_freetype2/Makefile.x86_64 b/emulators/suse91_freetype2/Makefile.x86_64
new file mode 100644
index 00000000000..d56fe5b8d74
--- /dev/null
+++ b/emulators/suse91_freetype2/Makefile.x86_64
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		freetype2-2.1.7-53.6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_freetype2/distinfo b/emulators/suse91_freetype2/distinfo
index 3a5a7372e66..c8183a03370 100644
--- a/emulators/suse91_freetype2/distinfo
+++ b/emulators/suse91_freetype2/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/11/06 14:52:44 salo Exp $
+$NetBSD: distinfo,v 1.4 2006/01/08 16:53:21 salo Exp $
 
 SHA1 (suse91/i586/freetype2-2.1.7-53.6.i586.rpm) = 89bb87089050637ef80bf093cff624f3dff5f6cc
 RMD160 (suse91/i586/freetype2-2.1.7-53.6.i586.rpm) = b362b26f8034142b2e3603891a26537227229622
 Size (suse91/i586/freetype2-2.1.7-53.6.i586.rpm) = 506026 bytes
+SHA1 (suse91/x86_64/freetype2-2.1.7-53.6.x86_64.rpm) = 49fadf651739a5e0efac36c4fda7226d4b776ba0
+RMD160 (suse91/x86_64/freetype2-2.1.7-53.6.x86_64.rpm) = a41b4708da1169c3781bc02003ca5a6951f486f5
+Size (suse91/x86_64/freetype2-2.1.7-53.6.x86_64.rpm) = 529067 bytes
diff --git a/emulators/suse91_glx/Makefile b/emulators/suse91_glx/Makefile
index 21fdc9e7375..10fafa403a5 100644
--- a/emulators/suse91_glx/Makefile
+++ b/emulators/suse91_glx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/12/12 14:43:24 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/08 16:53:21 salo Exp $
 
 DISTNAME=		suse_glx-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -17,9 +17,9 @@ NO_BUILD=		YES
 LIBTOOLIZE_PLIST=	NO
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-# the -devel version is necessary for libGL.so et.al. symlinks only
-RPMFILES=		XFree86-Mesa-4.3.99.902-40.${SUSE_ARCH}.rpm \
-			XFree86-Mesa-devel-4.3.99.902-40.${SUSE_ARCH}.rpm
+.if exists(Makefile.${MACHINE_ARCH})
+.include "Makefile.${MACHINE_ARCH}"
+.endif
 
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_glx/Makefile.i386 b/emulators/suse91_glx/Makefile.i386
new file mode 100644
index 00000000000..1d62be013d2
--- /dev/null
+++ b/emulators/suse91_glx/Makefile.i386
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+# the -devel version is necessary for libGL.so et.al. symlinks only
+RPMFILES=		XFree86-Mesa-4.3.99.902-40.${SUSE_ARCH}.rpm \
+			XFree86-Mesa-devel-4.3.99.902-40.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_glx/Makefile.x86_64 b/emulators/suse91_glx/Makefile.x86_64
new file mode 100644
index 00000000000..8995bac4a7c
--- /dev/null
+++ b/emulators/suse91_glx/Makefile.x86_64
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+# the -devel version is necessary for libGL.so et.al. symlinks only
+RPMFILES=		XFree86-Mesa-4.3.99.902-30.${SUSE_ARCH}.rpm \
+			XFree86-Mesa-devel-4.3.99.902-30.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_glx/distinfo b/emulators/suse91_glx/distinfo
index 62193d26e72..9a8e4c92d17 100644
--- a/emulators/suse91_glx/distinfo
+++ b/emulators/suse91_glx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/04/02 19:50:01 jdolecek Exp $
+$NetBSD: distinfo,v 1.2 2006/01/08 16:53:21 salo Exp $
 
 SHA1 (suse91/i586/XFree86-Mesa-4.3.99.902-40.i586.rpm) = 560f39d2a96a1f5df7f0b5001821adf0105e6325
 RMD160 (suse91/i586/XFree86-Mesa-4.3.99.902-40.i586.rpm) = 94615f439cadb85db5c8fc7d94201f2a52ac9895
@@ -6,3 +6,9 @@ Size (suse91/i586/XFree86-Mesa-4.3.99.902-40.i586.rpm) = 6152698 bytes
 SHA1 (suse91/i586/XFree86-Mesa-devel-4.3.99.902-40.i586.rpm) = a9172864b4bb019548d0158e06afb675ccb6a327
 RMD160 (suse91/i586/XFree86-Mesa-devel-4.3.99.902-40.i586.rpm) = 5f47dd63595c2a780059d719b89789c1a14b2845
 Size (suse91/i586/XFree86-Mesa-devel-4.3.99.902-40.i586.rpm) = 1073151 bytes
+SHA1 (suse91/x86_64/XFree86-Mesa-4.3.99.902-30.x86_64.rpm) = 866500404365d455bbbe49ea744073d7d00facb1
+RMD160 (suse91/x86_64/XFree86-Mesa-4.3.99.902-30.x86_64.rpm) = 9861e38f466e7f57f368722e3893a2b844af9fc3
+Size (suse91/x86_64/XFree86-Mesa-4.3.99.902-30.x86_64.rpm) = 4533698 bytes
+SHA1 (suse91/x86_64/XFree86-Mesa-devel-4.3.99.902-30.x86_64.rpm) = 7760b3617f52d0486a181a8a12278c422f60e8e0
+RMD160 (suse91/x86_64/XFree86-Mesa-devel-4.3.99.902-30.x86_64.rpm) = 0c51bcf27da23854eb710e950f7fe3cbfcca2e9a
+Size (suse91/x86_64/XFree86-Mesa-devel-4.3.99.902-30.x86_64.rpm) = 1173322 bytes
diff --git a/emulators/suse91_gtk/Makefile b/emulators/suse91_gtk/Makefile
index b44ebbe7456..484b6fff8ab 100644
--- a/emulators/suse91_gtk/Makefile
+++ b/emulators/suse91_gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/12/12 14:43:24 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/01/08 16:53:21 salo Exp $
 
 DISTNAME=		suse_gtk-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -15,8 +15,9 @@ EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-RPMFILES=		glib-1.2.10-586.${SUSE_ARCH}.rpm \
-			gtk-1.2.10-877.${SUSE_ARCH}.rpm
+.if exists(Makefile.${MACHINE_ARCH})
+.include "Makefile.${MACHINE_ARCH}"
+.endif
 
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_gtk/Makefile.i386 b/emulators/suse91_gtk/Makefile.i386
new file mode 100644
index 00000000000..883b9470196
--- /dev/null
+++ b/emulators/suse91_gtk/Makefile.i386
@@ -0,0 +1,4 @@
+# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		glib-1.2.10-586.${SUSE_ARCH}.rpm \
+			gtk-1.2.10-877.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_gtk/Makefile.x86_64 b/emulators/suse91_gtk/Makefile.x86_64
new file mode 100644
index 00000000000..ba01c9328f2
--- /dev/null
+++ b/emulators/suse91_gtk/Makefile.x86_64
@@ -0,0 +1,4 @@
+# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		glib-1.2.10-337.${SUSE_ARCH}.rpm \
+			gtk-1.2.10-488.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_gtk/distinfo b/emulators/suse91_gtk/distinfo
index 36fc5329458..d79873d851d 100644
--- a/emulators/suse91_gtk/distinfo
+++ b/emulators/suse91_gtk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:20 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/01/08 16:53:21 salo Exp $
 
 SHA1 (suse91/i586/glib-1.2.10-586.i586.rpm) = 0b6a69b48a1c49dd635f0568b758e018fb007eea
 RMD160 (suse91/i586/glib-1.2.10-586.i586.rpm) = 0bbb0c06e0d11df3fa51307980277c40eda04975
@@ -6,3 +6,9 @@ Size (suse91/i586/glib-1.2.10-586.i586.rpm) = 124852 bytes
 SHA1 (suse91/i586/gtk-1.2.10-877.i586.rpm) = 395f33db3ea0aec1d7f8ef23ac8d83efdf4243fb
 RMD160 (suse91/i586/gtk-1.2.10-877.i586.rpm) = a5b84ad4420b233217777bf96ca1a43782076c3e
 Size (suse91/i586/gtk-1.2.10-877.i586.rpm) = 860574 bytes
+SHA1 (suse91/x86_64/glib-1.2.10-337.x86_64.rpm) = bb90533ea908f16066de913972f60ffd0b6599a2
+RMD160 (suse91/x86_64/glib-1.2.10-337.x86_64.rpm) = 61ae253f0fd8b94a8f8a1558b10f2d3ab15c7eb4
+Size (suse91/x86_64/glib-1.2.10-337.x86_64.rpm) = 139342 bytes
+SHA1 (suse91/x86_64/gtk-1.2.10-488.x86_64.rpm) = d5ebcf118e7ab46faf4df6734aea438484232798
+RMD160 (suse91/x86_64/gtk-1.2.10-488.x86_64.rpm) = 5fce54df90902955e77da8ed613e78ad0f243176
+Size (suse91/x86_64/gtk-1.2.10-488.x86_64.rpm) = 934389 bytes
diff --git a/emulators/suse91_gtk2/Makefile b/emulators/suse91_gtk2/Makefile
index 841a32d5107..de092fca7a1 100644
--- a/emulators/suse91_gtk2/Makefile
+++ b/emulators/suse91_gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/12/29 06:21:39 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/08 16:53:21 salo Exp $
 
 DISTNAME=		suse_gtk2-${SUSE_VERSION}
 PKGREVISION=		4
@@ -21,15 +21,14 @@ EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-RPMFILES=		atk-1.4.1-124.${SUSE_ARCH}.rpm \
-			glib2-2.2.3-117.${SUSE_ARCH}.rpm \
-			gtk2-2.2.4-125.10.${SUSE_ARCH}.rpm \
-			pango-1.2.5-170.${SUSE_ARCH}.rpm
-
 # Initialize gtk/pango modules.
 FILES_SUBST+=		EMULDIR=${EMULDIR:Q}
 PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
 INSTALL_EXTRA_TMPL+=	${PKGDIR}/INSTALL
 
+.if exists(Makefile.${MACHINE_ARCH})
+.include "Makefile.${MACHINE_ARCH}"
+.endif
+
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_gtk2/Makefile.i386 b/emulators/suse91_gtk2/Makefile.i386
new file mode 100644
index 00000000000..4cbf5d93abf
--- /dev/null
+++ b/emulators/suse91_gtk2/Makefile.i386
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		atk-1.4.1-124.${SUSE_ARCH}.rpm \
+			glib2-2.2.3-117.${SUSE_ARCH}.rpm \
+			gtk2-2.2.4-125.10.${SUSE_ARCH}.rpm \
+			pango-1.2.5-170.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_gtk2/Makefile.x86_64 b/emulators/suse91_gtk2/Makefile.x86_64
new file mode 100644
index 00000000000..8af27512fae
--- /dev/null
+++ b/emulators/suse91_gtk2/Makefile.x86_64
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		atk-1.4.1-104.${SUSE_ARCH}.rpm \
+			glib2-2.2.3-106.${SUSE_ARCH}.rpm \
+			gtk2-2.2.4-125.10.${SUSE_ARCH}.rpm \
+			pango-1.2.5-148.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_gtk2/distinfo b/emulators/suse91_gtk2/distinfo
index c05c295ace7..913b6c50cac 100644
--- a/emulators/suse91_gtk2/distinfo
+++ b/emulators/suse91_gtk2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/11/27 18:02:01 salo Exp $
+$NetBSD: distinfo,v 1.5 2006/01/08 16:53:21 salo Exp $
 
 SHA1 (suse91/i586/atk-1.4.1-124.i586.rpm) = 4c0ccbd8a54960c792de95b85f1d006d289aa8c6
 RMD160 (suse91/i586/atk-1.4.1-124.i586.rpm) = fde8091cdaaea8a1160c801ec79cc876ea51ea05
@@ -12,3 +12,15 @@ Size (suse91/i586/gtk2-2.2.4-125.10.i586.rpm) = 2404171 bytes
 SHA1 (suse91/i586/pango-1.2.5-170.i586.rpm) = 085b6640bf649cd905b69799485e421a7d7fc995
 RMD160 (suse91/i586/pango-1.2.5-170.i586.rpm) = 7a591674c531812b3563bb7a63670600f5e13a21
 Size (suse91/i586/pango-1.2.5-170.i586.rpm) = 327533 bytes
+SHA1 (suse91/x86_64/atk-1.4.1-104.x86_64.rpm) = 1392a2623f2dfce4ecad3cfd297363729994712b
+RMD160 (suse91/x86_64/atk-1.4.1-104.x86_64.rpm) = 1c2b04710c76738c590569e13cc618928774ae4d
+Size (suse91/x86_64/atk-1.4.1-104.x86_64.rpm) = 134559 bytes
+SHA1 (suse91/x86_64/glib2-2.2.3-106.x86_64.rpm) = e1f45169453c8fe668881fc5732f63d33f324f67
+RMD160 (suse91/x86_64/glib2-2.2.3-106.x86_64.rpm) = 11873bccc89d5e999b097f27a6d1ac736419b71f
+Size (suse91/x86_64/glib2-2.2.3-106.x86_64.rpm) = 475869 bytes
+SHA1 (suse91/x86_64/gtk2-2.2.4-125.10.x86_64.rpm) = 6bcdf133ff3f44da500a04534cd60e602242b4ba
+RMD160 (suse91/x86_64/gtk2-2.2.4-125.10.x86_64.rpm) = 79f678649da0be9577e2f86e9433b2d259782613
+Size (suse91/x86_64/gtk2-2.2.4-125.10.x86_64.rpm) = 2537524 bytes
+SHA1 (suse91/x86_64/pango-1.2.5-148.x86_64.rpm) = cbc7b8a2d609cff54c3012e4bb2274d491d9ed5e
+RMD160 (suse91/x86_64/pango-1.2.5-148.x86_64.rpm) = 9cc80c226744e62d96fbc8c7c3976987b834f0ad
+Size (suse91/x86_64/pango-1.2.5-148.x86_64.rpm) = 347991 bytes
diff --git a/emulators/suse91_libjpeg/Makefile b/emulators/suse91_libjpeg/Makefile
index f6c7d038346..9f90e1636e8 100644
--- a/emulators/suse91_libjpeg/Makefile
+++ b/emulators/suse91_libjpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/12/12 14:43:24 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/08 16:53:21 salo Exp $
 
 DISTNAME=		suse_libjpeg-${SUSE_VERSION}
 PKGREVISION=		1
@@ -17,7 +17,9 @@ NO_BUILD=		YES
 LIBTOOLIZE_PLIST=	NO
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-RPMFILES=		libjpeg-6.2.0-731.${SUSE_ARCH}.rpm
+.if exists(Makefile.${MACHINE_ARCH})
+.include "Makefile.${MACHINE_ARCH}"
+.endif
 
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_libjpeg/Makefile.i386 b/emulators/suse91_libjpeg/Makefile.i386
new file mode 100644
index 00000000000..bebaf49e1d0
--- /dev/null
+++ b/emulators/suse91_libjpeg/Makefile.i386
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		libjpeg-6.2.0-731.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_libjpeg/Makefile.x86_64 b/emulators/suse91_libjpeg/Makefile.x86_64
new file mode 100644
index 00000000000..13d221541f1
--- /dev/null
+++ b/emulators/suse91_libjpeg/Makefile.x86_64
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		libjpeg-6.2.0-320.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_libjpeg/distinfo b/emulators/suse91_libjpeg/distinfo
index 110ad8d982b..5e02d0503ee 100644
--- a/emulators/suse91_libjpeg/distinfo
+++ b/emulators/suse91_libjpeg/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:20 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/01/08 16:53:21 salo Exp $
 
 SHA1 (suse91/i586/libjpeg-6.2.0-731.i586.rpm) = d7a77de29f2cab10df98fef2259cac6b5a96a607
 RMD160 (suse91/i586/libjpeg-6.2.0-731.i586.rpm) = ee7004d36fc5f56419ccd4f4a4dfbcb0e9a8f4f7
 Size (suse91/i586/libjpeg-6.2.0-731.i586.rpm) = 134966 bytes
+SHA1 (suse91/x86_64/libjpeg-6.2.0-320.x86_64.rpm) = 4a3d4d5c11e9e9fbdb1d0309e070ae0dff8f2336
+RMD160 (suse91/x86_64/libjpeg-6.2.0-320.x86_64.rpm) = 6333cedd354b315fe7a937c3c7bb7a27a334727e
+Size (suse91/x86_64/libjpeg-6.2.0-320.x86_64.rpm) = 121861 bytes
diff --git a/emulators/suse91_libpng/Makefile b/emulators/suse91_libpng/Makefile
index 55293203a72..a4835a17ee4 100644
--- a/emulators/suse91_libpng/Makefile
+++ b/emulators/suse91_libpng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/01/08 14:39:12 salo Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/08 16:53:21 salo Exp $
 
 DISTNAME=		suse_libpng-${SUSE_VERSION}
 PKGREVISION=		3
@@ -16,7 +16,9 @@ EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-RPMFILES=		libpng-1.2.5-182.10.${SUSE_ARCH}.rpm
+.if exists(Makefile.${MACHINE_ARCH})
+.include "Makefile.${MACHINE_ARCH}"
+.endif
 
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_libpng/Makefile.i386 b/emulators/suse91_libpng/Makefile.i386
new file mode 100644
index 00000000000..0e3b3e5c8e3
--- /dev/null
+++ b/emulators/suse91_libpng/Makefile.i386
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		libpng-1.2.5-182.10.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_libpng/Makefile.x86_64 b/emulators/suse91_libpng/Makefile.x86_64
new file mode 100644
index 00000000000..0ee1a4dab46
--- /dev/null
+++ b/emulators/suse91_libpng/Makefile.x86_64
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		libpng-1.2.5-182.10.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_libpng/distinfo b/emulators/suse91_libpng/distinfo
index f3b99208e44..45e63b86c1d 100644
--- a/emulators/suse91_libpng/distinfo
+++ b/emulators/suse91_libpng/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/11/06 14:52:44 salo Exp $
+$NetBSD: distinfo,v 1.5 2006/01/08 16:53:21 salo Exp $
 
 SHA1 (suse91/i586/libpng-1.2.5-182.10.i586.rpm) = e3665c086446997a3d4cb127c3f7d924d3d5c5e6
 RMD160 (suse91/i586/libpng-1.2.5-182.10.i586.rpm) = c8cdc177fc67de66b09928e49b8c9ef4464e81d1
 Size (suse91/i586/libpng-1.2.5-182.10.i586.rpm) = 179045 bytes
+SHA1 (suse91/x86_64/libpng-1.2.5-182.10.x86_64.rpm) = ec47c216de1b0ee53712fb81719c946ce45eee7f
+RMD160 (suse91/x86_64/libpng-1.2.5-182.10.x86_64.rpm) = 377edb3ccb9db6a39faed0932ad3b4f9e4ee675e
+Size (suse91/x86_64/libpng-1.2.5-182.10.x86_64.rpm) = 171663 bytes
diff --git a/emulators/suse91_libtiff/Makefile b/emulators/suse91_libtiff/Makefile
index f8c32ae0445..87b400fc273 100644
--- a/emulators/suse91_libtiff/Makefile
+++ b/emulators/suse91_libtiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/12/12 14:43:24 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/08 16:53:21 salo Exp $
 
 DISTNAME=		suse_libtiff-${SUSE_VERSION}
 PKGREVISION=		2
@@ -16,7 +16,9 @@ EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-RPMFILES=		libtiff-3.6.1-38.17.${SUSE_ARCH}.rpm
+.if exists(Makefile.${MACHINE_ARCH})
+.include "Makefile.${MACHINE_ARCH}"
+.endif
 
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_libtiff/Makefile.i386 b/emulators/suse91_libtiff/Makefile.i386
new file mode 100644
index 00000000000..0fadf9800b8
--- /dev/null
+++ b/emulators/suse91_libtiff/Makefile.i386
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		libtiff-3.6.1-38.17.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_libtiff/Makefile.x86_64 b/emulators/suse91_libtiff/Makefile.x86_64
new file mode 100644
index 00000000000..29b21c942ad
--- /dev/null
+++ b/emulators/suse91_libtiff/Makefile.x86_64
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		libtiff-3.6.1-38.17.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_libtiff/distinfo b/emulators/suse91_libtiff/distinfo
index 0a83e41dd84..55930739dd8 100644
--- a/emulators/suse91_libtiff/distinfo
+++ b/emulators/suse91_libtiff/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/11/06 14:52:44 salo Exp $
+$NetBSD: distinfo,v 1.5 2006/01/08 16:53:21 salo Exp $
 
 SHA1 (suse91/i586/libtiff-3.6.1-38.17.i586.rpm) = e0d853d66404d5627c1b5df0401ae39aff186156
 RMD160 (suse91/i586/libtiff-3.6.1-38.17.i586.rpm) = b9de66cbe361074b7f03c2d352584896214321e2
 Size (suse91/i586/libtiff-3.6.1-38.17.i586.rpm) = 187711 bytes
+SHA1 (suse91/x86_64/libtiff-3.6.1-38.17.x86_64.rpm) = 1ec851673763996fc70ae021574c415cbde22dcf
+RMD160 (suse91/x86_64/libtiff-3.6.1-38.17.x86_64.rpm) = 22829cb325cb3ba70d8ac5d97467f0a02345c39b
+Size (suse91/x86_64/libtiff-3.6.1-38.17.x86_64.rpm) = 192713 bytes
diff --git a/emulators/suse91_locale/Makefile b/emulators/suse91_locale/Makefile
index 6bdc3eb1470..9e69e5bc325 100644
--- a/emulators/suse91_locale/Makefile
+++ b/emulators/suse91_locale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/12/12 14:43:24 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/08 16:53:21 salo Exp $
 
 DISTNAME=		suse_locale-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -17,7 +17,9 @@ EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-RPMFILES=		glibc-locale-2.3.3-98.${SUSE_ARCH}.rpm
+.if exists(Makefile.${MACHINE_ARCH})
+.include "Makefile.${MACHINE_ARCH}"
+.endif
 
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_locale/Makefile.i386 b/emulators/suse91_locale/Makefile.i386
new file mode 100644
index 00000000000..a67e5c40860
--- /dev/null
+++ b/emulators/suse91_locale/Makefile.i386
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		glibc-locale-2.3.3-98.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_locale/Makefile.x86_64 b/emulators/suse91_locale/Makefile.x86_64
new file mode 100644
index 00000000000..74b54bd7525
--- /dev/null
+++ b/emulators/suse91_locale/Makefile.x86_64
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
+
+RPMFILES=		glibc-locale-2.3.3-63.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_locale/distinfo b/emulators/suse91_locale/distinfo
index 88fd25e0e60..1c86a96d54c 100644
--- a/emulators/suse91_locale/distinfo
+++ b/emulators/suse91_locale/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:20 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/01/08 16:53:21 salo Exp $
 
 SHA1 (suse91/i586/glibc-locale-2.3.3-98.i586.rpm) = 329ab066b6d21f95e0329731416806015ff2eda6
 RMD160 (suse91/i586/glibc-locale-2.3.3-98.i586.rpm) = 3591c7c7c0f0d3f7ae49e627c45ce1f425bda2d3
 Size (suse91/i586/glibc-locale-2.3.3-98.i586.rpm) = 10393732 bytes
+SHA1 (suse91/x86_64/glibc-locale-2.3.3-63.x86_64.rpm) = c0a43efd7b29585ad3de03e92c71397708061758
+RMD160 (suse91/x86_64/glibc-locale-2.3.3-63.x86_64.rpm) = a563550ba2df6a656d6b83747cc4c5905905a331
+Size (suse91/x86_64/glibc-locale-2.3.3-63.x86_64.rpm) = 10264418 bytes
diff --git a/emulators/suse91_openmotif/Makefile b/emulators/suse91_openmotif/Makefile
index 9eae641b0fd..cc152a73f48 100644
--- a/emulators/suse91_openmotif/Makefile
+++ b/emulators/suse91_openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/12/27 23:07:21 schmonz Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/08 16:53:22 salo Exp $
 
 DISTNAME=		suse_openmotif-${SUSE_VERSION}
 PKGREVISION=		2
@@ -16,8 +16,9 @@ EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-RPMFILES=		openmotif-libs-2.2.2-519.4.${SUSE_ARCH}.rpm \
-			openmotif21-libs-2.1.30MLI4-119.4.${SUSE_ARCH}.rpm
+.if exists(Makefile.${MACHINE_ARCH})
+.include "Makefile.${MACHINE_ARCH}"
+.endif
 
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_openmotif/Makefile.i386 b/emulators/suse91_openmotif/Makefile.i386
new file mode 100644
index 00000000000..d12fe8a9ac3
--- /dev/null
+++ b/emulators/suse91_openmotif/Makefile.i386
@@ -0,0 +1,4 @@
+# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:22 salo Exp $
+
+RPMFILES=		openmotif-libs-2.2.2-519.4.${SUSE_ARCH}.rpm \
+			openmotif21-libs-2.1.30MLI4-119.4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_openmotif/Makefile.x86_64 b/emulators/suse91_openmotif/Makefile.x86_64
new file mode 100644
index 00000000000..9f2c4ec85f0
--- /dev/null
+++ b/emulators/suse91_openmotif/Makefile.x86_64
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:22 salo Exp $
+
+RPMFILES=		openmotif-libs-2.2.2-519.4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_openmotif/distinfo b/emulators/suse91_openmotif/distinfo
index 8c75546784d..3edb50d6fe0 100644
--- a/emulators/suse91_openmotif/distinfo
+++ b/emulators/suse91_openmotif/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/11/06 14:52:44 salo Exp $
+$NetBSD: distinfo,v 1.5 2006/01/08 16:53:22 salo Exp $
 
 SHA1 (suse91/i586/openmotif-libs-2.2.2-519.4.i586.rpm) = 18885f5c5f8d361202df216b3d724b1668f1d9d9
 RMD160 (suse91/i586/openmotif-libs-2.2.2-519.4.i586.rpm) = c58fcceb1fa4a1e7a66469de2302c2930ce7ea94
@@ -6,3 +6,6 @@ Size (suse91/i586/openmotif-libs-2.2.2-519.4.i586.rpm) = 1185317 bytes
 SHA1 (suse91/i586/openmotif21-libs-2.1.30MLI4-119.4.i586.rpm) = 0590401f7420f7d12379cfff34dfbad86ee83d7a
 RMD160 (suse91/i586/openmotif21-libs-2.1.30MLI4-119.4.i586.rpm) = 893b1552c4166cd8e582ff0348e2638d16f5628d
 Size (suse91/i586/openmotif21-libs-2.1.30MLI4-119.4.i586.rpm) = 1070080 bytes
+SHA1 (suse91/x86_64/openmotif-libs-2.2.2-519.4.x86_64.rpm) = 8a1ab545f11a4566ab1dc2b9e636c5442727d717
+RMD160 (suse91/x86_64/openmotif-libs-2.2.2-519.4.x86_64.rpm) = 9d64b44955c43596083dfb6e243da6a04d4e76c6
+Size (suse91/x86_64/openmotif-libs-2.2.2-519.4.x86_64.rpm) = 1259732 bytes
diff --git a/emulators/suse91_slang/Makefile b/emulators/suse91_slang/Makefile
index 690260a2a7d..845b6272837 100644
--- a/emulators/suse91_slang/Makefile
+++ b/emulators/suse91_slang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/12/12 14:43:24 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/08 16:53:22 salo Exp $
 
 DISTNAME=		suse_slang-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -15,7 +15,9 @@ EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-RPMFILES=		slang-1.4.9-121.${SUSE_ARCH}.rpm
+.if exists(Makefile.${MACHINE_ARCH})
+.include "Makefile.${MACHINE_ARCH}"
+.endif
 
 post-install:
 	${LN} -sf ${PREFIX}/${EMULSUBDIR}/usr/lib/libslang-utf8.so.1 \
diff --git a/emulators/suse91_slang/Makefile.i386 b/emulators/suse91_slang/Makefile.i386
new file mode 100644
index 00000000000..4713c3d2436
--- /dev/null
+++ b/emulators/suse91_slang/Makefile.i386
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:22 salo Exp $
+
+RPMFILES=		slang-1.4.9-121.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_slang/Makefile.x86_64 b/emulators/suse91_slang/Makefile.x86_64
new file mode 100644
index 00000000000..e30fe9b0301
--- /dev/null
+++ b/emulators/suse91_slang/Makefile.x86_64
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:22 salo Exp $
+
+RPMFILES=		slang-1.4.9-112.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_slang/distinfo b/emulators/suse91_slang/distinfo
index 3e8f2352b5b..7224536d1fb 100644
--- a/emulators/suse91_slang/distinfo
+++ b/emulators/suse91_slang/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/04/02 19:44:24 jdolecek Exp $
+$NetBSD: distinfo,v 1.2 2006/01/08 16:53:22 salo Exp $
 
 SHA1 (suse91/i586/slang-1.4.9-121.i586.rpm) = 3a8e5e4a0e7177c378b414e879e162833d521a67
 RMD160 (suse91/i586/slang-1.4.9-121.i586.rpm) = 759cdb055ebf67b00cbb78d0e79528a34e58a4d1
 Size (suse91/i586/slang-1.4.9-121.i586.rpm) = 233659 bytes
+SHA1 (suse91/x86_64/slang-1.4.9-112.x86_64.rpm) = ce0601d63196287c1cc471e69fefd5c02fb3e393
+RMD160 (suse91/x86_64/slang-1.4.9-112.x86_64.rpm) = 32f3a4630d1205481e7af187ec4582b88f54cdc4
+Size (suse91/x86_64/slang-1.4.9-112.x86_64.rpm) = 252704 bytes
diff --git a/emulators/suse91_x11/Makefile b/emulators/suse91_x11/Makefile
index f0ae3ebad7c..3b44fd0859b 100644
--- a/emulators/suse91_x11/Makefile
+++ b/emulators/suse91_x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/12/12 14:43:24 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/08 16:53:22 salo Exp $
 
 DISTNAME=		suse_x11-${SUSE_VERSION}
 PKGREVISION=		3
@@ -16,7 +16,9 @@ EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-RPMFILES=		XFree86-libs-4.3.99.902-43.42.5.${SUSE_ARCH}.rpm
+.if exists(Makefile.${MACHINE_ARCH})
+.include "Makefile.${MACHINE_ARCH}"
+.endif
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/emulators/suse91_x11/Makefile.i386 b/emulators/suse91_x11/Makefile.i386
new file mode 100644
index 00000000000..f9176057571
--- /dev/null
+++ b/emulators/suse91_x11/Makefile.i386
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:22 salo Exp $
+
+RPMFILES=		XFree86-libs-4.3.99.902-43.42.5.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_x11/Makefile.x86_64 b/emulators/suse91_x11/Makefile.x86_64
new file mode 100644
index 00000000000..ec0ecd79c36
--- /dev/null
+++ b/emulators/suse91_x11/Makefile.x86_64
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:22 salo Exp $
+
+RPMFILES=		XFree86-libs-4.3.99.902-43.42.5.${SUSE_ARCH}.rpm