7 files changed, 28 insertions, 34 deletions
diff --git a/emulators/suse91_glx/DESCR b/emulators/suse91_glx/DESCR
index 64e8143cf19..15d0f9e4737 100644
--- a/emulators/suse91_glx/DESCR
+++ b/emulators/suse91_glx/DESCR
@@ -1,4 +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 which require GL shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require OpenGL/Mesa shared libraries.
diff --git a/emulators/suse91_glx/Makefile b/emulators/suse91_glx/Makefile
index 89dce049d69..211ebf3cf55 100644
--- a/emulators/suse91_glx/Makefile
+++ b/emulators/suse91_glx/Makefile
@@ -1,26 +1,16 @@
-# $NetBSD: Makefile,v 1.9 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.10 2007/07/29 05:19:10 jlam Exp $
 
-DISTNAME=		suse_glx-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_glx-${SUSE_VERSION}
+PKGREVISION=	4
+CATEGORIES=	emulators
 
-MAINTAINER=		jdolecek@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the GL library
+MAINTAINER=	jdolecek@NetBSD.org
+COMMENT=	Linux compatibility package for OpenGL/Mesa
 
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-DEPENDS+=		suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse91_x11
+EMUL_MODULES.linux=	base x11
 
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-LIBTOOLIZE_PLIST=	NO
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+# This symlink is managed by ldconfig(8).
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/${LINUX_LIBSUBDIR}/libglide3.so.3
 
 .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
deleted file mode 100644
index 1d62be013d2..00000000000
--- a/emulators/suse91_glx/Makefile.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-# $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
deleted file mode 100644
index 8995bac4a7c..00000000000
--- a/emulators/suse91_glx/Makefile.x86_64
+++ /dev/null
@@ -1,5 +0,0 @@
-# $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/PLIST_rpmfix.i386 b/emulators/suse91_glx/PLIST_rpmfix.i386
deleted file mode 100644
index dd21e4f6b71..00000000000
--- a/emulators/suse91_glx/PLIST_rpmfix.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST_rpmfix.i386,v 1.1 2006/05/08 20:39:30 joerg Exp $
-/usr/lib/libglide3.so.3
diff --git a/emulators/suse91_glx/suse.i386.mk b/emulators/suse91_glx/suse.i386.mk
new file mode 100644
index 00000000000..1715dfc013c
--- /dev/null
+++ b/emulators/suse91_glx/suse.i386.mk
@@ -0,0 +1,7 @@
+# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:11 jlam Exp $
+
+# SuSE i386 RPMs; the -devel version is necessary for libGL.so et.al.
+# symlinks only.
+#
+DISTFILES+=	XFree86-Mesa-4.3.99.902-40.${SUSE_ARCH}.rpm
+DISTFILES+=	XFree86-Mesa-devel-4.3.99.902-40.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_glx/suse.x86_64.mk b/emulators/suse91_glx/suse.x86_64.mk
new file mode 100644
index 00000000000..70cfd8562b6
--- /dev/null
+++ b/emulators/suse91_glx/suse.x86_64.mk
@@ -0,0 +1,7 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:11 jlam Exp $
+
+# SuSE x86_64 RPMs; the -devel version is necessary for libGL.so et.al.
+# symlinks only.
+#
+DISTFILES+=	XFree86-Mesa-4.3.99.902-30.${SUSE_ARCH}.rpm
+DISTFILES+=	XFree86-Mesa-devel-4.3.99.902-30.${SUSE_ARCH}.rpm