5 files changed, 13 insertions, 29 deletions
diff --git a/emulators/suse100_x11/DESCR b/emulators/suse100_x11/DESCR
index 023c56f39b1..9ce91f0841f 100644
--- a/emulators/suse100_x11/DESCR
+++ b/emulators/suse100_x11/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 glibc2 which require
-X11 shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require X11 shared libraries.
diff --git a/emulators/suse100_x11/Makefile b/emulators/suse100_x11/Makefile
index 34ceee39817..ca29939f52d 100644
--- a/emulators/suse100_x11/Makefile
+++ b/emulators/suse100_x11/Makefile
@@ -1,22 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2007/04/19 15:30:22 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2007/07/29 05:19:01 jlam Exp $
 
-DISTNAME=		suse_x11-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_x11-${SUSE_VERSION}
+PKGREVISION=	3
+CATEGORIES=	emulators
+DISTFILES=	xorg-x11-libs-6.8.2-100.2.${SUSE_ARCH}.rpm
 
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for X11 binaries
+MAINTAINER=	tonio@NetBSD.org
+COMMENT=	Linux compatibility package for X11
 
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-SUSE_INCLUDE_MAKEFILE_ARCH=	yes
+EMUL_MODULES.linux=	base
 
 .include "../../emulators/suse100_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_x11/Makefile.i386 b/emulators/suse100_x11/Makefile.i386
deleted file mode 100644
index 1c9d6e474cc..00000000000
--- a/emulators/suse100_x11/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		xorg-x11-libs-6.8.2-100.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_x11/Makefile.powerpc b/emulators/suse100_x11/Makefile.powerpc
deleted file mode 100644
index 00a4b715d3e..00000000000
--- a/emulators/suse100_x11/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		xorg-x11-libs-6.8.2-100.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_x11/Makefile.x86_64 b/emulators/suse100_x11/Makefile.x86_64
deleted file mode 100644
index 318058b0546..00000000000
--- a/emulators/suse100_x11/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		xorg-x11-libs-6.8.2-100.2.${SUSE_ARCH}.rpm