6 files changed, 21 insertions, 29 deletions
diff --git a/emulators/suse91_openmotif/DESCR b/emulators/suse91_openmotif/DESCR
index f67dbf54135..a24d084b127 100644
--- a/emulators/suse91_openmotif/DESCR
+++ b/emulators/suse91_openmotif/DESCR
@@ -1,5 +1,6 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
+Linux compatibility package based on the SuSE Linux distribution.
+Please visit http://www.suse.com/ for more information about SuSE
+Linux.
 
-This package supports running ELF binaries linked with OpenMotif shared
-libraries.
+This package supports running ELF binaries linked with glibc2 that
+require OpenMotif shared libraries.
diff --git a/emulators/suse91_openmotif/Makefile b/emulators/suse91_openmotif/Makefile
index a0a47fdcee8..becb35e457e 100644
--- a/emulators/suse91_openmotif/Makefile
+++ b/emulators/suse91_openmotif/Makefile
@@ -1,24 +1,13 @@
-# $NetBSD: Makefile,v 1.11 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.12 2007/07/29 05:19:19 jlam Exp $
 
-DISTNAME=		suse_openmotif-${SUSE_VERSION}
-PKGREVISION=		4
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_openmotif-${SUSE_VERSION}
+PKGREVISION=	5
+CATEGORIES=	emulators
 
-MAINTAINER=		jdolecek@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the Motif library
+MAINTAINER=	jdolecek@NetBSD.org
+COMMENT=	Linux compatibility package for OpenMotif
 
-DEPENDS+=		suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse91_x11
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+EMUL_MODULES.linux=	x11
 
 .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
deleted file mode 100644
index d12fe8a9ac3..00000000000
--- a/emulators/suse91_openmotif/Makefile.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-# $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
deleted file mode 100644
index 9f2c4ec85f0..00000000000
--- a/emulators/suse91_openmotif/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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/suse.i386.mk b/emulators/suse91_openmotif/suse.i386.mk
new file mode 100644
index 00000000000..7ffbb858b19
--- /dev/null
+++ b/emulators/suse91_openmotif/suse.i386.mk
@@ -0,0 +1,5 @@
+# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:20 jlam Exp $
+
+# SuSE i386 RPMs
+DISTFILES+=	openmotif-libs-2.2.2-519.4.${SUSE_ARCH}.rpm
+DISTFILES+=	openmotif21-libs-2.1.30MLI4-119.4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_openmotif/suse.x86_64.mk b/emulators/suse91_openmotif/suse.x86_64.mk
new file mode 100644
index 00000000000..d827c768d30
--- /dev/null
+++ b/emulators/suse91_openmotif/suse.x86_64.mk
@@ -0,0 +1,4 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:20 jlam Exp $
+
+# SuSE x86_64 RPMs
+DISTFILES=	openmotif-libs-2.2.2-519.4.${SUSE_ARCH}.rpm