* Add new emulator framework in pkgsrc/mk/emulator that handles all

binary-only packages that require binary "emulation" on the native operating system. Please see pkgsrc/mk/emulator/README for more details. * Teach the plist framework to automatically use any existing PLIST.${EMUL_PLATFORM} as part of the default PLIST_SRC definition. * Convert all of the binary-only packages in pkgsrc to use the emulator framework. Most of them have been tested to install and deinstall correctly. This involves the following cleanup actions: * Remove use of custom PLIST code and use PLIST.${EMUL_PLATFORM} more consistently. * Simplify packages by using default INSTALL and DEINSTALL scripts instead of custom INSTALL/DEINSTALL code. * Remove "SUSE_COMPAT32" and "PKG_OPTIONS.suse" from pkgsrc. Packages only need to state exactly which emulations they support, and the framework handles any i386-on-x86_64 or sparc-on-sparc64 uses. * Remove "USE_NATIVE_LINUX" from pkgsrc. The framework will automatically detect when the package is installing on Linux. Specific changes to packages include: * Bump the PKGREVISIONs for all of the suse100* and suse91* packages due to changes in the +INSTALL/+DEINSTALL scripts used in all of the packages. * Remove pkgsrc/emulators/suse_linux, which is unused by any packages. * cad/lc -- remove custom code to create the distinfo file for all supported platforms; just use "emul-fetch" and "emul-distinfo" instead. * lang/Cg-compiler -- install the shared libraries under ${EMULDIR} instead of ${PREFIX}/lib so that compiled programs will find the shared libraries. * mail/thunderbird-bin-nightly -- update to latest binary distributions for supported platforms. * multimedia/ns-flash -- update Linux version to 9.0.48 as the older version is no longer available for interactive fetch. * security/uvscan -- set LD_LIBRARY_PATH explicitly so that it's not necessary to install library symlinks into ${EMULDIR}/usr/local/lib. * www/firefox-bin-flash -- update Linux version to 9.0.48 as the older version is no longer available for interactive fetch.
author: jlam <jlam@pkgsrc.org> 2007-07-29 05:18:36 +0000
committer: jlam <jlam@pkgsrc.org> 2007-07-29 05:18:36 +0000
commit: 28eeb8a5663998ab6cfc07ef15ed10e5d97cf91d (patch)
tree: 45cad36d8470a568b9136017b2dd79c9efcc65bc
parent: 566d930409bea6d1ac48d9e1a3be5e5e1a6296e5 (diff)
download: pkgsrc-28eeb8a5663998ab6cfc07ef15ed10e5d97cf91d.tar.gz
447 files changed, 3872 insertions, 3731 deletions
diff --git a/archivers/rar-bin/Makefile b/archivers/rar-bin/Makefile
index b30656e6e4e..594aab4a71d 100644
--- a/archivers/rar-bin/Makefile
+++ b/archivers/rar-bin/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/04/19 15:30:22 xtraeme Exp $
-#
+# $NetBSD: Makefile,v 1.7 2007/07/29 05:18:36 jlam Exp $
 
 DISTNAME=		rarlinux-3.6.0
 PKGNAME=		${DISTNAME:C/linux/-bin/}
@@ -11,23 +10,15 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.rarsoft.com/rar_archiver.htm
 COMMENT=		RAR command line archiver (Linux binary)
 
-LICENSE=		rar-license
-
-ONLY_FOR_PLATFORM=	*-*-i386
-WRKSRC=			${WRKDIR}/rar
-
-# old name of the package
 CONFLICTS=		rarlinux-[0-9]* rar-linux-[0-9]*
 
-SUSE_COMPAT32=		yes
+LICENSE=		rar-license
 
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_base>=6.1:../../emulators/${SUSE_DIR_PREFIX}_base
-DEPENDS+=	suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
-.endif
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base compat
 
-NO_BUILD=	YES
-NO_CONFIGURE=	YES
+WRKSRC=			${WRKDIR}/rar
+BUILD_DIRS=		# empty
 
 INSTALLATION_DIRS=	bin lib
 
@@ -39,5 +30,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/doc/rar-bin
 	${INSTALL_DATA} ${WRKSRC}/rarfiles.lst ${PREFIX}/share/doc/rar-bin
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/stuffit/Makefile b/archivers/stuffit/Makefile
index 4b22d003c05..b24e4abf619 100644
--- a/archivers/stuffit/Makefile
+++ b/archivers/stuffit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/12/15 14:34:18 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2007/07/29 05:18:36 jlam Exp $
 
 DISTNAME=		stuffit520.611linux-i386
 PKGNAME=		stuffit-5.2.0.611
@@ -10,23 +10,17 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.stuffit.com/unix/stuffit/
 COMMENT=		Stuffit Archive Creator and Expander
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_base>=6:../../emulators/${SUSE_DIR_PREFIX}_base
-.endif
-
 RESTRICTED=		Redistribution not permitted
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-ONLY_FOR_PLATFORM=	*-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base
 
 WRKSRC=			${WRKDIR}
-NO_CONFIGURE=		yes
-NO_BUILD=		yes
+BUILD_DIRS=		# empty
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 INSTALLATION_DIRS+=	share/doc/stuffit/stuff share/doc/stuffit/unstuff
diff --git a/archivers/unace-bin/Makefile b/archivers/unace-bin/Makefile
index dd318933f04..c0dbdfa2921 100644
--- a/archivers/unace-bin/Makefile
+++ b/archivers/unace-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/05/22 22:22:02 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2007/07/29 05:18:36 jlam Exp $
 #
 
 DISTNAME=	linunace25
@@ -11,23 +11,15 @@ MAINTAINER=	dillo@NetBSD.org
 HOMEPAGE=	http://www.winace.com/
 COMMENT=	Extract, list and test files in ACE archives (Linux binary)
 
-ONLY_FOR_PLATFORM=	*-*-i386
-
 RESTRICTED=		Only original file distribution.
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-WRKSRC=		${WRKDIR}
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_base>=6.1:../../emulators/${SUSE_DIR_PREFIX}_base
-DEPENDS+=	suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
-.endif
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base compat
 
-NO_BUILD=	YES
-NO_CONFIGURE=	YES
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
 
 INSTALLATION_DIRS=	bin
 
@@ -36,5 +28,4 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unace-bin
 	${INSTALL_DATA} ${WRKSRC}/licence ${PREFIX}/share/doc/unace-bin
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/eagle/Makefile b/cad/eagle/Makefile
index 454634006c7..d9d74c50a36 100644
--- a/cad/eagle/Makefile
+++ b/cad/eagle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/05/22 22:22:02 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2007/07/29 05:18:36 jlam Exp $
 #
 
 DISTNAME=		eagle-lin-eng-4.14
@@ -12,14 +12,6 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.cadsoft.de/
 COMMENT=		Easy to use printed circuit board editor
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
 RESTRICTED=		Redistribution not permitted
 LICENSE=		fee-based-commercial-use
 NO_SRC_ON_FTP=		${RESTRICTED}
@@ -27,7 +19,10 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-NO_BUILD=		YES
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	x11
+
+BUILD_DIRS=		# empty
 INSTALLATION_DIRS=	bin
 
 do-configure:
diff --git a/cad/lc/Makefile b/cad/lc/Makefile
index a21881a3fd9..07b9bd461c9 100644
--- a/cad/lc/Makefile
+++ b/cad/lc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2007/02/24 03:43:49 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.10 2007/07/29 05:18:37 jlam Exp $
 
-DISTNAME=	lc	# Overridden below
+DISTNAME=	lc	# overridden below
 PKGNAME=	lc-2.10
 PKGREVISION=	2
 CATEGORIES=	cad
@@ -12,75 +12,44 @@ COMMENT=	Finite Difference Time Domain (FDTD) Electromagnetic Simulator
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
-RESTRICTED=	Original installer required to redistribute.
+RESTRICTED=		Original installer required to redistribute.
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 LICENSE=		lc-license
-CHECK_SHLIBS_SUPPORTED=	no
 
-WRKSRC=		${WRKDIR}/lc2.10
-NO_BUILD=	YES
+WRKSRC=			${WRKDIR}/lc2.10
+BUILD_DIRS=		# empty
+
+EMUL_PLATFORMS=		irix-mipsel irix-mipsel64
+EMUL_PLATFORMS+=	linux-i386 linux-x86_64
+EMUL_PLATFORMS+=	solaris-sparc
+EMUL_MODULES.linux=	motif x11
+SUSE_VERSION_REQD=	9.1
 
 .include "../../mk/bsd.prefs.mk"
 
-# With this, we can run
-#  make makesum MAINTAINER_MODE=yes
-# and process all the possible distfiles without regard to what platform we're on
-.if defined(MAINTAINER_MODE)
-DISTFILES=	lc_doc.tar.gz
-DISTFILES+=	lc_amd64_lx24.tar.gz
-DISTFILES+=	lc_irix.tar.gz
-DISTFILES+=	lc_irix64.tar.gz
-DISTFILES+=	lc_linux_motif1.tar.gz
-DISTFILES+=	lc_linux_motif3.tar.gz
-DISTFILES+=	lc_solaris.tar.gz
+DISTFILES=		lc_doc.tar.gz
+.if ${EMUL_PLATFORM} == "linux-i386"
+DISTFILES+=		lc_linux_motif3.tar.gz
+.elif ${EMUL_PLATFORM} == "linux-x86_64"
+DISTFILES+=		lc_amd64_lx24.tar.gz
+.elif ${EMUL_PLATFORM} == "irix-mipsel"
+DISTFILES+=		lc_irix.tar.gz
+.elif ${EMUL_PLATFORM} == "irix-mipsel64"
+DISTFILES+=		lc_irix64.tar.gz
+.elif ${EMUL_PLATFORM} == "solaris-sparc"
+DISTFILES+=		lc_solaris.tar.gz
+.endif
 
+.if ${EMUL_PLATFORM} == "linux-x86_64"
+WRKSRC=			${WRKDIR}/lc
+PLIST_SUBST+=		HAVE_LCSPICE="@comment "
 .else
-
-
-ONLY_FOR_PLATFORM=	*-*-i386 *-*-mipsel *-*-mipsel64
-ONLY_FOR_PLATFORM+=	*-*-sparc *-*-sparc64 *-*-x86_64
-
-.if (${MACHINE_ARCH} == "x86_64")
-DISTNAME=	lc_amd64_lx24
-. if (${OPSYS} == "NetBSD")
-DEPENDS+=	suse_openmotif>=9.1:../../emulators/${SUSE_DIR_PREFIX}_openmotif
-DEPENDS+=	suse_x11>=9.1:../../emulators/${SUSE_DIR_PREFIX}_x11
-. endif
-WRKSRC=		${WRKDIR}/lc
-HAVE_LCSPICE=	"@comment "
-
-.elif ${MACHINE_ARCH} == "mipsel"
-DISTNAME=	lc_irix
-
-.elif ${MACHINE_ARCH} == "mipsel64"
-DISTNAME=	lc_irix64
-
-.elif (${MACHINE_ARCH} == "i386")
-#DISTNAME=	lc_linux_motif1
-DISTNAME=	lc_linux_motif3
-. if (${OPSYS} == "NetBSD")
-DEPENDS+=	suse_openmotif>=9.1:../../emulators/${SUSE_DIR_PREFIX}_openmotif
-DEPENDS+=	suse_x11>=9.1:../../emulators/${SUSE_DIR_PREFIX}_x11
-. endif
-
-.elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
-DISTNAME=	lc_solaris
-. if (${OPSYS} == "NetBSD")
-.  if !exists(/emul/svr4/usr/lib/ld.so)
-PKG_FAIL_REASON+= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
-.  endif
-. endif
+PLIST_SUBST+=		HAVE_LCSPICE=""
 .endif
 
-HAVE_LCSPICE?=	""
-
-PLIST_SUBST+=	HAVE_LCSPICE=${HAVE_LCSPICE}
-
-DISTFILES=	lc_doc.tar.gz ${DISTNAME}${EXTRACT_SUFX}
-
 INSTALLATION_DIRS=	bin share
 
 do-install:
@@ -88,14 +57,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/lcplot ${PREFIX}/bin/lcplot
 	if test -f ${WRKSRC}/bin/spice ; then ${INSTALL_PROGRAM} ${WRKSRC}/bin/spice ${PREFIX}/bin/lcspice ; fi
 	cd ${PREFIX}/share && ${TAR} -zxf ${DISTDIR}/${DIST_SUBDIR}/lc_doc.tar.gz
-	${CHMOD} -R 644 ${PREFIX}/share/lc2.10
+	${CHMOD} -R ugo+rX ${PREFIX}/share/lc2.10
 	${CHOWN} -R ${SHAREOWN} ${PREFIX}/share/lc2.10
 	${CHGRP} -R ${SHAREGRP} ${PREFIX}/share/lc2.10
 
-.endif # !MAINTAINER
-
-# do not include the linux stuff if we are, for example, on a Solaris box
-. if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64")
-.include "../../emulators/suse_linux/Makefile.application"
-.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/lc/distinfo b/cad/lc/distinfo
index 2e69043a3dc..04d30ba06a6 100644
--- a/cad/lc/distinfo
+++ b/cad/lc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2007/02/24 00:17:58 dmcmahill Exp $
+$NetBSD: distinfo,v 1.3 2007/07/29 05:18:37 jlam Exp $
 
 SHA1 (lc-2.10/lc_amd64_lx24.tar.gz) = c750c470ca43047fa0ccb1029bdfc08874214491
 RMD160 (lc-2.10/lc_amd64_lx24.tar.gz) = a03c53018827e13167a26f27926ebe2b3bbf5846
@@ -12,9 +12,6 @@ Size (lc-2.10/lc_irix.tar.gz) = 2658949 bytes
 SHA1 (lc-2.10/lc_irix64.tar.gz) = cc616e039fe33e39b75680029f34730efda47494
 RMD160 (lc-2.10/lc_irix64.tar.gz) = 1b72abfae4da8ec8f3e22ee6b9e027d8cc0c60d0
 Size (lc-2.10/lc_irix64.tar.gz) = 2864612 bytes
-SHA1 (lc-2.10/lc_linux_motif1.tar.gz) = 7f46aa7846466649a57addde5ce30d6989353664
-RMD160 (lc-2.10/lc_linux_motif1.tar.gz) = ed2e7caad443dfaebc3df37765b5a563843e6653
-Size (lc-2.10/lc_linux_motif1.tar.gz) = 3020285 bytes
 SHA1 (lc-2.10/lc_linux_motif3.tar.gz) = e750aa83d3bd681abd96934fa8dcea2cf9050643
 RMD160 (lc-2.10/lc_linux_motif3.tar.gz) = 9a552a217bc743bd872ac475e26207bdb1708851
 Size (lc-2.10/lc_linux_motif3.tar.gz) = 8773141 bytes
diff --git a/chat/aim/Makefile b/chat/aim/Makefile
index 68a449d6079..5b3a6c44b28 100644
--- a/chat/aim/Makefile
+++ b/chat/aim/Makefile
@@ -1,44 +1,47 @@
-# $NetBSD: Makefile,v 1.16 2007/07/14 04:39:17 obache Exp $
+# $NetBSD: Makefile,v 1.17 2007/07/29 05:18:37 jlam Exp $
 
-DISTNAME=	aim-1.5.286
+DISTNAME=	aim-1.5.286-1.i386
+PKGNAME=	aim-1.5.286
 PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	http://ftp.newaol.com/aimgen/380469/
-EXTRACT_SUFX=	-1.i386.rpm
-
-DIST_SUBDIR=	# empty
-RPMFILES=	${DISTFILES}
+EXTRACT_SUFX=	.rpm
 
 MAINTAINER=	fredb@NetBSD.org
 HOMEPAGE=	http://www.aim.com/
 COMMENT=	AOL Instant Messenger (SM)
 
-BUILD_DEPENDS+=	rpm2pkg>=1.2:../../pkgtools/rpm2pkg
-
-do-install:
-	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	${LOCALBASE}/sbin/rpm2pkg -d ${PREFIX} -f ${PLIST_SRC} \
-	        -p ${EMULSUBDIR} ${DISTDIR}/${DISTFILES}
-	${LN} -fs ../${EMULSUBDIR}/usr/bin/aim ${PREFIX}/bin/aim
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base compat x11 gtk
 
-.include "../../emulators/suse_linux/Makefile.application"
+.include "../../mk/bsd.prefs.mk"
 
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_base>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_base
-DEPENDS+=	suse_compat>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_x11>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_x11
-DEPENDS+=	suse_gtk>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_gtk
+# This package installs from an RPM directly into "/usr" on a Linux
+# system, which can't be managed by pkgsrc unless ${LOCALBASE} == "/usr".
+#
+.if (${OPSYS} == "Linux") && (${LOCALBASE} != "/usr")
+NOT_FOR_PLATFORMS=	Linux-*-*
 .endif
 
-ONLY_FOR_PLATFORM= *-*-i386
-
-WRKSRC=		${WRKDIR}
-NO_BUILD=	YES
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
 
-EXTRACT_ONLY=	# nothing
-PLIST_SRC=	${WRKDIR}/PLIST.rpm
-PLIST_SUBST+=	EMULSUBDIR=${EMULSUBDIR:Q}
+EMUL_PKG_FMT=		rpm
+RPM2PKG_PREFIX=		${PREFIX}
+RPM2PKG_SUBPREFIX=	${EMULSUBDIR}
+.if (${OPSYS} == "Linux") && (${LOCALBASE} == "/usr")
+RPM2PKG_STRIP=		1
+.else
+RPM2PKG_STRIP=		0
+.endif
+RPM2PKG_STAGE=		do-install
 
 INSTALLATION_DIRS=	bin
 
+.if ${OPSYS} != "Linux"
+post-install:
+	${LN} -fs ${EMULDIR}/usr/bin/aim ${PREFIX}/bin/aim
+	${ECHO} "bin/aim" >> ${RPM2PKG_PLIST}
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/aim/PLIST b/chat/aim/PLIST
deleted file mode 100644
index 8ee51b05d31..00000000000
--- a/chat/aim/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/12/22 18:40:00 fredb Exp $
-bin/aim
diff --git a/chat/ymessenger/Makefile b/chat/ymessenger/Makefile
index f561b7ad445..7c06ed51724 100644
--- a/chat/ymessenger/Makefile
+++ b/chat/ymessenger/Makefile
@@ -1,30 +1,15 @@
-# $NetBSD: Makefile,v 1.17 2007/07/14 04:39:17 obache Exp $
+# $NetBSD: Makefile,v 1.18 2007/07/29 05:18:37 jlam Exp $
 
-DISTNAME=		ymessenger-1.0.4
+DISTNAME=		rh9.ymessenger-1.0.4-1.i386
+PKGNAME=		ymessenger-1.0.4
 CATEGORIES=		chat
 MASTER_SITES=		http://download.yahoo.com/dl/unix/
-DISTFILES=		rh9.${DISTNAME}-1.i386.rpm
+EXTRACT_SUFX=		.rpm
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://messenger.yahoo.com/
 COMMENT=		Yahoo! instant messaging client
 
-RPMFILES=		${DISTFILES}
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-EMULSUBDIR=		emul/linux
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_compat>=6.4:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=		suse_gtk>=6.4:../../emulators/${SUSE_DIR_PREFIX}_gtk
-DEPENDS+=		suse_gdk-pixbuf>=6.4:../../emulators/${SUSE_DIR_PREFIX}_gdk-pixbuf
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-DIST_SUBDIR=		# empty
-
 LICENSE=		generic-nonlicense
 RESTRICTED=		Commercial software (no permission to copy is evident).
 NO_SRC_ON_FTP=		${RESTRICTED}
@@ -32,15 +17,24 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-EXTRACT_ONLY=		# empty
-NO_BUILD=		yes
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	compat gtk gdk-pixbuf
+
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
 
-EMUL_YMESSENGER=	${PREFIX}/${EMULSUBDIR}/opt/ymessenger/bin/ymessenger
+EMUL_PKG_FMT=		rpm
+RPM2PKG_PREFIX=		${PREFIX}
+RPM2PKG_SUBPREFIX=	${EMULSUBDIR}
+RPM2PKG_STAGE=		do-install
+RPMIGNOREFILES=		./usr
+
+EMUL_YMESSENGER=	${EMULDIR}/opt/ymessenger/bin/ymessenger
 YMESSENGER=		${PREFIX}/bin/ymessenger
+
 post-install:
-	${SED} '1 s,bin,${EMULSUBDIR}/bin,' < ${EMUL_YMESSENGER} > ${YMESSENGER}
+	${SED} '1 s,bin,${EMULSUBDIRSLASH}bin,'				\
+		${EMUL_YMESSENGER} > ${YMESSENGER}
 	${CHMOD} 755 ${YMESSENGER}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/m1/Makefile b/emulators/m1/Makefile
index 9758c7eca94..070cafcf8b3 100644
--- a/emulators/m1/Makefile
+++ b/emulators/m1/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/06/15 13:31:28 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.9 2007/07/29 05:18:37 jlam Exp $
 
 DISTNAME=	m1074b2-lnx
 PKGNAME=	m1-0.7.4c
@@ -12,16 +11,11 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.emuhype.com/index.phtml?s=misc&ss=index
 COMMENT=	Arcade video and pinball game sound emulator (Linux binary)
 
-.include "../../emulators/suse_linux/Makefile.application"
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	compat
 
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_compat>=6.4:../../emulators/${SUSE_DIR_PREFIX}_compat
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-WRKSRC=		${WRKDIR}/m1-0.7.4
-NO_BUILD=	yes
+WRKSRC=			${WRKDIR}/m1-0.7.4
+BUILD_DIRS=		# empty
 
 INSTALLATION_DIRS=	bin
 
diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile
index 98957bfc71a..456e01318e9 100644
--- a/emulators/ski/Makefile
+++ b/emulators/ski/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2007/01/07 09:13:53 rillig Exp $
+#	$NetBSD: Makefile,v 1.8 2007/07/29 05:18:37 jlam Exp $
 
 DISTNAME=		ski-0.9.81-l6-i686
 PKGNAME=		ski-0.9.81.6
@@ -15,17 +15,14 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-ONLY_FOR_PLATFORM=	*-*-i386
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	x11
 
 WRKSRC=			${WRKDIR}
-INTERACTIVE_STAGE=	fetch extract
-NO_BUILD=		YES
+INTERACTIVE_STAGE=	fetch
+BUILD_DIRS=		# none
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 lib/X11/app-defaults
 
 DOWNLOAD=		http://www.hpl.hp.com/research/linux/ski/download.php
 
@@ -38,7 +35,9 @@ FETCH_MESSAGE=								\
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/nue/usr/bin/*ski* ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDIR}/nue/usr/man/man1/*ski*.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA} ${WRKDIR}/nue/usr/X11R6/lib/X11/app-defaults/XSki ${PREFIX}/lib/X11/app-defaults/XSki
+	${INSTALL_MAN} ${WRKDIR}/nue/usr/man/man1/*ski*.1		\
+		${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKDIR}/nue/usr/X11R6/lib/X11/app-defaults/XSki \
+		${PREFIX}/lib/X11/app-defaults/XSki
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_aspell/DESCR b/emulators/suse100_aspell/DESCR
index 32264c795f3..afa9ec2124a 100644
--- a/emulators/suse100_aspell/DESCR
+++ b/emulators/suse100_aspell/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
-aspell libraries.
+This package supports running ELF binaries linked with glibc2 that
+require aspell shared libraries.
diff --git a/emulators/suse100_aspell/Makefile b/emulators/suse100_aspell/Makefile
index 67a20c31a90..0898b64a7ef 100644
--- a/emulators/suse100_aspell/Makefile
+++ b/emulators/suse100_aspell/Makefile
@@ -1,24 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2007/04/19 15:30:20 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2007/07/29 05:18:38 jlam Exp $
 
-DISTNAME=		suse_aspell-${SUSE_VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_aspell-${SUSE_VERSION}
+PKGREVISION=	2
+CATEGORIES=	emulators
+DISTFILES=	aspell-0.60.3-2.${SUSE_ARCH}.rpm
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for Aspell library
+MAINTAINER=	pkgsrc-users@NetBSD.org
+COMMENT=	Linux compatibility package for aspell
 
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
-.endif
-
-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_aspell/Makefile.i386 b/emulators/suse100_aspell/Makefile.i386
deleted file mode 100644
index 15174f4f040..00000000000
--- a/emulators/suse100_aspell/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/04/18 14:08:33 salo Exp $
-
-RPMFILES=		aspell-0.60.3-2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_aspell/Makefile.powerpc b/emulators/suse100_aspell/Makefile.powerpc
deleted file mode 100644
index a63b54a46b2..00000000000
--- a/emulators/suse100_aspell/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/04/18 14:08:33 salo Exp $
-
-RPMFILES=		aspell-0.60.3-2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_aspell/Makefile.x86_64 b/emulators/suse100_aspell/Makefile.x86_64
deleted file mode 100644
index eb67615315a..00000000000
--- a/emulators/suse100_aspell/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/04/18 14:08:33 salo Exp $
-
-RPMFILES=		aspell-0.60.3-2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_base/DEINSTALL b/emulators/suse100_base/DEINSTALL
new file mode 100644
index 00000000000..e37a030b640
--- /dev/null
+++ b/emulators/suse100_base/DEINSTALL
@@ -0,0 +1,27 @@
+# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:18:38 jlam Exp $
+
+EMULDIR="${PKG_PREFIX}/@EMULSUBDIR@"
+
+case "${STAGE}" in
+DEINSTALL)
+	# Run any actions that require root privileges.
+	${TEST} ! -x ./+ROOT_ACTIONS ||
+		./+ROOT_ACTIONS REMOVE ${PKG_METADATA_DIR} || exit 1
+
+	# Blow away the /proc directory
+	${RM} -fr ${EMULDIR}/proc
+
+	# Remove a stray symlink that would normally be managed by
+	# ldconfig(8).
+	#
+	${RM} -f ${EMULDIR}/usr/@LINUX_LIBSUBDIR@/libz.so.1
+
+	# Remove some files created by pkgsrc.
+	${RM} -f ${EMULDIR}/etc/ld.so.cache
+	${RM} -f ${EMULDIR}/etc/mtab
+	${RM} -f ${EMULDIR}/etc/group
+	${RM} -f ${EMULDIR}/etc/gshadow
+	${RM} -f ${EMULDIR}/etc/passwd
+	${RM} -f ${EMULDIR}/etc/shadow
+	;;
+esac
diff --git a/emulators/suse100_base/DESCR b/emulators/suse100_base/DESCR
index 62e5a3f87e9..fa773614562 100644
--- a/emulators/suse100_base/DESCR
+++ b/emulators/suse100_base/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 don't
-require X11 shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+don't require X11 shared libraries.
diff --git a/emulators/suse100_base/INSTALL b/emulators/suse100_base/INSTALL
index ed22f89412e..51371f21458 100644
--- a/emulators/suse100_base/INSTALL
+++ b/emulators/suse100_base/INSTALL
@@ -1,30 +1,149 @@
-# $NetBSD: INSTALL,v 1.4 2007/04/19 15:30:20 xtraeme Exp $
+# $NetBSD: INSTALL,v 1.5 2007/07/29 05:18:39 jlam Exp $
 
-case "${STAGE}" in
-POST-INSTALL)
-	emulsubdir="@OPSYS_EMULSUBDIR@"
+# Generate a +ROOT_ACTIONS script that runs certain actions that require
+# superuser privileges.
+#
+case "${STAGE},$1" in
+UNPACK,|UNPACK,+ROOT_ACTIONS)
+	${CAT} > ./+ROOT_ACTIONS << 'EOF'
+#!@SH@
+#
+# +ROOT_ACTIONS - run actions requiring superuser privileges
+#
+# Usage: ./+ROOT_ACTIONS ADD|REMOVE [metadatadir]
+#
+# This script runs certain actions that require superuser privileges.
+# If such privileges are not available, then simply output a message
+# asking the user to run this script with the appropriate elevated
+# privileges.
+#
+
+CAT="@CAT@"
+CHMOD="@CHMOD@"
+CP="@CP@"
+ECHO="@ECHO@"
+ID="@ID@"
+LN="@LN@"
+MKDIR="@MKDIR@"
+PWD_CMD="@PWD_CMD@"
+RM="@RM@"
+SH="@SH@"
+TEST="@TEST@"
+
+SELF=$0
+ACTION=$1
+
+CURDIR=`${PWD_CMD}`
+PKG_METADATA_DIR="${2-${CURDIR}}"
+: ${PKGNAME=${PKG_METADATA_DIR##*/}}
+: ${PKG_PREFIX=@PREFIX@}
 
-	emuldir="@OPSYS_EMULDIR@"
-	pkgemuldir="${PKG_PREFIX}/emul/$emulsubdir"
+EMULDIR="${PKG_PREFIX}/@EMULSUBDIR@"
+OPSYS_EMULDIR="@OPSYS_EMULDIR@"
 
-	emuldir_pwd=`cd $emuldir 2>/dev/null && ${PWD_CMD}`
-	pkgemuldir_pwd=`cd $pkgemuldir 2>/dev/null && ${PWD_CMD}`
+ROOT_ACTIONS_COOKIE="${PKG_METADATA_DIR}/+ROOT_ACTIONS_done"
+EUID=`${ID} -u`
 
-	if ${TEST} "$emuldir_pwd" != "$pkgemuldir_pwd"; then
-		if ${TEST} -e $emuldir -o -L $emuldir; then
-			${CAT} << EOF
+exitcode=0
+case $ACTION,$EUID in
+ADD,0)
+	${ECHO} "" > ${ROOT_ACTIONS_COOKIE}
+	${CHMOD} g+w ${ROOT_ACTIONS_COOKIE}
+	# Create an appropriate Linux-like /dev directory.
+	${ECHO} "${PKGNAME}: populating ${EMULDIR}/dev"
+	${MKDIR} ${EMULDIR}/dev
+	${TEST} ! -f /dev/MAKEDEV ||
+		${CP} /dev/MAKEDEV ${EMULDIR}/dev
+	${TEST} ! -f /dev/MAKEDEV.subr ||
+		${CP} /dev/MAKEDEV.subr ${EMULDIR}/dev
+	( cd ${EMULDIR}/dev &&
+	  ${SH} ./MAKEDEV std audio &&
+	  ${LN} -fs sound dsp )
+
+	# Create the appropriate symlink so that the kernel will
+	# find the installed files.
+	#
+	OPSYS_EMULDIR_PWD=`cd ${OPSYS_EMULDIR} 2>/dev/null && ${PWD_CMD}`
+	EMULDIR_PWD=`cd ${EMULDIR} 2>/dev/null && ${PWD_CMD}`
+
+	if ${TEST} "${OPSYS_EMULDIR_PWD}" != "${EMULDIR_PWD}"; then
+		if ${TEST} -e ${OPSYS_EMULDIR} -o -L ${OPSYS_EMULDIR}; then
+			${CAT} << EOM
 ==============================================================================
-You must create a symbolic link for ${PKGNAME} to work properly:
+The following symbolic link must be created for ${PKGNAME}
+to work properly:
 
-	$pkgemuldir  ->  $emuldir
+	${EMULDIR} -> ${OPSYS_EMULDIR}
 
-It seems there is something else located at $emuldir.
 ==============================================================================
-EOF
+EOM
 		else
-			${MKDIR} -p `${DIRNAME} $emuldir` && 
-			${LN} -fs $pkgemuldir $emuldir
+			${ECHO} "${PKGNAME}: creating symlink ${EMULDIR} -> ${OPSYS_EMULDIR}"
+			( ${MKDIR} -p `${DIRNAME} ${OPSYS_EMULDIR}` && 
+			  ${LN} -fs ${EMULDIR} ${OPSYS_EMULDIR} ) || ${TRUE}
 		fi
 	fi
 	;;
+
+REMOVE,0)
+	${ECHO} "${PKGNAME}: removing ${EMULDIR}/dev"
+	${RM} -fr ${EMULDIR}/dev
+	${RM} -f ${ROOT_ACTIONS_COOKIE}
+	;;
+
+ADD,*)
+	if ${TEST} ! -f ${ROOT_ACTIONS_COOKIE}; then
+		${CAT} << EOM
+==============================================================================
+Please run the following command with superuser privileges to complete
+the installation of ${PKGNAME}:
+
+    cd ${PKG_METADATA_DIR} && ${SELF} ADD
+
+==============================================================================
+EOM
+	fi
+	;;
+
+REMOVE,*)
+	if ${TEST} -f ${ROOT_ACTIONS_COOKIE}; then
+		${CAT} << EOM
+==============================================================================
+Please run the following command with superuser privileges to begin the
+removal of ${PKGNAME}:
+
+    cd ${PKG_METADATA_DIR} && ${SELF} REMOVE
+
+Then, please run pkg_delete(1) again to complete the removal of this
+package.
+
+==============================================================================
+EOM
+		exitcode=1
+	fi
+	;;
+esac
+exit $exitcode
+
+EOF
+	${CHMOD} +x ./+ROOT_ACTIONS
+	;;
+esac
+
+EMULDIR="${PKG_PREFIX}/@EMULSUBDIR@"
+OPSYS_EMULDIR="@OPSYS_EMULDIR@"
+
+case "${STAGE}" in
+POST-INSTALL)
+	# Create a /proc mount point.
+	${MKDIR} -p ${EMULDIR}/proc
+
+	# Make /etc/mtab usable for Linux programs.
+	${RM} -f ${EMULDIR}/etc/mtab
+	${LN} -fs ${EMULDIR}/proc/mounts ${EMULDIR}/etc/mtab
+
+	# Run any actions that require root privileges.
+	${TEST} ! -x ./+ROOT_ACTIONS ||
+		./+ROOT_ACTIONS ADD ${PKG_METADATA_DIR}
+	;;
 esac
diff --git a/emulators/suse100_base/Makefile b/emulators/suse100_base/Makefile
index 2a6ee4703f2..aea3c7a1937 100644
--- a/emulators/suse100_base/Makefile
+++ b/emulators/suse100_base/Makefile
@@ -1,27 +1,18 @@
-# $NetBSD: Makefile,v 1.9 2007/04/19 15:30:20 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2007/07/29 05:18:39 jlam Exp $
 
-DISTNAME=		suse_base-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_base-${SUSE_VERSION}
+PKGREVISION=	4
+CATEGORIES=	emulators
 
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package
+MAINTAINER=	tonio@NetBSD.org
+COMMENT=	Linux compatibility package
 
-CONFLICTS=		linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]*
+CONFLICTS=	linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]*
 
-# these files are handled by manually during de-/installation/pkg_add
-CHECK_FILES_SKIP+=	${PREFIX}/${EMULSUBDIR}/dev/.*
-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} \
-			SUSE_COMPAT32_SUFFIX=${SUSE_COMPAT32_SUFFIX:Q}
-
-.include "../../mk/bsd.prefs.mk"
+# These files are managed by the +INSTALL/+DEINSTALL scripts.
+CHECK_FILES_SKIP+=	${EMULDIR}/dev/.*
+CHECK_FILES_SKIP+=	${EMULDIR}/etc/ld.so.cache
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/@LINUX_LIBSUBDIR@/libz.so.1
 
 RPMIGNOREPATH=		./etc/bash.bashrc ./etc/bash_completion.d \
 			./etc/cron.daily ./etc/csh.cshrc ./etc/csh.login \
@@ -30,53 +21,36 @@ RPMIGNOREPATH=		./etc/bash.bashrc ./etc/bash_completion.d \
 			./etc/pam.d ./etc/profile ./etc/profile.dos \
 			./etc/rc.d.README ./etc/rpc ./etc/shells ./etc/ttytype
 
-LINUX_LDD=		${PREFIX}/${EMULSUBDIR}/usr/bin/ldd
-LINUX_LIB?=		lib
+LINUX_LDD=		${EMULDIR}/usr/bin/ldd
+LINUX_LDCONFIG=		${EMULDIR}/usr/sbin/ldconfig
 
 INSTALLATION_DIRS=	sbin
+OWN_DIRS+=		${EMULSUBDIR}
+
+SUBST_CLASSES+=		suse
+SUBST_STAGE.suse=	do-build
+SUBST_FILES.suse=	SuSE-release linux-mkpwd.sh
+SUBST_VARS.suse=	EMULDIR SUSE_ARCH SUSE_VERSION
 
-SUSE_INCLUDE_MAKEFILE_ARCH=	yes
+# Some platforms, e.g. FreeBSD, need to "brand" the ELF binaries to
+# the correct type.
+#
+BRANDELF_CMD=	${BRANDELF:D${BRANDELF} -t Linux ${LINUX_LDCONFIG}:U${TRUE}}
 
-do-build:
-	@for FILE in ${FILESDIR}/SuSE-release ${FILESDIR}/*.sh; do \
-	  ${SED} -e 's#@@EMULDIR@@#${EMULDIR}#g' \
-	         -e 's#@@EMULSUBDIR@@#${EMULSUBDIR}#g' \
-	         -e 's#@@LINUX_LIB@@#${LINUX_LIB}#g' \
-	         -e 's#@@VERSION@@#${SUSE_VERSION}#g' \
-	         -e 's#@@ARCH@@#${SUSE_ARCH}#g' \
-	    $$FILE >${WRKDIR}/`basename $$FILE`; \
-	done
+post-extract:
+	${CP} ${FILESDIR}/SuSE-release ${WRKSRC}
+	${CP} ${FILESDIR}/*.sh ${WRKSRC}
 
 do-install:
-	${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 \
-	  ${INSTALL_DATA} /dev/MAKEDEV.subr ${EMULDIR}/dev; \
-	fi
-	cd ${EMULDIR}/dev && ${SH} ./MAKEDEV  std audio
-	cd ${EMULDIR}/dev && ${LN} -fs sound dsp
-	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	${RPM2PKG} ${RPM2PKGARGS}
-	${ECHO} "@dirrm ${EMULSUBDIR}" >>${PLIST_SRC}
-	${INSTALL_DATA} ${WRKDIR}/SuSE-release ${EMULDIR}/etc
-	${INSTALL_DATA_DIR} ${EMULDIR}/proc
-	${LN} -fs ${EMULDIR}/proc/mounts ${EMULDIR}/etc/mtab
-.if ${OPSYS} == "FreeBSD"
-	${BRANDELF} -t Linux ${EMULDIR}/sbin/ldconfig
-.endif
-	${EMULDIR}/sbin/ldconfig -r ${EMULDIR}
-	${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" \
-	  >>${PLIST_SRC}
-	${ECHO} "@unexec ${RMDIR} %D/${EMULSUBDIR}/etc 2>/dev/null || ${TRUE}" \
-	  >>${PLIST_SRC}
+	${INSTALL_SCRIPT} ${WRKSRC}/linux-mkpwd.sh \
+		${PREFIX}/sbin/${LINUX_BASE}-mkpwd
+	${INSTALL_DATA} ${WRKSRC}/SuSE-release ${EMULDIR}/etc
+	${BRANDELF_CMD}
 	${SED}	-e 's:#! :#! ${EMULDIR}:' \
 		-e 's:^RTLD=:RTLD=/${EMULSUBDIR}:' \
-		< ${LINUX_LDD} > ${LINUX_LDD}.new
+		${LINUX_LDD} > ${LINUX_LDD}.new
 	${MV} ${LINUX_LDD}.new ${LINUX_LDD}
 	${CHMOD} +x ${LINUX_LDD}
-	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${INSTALL_FILE} - POST-INSTALL
 
 .include "../../emulators/suse100_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_base/Makefile.i386 b/emulators/suse100_base/Makefile.i386
deleted file mode 100644
index d5ab050b105..00000000000
--- a/emulators/suse100_base/Makefile.i386
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		aaa_base-10.0-28.${SUSE_ARCH}.rpm \
-			bash-3.0-17.${SUSE_ARCH}.rpm \
-			coreutils-5.3.0-20.2.${SUSE_ARCH}.rpm \
-			glibc-2.3.5-40.${SUSE_ARCH}.rpm \
-			libgcc-4.0.2_20050901-3.${SUSE_ARCH}.rpm \
-			libacl-2.2.31-3.${SUSE_ARCH}.rpm \
-			libattr-2.4.24-2.${SUSE_ARCH}.rpm \
-			libselinux-1.23.11-3.${SUSE_ARCH}.rpm \
-			libstdc++-4.0.2_20050901-3.${SUSE_ARCH}.rpm \
-			ncurses-5.4-71.${SUSE_ARCH}.rpm \
-			readline-5.0-9.${SUSE_ARCH}.rpm \
-			zlib-1.2.3-3.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_base/Makefile.powerpc b/emulators/suse100_base/Makefile.powerpc
deleted file mode 100644
index 2d3601c5ae6..00000000000
--- a/emulators/suse100_base/Makefile.powerpc
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		aaa_base-10.0-28.${SUSE_ARCH}.rpm \
-			bash-3.0-17.${SUSE_ARCH}.rpm \
-			coreutils-5.3.0-20.2.${SUSE_ARCH}.rpm \
-			glibc-2.3.5-40.${SUSE_ARCH}.rpm \
-			libgcc-4.0.2_20050901-3.${SUSE_ARCH}.rpm \
-			libacl-2.2.31-3.${SUSE_ARCH}.rpm \
-			libattr-2.4.24-2.${SUSE_ARCH}.rpm \
-			libselinux-1.23.11-3.${SUSE_ARCH}.rpm \
-			libstdc++-4.0.2_20050901-3.${SUSE_ARCH}.rpm \
-			ncurses-5.4-71.${SUSE_ARCH}.rpm \
-			readline-5.0-9.${SUSE_ARCH}.rpm \
-			zlib-1.2.3-3.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_base/Makefile.x86_64 b/emulators/suse100_base/Makefile.x86_64
deleted file mode 100644
index fd5652311d5..00000000000
--- a/emulators/suse100_base/Makefile.x86_64
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		aaa_base-10.0-28.${SUSE_ARCH}.rpm \
-			bash-3.0-17.${SUSE_ARCH}.rpm \
-			coreutils-5.3.0-20.2.${SUSE_ARCH}.rpm \
-			glibc-2.3.5-40.${SUSE_ARCH}.rpm \
-			libgcc-4.0.2_20050901-3.${SUSE_ARCH}.rpm \
-			libacl-2.2.31-3.${SUSE_ARCH}.rpm \
-			libattr-2.4.24-2.${SUSE_ARCH}.rpm \
-			libselinux-1.23.11-3.${SUSE_ARCH}.rpm \
-			libstdc++-4.0.2_20050901-3.${SUSE_ARCH}.rpm \
-			ncurses-5.4-71.${SUSE_ARCH}.rpm \
-			readline-5.0-9.${SUSE_ARCH}.rpm \
-			zlib-1.2.3-3.${SUSE_ARCH}.rpm
-
-LINUX_LIB=		lib64
diff --git a/emulators/suse100_base/PLIST b/emulators/suse100_base/PLIST
index 7f94deb4cf5..d45388bb83f 100644
--- a/emulators/suse100_base/PLIST
+++ b/emulators/suse100_base/PLIST
@@ -1,15 +1,3 @@
-@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
-${EMULSUBDIR}/usr/${LINUX_LIB}/libz.so.1
-@exec ${MKDIR} %D/${EMULSUBDIR}/proc
-@dirrm ${EMULSUBDIR}/proc
-@unexec cd %D/${EMULSUBDIR}/etc && ${RM} -f group gshadow passwd shadow
-@exec ${MKDIR} %D/${EMULSUBDIR}/dev
-@exec cp -p /dev/MAKEDEV  %D/${EMULSUBDIR}/dev
-@exec cd %D/${EMULSUBDIR}/dev && sh ./MAKEDEV std audio
-@exec cd %D/${EMULSUBDIR}/dev && ln -s sound dsp
-@unexec ${RM} -f %D/${EMULSUBDIR}/dev/*
-@dirrm ${EMULSUBDIR}/dev
+@comment $NetBSD: PLIST,v 1.3 2007/07/29 05:18:40 jlam Exp $
+sbin/${LINUX_BASE}-mkpwd
+${EMULSUBDIRSLASH}etc/SuSE-release
diff --git a/emulators/suse100_base/files/SuSE-release b/emulators/suse100_base/files/SuSE-release
index 247032986b2..728e5a77870 100644
--- a/emulators/suse100_base/files/SuSE-release
+++ b/emulators/suse100_base/files/SuSE-release
@@ -1,2 +1,2 @@
-SuSE Linux @@VERSION@@ (@@ARCH@@)
-VERSION = @@VERSION@@
+SuSE Linux @SUSE_VERSION@ (@SUSE_ARCH@)
+VERSION = @SUSE_VERSION@
diff --git a/emulators/suse100_base/files/linux-mkpwd.sh b/emulators/suse100_base/files/linux-mkpwd.sh
index d751a771b8d..24409a0fc7c 100644
--- a/emulators/suse100_base/files/linux-mkpwd.sh
+++ b/emulators/suse100_base/files/linux-mkpwd.sh
@@ -1,13 +1,31 @@
 #!/bin/sh
 #
-# $NetBSD: linux-mkpwd.sh,v 1.1.1.1 2006/03/09 20:34:10 tonio Exp $
+# $NetBSD: linux-mkpwd.sh,v 1.2 2007/07/29 05:18:40 jlam Exp $
+#
+
+######################################################################
+#
+# NAME
+#	@LINUX_BASE@-mkpwd -- create passwd/group files for COMPAT_LINUX
+#
+# SYNOPSYS
+#	@LINUX_BASE@-mkpwd
+#
+# DESCRIPTION
+#	@LINUX_BASE@-mkpwd creates passwd and group files and databases
+#	for a COMPAT_LINUX installation based on the files found in
+#	/etc, e.g. /etc/passwd, /etc/master.passwd, /etc/group, etc.
+#
+######################################################################
 
 SRCDIR=/etc
-DESTDIR=@@EMULDIR@@/etc
+DESTDIR=@EMULDIR@/etc
+
+[ -d $DESTDIR ] || exit 1
 
 umask 22
 cd $DESTDIR
-cp $SRCDIR/passwd .
+cp -f $SRCDIR/passwd .
 sed s/^wheel:/root:/ <$SRCDIR/group >group
 
 umask 77
diff --git a/emulators/suse100_base/suse.i386.mk b/emulators/suse100_base/suse.i386.mk
new file mode 100644
index 00000000000..e666685287c
--- /dev/null
+++ b/emulators/suse100_base/suse.i386.mk
@@ -0,0 +1,15 @@
+# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:18:40 jlam Exp $
+
+# SuSE i386 RPMs
+DISTFILES+=	aaa_base-10.0-28.${SUSE_ARCH}.rpm
+DISTFILES+=	bash-3.0-17.${SUSE_ARCH}.rpm
+DISTFILES+=	coreutils-5.3.0-20.2.${SUSE_ARCH}.rpm
+DISTFILES+=	glibc-2.3.5-40.${SUSE_ARCH}.rpm
+DISTFILES+=	libacl-2.2.31-3.${SUSE_ARCH}.rpm
+DISTFILES+=	libattr-2.4.24-2.${SUSE_ARCH}.rpm
+DISTFILES+=	libgcc-4.0.2_20050901-3.${SUSE_ARCH}.rpm
+DISTFILES+=	libselinux-1.23.11-3.${SUSE_ARCH}.rpm
+DISTFILES+=	libstdc++-4.0.2_20050901-3.${SUSE_ARCH}.rpm
+DISTFILES+=	ncurses-5.4-71.${SUSE_ARCH}.rpm
+DISTFILES+=	readline-5.0-9.${SUSE_ARCH}.rpm
+DISTFILES+=	zlib-1.2.3-3.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_base/suse.powerpc.mk b/emulators/suse100_base/suse.powerpc.mk
new file mode 100644
index 00000000000..01000e50ded
--- /dev/null
+++ b/emulators/suse100_base/suse.powerpc.mk
@@ -0,0 +1,15 @@
+# $NetBSD: suse.powerpc.mk,v 1.1 2007/07/29 05:18:40 jlam Exp $
+
+# SuSE PowerPC RPMs
+DISTFILES+=	aaa_base-10.0-28.${SUSE_ARCH}.rpm
+DISTFILES+=	bash-3.0-17.${SUSE_ARCH}.rpm
+DISTFILES+=	coreutils-5.3.0-20.2.${SUSE_ARCH}.rpm
+DISTFILES+=	glibc-2.3.5-40.${SUSE_ARCH}.rpm
+DISTFILES+=	libgcc-4.0.2_20050901-3.${SUSE_ARCH}.rpm
+DISTFILES+=	libacl-2.2.31-3.${SUSE_ARCH}.rpm
+DISTFILES+=	libattr-2.4.24-2.${SUSE_ARCH}.rpm
+DISTFILES+=	libselinux-1.23.11-3.${SUSE_ARCH}.rpm
+DISTFILES+=	libstdc++-4.0.2_20050901-3.${SUSE_ARCH}.rpm
+DISTFILES+=	ncurses-5.4-71.${SUSE_ARCH}.rpm
+DISTFILES+=	readline-5.0-9.${SUSE_ARCH}.rpm
+DISTFILES+=	zlib-1.2.3-3.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_base/suse.x86_64.mk b/emulators/suse100_base/suse.x86_64.mk
new file mode 100644
index 00000000000..b604c3c18ba
--- /dev/null
+++ b/emulators/suse100_base/suse.x86_64.mk
@@ -0,0 +1,17 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:18:40 jlam Exp $
+
+# SuSE x86_64 RPMs
+DISTFILES+=	aaa_base-10.0-28.${SUSE_ARCH}.rpm
+DISTFILES+=	bash-3.0-17.${SUSE_ARCH}.rpm
+DISTFILES+=	coreutils-5.3.0-20.2.${SUSE_ARCH}.rpm
+DISTFILES+=	glibc-2.3.5-40.${SUSE_ARCH}.rpm
+DISTFILES+=	libgcc-4.0.2_20050901-3.${SUSE_ARCH}.rpm
+DISTFILES+=	libacl-2.2.31-3.${SUSE_ARCH}.rpm
+DISTFILES+=	libattr-2.4.24-2.${SUSE_ARCH}.rpm
+DISTFILES+=	libselinux-1.23.11-3.${SUSE_ARCH}.rpm
+DISTFILES+=	libstdc++-4.0.2_20050901-3.${SUSE_ARCH}.rpm
+DISTFILES+=	ncurses-5.4-71.${SUSE_ARCH}.rpm
+DISTFILES+=	readline-5.0-9.${SUSE_ARCH}.rpm
+DISTFILES+=	zlib-1.2.3-3.${SUSE_ARCH}.rpm
+
+LINUX_LIBSUBDIR=	lib64
diff --git a/emulators/suse100_compat/DESCR b/emulators/suse100_compat/DESCR
index addf8028f9b..573641b8dea 100644
--- a/emulators/suse100_compat/DESCR
+++ b/emulators/suse100_compat/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 contains some old shared libraries required for backwards
-compatibility.
+This package contains some old shared libraries required by older
+Linux binaries.
diff --git a/emulators/suse100_compat/Makefile b/emulators/suse100_compat/Makefile
index 3dfad8f1709..a3d823c074b 100644
--- a/emulators/suse100_compat/Makefile
+++ b/emulators/suse100_compat/Makefile
@@ -1,22 +1,16 @@
-# $NetBSD: Makefile,v 1.6 2007/04/19 15:30:20 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2007/07/29 05:18:41 jlam Exp $
 
-DISTNAME=		suse_compat-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_compat-${SUSE_VERSION}
+PKGREVISION=	3
+CATEGORIES=	emulators
+DISTFILES+=	compat-2004.11.13-4.${SUSE_ARCH}.rpm			\
+		compat-g77-3.3.5-2.${SUSE_ARCH}.rpm			\
+		compat-libstdc++-5.0.7-6.${SUSE_ARCH}.rpm
 
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package with old shared libraries
+MAINTAINER=	tonio@NetBSD.org
+COMMENT=	Linux compatibility package with old shared libraries
 
-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_compat/Makefile.i386 b/emulators/suse100_compat/Makefile.i386
deleted file mode 100644
index c3a16b181c2..00000000000
--- a/emulators/suse100_compat/Makefile.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.2 2007/03/24 21:52:04 salo Exp $
-
-RPMFILES=		compat-2004.11.13-4.${SUSE_ARCH}.rpm \
-			compat-g77-3.3.5-2.${SUSE_ARCH}.rpm \
-			compat-libstdc++-5.0.7-6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_compat/Makefile.powerpc b/emulators/suse100_compat/Makefile.powerpc
deleted file mode 100644
index a019c0b044a..00000000000
--- a/emulators/suse100_compat/Makefile.powerpc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.2 2007/03/24 21:52:04 salo Exp $
-
-RPMFILES=		compat-2004.11.13-4.${SUSE_ARCH}.rpm \
-			compat-g77-3.3.5-2.${SUSE_ARCH}.rpm \
-			compat-libstdc++-5.0.7-6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_compat/Makefile.x86_64 b/emulators/suse100_compat/Makefile.x86_64
deleted file mode 100644
index 5deeb193a3d..00000000000
--- a/emulators/suse100_compat/Makefile.x86_64
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.2 2007/03/24 21:52:04 salo Exp $
-
-RPMFILES=		compat-2004.11.13-4.${SUSE_ARCH}.rpm \
-			compat-g77-3.3.5-2.${SUSE_ARCH}.rpm \
-			compat-libstdc++-5.0.7-6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_expat/DESCR b/emulators/suse100_expat/DESCR
index 9f2f36c8801..4a64e91260e 100644
--- a/emulators/suse100_expat/DESCR
+++ b/emulators/suse100_expat/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
-expat shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require expat shared libraries.
diff --git a/emulators/suse100_expat/Makefile b/emulators/suse100_expat/Makefile
index 0a2d158c24e..fd2fe645f48 100644
--- a/emulators/suse100_expat/Makefile
+++ b/emulators/suse100_expat/Makefile
@@ -1,23 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:20 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:41 jlam Exp $
 
-DISTNAME=		suse_expat-${SUSE_VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_expat-${SUSE_VERSION}
+PKGREVISION=	2
+CATEGORIES=	emulators
+DISTFILES=	expat-1.95.8-5.${SUSE_ARCH}.rpm
 
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for expat binaries
+MAINTAINER=	tonio@NetBSD.org
+COMMENT=	Linux compatibility package for expat
 
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-LIBTOOLIZE_PLIST=	NO
-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_expat/Makefile.i386 b/emulators/suse100_expat/Makefile.i386
deleted file mode 100644
index ccb141d14e5..00000000000
--- a/emulators/suse100_expat/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/03/09 20:35:09 tonio Exp $
-
-RPMFILES=		expat-1.95.8-5.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_expat/Makefile.powerpc b/emulators/suse100_expat/Makefile.powerpc
deleted file mode 100644
index 0038cf086b6..00000000000
--- a/emulators/suse100_expat/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/03/09 20:35:09 tonio Exp $
-
-RPMFILES=		expat-1.95.8-5.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_expat/Makefile.x86_64 b/emulators/suse100_expat/Makefile.x86_64
deleted file mode 100644
index e852bacc46e..00000000000
--- a/emulators/suse100_expat/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/03/09 20:35:09 tonio Exp $
-
-RPMFILES=		expat-1.95.8-5.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_fontconfig/DESCR b/emulators/suse100_fontconfig/DESCR
index fffa11f3d2e..48a1e2cd2ab 100644
--- a/emulators/suse100_fontconfig/DESCR
+++ b/emulators/suse100_fontconfig/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
-fontconfig shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require fontconfig shared libraries.
diff --git a/emulators/suse100_fontconfig/Makefile b/emulators/suse100_fontconfig/Makefile
index 61b4cd6269b..a631f735a3a 100644
--- a/emulators/suse100_fontconfig/Makefile
+++ b/emulators/suse100_fontconfig/Makefile
@@ -1,23 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2007/04/19 15:30:20 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2007/07/29 05:18:42 jlam Exp $
 
-DISTNAME=		suse_fontconfig-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_fontconfig-${SUSE_VERSION}
+PKGREVISION=	3
+CATEGORIES=	emulators
+DISTFILES=	fontconfig-2.3.2.20050721-10.2.${SUSE_ARCH}.rpm
 
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for fontconfig binaries
+MAINTAINER=	tonio@NetBSD.org
+COMMENT=	Linux compatibility package for fontconfig
 
-DEPENDS+=		suse_expat-${SUSE_VERSION}{,nb*}:../../emulators/suse100_expat
-DEPENDS+=		suse_freetype2-${SUSE_VERSION}{,nb*}:../../emulators/suse100_freetype2
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-SUSE_INCLUDE_MAKEFILE_ARCH=	yes
+EMUL_MODULES.linux=	expat freetype2
 
 .include "../../emulators/suse100_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_fontconfig/Makefile.i386 b/emulators/suse100_fontconfig/Makefile.i386
deleted file mode 100644
index 119ba720d93..00000000000
--- a/emulators/suse100_fontconfig/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		fontconfig-2.3.2.20050721-10.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_fontconfig/Makefile.powerpc b/emulators/suse100_fontconfig/Makefile.powerpc
deleted file mode 100644
index b23c6d57fe3..00000000000
--- a/emulators/suse100_fontconfig/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		fontconfig-2.3.2.20050721-10.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_fontconfig/Makefile.x86_64 b/emulators/suse100_fontconfig/Makefile.x86_64
deleted file mode 100644
index dc81f87695d..00000000000
--- a/emulators/suse100_fontconfig/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=		fontconfig-2.3.2.20050721-10.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_freetype2/DESCR b/emulators/suse100_freetype2/DESCR
index b54860cc766..9d1ced14b3a 100644
--- a/emulators/suse100_freetype2/DESCR
+++ b/emulators/suse100_freetype2/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 freetype2 shared
-libraries.
+This package supports running ELF binaries linked with glibc2 that
+require freetype2 shared libraries.
diff --git a/emulators/suse100_freetype2/Makefile b/emulators/suse100_freetype2/Makefile
index 0124e4f4ca8..6578f5ff837 100644
--- a/emulators/suse100_freetype2/Makefile
+++ b/emulators/suse100_freetype2/Makefile
@@ -1,22 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2007/04/19 15:30:20 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2007/07/29 05:18:43 jlam Exp $
 
-DISTNAME=		suse_freetype2-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_freetype2-${SUSE_VERSION}
+PKGREVISION=	4
+CATEGORIES=	emulators
+DISTFILES=	freetype2-2.1.10-4.4.${SUSE_ARCH}.rpm
 
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for FreeType2 library
+MAINTAINER=	tonio@NetBSD.org
+COMMENT=	Linux compatibility package for freetype-2.x
 
-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_freetype2/Makefile.i386 b/emulators/suse100_freetype2/Makefile.i386
deleted file mode 100644
index e2f44be9044..00000000000
--- a/emulators/suse100_freetype2/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.3 2006/08/02 14:26:13 salo Exp $
-
-RPMFILES=		freetype2-2.1.10-4.4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_freetype2/Makefile.powerpc b/emulators/suse100_freetype2/Makefile.powerpc
deleted file mode 100644
index 5b5d86939b2..00000000000
--- a/emulators/suse100_freetype2/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.3 2006/08/02 14:26:13 salo Exp $
-
-RPMFILES=		freetype2-2.1.10-4.4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_freetype2/Makefile.x86_64 b/emulators/suse100_freetype2/Makefile.x86_64
deleted file mode 100644
index 1cfd6f98838..00000000000
--- a/emulators/suse100_freetype2/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.3 2006/08/02 14:26:13 salo Exp $
-
-RPMFILES=		freetype2-2.1.10-4.4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_gdk-pixbuf/DESCR b/emulators/suse100_gdk-pixbuf/DESCR
index b898081b301..dc8cea9566b 100644
--- a/emulators/suse100_gdk-pixbuf/DESCR
+++ b/emulators/suse100_gdk-pixbuf/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 that use gdk-pixbuf shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require gdk-pixbuf shared libraries.
diff --git a/emulators/suse100_gdk-pixbuf/Makefile b/emulators/suse100_gdk-pixbuf/Makefile
index dbcd44b5a7d..7da8eb25961 100644
--- a/emulators/suse100_gdk-pixbuf/Makefile
+++ b/emulators/suse100_gdk-pixbuf/Makefile
@@ -1,22 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:44 jlam Exp $
 
-DISTNAME=		suse_gdk-pixbuf-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_gdk-pixbuf-${SUSE_VERSION}
+PKGREVISION=	3
+CATEGORIES=	emulators
+DISTFILES=	gdk-pixbuf-0.22.0-72.3.${SUSE_ARCH}.rpm
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for gdk-pixbuf binaries
+MAINTAINER=	pkgsrc-users@NetBSD.org
+COMMENT=	Linux compatibility package for gdk-pixbuf
 
-DEPENDS+=		suse_gtk-${SUSE_VERSION}{,nb*}:../../emulators/suse100_gtk
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-SUSE_INCLUDE_MAKEFILE_ARCH=	yes
+EMUL_MODULES.linux=	gtk
 
 .include "../../emulators/suse100_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_gdk-pixbuf/Makefile.i386 b/emulators/suse100_gdk-pixbuf/Makefile.i386
deleted file mode 100644
index 25d8922a5ff..00000000000
--- a/emulators/suse100_gdk-pixbuf/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		gdk-pixbuf-0.22.0-72.3.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_gdk-pixbuf/Makefile.powerpc b/emulators/suse100_gdk-pixbuf/Makefile.powerpc
deleted file mode 100644
index 6d03f7a23af..00000000000
--- a/emulators/suse100_gdk-pixbuf/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		gdk-pixbuf-0.22.0-72.3.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_gdk-pixbuf/Makefile.x86_64 b/emulators/suse100_gdk-pixbuf/Makefile.x86_64
deleted file mode 100644
index 1c5b5906a36..00000000000
--- a/emulators/suse100_gdk-pixbuf/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=		gdk-pixbuf-0.22.0-72.3.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_glx/DESCR b/emulators/suse100_glx/DESCR
index 64e8143cf19..15d0f9e4737 100644
--- a/emulators/suse100_glx/DESCR
+++ b/emulators/suse100_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/suse100_glx/Makefile b/emulators/suse100_glx/Makefile
index 9d3b39044e8..0853af4dbcd 100644
--- a/emulators/suse100_glx/Makefile
+++ b/emulators/suse100_glx/Makefile
@@ -1,23 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:45 jlam Exp $
 
-DISTNAME=		suse_glx-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_glx-${SUSE_VERSION}
+PKGREVISION=	3
+CATEGORIES=	emulators
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the GL library
+MAINTAINER=	pkgsrc-users@NetBSD.org
+COMMENT=	Linux compatibility package for OpenGL/Mesa
 
-DEPENDS+=		suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
+EMUL_MODULES.linux=	x11
 
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-LIBTOOLIZE_PLIST=	NO
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-SUSE_INCLUDE_MAKEFILE_ARCH=	yes
+# This symlink is managed by ldconfig(8).
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/${LINUX_LIBSUBDIR}/libglide.so.3
 
 .include "../../emulators/suse100_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_glx/Makefile.i386 b/emulators/suse100_glx/Makefile.i386
deleted file mode 100644
index 4dbf9e56d05..00000000000
--- a/emulators/suse100_glx/Makefile.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/04/18 15:18:39 salo Exp $
-
-# the -devel version is necessary for libGL.so et.al. symlinks only
-RPMFILES=		xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm \
-			xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_glx/Makefile.powerpc b/emulators/suse100_glx/Makefile.powerpc
deleted file mode 100644
index 67d465aaae1..00000000000
--- a/emulators/suse100_glx/Makefile.powerpc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/04/18 15:18:39 salo Exp $
-
-# the -devel version is necessary for libGL.so et.al. symlinks only
-RPMFILES=		xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm \
-			xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_glx/Makefile.x86_64 b/emulators/suse100_glx/Makefile.x86_64
deleted file mode 100644
index 06d303bec4b..00000000000
--- a/emulators/suse100_glx/Makefile.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/04/18 15:18:39 salo Exp $
-
-# the -devel version is necessary for libGL.so et.al. symlinks only
-RPMFILES=		xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm \
-			xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm \
-			xorg-x11-Mesa-32bit-6.8.2-100.${SUSE_ARCH}.rpm \
-			xorg-x11-Mesa-devel-32bit-6.8.2-100.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_glx/PLIST_rpmfix.i386 b/emulators/suse100_glx/PLIST_rpmfix.i386
deleted file mode 100644
index 84378627263..00000000000
--- a/emulators/suse100_glx/PLIST_rpmfix.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST_rpmfix.i386,v 1.1 2006/04/28 14:15:06 joerg Exp $
-/usr/lib/libglide3.so.3
diff --git a/emulators/suse100_glx/suse.i386.mk b/emulators/suse100_glx/suse.i386.mk
new file mode 100644
index 00000000000..f95fc83424e
--- /dev/null
+++ b/emulators/suse100_glx/suse.i386.mk
@@ -0,0 +1,7 @@
+# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:18:47 jlam Exp $
+
+# SuSE i386 RPMs; the -devel version is necessary for libGL.so et.al.
+# symlinks only.
+#
+DISTFILES+=	xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm
+DISTFILES+=	xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_glx/suse.powerpc.mk b/emulators/suse100_glx/suse.powerpc.mk
new file mode 100644
index 00000000000..b3d95cb6282
--- /dev/null
+++ b/emulators/suse100_glx/suse.powerpc.mk
@@ -0,0 +1,7 @@
+# $NetBSD: suse.powerpc.mk,v 1.1 2007/07/29 05:18:47 jlam Exp $
+
+# SuSE PowerPC RPMs; the -devel version is necessary for libGL.so et.al.
+# symlinks only.
+#
+DISTFILES+=	xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm
+DISTFILES+=	xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_glx/suse.x86_64.mk b/emulators/suse100_glx/suse.x86_64.mk
new file mode 100644
index 00000000000..cfa6ad1584f
--- /dev/null
+++ b/emulators/suse100_glx/suse.x86_64.mk
@@ -0,0 +1,9 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:18:47 jlam Exp $
+
+# SuSE x86_64 RPMs; the -devel version is necessary for libGL.so et.al.
+# symlinks only.
+#
+DISTFILES+=	xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm
+DISTFILES+=	xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm
+DISTFILES+=	xorg-x11-Mesa-32bit-6.8.2-100.${SUSE_ARCH}.rpm
+DISTFILES+=	xorg-x11-Mesa-devel-32bit-6.8.2-100.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_gtk/DESCR b/emulators/suse100_gtk/DESCR
index d404f886f92..91db428d711 100644
--- a/emulators/suse100_gtk/DESCR
+++ b/emulators/suse100_gtk/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
-GTK shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require GTK+-1.x shared libraries.
diff --git a/emulators/suse100_gtk/Makefile b/emulators/suse100_gtk/Makefile
index d5bf3da247b..12bbd45624c 100644
--- a/emulators/suse100_gtk/Makefile
+++ b/emulators/suse100_gtk/Makefile
@@ -1,22 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2007/04/19 15:30:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2007/07/29 05:18:47 jlam Exp $
 
-DISTNAME=		suse_gtk-${SUSE_VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_gtk-${SUSE_VERSION}
+PKGREVISION=	2
+CATEGORIES=	emulators
+DISTFILES=	glib-1.2.10-595.${SUSE_ARCH}.rpm			\
+		gtk-1.2.10-888.${SUSE_ARCH}.rpm
 
-MAINTAINER=		tron@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for GTK binaries
+MAINTAINER=	tron@NetBSD.org
+COMMENT=	Linux compatibility package for GTK+-1.x
 
-DEPENDS+=		suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-SUSE_INCLUDE_MAKEFILE_ARCH=	yes
+EMUL_MODULES.linux=	x11
 
 .include "../../emulators/suse100_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_gtk/Makefile.i386 b/emulators/suse100_gtk/Makefile.i386
deleted file mode 100644
index 1916b3414d5..00000000000
--- a/emulators/suse100_gtk/Makefile.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.2 2006/04/18 13:58:47 tron Exp $
-
-RPMFILES=		glib-1.2.10-595.${SUSE_ARCH}.rpm \
-			gtk-1.2.10-888.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_gtk/Makefile.powerpc b/emulators/suse100_gtk/Makefile.powerpc
deleted file mode 100644
index c3d4ca5f0e9..00000000000
--- a/emulators/suse100_gtk/Makefile.powerpc
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/04/18 13:49:58 salo Exp $
-
-RPMFILES=		glib-1.2.10-595.${SUSE_ARCH}.rpm \
-			gtk-1.2.10-888.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_gtk/Makefile.x86_64 b/emulators/suse100_gtk/Makefile.x86_64
deleted file mode 100644
index 862f85e2557..00000000000
--- a/emulators/suse100_gtk/Makefile.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/04/18 13:49:58 salo Exp $
-
-RPMFILES=		glib-1.2.10-595.${SUSE_ARCH}.rpm \
-			gtk-1.2.10-888.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_gtk2/DEINSTALL b/emulators/suse100_gtk2/DEINSTALL
new file mode 100644
index 00000000000..0c1759d2401
--- /dev/null
+++ b/emulators/suse100_gtk2/DEINSTALL
@@ -0,0 +1,15 @@
+# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:18:48 jlam Exp $
+#
+# Remove gtk/pango module configuration.
+#
+case ${STAGE} in
+DEINSTALL)
+	GNOME_BINDIR="${PKG_PREFIX}/@EMULSUBDIR@/opt/gnome/bin"
+	GNOME_ETCDIR="${PKG_PREFIX}/@EMULSUBDIR@/etc/opt/gnome"
+
+	${ECHO} "${PKGNAME}: removing GTK/Pango module configuration"
+        ${RM} -f ${GNOME_ETCDIR}/gtk-2.0/gtk.immodules
+        ${RM} -f ${GNOME_ETCDIR}/gtk-2.0/gdk-pixbuf.loaders
+        ${RM} -f ${GNOME_ETCDIR}/pango/pango.modules
+	;;
+esac
diff --git a/emulators/suse100_gtk2/DESCR b/emulators/suse100_gtk2/DESCR
index 962f8891e8f..bc684571d53 100644
--- a/emulators/suse100_gtk2/DESCR
+++ b/emulators/suse100_gtk2/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
-GTK2 shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require GTK+-2.x shared libraries.
diff --git a/emulators/suse100_gtk2/INSTALL b/emulators/suse100_gtk2/INSTALL
index ad34cc92f13..1336efe570f 100644
--- a/emulators/suse100_gtk2/INSTALL
+++ b/emulators/suse100_gtk2/INSTALL
@@ -1,15 +1,17 @@
-# $NetBSD: INSTALL,v 1.2 2007/02/18 12:34:19 tonio Exp $
+# $NetBSD: INSTALL,v 1.3 2007/07/29 05:18:48 jlam Exp $
 #
 # Initialize gtk/pango module configuration.
 #
 case ${STAGE} in
-    POST-INSTALL)
-        @EMULDIR@/opt/gnome/bin/gtk-query-immodules-2.0@BINSUFFIX@ > @EMULDIR@/etc/opt/gnome/gtk-2.0/gtk.immodules
+POST-INSTALL)
+	GNOME_BINDIR="${PKG_PREFIX}/@EMULSUBDIR@/opt/gnome/bin"
+	GNOME_ETCDIR="${PKG_PREFIX}/@EMULSUBDIR@/etc/opt/gnome"
 
-        @EMULDIR@/opt/gnome/bin/gdk-pixbuf-query-loaders@BINSUFFIX@ > @EMULDIR@/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders
+	${ECHO} "${PKGNAME}: initializing GTK/Pango module configuration"
+        ${GNOME_BINDIR}/gtk-query-immodules-2.0@BINSUFFIX@ > ${GNOME_ETCDIR}/gtk-2.0/gtk.immodules
 
-        @EMULDIR@/opt/gnome/bin/pango-querymodules@BINSUFFIX@ > @EMULDIR@/etc/opt/gnome/pango/pango.modules                
-	;;
-    *)
+        ${GNOME_BINDIR}/gdk-pixbuf-query-loaders@BINSUFFIX@ > ${GNOME_ETCDIR}/gtk-2.0/gdk-pixbuf.loaders
+
+        ${GNOME_BINDIR}/pango-querymodules@BINSUFFIX@ > ${GNOME_ETCDIR}/pango/pango.modules
 	;;
 esac
diff --git a/emulators/suse100_gtk2/Makefile b/emulators/suse100_gtk2/Makefile
index 4406d208e1c..70f91b36917 100644
--- a/emulators/suse100_gtk2/Makefile
+++ b/emulators/suse100_gtk2/Makefile
@@ -1,32 +1,27 @@
-# $NetBSD: Makefile,v 1.8 2007/04/19 15:30:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2007/07/29 05:18:48 jlam Exp $
 
-DISTNAME=		suse_gtk2-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_gtk2-${SUSE_VERSION}
+PKGREVISION=	4
+CATEGORIES=	emulators
+DISTFILES=	atk-1.10.3-2.${SUSE_ARCH}.rpm				\
+		glib2-2.8.1-3.${SUSE_ARCH}.rpm				\
+		gtk2-2.8.3-4.7.${SUSE_ARCH}.rpm				\
+		cairo-1.0.0-7.4.${SUSE_ARCH}.rpm			\
+		glitz-0.4.4-4.${SUSE_ARCH}.rpm				\
+		pango-1.10.0-3.${SUSE_ARCH}.rpm
 
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for GTK2 binaries
+MAINTAINER=	tonio@NetBSD.org
+COMMENT=	Linux compatibility package for GTK+-2.x
 
-DEPENDS+=		suse_fontconfig-${SUSE_VERSION}{,nb*}:../../emulators/suse100_fontconfig
-DEPENDS+=		suse_freetype2-${SUSE_VERSION}{,nb*}:../../emulators/suse100_freetype2
-DEPENDS+=		suse_libjpeg-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libjpeg
-DEPENDS+=		suse_libpng-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libpng
-DEPENDS+=		suse_libtiff-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libtiff
-DEPENDS+=		suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
+EMUL_MODULES.linux=	fontconfig freetype2 jpeg png tiff x11
 
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
+# These files are managed by the +INSTALL/+DEINSTALL scripts.
+CHECK_FILES_SKIP+=	${EMULDIR}/etc/opt/gnome/gtk-2.0/gtk.immodules
+CHECK_FILES_SKIP+=	${EMULDIR}/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders
+CHECK_FILES_SKIP+=	${EMULDIR}/etc/opt/gnome/pango/pango.modules
 
-# Initialize gtk/pango modules.
-FILES_SUBST+=		EMULDIR=${EMULDIR:Q}
-FILES_SUBST+=		BINSUFFIX=${BINSUFFIX:Q}
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
-
-SUSE_INCLUDE_MAKEFILE_ARCH=	yes
+BINSUFFIX?=	# empty
+FILES_SUBST+=	BINSUFFIX=${BINSUFFIX:Q}
 
 .include "../../emulators/suse100_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_gtk2/Makefile.i386 b/emulators/suse100_gtk2/Makefile.i386
deleted file mode 100644
index c8ddfeb6c0f..00000000000
--- a/emulators/suse100_gtk2/Makefile.i386
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.4 2007/03/24 21:52:51 salo Exp $
-
-RPMFILES=		atk-1.10.3-2.${SUSE_ARCH}.rpm \
-			glib2-2.8.1-3.${SUSE_ARCH}.rpm \
-			gtk2-2.8.3-4.7.${SUSE_ARCH}.rpm \
-			cairo-1.0.0-7.4.${SUSE_ARCH}.rpm \
-			glitz-0.4.4-4.${SUSE_ARCH}.rpm \
-			pango-1.10.0-3.${SUSE_ARCH}.rpm
-
-BINSUFFIX=
diff --git a/emulators/suse100_gtk2/Makefile.powerpc b/emulators/suse100_gtk2/Makefile.powerpc
deleted file mode 100644
index 2200043a08b..00000000000
--- a/emulators/suse100_gtk2/Makefile.powerpc
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.4 2007/03/24 21:52:51 salo Exp $
-
-RPMFILES=		atk-1.10.3-2.${SUSE_ARCH}.rpm \
-			glib2-2.8.1-3.${SUSE_ARCH}.rpm \
-			gtk2-2.8.3-4.7.${SUSE_ARCH}.rpm \
-			cairo-1.0.0-7.4.${SUSE_ARCH}.rpm \
-			glitz-0.4.4-4.${SUSE_ARCH}.rpm \
-			pango-1.10.0-3.${SUSE_ARCH}.rpm
-
-BINSUFFIX=
diff --git a/emulators/suse100_gtk2/Makefile.x86_64 b/emulators/suse100_gtk2/Makefile.x86_64
deleted file mode 100644
index ada1129d2e6..00000000000
--- a/emulators/suse100_gtk2/Makefile.x86_64
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.4 2007/03/24 21:52:51 salo Exp $
-
-RPMFILES=		atk-1.10.3-2.${SUSE_ARCH}.rpm \
-			glib2-2.8.1-3.${SUSE_ARCH}.rpm \
-			gtk2-2.8.3-4.7.${SUSE_ARCH}.rpm \
-			cairo-1.0.0-7.4.${SUSE_ARCH}.rpm \
-			glitz-0.4.4-4.${SUSE_ARCH}.rpm \
-			pango-1.10.0-3.${SUSE_ARCH}.rpm
-
-BINSUFFIX=	-64
diff --git a/emulators/suse100_gtk2/PLIST b/emulators/suse100_gtk2/PLIST
deleted file mode 100644
index 72158d5fc79..00000000000
--- a/emulators/suse100_gtk2/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/03/09 20:38:51 tonio Exp $
-${EMULSUBDIR}/etc/opt/gnome/gtk-2.0/gtk.immodules
-${EMULSUBDIR}/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders
-${EMULSUBDIR}/etc/opt/gnome/pango/pango.modules
diff --git a/emulators/suse100_gtk2/suse.x86_64.mk b/emulators/suse100_gtk2/suse.x86_64.mk
new file mode 100644
index 00000000000..9f5b0ad0565
--- /dev/null
+++ b/emulators/suse100_gtk2/suse.x86_64.mk
@@ -0,0 +1,4 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:18:49 jlam Exp $
+
+# Suffix on the GTK+-2.x/Pango binaries used in the INSTALL script
+BINSUFFIX=	-64
diff --git a/emulators/suse100_libcups/DESCR b/emulators/suse100_libcups/DESCR
index 63bc28d4eca..2ecf12ed3fb 100644
--- a/emulators/suse100_libcups/DESCR
+++ b/emulators/suse100_libcups/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 linked with cups shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require CUPS shared libraries.
diff --git a/emulators/suse100_libcups/Makefile b/emulators/suse100_libcups/Makefile
index e21682eea09..5cbb4d2e68a 100644
--- a/emulators/suse100_libcups/Makefile
+++ b/emulators/suse100_libcups/Makefile
@@ -1,22 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:50 jlam Exp $
 
-DISTNAME=		suse_libcups-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_libcups-${SUSE_VERSION}
+PKGREVISION=	3
+CATEGORIES=	emulators
+DISTFILES=	cups-libs-1.1.23-21.6.${SUSE_ARCH}.rpm
 
-MAINTAINER=		markd@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the Cups library
+MAINTAINER=	markd@NetBSD.org
+COMMENT=	Linux compatibility package for CUPS
 
-DEPENDS+=		suse_openssl-${SUSE_VERSION}{,nb*}:../../emulators/suse100_openssl
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-SUSE_INCLUDE_MAKEFILE_ARCH=	yes
+EMUL_MODULES.linux=	openssl
 
 .include "../../emulators/suse100_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_libcups/Makefile.i386 b/emulators/suse100_libcups/Makefile.i386
deleted file mode 100644
index aefe14c0dd4..00000000000
--- a/emulators/suse100_libcups/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.2 2007/03/24 21:52:51 salo Exp $
-
-RPMFILES=		cups-libs-1.1.23-21.6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libcups/Makefile.powerpc b/emulators/suse100_libcups/Makefile.powerpc
deleted file mode 100644
index 030a48e5e04..00000000000
--- a/emulators/suse100_libcups/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.2 2007/03/24 21:52:51 salo Exp $
-
-RPMFILES=		cups-libs-1.1.23-21.6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libcups/Makefile.x86_64 b/emulators/suse100_libcups/Makefile.x86_64
deleted file mode 100644
index 070a37b4647..00000000000
--- a/emulators/suse100_libcups/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.2 2007/03/24 21:52:51 salo Exp $
-
-RPMFILES=		cups-libs-1.1.23-21.6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libjpeg/DESCR b/emulators/suse100_libjpeg/DESCR
index 3fe7a54d422..b9297dc4d48 100644
--- a/emulators/suse100_libjpeg/DESCR
+++ b/emulators/suse100_libjpeg/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 linked with jpeg shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require JPEG shared libraries.
diff --git a/emulators/suse100_libjpeg/Makefile b/emulators/suse100_libjpeg/Makefile
index 4e0a265d59f..473496957f3 100644
--- a/emulators/suse100_libjpeg/Makefile
+++ b/emulators/suse100_libjpeg/Makefile
@@ -1,23 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:51 jlam Exp $
 
-DISTNAME=		suse_libjpeg-${SUSE_VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_libjpeg-${SUSE_VERSION}
+PKGREVISION=	2
+CATEGORIES=	emulators
+DISTFILES=	libjpeg-6.2.0-739.${SUSE_ARCH}.rpm
 
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the JPEG library
+MAINTAINER=	tonio@NetBSD.org
+COMMENT=	Linux compatibility package for JPEG
 
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-LIBTOOLIZE_PLIST=	NO
-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_libjpeg/Makefile.i386 b/emulators/suse100_libjpeg/Makefile.i386
deleted file mode 100644
index 2e514eecb30..00000000000
--- a/emulators/suse100_libjpeg/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/03/09 20:37:33 tonio Exp $
-
-RPMFILES=		libjpeg-6.2.0-739.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libjpeg/Makefile.powerpc b/emulators/suse100_libjpeg/Makefile.powerpc
deleted file mode 100644
index e997f59f99e..00000000000
--- a/emulators/suse100_libjpeg/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/03/09 20:37:33 tonio Exp $
-
-RPMFILES=		libjpeg-6.2.0-739.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libjpeg/Makefile.x86_64 b/emulators/suse100_libjpeg/Makefile.x86_64
deleted file mode 100644
index bffc9b5ac1a..00000000000
--- a/emulators/suse100_libjpeg/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/03/09 20:37:33 tonio Exp $
-
-RPMFILES=		libjpeg-6.2.0-739.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libpng/DESCR b/emulators/suse100_libpng/DESCR
index f330608b9fc..23bdd4b7227 100644
--- a/emulators/suse100_libpng/DESCR
+++ b/emulators/suse100_libpng/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 linked with png shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require PNG shared libraries.
diff --git a/emulators/suse100_libpng/Makefile b/emulators/suse100_libpng/Makefile
index 9e7529b92ea..601b447dfd1 100644
--- a/emulators/suse100_libpng/Makefile
+++ b/emulators/suse100_libpng/Makefile
@@ -1,22 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2007/04/19 15:30:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2007/07/29 05:18:52 jlam Exp $
 
-DISTNAME=		suse_libpng-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_libpng-${SUSE_VERSION}
+PKGREVISION=	3
+CATEGORIES=	emulators
+DISTFILES=	libpng-1.2.8-5.2.${SUSE_ARCH}.rpm
 
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the PNG library
+MAINTAINER=	tonio@NetBSD.org
+COMMENT=	Linux compatibility package for PNG
 
-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_libpng/Makefile.i386 b/emulators/suse100_libpng/Makefile.i386
deleted file mode 100644
index a1b3b6a771b..00000000000
--- a/emulators/suse100_libpng/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.2 2006/12/06 10:35:58 wiz Exp $
-
-RPMFILES=		libpng-1.2.8-5.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libpng/Makefile.powerpc b/emulators/suse100_libpng/Makefile.powerpc
deleted file mode 100644
index be131b36f60..00000000000
--- a/emulators/suse100_libpng/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.2 2006/12/06 10:35:58 wiz Exp $
-
-RPMFILES=		libpng-1.2.8-5.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libpng/Makefile.x86_64 b/emulators/suse100_libpng/Makefile.x86_64
deleted file mode 100644
index b47853e883a..00000000000
--- a/emulators/suse100_libpng/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.2 2006/12/06 10:35:58 wiz Exp $
-
-RPMFILES=		libpng-1.2.8-5.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libtiff/DESCR b/emulators/suse100_libtiff/DESCR
index 6eb5ded69a7..8a6de414578 100644
--- a/emulators/suse100_libtiff/DESCR
+++ b/emulators/suse100_libtiff/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 linked with tiff shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require TIFF shared libraries.
diff --git a/emulators/suse100_libtiff/Makefile b/emulators/suse100_libtiff/Makefile
index f7758f65ddd..c8ce6105945 100644
--- a/emulators/suse100_libtiff/Makefile
+++ b/emulators/suse100_libtiff/Makefile
@@ -1,22 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2007/04/19 15:30:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2007/07/29 05:18:52 jlam Exp $
 
-DISTNAME=		suse_libtiff-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_libtiff-${SUSE_VERSION}
+PKGREVISION=	4
+CATEGORIES=	emulators
+DISTFILES=	libtiff-3.7.3-2.6.${SUSE_ARCH}.rpm
 
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the TIFF library
+MAINTAINER=	tonio@NetBSD.org
+COMMENT=	Linux compatibility package for TIFF
 
-DEPENDS+=		suse_libjpeg-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libjpeg
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-SUSE_INCLUDE_MAKEFILE_ARCH=	yes
+EMUL_MODULES.linux=	jpeg
 
 .include "../../emulators/suse100_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_libtiff/Makefile.i386 b/emulators/suse100_libtiff/Makefile.i386
deleted file mode 100644
index 31b6a755fc0..00000000000
--- a/emulators/suse100_libtiff/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.3 2006/08/02 14:26:13 salo Exp $
-
-RPMFILES=		libtiff-3.7.3-2.6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libtiff/Makefile.powerpc b/emulators/suse100_libtiff/Makefile.powerpc
deleted file mode 100644
index 1d19558fda9..00000000000
--- a/emulators/suse100_libtiff/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.3 2006/08/02 14:26:13 salo Exp $
-
-RPMFILES=		libtiff-3.7.3-2.6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libtiff/Makefile.x86_64 b/emulators/suse100_libtiff/Makefile.x86_64
deleted file mode 100644
index abe1444fc35..00000000000
--- a/emulators/suse100_libtiff/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.3 2006/08/02 14:26:13 salo Exp $
-
-RPMFILES=		libtiff-3.7.3-2.6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libxml2/DESCR b/emulators/suse100_libxml2/DESCR
index 5748383626e..93549c57c7e 100644
--- a/emulators/suse100_libxml2/DESCR
+++ b/emulators/suse100_libxml2/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 libxml2 shared
-libraries.
+This package supports running ELF binaries linked with glibc2 that
+require libxml2 shared libraries.
diff --git a/emulators/suse100_libxml2/Makefile b/emulators/suse100_libxml2/Makefile
index 85a2cd7e8ba..7536fc791dc 100644
--- a/emulators/suse100_libxml2/Makefile
+++ b/emulators/suse100_libxml2/Makefile
@@ -1,22 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2007/04/19 15:30:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2007/07/29 05:18:53 jlam Exp $
 
 DISTNAME=	suse_libxml2-${SUSE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SUSE100}
-DISTFILES=	${RPMFILES}
+DISTFILES=	libxml2-2.6.20-4.${SUSE_ARCH}.rpm
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.suse.com/
-COMMENT=	Linux compatibility package for the libxml2 library
+COMMENT=	Linux compatibility package for libxml2
 
-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_libxml2/Makefile.i386 b/emulators/suse100_libxml2/Makefile.i386
deleted file mode 100644
index 8117679d2da..00000000000
--- a/emulators/suse100_libxml2/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/06/13 11:30:48 salo Exp $
-
-RPMFILES=		libxml2-2.6.20-4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libxml2/Makefile.powerpc b/emulators/suse100_libxml2/Makefile.powerpc
deleted file mode 100644
index d93a64cd8a5..00000000000
--- a/emulators/suse100_libxml2/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/06/13 11:30:48 salo Exp $
-
-RPMFILES=		libxml2-2.6.20-4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libxml2/Makefile.x86_64 b/emulators/suse100_libxml2/Makefile.x86_64
deleted file mode 100644
index 725a04f0822..00000000000
--- a/emulators/suse100_libxml2/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/06/13 11:30:48 salo Exp $
-
-RPMFILES=		libxml2-2.6.20-4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_linux/Makefile.common b/emulators/suse100_linux/Makefile.common
index bde7eaeb487..e2ebfb575dc 100644
--- a/emulators/suse100_linux/Makefile.common
+++ b/emulators/suse100_linux/Makefile.common
@@ -1,18 +1,32 @@
-# $NetBSD: Makefile.common,v 1.15 2007/05/04 23:46:56 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.16 2007/07/29 05:18:54 jlam Exp $
 
-.include "../../emulators/suse100_linux/vars.mk"
-.include "../../emulators/suse100_linux/compat32.mk"
-.include "../../emulators/suse100_linux/arch.mk"
+SUSE_PKG=		yes
+SUSE_VERSION=		10.0
+SUSE_VERSION_REQD=	${SUSE_VERSION}
 
-ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-i386 NetBSD-3.99*-x86_64 \
-			NetBSD-[2-9]*-powerpc \
-			NetBSD-[4-9]*-x86_64 FreeBSD-*-i386 \
-			DragonFly-*-i386
+EMUL_PLATFORMS?=	linux-i386 linux-powerpc linux-x86_64
+
+.include "../../mk/bsd.prefs.mk"
+
+# The SuSE 10.x Linux packages are only usable on the following platforms.
+ONLY_FOR_PLATFORM+=	DragonFly-*-i386
+ONLY_FOR_PLATFORM+=	FreeBSD-*-i386
+ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-i386
+ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-powerpc
+ONLY_FOR_PLATFORM+=	NetBSD-3.99*-x86_64
+ONLY_FOR_PLATFORM+=	NetBSD-[4-9]*-x86_64
+
+# _SUSE_ARCH.* is a table of ${EMUL_ARCH} to SuSE architectures.
+_SUSE_ARCH.${EMUL_ARCH}=	${EMUL_ARCH}
+_SUSE_ARCH.i386=		i586
+_SUSE_ARCH.powerpc=		ppc
+_SUSE_ARCH=			${_SUSE_ARCH.${EMUL_ARCH}}
+SUSE_ARCH=			${_SUSE_ARCH}
 
 _SUSE_FTP_SUBDIR=	distribution/SL-${SUSE_VERSION}-OSS/inst-source/suse/${SUSE_ARCH}/
-_SUSE_FTP_SUBDIR_UPD=	suse/${SUSE_ARCH_DIR}/update/${SUSE_VERSION}/rpm/${SUSE_ARCH}/
+_SUSE_FTP_SUBDIR_UPD=	suse/update/${SUSE_VERSION}/rpm/${SUSE_ARCH}/
 
-MASTER_SITE_SUSE100?= \
+MASTER_SITE_SUSE_${SUSE_VERSION}=	\
 	ftp://suse.inode.at/opensuse/${_SUSE_FTP_SUBDIR} \
 	http://suse.inode.at/opensuse/${_SUSE_FTP_SUBDIR} \
 	ftp://suse.inode.at/pub/update/${SUSE_VERSION}/rpm/${SUSE_ARCH}/ \
@@ -25,106 +39,35 @@ 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
+MASTER_SITES?=		${MASTER_SITE_SUSE_${SUSE_VERSION}}
 DIST_SUBDIR?=		suse${SUSE_VERSION:S/.//}/${SUSE_ARCH}
-.endif
+
+HOMEPAGE?=		http://www.suse.com/
 
 WRKSRC?=		${WRKDIR}
+BUILD_DIRS?=		# empty
 MANCOMPRESSED?=		yes
 
-# Don't check any script interpreter, as long as nobody complains.
-CHECK_INTERPRETER_SKIP=	*
+EMUL_PKG_FMT?=		rpm
+RPM2PKG_PREFIX?=	${PREFIX}
+RPM2PKG_SUBPREFIX?=	${EMULSUBDIR}
+RPM2PKG_STAGE?=		do-install
 
-OPSYS_EMULSUBDIR=	linux${SUSE_COMPAT32_SUFFIX}
-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}
+.if (${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64")
+PKGNAME:=		${DISTNAME:S/^suse_/suse32_/}
+COMMENT:=		${COMMENT:S/Linux/Linux 32-bit/}
+LINUX_BASE=		linux32
 .else
-OPSYS_EMULDIR=		/${EMULSUBDIR}
-.endif
-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
-
-BUILD_DEFS+=		RPMFILES
-.if defined(RPMIGNOREPATH)
-BUILD_DEFS+=		RPMIGNOREPATH
-.endif
-
-# 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)
-RPM2PKGARGS+=		-s ${RPM2PKGSTRIP}
-.  endif
-.  for TEMP in ${RPMIGNOREPATH}
-RPM2PKGARGS+=		-i ${TEMP}
-.  endfor
-.  for TEMP in ${RPMFILES}
-RPM2PKGARGS+=		${DISTDIR}/${DIST_SUBDIR}/${TEMP}
-.  endfor
+LINUX_BASE=		linux
 .endif
+PLIST_SUBST+=		LINUX_BASE=${LINUX_BASE:Q}
+FILES_SUBST+=		LINUX_BASE=${LINUX_BASE:Q}
 
-# regenerate distinfo for all platforms supported by the suse100_* packages
-suse100-distinfo:
-	( ${ECHO} '$$'NetBSD'$$';			\
-	${ECHO} '';					\
-	MACHINE_ARCH=i386 ${MAKE} distinfo 1>&2;	\
-		${GREP} rpm distinfo;			\
-	MACHINE_ARCH=powerpc ${MAKE} distinfo 1>&2;	\
-		${GREP} rpm distinfo;			\
-	MACHINE_ARCH=x86_64 ${MAKE} distinfo 1>&2;	\
-		${GREP} rpm distinfo;			\
-	) > distinfo.new
-	${MV} -f distinfo.new distinfo
+LINUX_LIBSUBDIR?=	lib
+PLIST_SUBST+=		LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q}
+FILES_SUBST+=		LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q}
 
-.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}; \
-	else \
-	  ${RM} -f ${PLIST_SRC}; \
-	  ${CP} ${PKGSRCDIR}/emulators/suse_linux/PLIST_dynamic ${PLIST_SRC} ; \
-	fi
-	@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 \
-	  ${ECHO_MSG} "===> [Automatic Linux shared object handling]"; \
-	  ${EMULDIR}/sbin/ldconfig -r ${EMULDIR}; \
-	  ${MV} -f ${PLIST_SRC} ${PLIST_SRC}.old; \
-	  ${GREP} -v '^@dirrm' ${PLIST_SRC}.old >${PLIST_SRC} || ${TRUE}; \
-	  ${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" >>${PLIST_SRC}; \
-	  ${ECHO} "@unexec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR} 2>/dev/null" >>${PLIST_SRC}; \
-	  ${GREP} '^@dirrm' ${PLIST_SRC}.old >>${PLIST_SRC} || ${TRUE}; \
-	  ${RM} -f ${PLIST_SRC}.old; \
-	fi
-.  endif
-.endif
+# Include an "override" SuSE-specific and architecture-specific
+# Makefile fragment if it exists.
+#
+.sinclude "suse.${EMUL_ARCH}.mk"
diff --git a/emulators/suse100_linux/arch.mk b/emulators/suse100_linux/arch.mk
deleted file mode 100644
index a81df844cef..00000000000
--- a/emulators/suse100_linux/arch.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: arch.mk,v 1.1.1.1 2006/03/09 20:33:46 tonio Exp $
-
-.ifndef SUSE_ARCH_MK
-SUSE_ARCH_MK=1
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-SUSE_ARCH?=	i586
-SUSE_ARCH_DIR?=	${MACHINE_ARCH}
-.elif ${MACHINE_ARCH} == "powerpc"
-SUSE_ARCH?=	ppc
-.else
-SUSE_ARCH?=	${MACHINE_ARCH}
-.endif
-
-SUSE_ARCH_DIR?=	${SUSE_ARCH}
-
-.endif # SUSE_ARCH_MK
diff --git a/emulators/suse100_linux/compat32.mk b/emulators/suse100_linux/compat32.mk
deleted file mode 100644
index 4349b0ef361..00000000000
--- a/emulators/suse100_linux/compat32.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-# $NetBSD: compat32.mk,v 1.4 2007/04/20 21:35:00 xtraeme Exp $
-#
-
-.ifndef SUSE_LINUX_COMPAT32_MK
-SUSE_LINUX_COMPAT32_MK=	# defined
-
-.include "../../mk/bsd.prefs.mk"
-
-.  if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "x86_64"
-
-#
-# We must protect this part with packages that are using
-# the options framework, otherwise we'll end executing two
-# targets for the options.
-#
-.  ifndef SUSE_COMPAT32_OPT
-PKG_OPTIONS_VAR=	PKG_OPTIONS.suse
-PKG_SUPPORTED_OPTIONS=	compat32
-
-.    include "../../mk/bsd.options.mk"
-.  else
-ONLY_FOR_PLATFORM:=	${ONLY_FOR_PLATFORM} NetBSD-*-x86_64
-#MACHINE_ARCH:=		i386
-DEPENDS:=		${DEPENDS:S/suse/suse32/}
-EMULSUBDIR:=		emul/linux32
-.  endif
-
-STRING_ERROR1=		\
-	"This package is not compatible with x86_64 without using "
-STRING_ERROR2=		\
-	"PKG_OPTIONS.suse=compat32."
-MYSTRING=		${STRING_ERROR1}${STRING_ERROR2}
-
-.    if !empty(PKG_OPTIONS:Mcompat32)
-#
-# We don't need to override the following vars in packages using
-# SUSE_COMPAT32, because this is only required for the suse 
-# packages.
-#
-.      ifndef SUSE_COMPAT32
-#
-# Override required vars
-#
-PKGNAME:=		${DISTNAME:S/suse/suse32/}
-COMMENT:=		${COMMENT:S/Linux/Linux 32/}
-SUSE_ARCH:=		i586
-.      endif
-#
-# This is common for all linux packages.
-#
-MACHINE_ARCH:=		i386
-ARCH:=			${MACHINE_ARCH}
-DEPENDS:=		${DEPENDS:S/suse/suse32/}
-LINUX_LIB:=		lib
-BINSUFFIX:=		# empty
-#
-# Use the correct directories.
-#
-OPSYS_EMULSUBDIR=	linux32
-SUSE_COMPAT32_SUFFIX=	32
-EMULSUBDIR:=		emul/linux32
-.    else
-OPSYS_EMULSUBDIR=	linux
-SUSE_COMPAT32_SUFFIX=	# empty
-.      if defined(ONLY_FOR_PLATFORM) && \
-	    empty(ONLY_FOR_PLATFORM:MNetBSD-*-x86_64)
-PKG_FAIL_REASON+=	${MYSTRING}
-.      endif
-.    endif # end of PKG_OPTIONS.suse=compat32
-.  endif # end of NetBSD && x86_64
-#
-# This is to avoid to use the same code on every package
-# many times.
-#
-.  ifdef SUSE_INCLUDE_MAKEFILE_ARCH
-.    if exists(Makefile.${MACHINE_ARCH})
-.      include "Makefile.${MACHINE_ARCH}"
-.    endif
-.  endif
-
-.endif # end of SUSE_LINUX_COMPAT32_MK
diff --git a/emulators/suse100_linux/emulator.mk b/emulators/suse100_linux/emulator.mk
new file mode 100644
index 00000000000..3b022e062ce
--- /dev/null
+++ b/emulators/suse100_linux/emulator.mk
@@ -0,0 +1,50 @@
+# $NetBSD: emulator.mk,v 1.1 2007/07/29 05:18:55 jlam Exp $
+#
+# This file is included by linux-suse.mk in the emulator framework.
+#
+# Variables set by this file:
+#
+# EMUL_DISTRO
+#	The SuSE Linux distribution.
+#
+# DEPENDS_${EMUL_DISTRO}.*
+#	A table that maps "modules" to SuSE package dependencies.
+#
+
+EMUL_DISTRO=		suse-10.0
+
+.if defined(SUSE_PKG)
+_SUSE_VERSION_REQD=	-${SUSE_VERSION_REQD}{,nb*}
+.else
+_SUSE_VERSION_REQD=	>=${SUSE_VERSION_REQD}
+.endif
+
+# DEPENDS_suse-10.0.* maps Linux "modules" to SuSE package dependencies.
+DEPENDS_suse-10.0.aspell?=	suse_aspell${_SUSE_VERSION_REQD}:../../emulators/suse100_aspell
+DEPENDS_suse-10.0.base?=	suse_base${_SUSE_VERSION_REQD}:../../emulators/suse100_base
+DEPENDS_suse-10.0.compat?=	suse_compat${_SUSE_VERSION_REQD}:../../emulators/suse100_compat
+DEPENDS_suse-10.0.cups?=	suse_libcups${_SUSE_VERSION_REQD}:../../emulators/suse100_libcups
+DEPENDS_suse-10.0.expat?=	suse_expat${_SUSE_VERSION_REQD}:../../emulators/suse100_expat
+DEPENDS_suse-10.0.fontconfig?=	suse_fontconfig${_SUSE_VERSION_REQD}:../../emulators/suse100_fontconfig
+DEPENDS_suse-10.0.freetype2?=	suse_freetype2${_SUSE_VERSION_REQD}:../../emulators/suse100_freetype2
+DEPENDS_suse-10.0.gdk-pixbuf?=	suse_gdk-pixbuf${_SUSE_VERSION_REQD}:../../emulators/suse100_gdk-pixbuf
+DEPENDS_suse-10.0.glx?=	suse_glx${_SUSE_VERSION_REQD}:../../emulators/suse100_glx
+DEPENDS_suse-10.0.gtk?=	suse_gtk${_SUSE_VERSION_REQD}:../../emulators/suse100_gtk
+DEPENDS_suse-10.0.gtk2?=	suse_gtk2${_SUSE_VERSION_REQD}:../../emulators/suse100_gtk2
+DEPENDS_suse-10.0.jpeg?=	suse_libjpeg${_SUSE_VERSION_REQD}:../../emulators/suse100_libjpeg
+DEPENDS_suse-10.0.locale?=	suse_locale${_SUSE_VERSION_REQD}:../../emulators/suse100_locale
+DEPENDS_suse-10.0.motif?=	suse_openmotif${_SUSE_VERSION_REQD}:../../emulators/suse100_openmotif
+DEPENDS_suse-10.0.openssl?=	suse_openssl${_SUSE_VERSION_REQD}:../../emulators/suse100_openssl
+DEPENDS_suse-10.0.png?=	suse_libpng${_SUSE_VERSION_REQD}:../../emulators/suse100_libpng
+DEPENDS_suse-10.0.slang?=	suse_slang${_SUSE_VERSION_REQD}:../../emulators/suse100_slang
+DEPENDS_suse-10.0.tiff?=	suse_libtiff${_SUSE_VERSION_REQD}:../../emulators/suse100_libtiff
+DEPENDS_suse-10.0.vmware?=	suse_vmware${_SUSE_VERSION_REQD}:../../emulators/suse100_vmware
+DEPENDS_suse-10.0.x11?=	suse_x11${_SUSE_VERSION_REQD}:../../emulators/suse100_x11
+DEPENDS_suse-10.0.xml2?=	suse_libxml2${_SUSE_VERSION_REQD}:../../emulators/suse100_libxml2
+
+.if (${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64")
+.  for _mod_ in ${_LINUX_MODULES}
+DEPENDS_suse-10.0.${_mod_}:=	\
+	${DEPENDS_suse-10.0.${_mod_}:S/^suse_/suse32_/}
+.  endfor
+.endif
diff --git a/emulators/suse100_linux/vars.mk b/emulators/suse100_linux/vars.mk
deleted file mode 100644
index 7f78258bdaf..00000000000
--- a/emulators/suse100_linux/vars.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: vars.mk,v 1.1.1.1 2006/03/09 20:33:46 tonio Exp $
-
-.ifndef SUSE_VARS_MK
-SUSE_VARS_MK=1
-
-SUSE_DIR_PREFIX=	suse100
-SUSE_VERSION=		10.0
-
-.endif # SUSE_VARS_MK
diff --git a/emulators/suse100_locale/DESCR b/emulators/suse100_locale/DESCR
index 25484919ed3..f5796d1ef9e 100644
--- a/emulators/suse100_locale/DESCR
+++ b/emulators/suse100_locale/DESCR
@@ -1,4 +1,5 @@
-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 includes the glibc locale files.
+This package contains the glibc2 locale files.
diff --git a/emulators/suse100_locale/Makefile b/emulators/suse100_locale/Makefile
index 71a4a30e311..6c1db2fe4ec 100644
--- a/emulators/suse100_locale/Makefile
+++ b/emulators/suse100_locale/Makefile
@@ -1,24 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:55 jlam Exp $
 
-DISTNAME=		suse_locale-${SUSE_VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_locale-${SUSE_VERSION}
+PKGREVISION=	2
+CATEGORIES=	emulators
+DISTFILES=	glibc-locale-2.3.5-40.${SUSE_ARCH}.rpm
 
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Locale files for the Linux compatibility package
+CONFLICTS=	linux-locale-[0-9]*
 
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
+MAINTAINER=	tonio@NetBSD.org
+COMMENT=	Linux compatibility package with locale files
 
-CONFLICTS=		linux-locale-[0-9]*
-
-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_locale/Makefile.i386 b/emulators/suse100_locale/Makefile.i386
deleted file mode 100644
index 90b6fccd962..00000000000
--- a/emulators/suse100_locale/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/03/13 10:25:35 tonio Exp $
-
-RPMFILES=		glibc-locale-2.3.5-40.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_locale/Makefile.powerpc b/emulators/suse100_locale/Makefile.powerpc
deleted file mode 100644
index 6355c572d00..00000000000
--- a/emulators/suse100_locale/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/03/13 10:25:35 tonio Exp $
-
-RPMFILES=		glibc-locale-2.3.5-40.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_locale/Makefile.x86_64 b/emulators/suse100_locale/Makefile.x86_64
deleted file mode 100644
index 270741ff188..00000000000
--- a/emulators/suse100_locale/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/03/13 10:25:35 tonio Exp $
-
-RPMFILES=		glibc-locale-2.3.5-40.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_openmotif/DESCR b/emulators/suse100_openmotif/DESCR
index f67dbf54135..a24d084b127 100644
--- a/emulators/suse100_openmotif/DESCR
+++ b/emulators/suse100_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/suse100_openmotif/Makefile b/emulators/suse100_openmotif/Makefile
index 74adf372e2c..8c45280b4fc 100644
--- a/emulators/suse100_openmotif/Makefile
+++ b/emulators/suse100_openmotif/Makefile
@@ -1,22 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2007/04/19 15:30:22 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2007/07/29 05:18:56 jlam Exp $
 
-DISTNAME=		suse_openmotif-${SUSE_VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_openmotif-${SUSE_VERSION}
+PKGREVISION=	2
+CATEGORIES=	emulators
 
-MAINTAINER=		tron@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the Motif library
+MAINTAINER=	tron@NetBSD.org
+COMMENT=	Linux compatibility package for OpenMotif
 
-DEPENDS+=		suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-SUSE_INCLUDE_MAKEFILE_ARCH=	yes
+EMUL_MODULES.linux=	x11
 
 .include "../../emulators/suse100_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_openmotif/Makefile.i386 b/emulators/suse100_openmotif/Makefile.i386
deleted file mode 100644
index 878ef2f0470..00000000000
--- a/emulators/suse100_openmotif/Makefile.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/04/18 09:01:36 tron Exp $
-
-RPMFILES=		openmotif-libs-2.2.3-13.${SUSE_ARCH}.rpm \
-			openmotif21-libs-2.1.30MLI4-128.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_openmotif/Makefile.powerpc b/emulators/suse100_openmotif/Makefile.powerpc
deleted file mode 100644
index 63b92bcbceb..00000000000
--- a/emulators/suse100_openmotif/Makefile.powerpc
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1 2006/04/18 09:29:47 salo Exp $
-
-RPMFILES=		openmotif-libs-2.2.3-13.${SUSE_ARCH}.rpm \
-			openmotif21-libs-2.1.30MLI4-128.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_openmotif/Makefile.x86_64 b/emulators/suse100_openmotif/Makefile.x86_64
deleted file mode 100644
index 7829ea9b7ad..00000000000
--- a/emulators/suse100_openmotif/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/04/18 09:29:47 salo Exp $
-
-RPMFILES=		openmotif-libs-2.2.3-13.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_openmotif/suse.i386.mk b/emulators/suse100_openmotif/suse.i386.mk
new file mode 100644
index 00000000000..3a7e5db26f8
--- /dev/null
+++ b/emulators/suse100_openmotif/suse.i386.mk
@@ -0,0 +1,5 @@
+# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:18:57 jlam Exp $
+
+# SuSE i386 RPMs
+DISTFILES+=	openmotif-libs-2.2.3-13.${SUSE_ARCH}.rpm
+DISTFILES+=	openmotif21-libs-2.1.30MLI4-128.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_openmotif/suse.powerpc.mk b/emulators/suse100_openmotif/suse.powerpc.mk
new file mode 100644
index 00000000000..0365bd54936
--- /dev/null
+++ b/emulators/suse100_openmotif/suse.powerpc.mk
@@ -0,0 +1,5 @@
+# $NetBSD: suse.powerpc.mk,v 1.1 2007/07/29 05:18:57 jlam Exp $
+
+# SuSE PowerPC RPMs
+DISTFILES+=	openmotif-libs-2.2.3-13.${SUSE_ARCH}.rpm
+DISTFILES+=	openmotif21-libs-2.1.30MLI4-128.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_openmotif/suse.x86_64.mk b/emulators/suse100_openmotif/suse.x86_64.mk
new file mode 100644
index 00000000000..e31e61ac061
--- /dev/null
+++ b/emulators/suse100_openmotif/suse.x86_64.mk
@@ -0,0 +1,4 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:18:57 jlam Exp $
+
+# SuSE x86_64 RPMs
+DISTFILES=	openmotif-libs-2.2.3-13.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_openssl/DESCR b/emulators/suse100_openssl/DESCR
index 2f0601735d1..13eec82d7d4 100644
--- a/emulators/suse100_openssl/DESCR
+++ b/emulators/suse100_openssl/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 openssl shared
-libraries.
+This package supports running ELF binaries linked with glibc2 that
+require OpenSSL shared libraries.
diff --git a/emulators/suse100_openssl/Makefile b/emulators/suse100_openssl/Makefile
index 45781473145..4ebfe67a5db 100644
--- a/emulators/suse100_openssl/Makefile
+++ b/emulators/suse100_openssl/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:18:57 jlam Exp $
 
-DISTNAME=		suse_openssl-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_openssl-${SUSE_VERSION}
+PKGREVISION=	4
+CATEGORIES=	emulators
+DISTFILES=	openssl-0.9.7g-2.12.${SUSE_ARCH}.rpm
 
-MAINTAINER=		markd@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the OpenSSL library
+MAINTAINER=	markd@NetBSD.org
+COMMENT=	Linux compatibility package for OpenSSL
 
-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_openssl/Makefile.i386 b/emulators/suse100_openssl/Makefile.i386
deleted file mode 100644
index e5d18b28c72..00000000000
--- a/emulators/suse100_openssl/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.3 2007/03/24 21:52:51 salo Exp $
-
-RPMFILES=		openssl-0.9.7g-2.12.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_openssl/Makefile.powerpc b/emulators/suse100_openssl/Makefile.powerpc
deleted file mode 100644
index fe5dfc4df9e..00000000000
--- a/emulators/suse100_openssl/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.3 2007/03/24 21:52:51 salo Exp $
-
-RPMFILES=		openssl-0.9.7g-2.12.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_openssl/Makefile.x86_64 b/emulators/suse100_openssl/Makefile.x86_64
deleted file mode 100644
index c0e4c4c2b0d..00000000000
--- a/emulators/suse100_openssl/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.3 2007/03/24 21:52:51 salo Exp $
-
-RPMFILES=		openssl-0.9.7g-2.12.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_slang/DESCR b/emulators/suse100_slang/DESCR
index f9f21396127..f870b1b9b9f 100644
--- a/emulators/suse100_slang/DESCR
+++ b/emulators/suse100_slang/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
-the "slang" library.
+This package supports running ELF binaries linked with glibc2 that
+require S-Lang shared libraries.
diff --git a/emulators/suse100_slang/Makefile b/emulators/suse100_slang/Makefile
index 5b48a342908..c0311a3a591 100644
--- a/emulators/suse100_slang/Makefile
+++ b/emulators/suse100_slang/Makefile
@@ -1,27 +1,20 @@
-# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:22 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:58 jlam Exp $
 
-DISTNAME=		suse_slang-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_slang-${SUSE_VERSION}
+PKGREVISION=	3
+CATEGORIES=	emulators
+DISTFILES=	slang-1.4.9-127.${SUSE_ARCH}.rpm
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for slang library
+MAINTAINER=	pkgsrc-users@NetBSD.org
+COMMENT=	Linux compatibility package for S-Lang
 
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
+EMUL_MODULES.linux=	base
 
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
-
-SUSE_INCLUDE_MAKEFILE_ARCH=	yes
+# This symlink is managed by ldconfig(8).
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/${LINUX_LIBSUBDIR}/libslang.so.1
 
 post-install:
-	cd ${PREFIX}/${EMULSUBDIR}/usr/lib &&  \
-		${LN} -sf libslang-utf8.so.1 libslang.so.1
+	cd ${EMULDIR}/usr/lib && ${LN} -fs libslang-utf8.so.1 libslang.so.1
 
 .include "../../emulators/suse100_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_slang/Makefile.i386 b/emulators/suse100_slang/Makefile.i386
deleted file mode 100644
index 919a4929a5c..00000000000
--- a/emulators/suse100_slang/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/04/18 14:43:27 salo Exp $
-
-RPMFILES=		slang-1.4.9-127.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_slang/Makefile.powerpc b/emulators/suse100_slang/Makefile.powerpc
deleted file mode 100644
index ad5d557c2f3..00000000000
--- a/emulators/suse100_slang/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/04/18 14:43:27 salo Exp $
-
-RPMFILES=		slang-1.4.9-127.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_slang/Makefile.x86_64 b/emulators/suse100_slang/Makefile.x86_64
deleted file mode 100644
index 448940cc2e0..00000000000
--- a/emulators/suse100_slang/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/04/18 14:43:27 salo Exp $
-
-RPMFILES=		slang-1.4.9-127.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_slang/PLIST b/emulators/suse100_slang/PLIST
deleted file mode 100644
index 4451b4a5386..00000000000
--- a/emulators/suse100_slang/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/06/30 16:20:24 salo Exp $
-@exec ${LN} -sf %D/${EMULSUBDIR}/usr/lib/libslang-utf8.so.1 %D/${EMULSUBDIR}/usr/lib/libslang.so.1
diff --git a/emulators/suse100_slang/PLIST_rpmfix.i386 b/emulators/suse100_slang/PLIST_rpmfix.i386
deleted file mode 100644
index ba94212ba3d..00000000000
--- a/emulators/suse100_slang/PLIST_rpmfix.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST_rpmfix.i386,v 1.1 2006/04/28 14:15:06 joerg Exp $
-/usr/lib/libslang.so.1
diff --git a/emulators/suse100_vmware/DEINSTALL b/emulators/suse100_vmware/DEINSTALL
new file mode 100644
index 00000000000..eaf7327d1f8
--- /dev/null
+++ b/emulators/suse100_vmware/DEINSTALL
@@ -0,0 +1,9 @@
+# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:19:00 jlam Exp $
+
+case "${STAGE}" in
+DEINSTALL)
+	# Run any actions that require root privileges.
+	${TEST} ! -x ./+ROOT_ACTIONS ||
+		./+ROOT_ACTIONS REMOVE ${PKG_METADATA_DIR} || exit 1
+	;;
+esac
diff --git a/emulators/suse100_vmware/DESCR b/emulators/suse100_vmware/DESCR
index 9777e703fdd..efff03682f1 100644
--- a/emulators/suse100_vmware/DESCR
+++ b/emulators/suse100_vmware/DESCR
@@ -1,4 +1,5 @@
-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 is supposed to help running VMware under NetBSD.
+This package is a helper package for running VMware.
diff --git a/emulators/suse100_vmware/INSTALL b/emulators/suse100_vmware/INSTALL
new file mode 100644
index 00000000000..c1d5d28d67c
--- /dev/null
+++ b/emulators/suse100_vmware/INSTALL
@@ -0,0 +1,156 @@
+# $NetBSD: INSTALL,v 1.1 2007/07/29 05:19:00 jlam Exp $
+
+# Generate a +ROOT_ACTIONS script that runs certain actions that require
+# superuser privileges.
+#
+case "${STAGE},$1" in
+UNPACK,|UNPACK,+ROOT_ACTIONS)
+	${CAT} > ./+ROOT_ACTIONS << 'EOF'
+#!@SH@
+#
+# +ROOT_ACTIONS - run actions requiring superuser privileges
+#
+# Usage: ./+ROOT_ACTIONS ADD|REMOVE [metadatadir]
+#
+# This script runs certain actions that require superuser privileges.
+# If such privileges are not available, then simply output a message
+# asking the user to run this script with the appropriate elevated
+# privileges.
+#
+# Lines starting with "# SYMLINK: " are data read by this script that
+# name the source paths and corresponding symlink that is managed by
+# this script.  If the symlink path is relative, then it is taken to be
+# relative to ${PKG_PREFIX}.  The source path is always unchanged.
+#
+#	# SYMLINK: /dev/rcd0a ${EMULSUBDIR}/dev/cdrom
+#
+
+CAT="@CAT@"
+CHMOD="@CHMOD@"
+ECHO="@ECHO@"
+ID="@ID@"
+LN="@LN@"
+PWD_CMD="@PWD_CMD@"
+RM="@RM@"
+SED="@SED@"
+TEST="@TEST@"
+
+SELF=$0
+ACTION=$1
+
+CURDIR=`${PWD_CMD}`
+PKG_METADATA_DIR="${2-${CURDIR}}"
+: ${PKGNAME=${PKG_METADATA_DIR##*/}}
+: ${PKG_PREFIX=@PREFIX@}
+
+ROOT_ACTIONS_COOKIE="${PKG_METADATA_DIR}/+ROOT_ACTIONS_done"
+EUID=`${ID} -u`
+
+exitcode=0
+case $ACTION,$EUID in
+ADD,0)
+	${ECHO} "" > ${ROOT_ACTIONS_COOKIE}
+	${CHMOD} g+w ${ROOT_ACTIONS_COOKIE}
+	${SED} -n "/^\# SYMLINK: /{s/^\# SYMLINK: //;p;}" ${SELF} |
+	while read src dst; do
+		case $src in
+		"")	continue ;;
+		esac
+		case $dst in
+		"")	continue ;;
+		[!/]*)	dst="${PKG_PREFIX}/$dst" ;;
+		esac
+
+		if ${TEST} ! -e "$dst"; then
+			${ECHO} "${PKGNAME}: linking $dst -> $src"
+			${LN} -fs "$src" "$dst"
+		fi
+	done
+	;;
+
+REMOVE,0)
+	${SED} -n "/^\# SYMLINK: /{s/^\# SYMLINK: //;p;}" ${SELF} |
+	while read src dst; do
+		case $src in
+		"")	continue ;;
+		esac
+		case $dst in
+		"")	continue ;;
+		[!/]*)	dst="${PKG_PREFIX}/$dst" ;;
+		esac
+
+		if ${TEST} -e "$dst"; then
+			${ECHO} "${PKGNAME}: removing $dst"
+			${RM} -f "$dst"
+		fi
+	done
+	${RM} -f ${ROOT_ACTIONS_COOKIE}
+	;;
+
+ADD,*)
+	if ${TEST} ! -f ${ROOT_ACTIONS_COOKIE}; then
+		${CAT} << EOM
+==============================================================================
+Please run the following command with superuser privileges to complete
+the installation of ${PKGNAME}:
+
+    cd ${PKG_METADATA_DIR} && ${SELF} ADD
+
+==============================================================================
+EOM
+	fi
+	;;
+
+REMOVE,*)
+	if ${TEST} -f ${ROOT_ACTIONS_COOKIE}; then
+		${CAT} << EOM
+==============================================================================
+Please run the following command with superuser privileges to begin the
+removal of ${PKGNAME}:
+
+    cd ${PKG_METADATA_DIR} && ${SELF} REMOVE
+
+Then, please run pkg_delete(1) again to complete the removal of this
+package.
+
+==============================================================================
+EOM
+		exitcode=1
+	fi
+	;;
+esac
+exit $exitcode
+
+EOF
+	${SED} -n "/^\# SYMLINK: /p" ${SELF} >> ./+ROOT_ACTIONS
+	${CHMOD} +x ./+ROOT_ACTIONS
+	;;
+esac
+
+# SYMLINK: /dev/rcd0a @EMULSUBDIR@/dev/cdrom
+# SYMLINK: /dev/rfd0a @EMULSUBDIR@/dev/fd0
+# SYMLINK: /dev/wd0d @EMULSUBDIR@/dev/hda
+# SYMLINK: /dev/wd1d @EMULSUBDIR@/dev/hdb
+# SYMLINK: /dev/wd2d @EMULSUBDIR@/dev/hdc
+# SYMLINK: /dev/wd3d @EMULSUBDIR@/dev/hdd
+# SYMLINK: /dev/sd0d @EMULSUBDIR@/dev/hde
+# SYMLINK: /dev/sd1d @EMULSUBDIR@/dev/hdf
+# SYMLINK: /dev/sd2d @EMULSUBDIR@/dev/hdg
+# SYMLINK: /dev/sd3d @EMULSUBDIR@/dev/hdh
+# SYMLINK: /dev/sd4d @EMULSUBDIR@/dev/hdi
+# SYMLINK: /dev/ttyE0 @EMULSUBDIR@/dev/tty1
+# SYMLINK: /dev/ttyE1 @EMULSUBDIR@/dev/tty2
+# SYMLINK: /dev/ttyE2 @EMULSUBDIR@/dev/tty3
+# SYMLINK: /dev/ttyE3 @EMULSUBDIR@/dev/tty4
+# SYMLINK: /dev/ttyE4 @EMULSUBDIR@/dev/tty5
+# SYMLINK: /dev/ttyE5 @EMULSUBDIR@/dev/tty6
+# SYMLINK: /dev/ttyE6 @EMULSUBDIR@/dev/tty7
+# SYMLINK: /dev/ttyE7 @EMULSUBDIR@/dev/tty8
+# SYMLINK: tty1 @EMULSUBDIR@/dev/tty0
+
+case "${STAGE}" in
+POST-INSTALL)
+	${TEST} ! -x ./+ROOT_ACTIONS ||
+		./+ROOT_ACTIONS ADD ${PKG_METADATA_DIR}
+	;;
+esac
diff --git a/emulators/suse100_vmware/Makefile b/emulators/suse100_vmware/Makefile
index bc8b623fd91..31e7ed9870a 100644
--- a/emulators/suse100_vmware/Makefile
+++ b/emulators/suse100_vmware/Makefile
@@ -1,35 +1,15 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/21 16:10:13 tron Exp $
+# $NetBSD: Makefile,v 1.2 2007/07/29 05:19:00 jlam Exp $
 
 DISTNAME=	suse_vmware-${SUSE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SUSE100}
-DISTFILES=	${RPMFILES}
+DISTFILES=	grep-2.5.1a-5.${SUSE_ARCH}.rpm
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.suse.com/
-COMMENT=	Linux compatibility package to support running VMware
+COMMENT=	Linux compatibility package to help run VMware
 
-DEPENDS+=	suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
-DEPENDS+=	suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
-
-EXTRACT_ONLY=	# empty
-NO_BUILD=	YES
-PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST+=	EMULSUBDIR=${EMULSUBDIR:Q}
-
-RPMFILES=	grep-2.5.1a-5.i586.rpm
-RPMIGNOREPATH=	usr
-
-post-install:
-	${GREP} -v '^#' ${FILESDIR}/device-links | \
-	${AWK} '{print("${LN} -fs "$$1" ${EMULDIR}/dev/"$$2)}' | \
-	${SH} -
-	${GREP} -v '^#' ${FILESDIR}/device-links | \
-	${AWK} '{print("@exec ${LN} -fs "$$1" %D/${EMULSUBDIR}/dev/"$$2)}' \
-	  >>${PLIST_SRC}
-	${GREP} -v '^#' ${FILESDIR}/device-links | \
-	${AWK} '{print("@unexec ${RM} -f %D/${EMULSUBDIR}/dev/"$$2)}' \
-	  >>${PLIST_SRC}
+EMUL_MODULES.linux=	base x11
+RPMIGNOREPATH=		usr
 
 .include "../../emulators/suse100_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_vmware/PLIST b/emulators/suse100_vmware/PLIST
deleted file mode 100644
index c2dda48050e..00000000000
--- a/emulators/suse100_vmware/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/03/21 16:10:13 tron Exp $
-@comment this plist intentionally left empty
diff --git a/emulators/suse100_vmware/distinfo b/emulators/suse100_vmware/distinfo
index 8c544fcff27..41dd56c3353 100644
--- a/emulators/suse100_vmware/distinfo
+++ b/emulators/suse100_vmware/distinfo
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/21 16:10:13 tron Exp $
+$NetBSD: distinfo,v 1.2 2007/07/29 05:19:01 jlam Exp $
 
 SHA1 (suse100/i586/grep-2.5.1a-5.i586.rpm) = 728aab187b21e2e3ca8157a04e6bfec289c0fe43
 RMD160 (suse100/i586/grep-2.5.1a-5.i586.rpm) = 884f721b66cf236d7baccf83711495ed67529e52
 Size (suse100/i586/grep-2.5.1a-5.i586.rpm) = 179908 bytes
+SHA1 (suse100/ppc/grep-2.5.1a-5.ppc.rpm) = 8a73f4feb5c263c33899d4466545f083d888b6fd
+RMD160 (suse100/ppc/grep-2.5.1a-5.ppc.rpm) = a9da42c0b55eb8984a51c6b64f213ddb1e207537
+Size (suse100/ppc/grep-2.5.1a-5.ppc.rpm) = 187765 bytes
+SHA1 (suse100/x86_64/grep-2.5.1a-5.x86_64.rpm) = 0727852e8e75fb8af48dc463882efe810e76378a
+RMD160 (suse100/x86_64/grep-2.5.1a-5.x86_64.rpm) = cfde4f3da0f7a1fb463f46ef5dbaa9ef0b2a949a
+Size (suse100/x86_64/grep-2.5.1a-5.x86_64.rpm) = 182763 bytes
diff --git a/emulators/suse100_vmware/files/device-links b/emulators/suse100_vmware/files/device-links
deleted file mode 100644
index fb13c5500f6..00000000000
--- a/emulators/suse100_vmware/files/device-links
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: device-links,v 1.1.1.1 2007/03/21 16:10:13 tron Exp $
-/dev/rcd0a cdrom
-/dev/rfd0a fd0
-/dev/wd0d hda
-/dev/wd1d hdb
-/dev/wd2d hdc
-/dev/wd3d hdd
-/dev/sd0d hde
-/dev/sd1d hdf
-/dev/sd2d hdg
-/dev/sd3d hdh
-/dev/sd4d hdi
-/dev/ttyE0 tty1
-/dev/ttyE1 tty2
-/dev/ttyE2 tty3
-/dev/ttyE3 tty4
-/dev/ttyE4 tty5
-/dev/ttyE5 tty6
-/dev/ttyE6 tty7
-/dev/ttyE7 tty8
-tty1 tty0
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
diff --git a/emulators/suse91_aspell/DESCR b/emulators/suse91_aspell/DESCR
index 62e5a3f87e9..824b179f770 100644
--- a/emulators/suse91_aspell/DESCR
+++ b/emulators/suse91_aspell/DESCR
@@ -1,5 +1,5 @@
-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 it.
 
-This package supports running ELF binaries linked with glibc2 which don't
-require X11 shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require aspell shared libraries.
diff --git a/emulators/suse91_aspell/Makefile b/emulators/suse91_aspell/Makefile
index 698f08429df..68fe745368f 100644
--- a/emulators/suse91_aspell/Makefile
+++ b/emulators/suse91_aspell/Makefile
@@ -1,24 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.11 2007/07/29 05:19:02 jlam Exp $
 
-DISTNAME=		suse_aspell-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_aspell-${SUSE_VERSION}
+PKGREVISION=	4
+CATEGORIES=	emulators
+DISTFILES=	aspell-0.50.5-38.4.${SUSE_ARCH}.rpm
 
-MAINTAINER=		jdolecek@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for Aspell library
+MAINTAINER=	jdolecek@NetBSD.org
+COMMENT=	Linux compatibility package for aspell
 
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+EMUL_MODULES.linux=	base
 
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_aspell/Makefile.i386 b/emulators/suse91_aspell/Makefile.i386
deleted file mode 100644
index b4dd2849563..00000000000
--- a/emulators/suse91_aspell/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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
deleted file mode 100644
index 523d98c7265..00000000000
--- a/emulators/suse91_aspell/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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_base/DEINSTALL b/emulators/suse91_base/DEINSTALL
new file mode 100644
index 00000000000..28db71f2665
--- /dev/null
+++ b/emulators/suse91_base/DEINSTALL
@@ -0,0 +1,27 @@
+# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:19:03 jlam Exp $
+
+EMULDIR="${PKG_PREFIX}/@EMULSUBDIR@"
+
+case "${STAGE}" in
+DEINSTALL)
+	# Run any actions that require root privileges.
+	${TEST} ! -x ./+ROOT_ACTIONS ||
+		./+ROOT_ACTIONS REMOVE ${PKG_METADATA_DIR} || exit 1
+
+	# Blow away the /proc directory
+	${RM} -fr ${EMULDIR}/proc
+
+	# Remove a stray symlink that would normally be managed by
+	# ldconfig(8).
+	#
+	${RM} -f ${EMULDIR}/usr/@LINUX_LIBSUBDIR@/libz.so.1
+
+	# Remove some files created by pkgsrc.
+	${RM} -f ${EMULDIR}/etc/ld.so.cache
+	${RM} -f ${EMULDIR}/etc/mtab
+	${RM} -f ${EMULDIR}/etc/group
+	${RM} -f ${EMULDIR}/etc/gshadow
+	${RM} -f ${EMULDIR}/etc/passwd
+	${RM} -f ${EMULDIR}/etc/shadow
+	;;
+esac
diff --git a/emulators/suse91_base/DESCR b/emulators/suse91_base/DESCR
index 62e5a3f87e9..e850f8c5bb7 100644
--- a/emulators/suse91_base/DESCR
+++ b/emulators/suse91_base/DESCR
@@ -1,5 +1,5 @@
-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 it.
 
-This package supports running ELF binaries linked with glibc2 which don't
-require X11 shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+don't require X11 shared libraries.
diff --git a/emulators/suse91_base/INSTALL b/emulators/suse91_base/INSTALL
index b4da446a9b9..6edf26b6c4f 100644
--- a/emulators/suse91_base/INSTALL
+++ b/emulators/suse91_base/INSTALL
@@ -1,29 +1,149 @@
-# $NetBSD: INSTALL,v 1.3 2006/06/23 15:48:50 jlam Exp $
+# $NetBSD: INSTALL,v 1.4 2007/07/29 05:19:04 jlam Exp $
 
-case "${STAGE}" in
-POST-INSTALL)
-	emulsubdir=linux
+# Generate a +ROOT_ACTIONS script that runs certain actions that require
+# superuser privileges.
+#
+case "${STAGE},$1" in
+UNPACK,|UNPACK,+ROOT_ACTIONS)
+	${CAT} > ./+ROOT_ACTIONS << 'EOF'
+#!@SH@
+#
+# +ROOT_ACTIONS - run actions requiring superuser privileges
+#
+# Usage: ./+ROOT_ACTIONS ADD|REMOVE [metadatadir]
+#
+# This script runs certain actions that require superuser privileges.
+# If such privileges are not available, then simply output a message
+# asking the user to run this script with the appropriate elevated
+# privileges.
+#
+
+CAT="@CAT@"
+CHMOD="@CHMOD@"
+CP="@CP@"
+ECHO="@ECHO@"
+ID="@ID@"
+LN="@LN@"
+MKDIR="@MKDIR@"
+PWD_CMD="@PWD_CMD@"
+RM="@RM@"
+SH="@SH@"
+TEST="@TEST@"
+
+SELF=$0
+ACTION=$1
+
+CURDIR=`${PWD_CMD}`
+PKG_METADATA_DIR="${2-${CURDIR}}"
+: ${PKGNAME=${PKG_METADATA_DIR##*/}}
+: ${PKG_PREFIX=@PREFIX@}
 
-	emuldir="@OPSYS_EMULDIR@"
-	pkgemuldir="${PKG_PREFIX}/emul/$emulsubdir"
+EMULDIR="${PKG_PREFIX}/@EMULSUBDIR@"
+OPSYS_EMULDIR="@OPSYS_EMULDIR@"
 
-	emuldir_pwd=`cd $emuldir 2>/dev/null && ${PWD_CMD}`
-	pkgemuldir_pwd=`cd $pkgemuldir 2>/dev/null && ${PWD_CMD}`
+ROOT_ACTIONS_COOKIE="${PKG_METADATA_DIR}/+ROOT_ACTIONS_done"
+EUID=`${ID} -u`
 
-	if ${TEST} "$emuldir_pwd" != "$pkgemuldir_pwd"; then
-		if ${TEST} -e $emuldir -o -L $emuldir; then
-			${CAT} << EOF
+exitcode=0
+case $ACTION,$EUID in
+ADD,0)
+	${ECHO} "" > ${ROOT_ACTIONS_COOKIE}
+	${CHMOD} g+w ${ROOT_ACTIONS_COOKIE}
+	# Create an appropriate Linux-like /dev directory.
+	${ECHO} "${PKGNAME}: populating ${EMULDIR}/dev"
+	${MKDIR} ${EMULDIR}/dev
+	${TEST} ! -f /dev/MAKEDEV ||
+		${CP} /dev/MAKEDEV ${EMULDIR}/dev
+	${TEST} ! -f /dev/MAKEDEV.subr ||
+		${CP} /dev/MAKEDEV.subr ${EMULDIR}/dev
+	( cd ${EMULDIR}/dev &&
+	  ${SH} ./MAKEDEV std audio &&
+	  ${LN} -fs sound dsp )
+
+	# Create the appropriate symlink so that the kernel will
+	# find the installed files.
+	#
+	OPSYS_EMULDIR_PWD=`cd ${OPSYS_EMULDIR} 2>/dev/null && ${PWD_CMD}`
+	EMULDIR_PWD=`cd ${EMULDIR} 2>/dev/null && ${PWD_CMD}`
+
+	if ${TEST} "${OPSYS_EMULDIR_PWD}" != "${EMULDIR_PWD}"; then
+		if ${TEST} -e ${OPSYS_EMULDIR} -o -L ${OPSYS_EMULDIR}; then
+			${CAT} << EOM
 ==============================================================================
-You must create a symbolic link for ${PKGNAME} to work properly:
+The following symbolic link must be created for ${PKGNAME}
+to work properly:
 
-	$pkgemuldir  ->  $emuldir
+	${EMULDIR} -> ${OPSYS_EMULDIR}
 
-It seems there is something else located at $emuldir.
 ==============================================================================
-EOF
+EOM
 		else
-			${MKDIR} -p /emul && ${LN} -fs $pkgemuldir $emuldir
+			${ECHO} "${PKGNAME}: creating symlink ${EMULDIR} -> ${OPSYS_EMULDIR}"
+			( ${MKDIR} -p `${DIRNAME} ${OPSYS_EMULDIR}` && 
+			  ${LN} -fs ${EMULDIR} ${OPSYS_EMULDIR} ) || ${TRUE}
 		fi
 	fi
 	;;
+
+REMOVE,0)
+	${ECHO} "${PKGNAME}: removing ${EMULDIR}/dev"
+	${RM} -fr ${EMULDIR}/dev
+	${RM} -f ${ROOT_ACTIONS_COOKIE}
+	;;
+
+ADD,*)
+	if ${TEST} ! -f ${ROOT_ACTIONS_COOKIE}; then
+		${CAT} << EOM
+==============================================================================
+Please run the following command with superuser privileges to complete
+the installation of ${PKGNAME}:
+
+    cd ${PKG_METADATA_DIR} && ${SELF} ADD
+
+==============================================================================
+EOM
+	fi
+	;;
+
+REMOVE,*)
+	if ${TEST} -f ${ROOT_ACTIONS_COOKIE}; then
+		${CAT} << EOM
+==============================================================================
+Please run the following command with superuser privileges to begin the
+removal of ${PKGNAME}:
+
+    cd ${PKG_METADATA_DIR} && ${SELF} REMOVE
+
+Then, please run pkg_delete(1) again to complete the removal of this
+package.
+
+==============================================================================
+EOM
+		exitcode=1
+	fi
+	;;
+esac
+exit $exitcode
+
+EOF
+	${CHMOD} +x ./+ROOT_ACTIONS
+	;;
+esac
+
+EMULDIR="${PKG_PREFIX}/@EMULSUBDIR@"
+OPSYS_EMULDIR="@OPSYS_EMULDIR@"
+
+case "${STAGE}" in
+POST-INSTALL)
+	# Create a /proc mount point.
+	${MKDIR} -p ${EMULDIR}/proc
+
+	# Make /etc/mtab usable for Linux programs.
+	${RM} -f ${EMULDIR}/etc/mtab
+	${LN} -fs ${EMULDIR}/proc/mounts ${EMULDIR}/etc/mtab
+
+	# Run any actions that require root privileges.
+	${TEST} ! -x ./+ROOT_ACTIONS ||
+		./+ROOT_ACTIONS ADD ${PKG_METADATA_DIR}
+	;;
 esac
diff --git a/emulators/suse91_base/Makefile b/emulators/suse91_base/Makefile
index 7efa78acf65..d06b6b431cb 100644
--- a/emulators/suse91_base/Makefile
+++ b/emulators/suse91_base/Makefile
@@ -1,29 +1,18 @@
-# $NetBSD: Makefile,v 1.26 2007/02/22 19:26:28 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2007/07/29 05:19:04 jlam Exp $
 
-DISTNAME=		suse_base-${SUSE_VERSION}
-PKGREVISION=		12
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_base-${SUSE_VERSION}
+PKGREVISION=	13
+CATEGORIES=	emulators
 
-MAINTAINER=		tron@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package
+MAINTAINER=	tron@NetBSD.org
+COMMENT=	Linux compatibility package
 
-CONFLICTS=		linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]*
+CONFLICTS=	linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]*
 
-# these files are handled by manually during de-/installation/pkg_add
-CHECK_FILES_SKIP+=	${PREFIX}/${EMULSUBDIR}/dev/.*
-CHECK_FILES_SKIP+=	${PREFIX}/${EMULSUBDIR}/etc/ld.so.cache
-CHECK_INTERPRETER_SKIP+=	${PREFIX}/${EMULSUBDIR}/*
-
-EXTRACT_ONLY=		# empty
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q} LINUX_LIB=${LINUX_LIB:Q}
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+# These files are managed by the +INSTALL/+DEINSTALL scripts.
+CHECK_FILES_SKIP+=	${EMULDIR}/dev/.*
+CHECK_FILES_SKIP+=	${EMULDIR}/etc/ld.so.cache
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/${LINUX_LIBSUBDIR}/libz.so.1
 
 RPMIGNOREPATH=		./etc/bash.bashrc ./etc/bash_completion.d \
 			./etc/cron.daily ./etc/csh.cshrc ./etc/csh.login \
@@ -32,48 +21,34 @@ RPMIGNOREPATH=		./etc/bash.bashrc ./etc/bash_completion.d \
 			./etc/pam.d ./etc/profile ./etc/profile.dos \
 			./etc/rc.d.README ./etc/rpc ./etc/shells ./etc/ttytype
 
-LINUX_LDD=		${PREFIX}/${EMULSUBDIR}/usr/bin/ldd
-LINUX_LIB?=		lib
-
-.include "../../mk/bsd.prefs.mk"
+LINUX_LDD=		${EMULDIR}/usr/bin/ldd
+LINUX_LDCONFIG=		${EMULDIR}/usr/sbin/ldconfig
 
 INSTALLATION_DIRS=	sbin
+OWN_DIRS+=		${EMULSUBDIR}
+
+SUBST_CLASSES+=		suse
+SUBST_STAGE.suse=	do-build
+SUBST_FILES.suse=	SuSE-release linux-mkpwd.sh
+SUBST_VARS.suse=	EMULDIR SUSE_ARCH SUSE_VERSION
+
+# Some platforms, e.g. FreeBSD, need to "brand" the ELF binaries to
+# the correct type.
+#
+BRANDELF_CMD=	${BRANDELF:D${BRANDELF} -t Linux ${LINUX_LDCONFIG}:U${TRUE}}
 
-do-build:
-	@for FILE in ${FILESDIR}/SuSE-release ${FILESDIR}/*.sh; do \
-	  ${SED} -e 's#@@EMULDIR@@#${EMULDIR}#g' \
-	         -e 's#@@EMULSUBDIR@@#${EMULSUBDIR}#g' \
-	         -e 's#@@LINUX_LIB@@#${LINUX_LIB}#g' \
-	         -e 's#@@VERSION@@#${SUSE_VERSION}#g' \
-	         -e 's#@@ARCH@@#${SUSE_ARCH}#g' \
-	    $$FILE >${WRKDIR}/`basename $$FILE`; \
-	done
+post-extract:
+	${CP} ${FILESDIR}/SuSE-release ${WRKSRC}
+	${CP} ${FILESDIR}/*.sh ${WRKSRC}
 
 do-install:
-	for FILE in ${WRKDIR}/*.sh; do \
-	  ${INSTALL_SCRIPT} $$FILE ${PREFIX}/sbin/`basename $$FILE .sh`; \
-	done
-	${INSTALL_DATA_DIR} ${EMULDIR}/dev
-	${INSTALL_DATA} /dev/MAKEDEV ${EMULDIR}/dev
-	cd ${EMULDIR}/dev && ${SH} ./MAKEDEV  std audio
-	cd ${EMULDIR}/dev && ${LN} -fs sound dsp
-	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	${RPM2PKG} ${RPM2PKGARGS}
-	${ECHO} "@dirrm ${EMULSUBDIR}" >>${PLIST_SRC}
-	${INSTALL_DATA} ${WRKDIR}/SuSE-release ${EMULDIR}/etc
-	${INSTALL_DATA_DIR} ${EMULDIR}/proc
-	${LN} -fs ${EMULDIR}/proc/mounts ${EMULDIR}/etc/mtab
-.if ${OPSYS} == "FreeBSD"
-	${BRANDELF} -t Linux ${EMULDIR}/sbin/ldconfig
-.endif
-	${EMULDIR}/sbin/ldconfig -r ${EMULDIR}
-	${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" \
-	  >>${PLIST_SRC}
-	${ECHO} "@unexec ${RMDIR} %D/${EMULSUBDIR}/etc 2>/dev/null || ${TRUE}" \
-	  >>${PLIST_SRC}
+	${INSTALL_SCRIPT} ${WRKSRC}/linux-mkpwd.sh \
+		${PREFIX}/sbin/${LINUX_BASE}-mkpwd
+	${INSTALL_DATA} ${WRKSRC}/SuSE-release ${EMULDIR}/etc
+	${BRANDELF_CMD}
 	${SED}	-e 's:#! :#! ${EMULDIR}:' \
 		-e 's:^RTLD=:RTLD=/${EMULSUBDIR}:' \
-		< ${LINUX_LDD} > ${LINUX_LDD}.new
+		${LINUX_LDD} > ${LINUX_LDD}.new
 	${MV} ${LINUX_LDD}.new ${LINUX_LDD}
 	${CHMOD} +x ${LINUX_LDD}
 
diff --git a/emulators/suse91_base/Makefile.i386 b/emulators/suse91_base/Makefile.i386
deleted file mode 100644
index 39285912de1..00000000000
--- a/emulators/suse91_base/Makefile.i386
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.3 2005/11/06 14:52:43 salo Exp $
-
-RPMFILES=		aaa_base-9.1-0.29.${SUSE_ARCH}.rpm \
-			bash-2.05b-305.1.${SUSE_ARCH}.rpm \
-			coreutils-5.2.1-23.8.${SUSE_ARCH}.rpm \
-			glibc-2.3.3-98.${SUSE_ARCH}.rpm \
-			libgcc-3.3.3-41.${SUSE_ARCH}.rpm \
-			libacl-2.2.21-54.4.${SUSE_ARCH}.rpm \
-			libattr-2.4.12-56.${SUSE_ARCH}.rpm \
-			libselinux-1.8-16.${SUSE_ARCH}.rpm \
-			libstdc++-3.3.3-41.${SUSE_ARCH}.rpm \
-			ncurses-5.4-61.3.${SUSE_ARCH}.rpm \
-			readline-4.3-306.${SUSE_ARCH}.rpm \
-			zlib-1.2.1-70.12.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_base/Makefile.x86_64 b/emulators/suse91_base/Makefile.x86_64
deleted file mode 100644
index ae359fb2ce8..00000000000
--- a/emulators/suse91_base/Makefile.x86_64
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.4 2007/02/22 19:26:28 wiz Exp $
-
-RPMFILES=		aaa_base-9.1-0.29.${SUSE_ARCH}.rpm \
-                        bash-2.05b-305.1.${SUSE_ARCH}.rpm \
-                        coreutils-5.2.1-23.8.${SUSE_ARCH}.rpm \
-                        glibc-2.3.3-63.${SUSE_ARCH}.rpm \
-                        libgcc-3.3.3-33.${SUSE_ARCH}.rpm \
-                        libacl-2.2.21-54.4.${SUSE_ARCH}.rpm \
-                        libattr-2.4.12-44.${SUSE_ARCH}.rpm \
-                        libselinux-1.8-15.${SUSE_ARCH}.rpm \
-                        libstdc++-3.3.3-33.${SUSE_ARCH}.rpm \
-                        ncurses-5.4-61.3.${SUSE_ARCH}.rpm \
-                        readline-4.3-301.${SUSE_ARCH}.rpm \
-                        zlib-1.2.1-70.12.${SUSE_ARCH}.rpm
-
-LINUX_LIB=		lib64
diff --git a/emulators/suse91_base/PLIST b/emulators/suse91_base/PLIST
index 645527486fc..8888643a35e 100644
--- a/emulators/suse91_base/PLIST
+++ b/emulators/suse91_base/PLIST
@@ -1,15 +1,3 @@
-@comment $NetBSD: PLIST,v 1.5 2005/08/16 00:30:41 dmcmahill Exp $
-sbin/linux-mkpwd
-@unexec ${RM} -f %D/${EMULSUBDIR}/etc/ld.so.cache
-${EMULSUBDIR}/etc/SuSE-release
-${EMULSUBDIR}/etc/mtab
-${EMULSUBDIR}/usr/${LINUX_LIB}/libz.so.1
-@exec ${MKDIR} %D/${EMULSUBDIR}/proc
-@dirrm ${EMULSUBDIR}/proc
-@unexec cd %D/${EMULSUBDIR}/etc && ${RM} -f group gshadow passwd shadow
-@exec ${MKDIR} %D/${EMULSUBDIR}/dev
-@exec cp -p /dev/MAKEDEV  %D/${EMULSUBDIR}/dev
-@exec cd %D/${EMULSUBDIR}/dev && sh ./MAKEDEV std audio
-@exec cd %D/${EMULSUBDIR}/dev && ln -s sound dsp
-@unexec ${RM} -f %D/${EMULSUBDIR}/dev/*
-@dirrm ${EMULSUBDIR}/dev
+@comment $NetBSD: PLIST,v 1.6 2007/07/29 05:19:04 jlam Exp $
+sbin/${LINUX_BASE}-mkpwd
+${EMULSUBDIRSLASH}etc/SuSE-release
diff --git a/emulators/suse91_base/files/SuSE-release b/emulators/suse91_base/files/SuSE-release
index 247032986b2..728e5a77870 100644
--- a/emulators/suse91_base/files/SuSE-release
+++ b/emulators/suse91_base/files/SuSE-release
@@ -1,2 +1,2 @@
-SuSE Linux @@VERSION@@ (@@ARCH@@)
-VERSION = @@VERSION@@
+SuSE Linux @SUSE_VERSION@ (@SUSE_ARCH@)
+VERSION = @SUSE_VERSION@
diff --git a/emulators/suse91_base/files/linux-mkpwd.sh b/emulators/suse91_base/files/linux-mkpwd.sh
index 1fd4c3626bf..ea43d25adc3 100644
--- a/emulators/suse91_base/files/linux-mkpwd.sh
+++ b/emulators/suse91_base/files/linux-mkpwd.sh
@@ -1,13 +1,31 @@
 #!/bin/sh
 #
-# $NetBSD: linux-mkpwd.sh,v 1.1.1.1 2004/07/13 10:31:14 tron Exp $
+# $NetBSD: linux-mkpwd.sh,v 1.2 2007/07/29 05:19:05 jlam Exp $
+#
+
+######################################################################
+#
+# NAME
+#	@LINUX_BASE@-mkpwd -- create passwd/group files for COMPAT_LINUX
+#
+# SYNOPSYS
+#	@LINUX_BASE@-mkpwd
+#
+# DESCRIPTION
+#	@LINUX_BASE@-mkpwd creates passwd and group files and databases
+#	for a COMPAT_LINUX installation based on the files found in
+#	/etc, e.g. /etc/passwd, /etc/master.passwd, /etc/group, etc.
+#
+######################################################################
 
 SRCDIR=/etc
-DESTDIR=@@EMULDIR@@/etc
+DESTDIR=@EMULDIR@/etc
+
+[ -d $DESTDIR ] || exit 1
 
 umask 22
 cd $DESTDIR
-cp $SRCDIR/passwd .
+cp -f $SRCDIR/passwd .
 sed s/^wheel:/root:/ <$SRCDIR/group >group
 
 umask 77
diff --git a/emulators/suse91_base/suse.i386.mk b/emulators/suse91_base/suse.i386.mk
new file mode 100644
index 00000000000..1850283ca1a
--- /dev/null
+++ b/emulators/suse91_base/suse.i386.mk
@@ -0,0 +1,15 @@
+# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:05 jlam Exp $
+
+# SuSE i386 RPMs
+DISTFILES+=	aaa_base-9.1-0.29.${SUSE_ARCH}.rpm
+DISTFILES+=	bash-2.05b-305.1.${SUSE_ARCH}.rpm
+DISTFILES+=	coreutils-5.2.1-23.8.${SUSE_ARCH}.rpm
+DISTFILES+=	glibc-2.3.3-98.${SUSE_ARCH}.rpm
+DISTFILES+=	libacl-2.2.21-54.4.${SUSE_ARCH}.rpm
+DISTFILES+=	libattr-2.4.12-56.${SUSE_ARCH}.rpm
+DISTFILES+=	libgcc-3.3.3-41.${SUSE_ARCH}.rpm
+DISTFILES+=	libselinux-1.8-16.${SUSE_ARCH}.rpm
+DISTFILES+=	libstdc++-3.3.3-41.${SUSE_ARCH}.rpm
+DISTFILES+=	ncurses-5.4-61.3.${SUSE_ARCH}.rpm
+DISTFILES+=	readline-4.3-306.${SUSE_ARCH}.rpm
+DISTFILES+=	zlib-1.2.1-70.12.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_base/suse.x86_64.mk b/emulators/suse91_base/suse.x86_64.mk
new file mode 100644
index 00000000000..884314e8131
--- /dev/null
+++ b/emulators/suse91_base/suse.x86_64.mk
@@ -0,0 +1,17 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:05 jlam Exp $
+
+# SuSE x86_64 RPMs
+DISTFILES+=	aaa_base-9.1-0.29.${SUSE_ARCH}.rpm
+DISTFILES+=	bash-2.05b-305.1.${SUSE_ARCH}.rpm
+DISTFILES+=	coreutils-5.2.1-23.8.${SUSE_ARCH}.rpm
+DISTFILES+=	glibc-2.3.3-63.${SUSE_ARCH}.rpm
+DISTFILES+=	libacl-2.2.21-54.4.${SUSE_ARCH}.rpm
+DISTFILES+=	libattr-2.4.12-44.${SUSE_ARCH}.rpm
+DISTFILES+=	libgcc-3.3.3-33.${SUSE_ARCH}.rpm
+DISTFILES+=	libselinux-1.8-15.${SUSE_ARCH}.rpm
+DISTFILES+=	libstdc++-3.3.3-33.${SUSE_ARCH}.rpm
+DISTFILES+=	ncurses-5.4-61.3.${SUSE_ARCH}.rpm
+DISTFILES+=	readline-4.3-301.${SUSE_ARCH}.rpm
+DISTFILES+=	zlib-1.2.1-70.12.${SUSE_ARCH}.rpm
+
+LINUX_LIBSUBDIR=	lib64
diff --git a/emulators/suse91_compat/DESCR b/emulators/suse91_compat/DESCR
index addf8028f9b..573641b8dea 100644
--- a/emulators/suse91_compat/DESCR
+++ b/emulators/suse91_compat/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 contains some old shared libraries required for backwards
-compatibility.
+This package contains some old shared libraries required by older
+Linux binaries.
diff --git a/emulators/suse91_compat/Makefile b/emulators/suse91_compat/Makefile
index 6eb8164602c..7320d0bf46e 100644
--- a/emulators/suse91_compat/Makefile
+++ b/emulators/suse91_compat/Makefile
@@ -1,24 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.10 2007/07/29 05:19:05 jlam Exp $
 
-DISTNAME=		suse_compat-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_compat-${SUSE_VERSION}
+PKGREVISION=	3
+CATEGORIES=	emulators
 
-MAINTAINER=		tron@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package with old shared libraries
+MAINTAINER=	tron@NetBSD.org
+COMMENT=	Linux compatibility package with old shared libraries
 
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+EMUL_MODULES.linux=	base
 
 .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
deleted file mode 100644
index c91f756b2ad..00000000000
--- a/emulators/suse91_compat/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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
deleted file mode 100644
index 1c784525b32..00000000000
--- a/emulators/suse91_compat/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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/suse.i386.mk b/emulators/suse91_compat/suse.i386.mk
new file mode 100644
index 00000000000..582642f54e7
--- /dev/null
+++ b/emulators/suse91_compat/suse.i386.mk
@@ -0,0 +1,4 @@
+# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:06 jlam Exp $
+
+# SuSE i386 RPMs
+DISTFILES=	compat-2004.4.2-3.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_compat/suse.x86_64.mk b/emulators/suse91_compat/suse.x86_64.mk
new file mode 100644
index 00000000000..13dd631136e
--- /dev/null
+++ b/emulators/suse91_compat/suse.x86_64.mk
@@ -0,0 +1,3 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:06 jlam Exp $
+
+DISTFILES=	compat-2004.4.2-2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_expat/DESCR b/emulators/suse91_expat/DESCR
index 9f2f36c8801..4a64e91260e 100644
--- a/emulators/suse91_expat/DESCR
+++ b/emulators/suse91_expat/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
-expat shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require expat shared libraries.
diff --git a/emulators/suse91_expat/Makefile b/emulators/suse91_expat/Makefile
index 2dfa1483d29..08fba9dfe6b 100644
--- a/emulators/suse91_expat/Makefile
+++ b/emulators/suse91_expat/Makefile
@@ -1,25 +1,13 @@
-# $NetBSD: Makefile,v 1.8 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.9 2007/07/29 05:19:06 jlam Exp $
 
-DISTNAME=		suse_expat-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_expat-${SUSE_VERSION}
+PKGREVISION=	4
+CATEGORIES=	emulators
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for expat binaries
+MAINTAINER=	pkgsrc-users@NetBSD.org
+COMMENT=	Linux compatibility package for expat
 
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-LIBTOOLIZE_PLIST=	NO
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+EMUL_MODULES.linux=	base
 
 .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
deleted file mode 100644
index 385044ba27f..00000000000
--- a/emulators/suse91_expat/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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
deleted file mode 100644
index b29da228bdc..00000000000
--- a/emulators/suse91_expat/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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/suse.i386.mk b/emulators/suse91_expat/suse.i386.mk
new file mode 100644
index 00000000000..14e0cb99566
--- /dev/null
+++ b/emulators/suse91_expat/suse.i386.mk
@@ -0,0 +1,4 @@
+# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:07 jlam Exp $
+
+# SuSE i386 RPMs
+DISTFILES=	expat-1.95.7-37.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_expat/suse.x86_64.mk b/emulators/suse91_expat/suse.x86_64.mk
new file mode 100644
index 00000000000..8d90a9c7639
--- /dev/null
+++ b/emulators/suse91_expat/suse.x86_64.mk
@@ -0,0 +1,4 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:07 jlam Exp $
+
+# SuSE x86_64 RPMs
+DISTFILES=	expat-1.95.7-31.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_fontconfig/DESCR b/emulators/suse91_fontconfig/DESCR
index fffa11f3d2e..48a1e2cd2ab 100644
--- a/emulators/suse91_fontconfig/DESCR
+++ b/emulators/suse91_fontconfig/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
-fontconfig shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require fontconfig shared libraries.
diff --git a/emulators/suse91_fontconfig/Makefile b/emulators/suse91_fontconfig/Makefile
index fd6f9996d92..e8f661ea773 100644
--- a/emulators/suse91_fontconfig/Makefile
+++ b/emulators/suse91_fontconfig/Makefile
@@ -1,25 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.8 2007/07/29 05:19:07 jlam Exp $
 
-DISTNAME=		suse_fontconfig-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_fontconfig-${SUSE_VERSION}
+PKGREVISION=	3
+CATEGORIES=	emulators
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for fontconfig binaries
+MAINTAINER=	pkgsrc-users@NetBSD.org
+COMMENT=	Linux compatibility package for fontconfig
 
-DEPENDS+=		suse_expat-${SUSE_VERSION}{,nb*}:../../emulators/suse91_expat
-DEPENDS+=		suse_freetype2-${SUSE_VERSION}{,nb*}:../../emulators/suse91_freetype2
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+EMUL_MODULES.linux=	expat freetype2
 
 .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
deleted file mode 100644
index 430ee8a916d..00000000000
--- a/emulators/suse91_fontconfig/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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
deleted file mode 100644
index d8374752a9c..00000000000
--- a/emulators/suse91_fontconfig/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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/suse.i386.mk b/emulators/suse91_fontconfig/suse.i386.mk
new file mode 100644
index 00000000000..03ebb5bf3a1
--- /dev/null
+++ b/emulators/suse91_fontconfig/suse.i386.mk
@@ -0,0 +1,4 @@
+# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:08 jlam Exp $
+
+# SuSE i386 RPMs
+DISTFILES=	fontconfig-2.2.92.20040221-28.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_fontconfig/suse.x86_64.mk b/emulators/suse91_fontconfig/suse.x86_64.mk
new file mode 100644
index 00000000000..a4aad7e7512
--- /dev/null
+++ b/emulators/suse91_fontconfig/suse.x86_64.mk
@@ -0,0 +1,4 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:08 jlam Exp $
+
+# SuSE x86_64 RPMs
+DISTFILES=	fontconfig-2.2.92.20040221-24.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_freetype2/DESCR b/emulators/suse91_freetype2/DESCR
index b54860cc766..9d1ced14b3a 100644
--- a/emulators/suse91_freetype2/DESCR
+++ b/emulators/suse91_freetype2/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 freetype2 shared
-libraries.
+This package supports running ELF binaries linked with glibc2 that
+require freetype2 shared libraries.
diff --git a/emulators/suse91_freetype2/Makefile b/emulators/suse91_freetype2/Makefile
index d8744d8d29b..5d34255e21d 100644
--- a/emulators/suse91_freetype2/Makefile
+++ b/emulators/suse91_freetype2/Makefile
@@ -1,24 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.8 2007/07/29 05:19:09 jlam Exp $
 
-DISTNAME=		suse_freetype2-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_freetype2-${SUSE_VERSION}
+PKGREVISION=	4
+CATEGORIES=	emulators
+DISTFILES=	freetype2-2.1.7-53.6.${SUSE_ARCH}.rpm
 
-MAINTAINER=		jdolecek@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for FreeType2 library
+MAINTAINER=	jdolecek@NetBSD.org
+COMMENT=	Linux compatibility package for freetype-2.x
 
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+EMUL_MODULES.linux=	base
 
 .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
deleted file mode 100644
index f1c2ac608af..00000000000
--- a/emulators/suse91_freetype2/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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
deleted file mode 100644
index d56fe5b8d74..00000000000
--- a/emulators/suse91_freetype2/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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_gdk-pixbuf/DESCR b/emulators/suse91_gdk-pixbuf/DESCR
index b898081b301..dc8cea9566b 100644
--- a/emulators/suse91_gdk-pixbuf/DESCR
+++ b/emulators/suse91_gdk-pixbuf/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 that use gdk-pixbuf shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require gdk-pixbuf shared libraries.
diff --git a/emulators/suse91_gdk-pixbuf/Makefile b/emulators/suse91_gdk-pixbuf/Makefile
index e85b3403e58..7e67ece3568 100644
--- a/emulators/suse91_gdk-pixbuf/Makefile
+++ b/emulators/suse91_gdk-pixbuf/Makefile
@@ -1,24 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.3 2007/07/29 05:19:10 jlam Exp $
 
-DISTNAME=		suse_gdk-pixbuf-${SUSE_VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_gdk-pixbuf-${SUSE_VERSION}
+PKGREVISION=	2
+CATEGORIES=	emulators
+DISTFILES=	gdk-pixbuf-0.22.0-62.13.${SUSE_ARCH}.rpm
 
-MAINTAINER=		tron@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for gdk-pixbuf binaries
+MAINTAINER=	tron@NetBSD.org
+COMMENT=	Linux compatibility package for gdk-pixbuf
 
-DEPENDS+=		suse_gtk-${SUSE_VERSION}{,nb*}:../../emulators/suse91_gtk
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+EMUL_MODULES.linux=	gtk
 
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_gdk-pixbuf/Makefile.i386 b/emulators/suse91_gdk-pixbuf/Makefile.i386
deleted file mode 100644
index 60245f8ddd3..00000000000
--- a/emulators/suse91_gdk-pixbuf/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1 2006/03/06 09:10:54 toddpw Exp $
-
-RPMFILES=		gdk-pixbuf-0.22.0-62.13.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_gdk-pixbuf/Makefile.x86_64 b/emulators/suse91_gdk-pixbuf/Makefile.x86_64
deleted file mode 100644
index a514ad2fa53..00000000000
--- a/emulators/suse91_gdk-pixbuf/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/06/26 19:41:05 salo Exp $
-
-RPMFILES=		gdk-pixbuf-0.22.0-62.13.${SUSE_ARCH}.rpm
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
diff --git a/emulators/suse91_gtk/DESCR b/emulators/suse91_gtk/DESCR
index d404f886f92..91db428d711 100644
--- a/emulators/suse91_gtk/DESCR
+++ b/emulators/suse91_gtk/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
-GTK shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require GTK+-1.x shared libraries.
diff --git a/emulators/suse91_gtk/Makefile b/emulators/suse91_gtk/Makefile
index 2a187566fef..3cfacc1fb84 100644
--- a/emulators/suse91_gtk/Makefile
+++ b/emulators/suse91_gtk/Makefile
@@ -1,24 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.8 2007/07/29 05:19:11 jlam Exp $
 
-DISTNAME=		suse_gtk-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_gtk-${SUSE_VERSION}
+PKGREVISION=	3
+CATEGORIES=	emulators
 
-MAINTAINER=		tron@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for GTK binaries
+MAINTAINER=	tron@NetBSD.org
+COMMENT=	Linux compatibility package for GTK+-1.x
 
-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_gtk/Makefile.i386 b/emulators/suse91_gtk/Makefile.i386
deleted file mode 100644
index 883b9470196..00000000000
--- a/emulators/suse91_gtk/Makefile.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-# $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
deleted file mode 100644
index ba01c9328f2..00000000000
--- a/emulators/suse91_gtk/Makefile.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-# $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/suse.i386.mk b/emulators/suse91_gtk/suse.i386.mk
new file mode 100644
index 00000000000..bfce4b4d35c
--- /dev/null
+++ b/emulators/suse91_gtk/suse.i386.mk
@@ -0,0 +1,5 @@
+# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:12 jlam Exp $
+
+# SuSE i386 RPMs
+DISTFILES+=	glib-1.2.10-586.${SUSE_ARCH}.rpm
+DISTFILES+=	gtk-1.2.10-877.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_gtk/suse.x86_64.mk b/emulators/suse91_gtk/suse.x86_64.mk
new file mode 100644
index 00000000000..ee58f28e5de
--- /dev/null
+++ b/emulators/suse91_gtk/suse.x86_64.mk
@@ -0,0 +1,5 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:12 jlam Exp $
+
+# SuSE x86_64 RPMs
+DISTFILES+=	glib-1.2.10-337.${SUSE_ARCH}.rpm
+DISTFILES+=	gtk-1.2.10-488.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_gtk2/DEINSTALL b/emulators/suse91_gtk2/DEINSTALL
new file mode 100644
index 00000000000..d90af144902
--- /dev/null
+++ b/emulators/suse91_gtk2/DEINSTALL
@@ -0,0 +1,15 @@
+# $NetBSD: DEINSTALL,v 1.3 2007/07/29 05:19:12 jlam Exp $
+#
+# Remove gtk/pango module configuration.
+#
+case ${STAGE} in
+DEINSTALL)
+	GNOME_BINDIR="${PKG_PREFIX}/@EMULSUBDIR@/opt/gnome/bin"
+	GNOME_ETCDIR="${PKG_PREFIX}/@EMULSUBDIR@/etc/opt/gnome"
+
+	${ECHO} "${PKGNAME}: removing GTK/Pango module configuration"
+        ${RM} -f ${GNOME_ETCDIR}/gtk-2.0/gtk.immodules
+        ${RM} -f ${GNOME_ETCDIR}/gtk-2.0/gdk-pixbuf.loaders
+        ${RM} -f ${GNOME_ETCDIR}/pango/pango.modules
+	;;
+esac
diff --git a/emulators/suse91_gtk2/DESCR b/emulators/suse91_gtk2/DESCR
index 962f8891e8f..bc684571d53 100644
--- a/emulators/suse91_gtk2/DESCR
+++ b/emulators/suse91_gtk2/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
-GTK2 shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require GTK+-2.x shared libraries.
diff --git a/emulators/suse91_gtk2/INSTALL b/emulators/suse91_gtk2/INSTALL
index 57074111b3b..6af096e2eb8 100644
--- a/emulators/suse91_gtk2/INSTALL
+++ b/emulators/suse91_gtk2/INSTALL
@@ -1,15 +1,17 @@
-# $NetBSD: INSTALL,v 1.3 2005/01/22 12:35:26 jdolecek Exp $
+# $NetBSD: INSTALL,v 1.4 2007/07/29 05:19:13 jlam Exp $
 #
 # Initialize gtk/pango module configuration.
 #
 case ${STAGE} in
-    POST-INSTALL)
-        @EMULDIR@/opt/gnome/bin/gtk-query-immodules-2.0 > @EMULDIR@/etc/opt/gnome/gtk-2.0/gtk.immodules
+POST-INSTALL)
+	GNOME_BINDIR="${PKG_PREFIX}/@EMULSUBDIR@/opt/gnome/bin"
+	GNOME_ETCDIR="${PKG_PREFIX}/@EMULSUBDIR@/etc/opt/gnome"
 
-        @EMULDIR@/opt/gnome/bin/gdk-pixbuf-query-loaders > @EMULDIR@/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders
+	${ECHO} "${PKGNAME}: initializing GTK/Pango module configuration"
+        ${GNOME_BINDIR}/gtk-query-immodules-2.0> ${GNOME_ETCDIR}/gtk-2.0/gtk.immodules
 
-        @EMULDIR@/opt/gnome/bin/pango-querymodules > @EMULDIR@/etc/opt/gnome/pango/pango.modules                
-	;;
-    *)
+        ${GNOME_BINDIR}/gdk-pixbuf-query-loaders> ${GNOME_ETCDIR}/gtk-2.0/gdk-pixbuf.loaders
+
+        ${GNOME_BINDIR}/pango-querymodules> ${GNOME_ETCDIR}/pango/pango.modules
 	;;
 esac
diff --git a/emulators/suse91_gtk2/Makefile b/emulators/suse91_gtk2/Makefile
index 4fd11bc002c..4fe3c8c9b4c 100644
--- a/emulators/suse91_gtk2/Makefile
+++ b/emulators/suse91_gtk2/Makefile
@@ -1,33 +1,17 @@
-# $NetBSD: Makefile,v 1.17 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.18 2007/07/29 05:19:13 jlam Exp $
 
-DISTNAME=		suse_gtk2-${SUSE_VERSION}
-PKGREVISION=		6
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_gtk2-${SUSE_VERSION}
+PKGREVISION=	7
+CATEGORIES=	emulators
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for GTK2 binaries
+MAINTAINER=	pkgsrc-users@NetBSD.org
+COMMENT=	Linux compatibility package for GTK+-2.x
 
-DEPENDS+=		suse_fontconfig-${SUSE_VERSION}{,nb*}:../../emulators/suse91_fontconfig
-DEPENDS+=		suse_freetype2-${SUSE_VERSION}{,nb*}:../../emulators/suse91_freetype2
-DEPENDS+=		suse_libjpeg-${SUSE_VERSION}{,nb*}:../../emulators/suse91_libjpeg
-DEPENDS+=		suse_libpng-${SUSE_VERSION}{,nb*}:../../emulators/suse91_libpng
-DEPENDS+=		suse_libtiff-${SUSE_VERSION}{,nb*}:../../emulators/suse91_libtiff
-DEPENDS+=		suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse91_x11
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
+EMUL_MODULES.linux=	fontconfig freetype2 jpeg png tiff x11
 
 # Initialize gtk/pango modules.
 FILES_SUBST+=		EMULDIR=${EMULDIR:Q}
 PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
 
-.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
deleted file mode 100644
index 4cbf5d93abf..00000000000
--- a/emulators/suse91_gtk2/Makefile.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-# $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
deleted file mode 100644
index 8af27512fae..00000000000
--- a/emulators/suse91_gtk2/Makefile.x86_64
+++ /dev/null
@@ -1,6 +0,0 @@
-# $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/PLIST b/emulators/suse91_gtk2/PLIST
deleted file mode 100644
index 92b8a7ab074..00000000000
--- a/emulators/suse91_gtk2/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2005/01/22 12:35:26 jdolecek Exp $
-${EMULSUBDIR}/etc/opt/gnome/gtk-2.0/gtk.immodules
-${EMULSUBDIR}/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders
-${EMULSUBDIR}/etc/opt/gnome/pango/pango.modules
diff --git a/emulators/suse91_gtk2/suse.i386.mk b/emulators/suse91_gtk2/suse.i386.mk
new file mode 100644
index 00000000000..b1b46d68d3a
--- /dev/null
+++ b/emulators/suse91_gtk2/suse.i386.mk
@@ -0,0 +1,7 @@
+# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:14 jlam Exp $
+
+# SuSE i386 RPMs
+DISTFILES+=	atk-1.4.1-124.${SUSE_ARCH}.rpm
+DISTFILES+=	glib2-2.2.3-117.${SUSE_ARCH}.rpm
+DISTFILES+=	gtk2-2.2.4-125.10.${SUSE_ARCH}.rpm
+DISTFILES+=	pango-1.2.5-170.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_gtk2/suse.x86_64.mk b/emulators/suse91_gtk2/suse.x86_64.mk
new file mode 100644
index 00000000000..bedc20ae84e
--- /dev/null
+++ b/emulators/suse91_gtk2/suse.x86_64.mk
@@ -0,0 +1,7 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:14 jlam Exp $
+
+# SuSE x86_64 RPMs
+DISTFILES+=	atk-1.4.1-104.${SUSE_ARCH}.rpm
+DISTFILES+=	glib2-2.2.3-106.${SUSE_ARCH}.rpm
+DISTFILES+=	gtk2-2.2.4-125.10.${SUSE_ARCH}.rpm
+DISTFILES+=	pango-1.2.5-148.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_libjpeg/DESCR b/emulators/suse91_libjpeg/DESCR
index 3fe7a54d422..b9297dc4d48 100644
--- a/emulators/suse91_libjpeg/DESCR
+++ b/emulators/suse91_libjpeg/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 linked with jpeg shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require JPEG shared libraries.
diff --git a/emulators/suse91_libjpeg/Makefile b/emulators/suse91_libjpeg/Makefile
index 787de19eb01..400f688203e 100644
--- a/emulators/suse91_libjpeg/Makefile
+++ b/emulators/suse91_libjpeg/Makefile
@@ -1,25 +1,13 @@
-# $NetBSD: Makefile,v 1.8 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.9 2007/07/29 05:19:14 jlam Exp $
 
-DISTNAME=		suse_libjpeg-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_libjpeg-${SUSE_VERSION}
+PKGREVISION=	4
+CATEGORIES=	emulators
 
-MAINTAINER=		jdolecek@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the JPEG library
+MAINTAINER=	jdolecek@NetBSD.org
+COMMENT=	Linux compatibility package for JPEG
 
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-LIBTOOLIZE_PLIST=	NO
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+EMUL_MODULES.linux=	base
 
 .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
deleted file mode 100644
index bebaf49e1d0..00000000000
--- a/emulators/suse91_libjpeg/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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
deleted file mode 100644
index 13d221541f1..00000000000
--- a/emulators/suse91_libjpeg/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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/suse.i386.mk b/emulators/suse91_libjpeg/suse.i386.mk
new file mode 100644
index 00000000000..3dbc2cd8040
--- /dev/null
+++ b/emulators/suse91_libjpeg/suse.i386.mk
@@ -0,0 +1,4 @@
+# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:15 jlam Exp $
+
+# SuSE i386 RPMs
+DISTFILES=	libjpeg-6.2.0-731.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_libjpeg/suse.x86_64.mk b/emulators/suse91_libjpeg/suse.x86_64.mk
new file mode 100644
index 00000000000..daadbfaf3cb
--- /dev/null
+++ b/emulators/suse91_libjpeg/suse.x86_64.mk
@@ -0,0 +1,4 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:15 jlam Exp $
+
+# SuSE x86_64 RPMs
+DISTFILSE=	libjpeg-6.2.0-320.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_libpng/DESCR b/emulators/suse91_libpng/DESCR
index f330608b9fc..23bdd4b7227 100644
--- a/emulators/suse91_libpng/DESCR
+++ b/emulators/suse91_libpng/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 linked with png shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require PNG shared libraries.
diff --git a/emulators/suse91_libpng/Makefile b/emulators/suse91_libpng/Makefile
index 35a359d5979..47023ba6c68 100644
--- a/emulators/suse91_libpng/Makefile
+++ b/emulators/suse91_libpng/Makefile
@@ -1,24 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.11 2007/07/29 05:19:15 jlam Exp $
 
-DISTNAME=		suse_libpng-${SUSE_VERSION}
-PKGREVISION=		5
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_libpng-${SUSE_VERSION}
+PKGREVISION=	6
+CATEGORIES=	emulators
+DISTFILES=	libpng-1.2.5-182.10.${SUSE_ARCH}.rpm
 
-MAINTAINER=		jdolecek@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the PNG library
+MAINTAINER=	jdolecek@NetBSD.org
+COMMENT=	Linux compatibility package for PNG
 
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+EMUL_MODULES.linux=	base
 
 .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
deleted file mode 100644
index 0e3b3e5c8e3..00000000000
--- a/emulators/suse91_libpng/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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
deleted file mode 100644
index 0ee1a4dab46..00000000000
--- a/emulators/suse91_libpng/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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_libtiff/DESCR b/emulators/suse91_libtiff/DESCR
index 6eb5ded69a7..8a6de414578 100644
--- a/emulators/suse91_libtiff/DESCR
+++ b/emulators/suse91_libtiff/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 linked with tiff shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require TIFF shared libraries.
diff --git a/emulators/suse91_libtiff/Makefile b/emulators/suse91_libtiff/Makefile
index 9f041b349f0..cfd6017066f 100644
--- a/emulators/suse91_libtiff/Makefile
+++ b/emulators/suse91_libtiff/Makefile
@@ -1,24 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.11 2007/07/29 05:19:16 jlam Exp $
 
-DISTNAME=		suse_libtiff-${SUSE_VERSION}
-PKGREVISION=		5
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_libtiff-${SUSE_VERSION}
+PKGREVISION=	6
+CATEGORIES=	emulators
+DISTFILES=	libtiff-3.6.1-38.26.${SUSE_ARCH}.rpm
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the TIFF library
+MAINTAINER=	pkgsrc-users@NetBSD.org
+COMMENT=	Linux compatibility package for TIFF
 
-DEPENDS+=		suse_libjpeg-${SUSE_VERSION}{,nb*}:../../emulators/suse91_libjpeg
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+EMUL_MODULES.linux=	jpeg
 
 .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
deleted file mode 100644
index 2922a4cd03a..00000000000
--- a/emulators/suse91_libtiff/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.2 2006/06/26 19:42:26 salo Exp $
-
-RPMFILES=		libtiff-3.6.1-38.26.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_libtiff/Makefile.x86_64 b/emulators/suse91_libtiff/Makefile.x86_64
deleted file mode 100644
index 46042d91c9c..00000000000
--- a/emulators/suse91_libtiff/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.2 2006/06/26 19:42:26 salo Exp $
-
-RPMFILES=		libtiff-3.6.1-38.26.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_linux/Makefile.common b/emulators/suse91_linux/Makefile.common
index d5b873ae048..f672d42f045 100644
--- a/emulators/suse91_linux/Makefile.common
+++ b/emulators/suse91_linux/Makefile.common
@@ -1,87 +1,70 @@
-# $NetBSD: Makefile.common,v 1.16 2007/01/23 16:54:59 joerg Exp $
+# $NetBSD: Makefile.common,v 1.17 2007/07/29 05:19:17 jlam Exp $
 
-.include "../../emulators/suse91_linux/vars.mk"
-.include "../../emulators/suse91_linux/arch.mk"
+SUSE_PKG=		yes
+SUSE_VERSION=		9.1
+SUSE_VERSION_REQD=	${SUSE_VERSION}
 
-ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-i386 NetBSD-3.99*-x86_64 \
-			NetBSD-[4-9]*-x86_64 FreeBSD-*-i386 \
-			DragonFly-*-i386
+EMUL_PLATFORMS?=	linux-i386 linux-x86_64
 
-_SUSE_FTP_SUBDIR=	suse/discontinued/${SUSE_ARCH_DIR}/9.1/suse/${SUSE_ARCH}/
-_SUSE_FTP_SUBDIR_UPD=	suse/discontinued/${SUSE_ARCH_DIR}/update/9.1/rpm/${SUSE_ARCH}/
+.include "../../mk/bsd.prefs.mk"
 
-MASTER_SITE_SUSE91?=	ftp://ftp.suse.com/pub/${_SUSE_FTP_SUBDIR} \
-			ftp://ftp.suse.com/pub/${_SUSE_FTP_SUBDIR_UPD} \
-			ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/${_SUSE_FTP_SUBDIR} \
-			ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/${_SUSE_FTP_SUBDIR_UPD} \
-			ftp://gd.tuwien.ac.at/linux/suse.com/${_SUSE_FTP_SUBDIR} \
-			ftp://gd.tuwien.ac.at/linux/suse.com/${_SUSE_FTP_SUBDIR_UPD} \
-			ftp://mirror.mcs.anl.gov/pub/${_SUSE_FTP_SUBDIR} \
-			ftp://mirror.mcs.anl.gov/pub/${_SUSE_FTP_SUBDIR_UPD} \
-			ftp://ftp.sh.cvut.cz/MIRRORS/${_SUSE_FTP_SUBDIR:C/^suse/suse\/pub/} \
-			ftp://ftp.sh.cvut.cz/MIRRORS/${_SUSE_FTP_SUBDIR_UPD:C/^suse/suse\/pub/}
+# The SuSE 10.x Linux packages are only usable on the following platforms.
+ONLY_FOR_PLATFORM+=	DragonFly-*-i386
+ONLY_FOR_PLATFORM+=	FreeBSD-*-i386
+ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-i386
+ONLY_FOR_PLATFORM+=	NetBSD-3.99*-x86_64
+ONLY_FOR_PLATFORM+=	NetBSD-[4-9]*-x86_64
 
+# _SUSE_ARCH.* is a table of ${EMUL_ARCH} to SuSE architectures.
+_SUSE_ARCH.${EMUL_ARCH}=	${EMUL_ARCH}
+_SUSE_ARCH.i386=		i586
+_SUSE_ARCH=			${_SUSE_ARCH.${EMUL_ARCH}}
+SUSE_ARCH=			${_SUSE_ARCH}
+
+_SUSE_FTP_SUBDIR=	suse/discontinued/${MACHINE_ARCH}/9.1/suse/${SUSE_ARCH}/
+_SUSE_FTP_SUBDIR_UPD=	suse/discontinued/${MACHINE_ARCH}/update/9.1/rpm/${SUSE_ARCH}/
+
+MASTER_SITE_SUSE_${SUSE_VERSION}=	\
+	ftp://ftp.suse.com/pub/${_SUSE_FTP_SUBDIR} \
+	ftp://ftp.suse.com/pub/${_SUSE_FTP_SUBDIR_UPD} \
+	ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/${_SUSE_FTP_SUBDIR} \
+	ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/${_SUSE_FTP_SUBDIR_UPD} \
+	ftp://gd.tuwien.ac.at/linux/suse.com/${_SUSE_FTP_SUBDIR} \
+	ftp://gd.tuwien.ac.at/linux/suse.com/${_SUSE_FTP_SUBDIR_UPD} \
+	ftp://mirror.mcs.anl.gov/pub/${_SUSE_FTP_SUBDIR} \
+	ftp://mirror.mcs.anl.gov/pub/${_SUSE_FTP_SUBDIR_UPD} \
+	ftp://ftp.sh.cvut.cz/MIRRORS/${_SUSE_FTP_SUBDIR:C/^suse/suse\/pub/} \
+	ftp://ftp.sh.cvut.cz/MIRRORS/${_SUSE_FTP_SUBDIR_UPD:C/^suse/suse\/pub/}
+
+MASTER_SITES?=		${MASTER_SITE_SUSE_${SUSE_VERSION}}
 DIST_SUBDIR?=		suse${SUSE_VERSION:S/.//}/${SUSE_ARCH}
 
+HOMEPAGE?=		http://www.suse.com/
+
 WRKSRC?=		${WRKDIR}
+BUILD_DIRS?=		# empty
 MANCOMPRESSED?=		yes
 
-EMULSUBDIR=		emul/linux
-EMULDIR=		${PREFIX}/${EMULSUBDIR}
+EMUL_PKG_FMT?=		rpm
+RPM2PKG_PREFIX?=	${PREFIX}
+RPM2PKG_SUBPREFIX?=	${EMULSUBDIR}
+RPM2PKG_STAGE?=		do-install
 
-# Set location of OPSYS-specific emulation directory
-.if ${OPSYS} == "NetBSD"
-OPSYS_EMULDIR=		/${EMULSUBDIR}
-.elif (${OPSYS} == "FreeBSD") || (${OPSYS} == "DragonFly")
-OPSYS_EMULDIR=		/compat/${EMULSUBDIR:T}
+.if (${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64")
+PKGNAME:=		${DISTNAME:S/^suse_/suse32_/}
+COMMENT:=		${COMMENT:S/Linux/Linux 32-bit/}
+LINUX_BASE=		linux32
 .else
-OPSYS_EMULDIR=		/${EMULSUBDIR}
-.endif
-FILES_SUBST+=		OPSYS_EMULDIR=${OPSYS_EMULDIR:Q}
-
-RPM2PKG=		${PREFIX}/sbin/rpm2pkg
-BUILD_DEPENDS+=		rpm2pkg>=2.1:../../pkgtools/rpm2pkg
-
-BUILD_DEFS+=		RPMFILES
-.if defined(RPMIGNOREPATH)
-BUILD_DEFS+=		RPMIGNOREPATH
+LINUX_BASE=		linux
 .endif
+PLIST_SUBST+=		LINUX_BASE=${LINUX_BASE:Q}
+FILES_SUBST+=		LINUX_BASE=${LINUX_BASE:Q}
 
-# The SuSE Linux packages have circular dependencies.
-LDD?=			${TRUE}
+LINUX_LIBSUBDIR?=	lib
+PLIST_SUBST+=		LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q}
+FILES_SUBST+=		LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q}
 
-RPM2PKGSTRIP?=		1
-RPM2PKGARGS?=		-d ${PREFIX} -f ${PLIST_SRC} -p ${EMULSUBDIR}
-.if empty(RPM2PKGSTRIP:M0)
-RPM2PKGARGS+=		-s ${RPM2PKGSTRIP}
-.endif
-.for TEMP in ${RPMIGNOREPATH}
-RPM2PKGARGS+=		-i ${TEMP}
-.endfor
-.for TEMP in ${RPMFILES}
-RPM2PKGARGS+=		${DISTDIR}/${DIST_SUBDIR}/${TEMP}
-.endfor
-
-.if !target(do-install)
-do-install:
-	@if [ -f ${PKGDIR}/PLIST ]; then \
-	  ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}; \
-	else \
-	  ${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}; \
-	fi
-	${RPM2PKG} ${RPM2PKGARGS}
-	@if ${GREP} -q 'lib.*\.so' ${PLIST_SRC}; then \
-	  ${ECHO_MSG} "===> [Automatic Linux shared object handling]"; \
-	  ${EMULDIR}/sbin/ldconfig -r ${EMULDIR}; \
-	  ${MV} -f ${PLIST_SRC} ${PLIST_SRC}.old; \
-	  ${GREP} -v '^@dirrm' ${PLIST_SRC}.old >${PLIST_SRC} || ${TRUE}; \
-	  ${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" >>${PLIST_SRC}; \
-	  ${ECHO} "@unexec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR} 2>/dev/null" >>${PLIST_SRC}; \
-	  ${GREP} '^@dirrm' ${PLIST_SRC}.old >>${PLIST_SRC} || ${TRUE}; \
-	  ${RM} -f ${PLIST_SRC}.old; \
-	fi
-.endif
+# Include an "override" SuSE-specific and architecture-specific
+# Makefile fragment if it exists.
+#
+.sinclude "suse.${EMUL_ARCH}.mk"
diff --git a/emulators/suse91_linux/arch.mk b/emulators/suse91_linux/arch.mk
deleted file mode 100644
index c4db621bfeb..00000000000
--- a/emulators/suse91_linux/arch.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: arch.mk,v 1.1.1.1 2004/07/13 10:31:15 tron Exp $
-
-.ifndef SUSE_ARCH_MK
-SUSE_ARCH_MK=1
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-SUSE_ARCH?=	i586
-SUSE_ARCH_DIR?=	${MACHINE_ARCH}
-.elif ${MACHINE_ARCH} == "powerpc"
-SUSE_ARCH?=	ppc
-.else
-SUSE_ARCH?=	${MACHINE_ARCH}
-.endif
-
-SUSE_ARCH_DIR?=	${SUSE_ARCH}
-
-.endif # SUSE_ARCH_MK
diff --git a/emulators/suse91_linux/emulator.mk b/emulators/suse91_linux/emulator.mk
new file mode 100644
index 00000000000..1ec73cab815
--- /dev/null
+++ b/emulators/suse91_linux/emulator.mk
@@ -0,0 +1,47 @@
+# $NetBSD: emulator.mk,v 1.1 2007/07/29 05:19:17 jlam Exp $
+#
+# This file is included by linux-suse.mk in the emulator framework.
+#
+# Variables set by this file:
+#
+# EMUL_DISTRO
+#	The SuSE Linux distribution.
+#
+# DEPENDS_${EMUL_DISTRO}.*
+#	A table that maps "modules" to SuSE package dependencies.
+#
+
+EMUL_DISTRO=		suse-9.1
+
+.if defined(SUSE_PKG)
+_SUSE_VERSION_REQD=	-${SUSE_VERSION_REQD}{,nb*}
+.else
+_SUSE_VERSION_REQD=	>=${SUSE_VERSION_REQD}
+.endif
+
+# DEPENDS_suse-9.1.* maps Linux "modules" to SuSE package dependencies.
+DEPENDS_suse-9.1.aspell?=	suse_aspell${_SUSE_VERSION_REQD}:../../emulators/suse91_aspell
+DEPENDS_suse-9.1.base?=		suse_base${_SUSE_VERSION_REQD}:../../emulators/suse91_base
+DEPENDS_suse-9.1.compat?=	suse_compat${_SUSE_VERSION_REQD}:../../emulators/suse91_compat
+DEPENDS_suse-9.1.expat?=	suse_expat${_SUSE_VERSION_REQD}:../../emulators/suse91_expat
+DEPENDS_suse-9.1.fontconfig?=	suse_fontconfig${_SUSE_VERSION_REQD}:../../emulators/suse91_fontconfig
+DEPENDS_suse-9.1.freetype2?=	suse_freetype2${_SUSE_VERSION_REQD}:../../emulators/suse91_freetype2
+DEPENDS_suse-9.1.gdk-pixbuf?=	suse_gdk-pixbuf${_SUSE_VERSION_REQD}:../../emulators/suse91_gdk-pixbuf
+DEPENDS_suse-9.1.glx?=		suse_glx${_SUSE_VERSION_REQD}:../../emulators/suse91_glx
+DEPENDS_suse-9.1.gtk?=		suse_gtk${_SUSE_VERSION_REQD}:../../emulators/suse91_gtk
+DEPENDS_suse-9.1.gtk2?=		suse_gtk2${_SUSE_VERSION_REQD}:../../emulators/suse91_gtk2
+DEPENDS_suse-9.1.jpeg?=		suse_libjpeg${_SUSE_VERSION_REQD}:../../emulators/suse91_libjpeg
+DEPENDS_suse-9.1.locale?=	suse_locale${_SUSE_VERSION_REQD}:../../emulators/suse91_locale
+DEPENDS_suse-9.1.motif?=	suse_openmotif${_SUSE_VERSION_REQD}:../../emulators/suse91_openmotif
+DEPENDS_suse-9.1.png?=		suse_libpng${_SUSE_VERSION_REQD}:../../emulators/suse91_libpng
+DEPENDS_suse-9.1.slang?=	suse_slang${_SUSE_VERSION_REQD}:../../emulators/suse91_slang
+DEPENDS_suse-9.1.tiff?=		suse_libtiff${_SUSE_VERSION_REQD}:../../emulators/suse91_libtiff
+DEPENDS_suse-9.1.vmware?=	suse_vmware${_SUSE_VERSION_REQD}:../../emulators/suse91_vmware
+DEPENDS_suse-9.1.x11?=		suse_x11${_SUSE_VERSION_REQD}:../../emulators/suse91_x11
+
+.if (${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64")
+.  for _mod_ in ${_LINUX_MODULES}
+DEPENDS_suse-9.1.${_mod_}:=	\
+	${DEPENDS_suse-9.1.${_mod_}:S/^suse_/suse32_/}
+.  endfor
+.endif
diff --git a/emulators/suse91_linux/vars.mk b/emulators/suse91_linux/vars.mk
deleted file mode 100644
index ffe221743bb..00000000000
--- a/emulators/suse91_linux/vars.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: vars.mk,v 1.1 2005/04/03 21:23:15 jdolecek Exp $
-
-.ifndef SUSE_VARS_MK
-SUSE_VARS_MK=1
-
-SUSE_DIR_PREFIX=	suse91
-SUSE_VERSION=		9.1
-
-.endif # SUSE_VARS_MK
diff --git a/emulators/suse91_locale/DESCR b/emulators/suse91_locale/DESCR
index 25484919ed3..f5796d1ef9e 100644
--- a/emulators/suse91_locale/DESCR
+++ b/emulators/suse91_locale/DESCR
@@ -1,4 +1,5 @@
-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 includes the glibc locale files.
+This package contains the glibc2 locale files.
diff --git a/emulators/suse91_locale/Makefile b/emulators/suse91_locale/Makefile
index b4eec1d142b..11e71b62a3c 100644
--- a/emulators/suse91_locale/Makefile
+++ b/emulators/suse91_locale/Makefile
@@ -1,26 +1,15 @@
-# $NetBSD: Makefile,v 1.7 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.8 2007/07/29 05:19:18 jlam Exp $
 
-DISTNAME=		suse_locale-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_locale-${SUSE_VERSION}
+PKGREVISION=	3
+CATEGORIES=	emulators
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Locale files for the Linux compatibility package
+CONFLICTS=	linux-locale-[0-9]*
 
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
+MAINTAINER=	pkgsrc-users@NetBSD.org
+COMMENT=	Linux compatibility package with locale files
 
-CONFLICTS=		linux-locale-[0-9]*
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+EMUL_MODULES.linux=	base
 
 .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
deleted file mode 100644
index a67e5c40860..00000000000
--- a/emulators/suse91_locale/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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
deleted file mode 100644
index 74b54bd7525..00000000000
--- a/emulators/suse91_locale/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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/suse.i386.mk b/emulators/suse91_locale/suse.i386.mk
new file mode 100644
index 00000000000..9141531a928
--- /dev/null
+++ b/emulators/suse91_locale/suse.i386.mk
@@ -0,0 +1,4 @@
+# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:19 jlam Exp $
+
+# SuSE i386 RPMs
+DISTFILES=	glibc-locale-2.3.3-98.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_locale/suse.x86_64.mk b/emulators/suse91_locale/suse.x86_64.mk
new file mode 100644
index 00000000000..e01fae4e13e
--- /dev/null
+++ b/emulators/suse91_locale/suse.x86_64.mk
@@ -0,0 +1,4 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:19 jlam Exp $
+
+# SuSE x86_64 RPMs
+DISTFILES=	glibc-locale-2.3.3-63.${SUSE_ARCH}.rpm
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
diff --git a/emulators/suse91_slang/DESCR b/emulators/suse91_slang/DESCR
index f9f21396127..f870b1b9b9f 100644
--- a/emulators/suse91_slang/DESCR
+++ b/emulators/suse91_slang/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
-the "slang" library.
+This package supports running ELF binaries linked with glibc2 that
+require S-Lang shared libraries.
diff --git a/emulators/suse91_slang/Makefile b/emulators/suse91_slang/Makefile
index 0201d77154d..62add579652 100644
--- a/emulators/suse91_slang/Makefile
+++ b/emulators/suse91_slang/Makefile
@@ -1,28 +1,20 @@
-# $NetBSD: Makefile,v 1.11 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.12 2007/07/29 05:19:20 jlam Exp $
 
-DISTNAME=		suse_slang-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_slang-${SUSE_VERSION}
+PKGREVISION=	4
+CATEGORIES=	emulators
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for slang library
+MAINTAINER=	pkgsrc-users@NetBSD.org
+COMMENT=	Linux compatibility package for S-Lang
 
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
+EMUL_MODULES.linux=	base
 
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-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}/libslang.so.1
 
 post-install:
-	${LN} -sf ${PREFIX}/${EMULSUBDIR}/usr/lib/libslang-utf8.so.1 \
-		${PREFIX}/${EMULSUBDIR}/usr/lib/libslang.so.1
+	cd ${EMULDIR}/usr/${LINUX_LIBSUBDIR} && \
+		${LN} -fs libslang-utf8.so.1 libslang.so.1
 
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_slang/Makefile.i386 b/emulators/suse91_slang/Makefile.i386
deleted file mode 100644
index 4713c3d2436..00000000000
--- a/emulators/suse91_slang/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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
deleted file mode 100644
index e30fe9b0301..00000000000
--- a/emulators/suse91_slang/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=		slang-1.4.9-112.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_slang/PLIST_rpmfix.i386 b/emulators/suse91_slang/PLIST_rpmfix.i386
deleted file mode 100644
index 4baff0be128..00000000000
--- a/emulators/suse91_slang/PLIST_rpmfix.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST_rpmfix.i386,v 1.2 2006/05/28 17:41:18 rillig Exp $
-/usr/lib/libslang.so.1
diff --git a/emulators/suse91_slang/suse.i386.mk b/emulators/suse91_slang/suse.i386.mk
new file mode 100644
index 00000000000..38aa10c7d41
--- /dev/null
+++ b/emulators/suse91_slang/suse.i386.mk
@@ -0,0 +1,4 @@
+# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:21 jlam Exp $
+
+# SuSE i386 RPMs
+DISTFILES=	slang-1.4.9-121.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_slang/suse.x86_64.mk b/emulators/suse91_slang/suse.x86_64.mk
new file mode 100644
index 00000000000..a5e1982486e
--- /dev/null
+++ b/emulators/suse91_slang/suse.x86_64.mk
@@ -0,0 +1,4 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:21 jlam Exp $
+
+# SuSE x86_64 RPMs
+DISTFILES=	slang-1.4.9-112.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_vmware/DEINSTALL b/emulators/suse91_vmware/DEINSTALL
new file mode 100644
index 00000000000..4b8b4b81dec
--- /dev/null
+++ b/emulators/suse91_vmware/DEINSTALL
@@ -0,0 +1,9 @@
+# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:19:22 jlam Exp $
+
+case "${STAGE}" in
+DEINSTALL)
+	# Run any actions that require root privileges.
+	${TEST} ! -x ./+ROOT_ACTIONS ||
+		./+ROOT_ACTIONS REMOVE ${PKG_METADATA_DIR} || exit 1
+	;;
+esac
diff --git a/emulators/suse91_vmware/DESCR b/emulators/suse91_vmware/DESCR
index 9777e703fdd..efff03682f1 100644
--- a/emulators/suse91_vmware/DESCR
+++ b/emulators/suse91_vmware/DESCR
@@ -1,4 +1,5 @@
-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 is supposed to help running VMware under NetBSD.
+This package is a helper package for running VMware.
diff --git a/emulators/suse91_vmware/INSTALL b/emulators/suse91_vmware/INSTALL
new file mode 100644
index 00000000000..2ecaa0a2007
--- /dev/null
+++ b/emulators/suse91_vmware/INSTALL
@@ -0,0 +1,156 @@
+# $NetBSD: INSTALL,v 1.1 2007/07/29 05:19:22 jlam Exp $
+
+# Generate a +ROOT_ACTIONS script that runs certain actions that require
+# superuser privileges.
+#
+case "${STAGE},$1" in
+UNPACK,|UNPACK,+ROOT_ACTIONS)
+	${CAT} > ./+ROOT_ACTIONS << 'EOF'
+#!@SH@
+#
+# +ROOT_ACTIONS - run actions requiring superuser privileges
+#
+# Usage: ./+ROOT_ACTIONS ADD|REMOVE [metadatadir]
+#
+# This script runs certain actions that require superuser privileges.
+# If such privileges are not available, then simply output a message
+# asking the user to run this script with the appropriate elevated
+# privileges.
+#
+# Lines starting with "# SYMLINK: " are data read by this script that
+# name the source paths and corresponding symlink that is managed by
+# this script.  If the symlink path is relative, then it is taken to be
+# relative to ${PKG_PREFIX}.  The source path is always unchanged.
+#
+#	# SYMLINK: /dev/rcd0a ${EMULSUBDIR}/dev/cdrom
+#
+
+CAT="@CAT@"
+CHMOD="@CHMOD@"
+ECHO="@ECHO@"
+ID="@ID@"
+LN="@LN@"
+PWD_CMD="@PWD_CMD@"
+RM="@RM@"
+SED="@SED@"
+TEST="@TEST@"
+
+SELF=$0
+ACTION=$1
+
+CURDIR=`${PWD_CMD}`
+PKG_METADATA_DIR="${2-${CURDIR}}"
+: ${PKGNAME=${PKG_METADATA_DIR##*/}}
+: ${PKG_PREFIX=@PREFIX@}
+
+ROOT_ACTIONS_COOKIE="${PKG_METADATA_DIR}/+ROOT_ACTIONS_done"
+EUID=`${ID} -u`
+
+exitcode=0
+case $ACTION,$EUID in
+ADD,0)
+	${ECHO} "" > ${ROOT_ACTIONS_COOKIE}
+	${CHMOD} g+w ${ROOT_ACTIONS_COOKIE}
+	${SED} -n "/^\# SYMLINK: /{s/^\# SYMLINK: //;p;}" ${SELF} |
+	while read src dst; do
+		case $src in
+		"")	continue ;;
+		esac
+		case $dst in
+		"")	continue ;;
+		[!/]*)	dst="${PKG_PREFIX}/$dst" ;;
+		esac
+
+		if ${TEST} ! -e "$dst"; then
+			${ECHO} "${PKGNAME}: linking $dst -> $src"
+			${LN} -fs "$src" "$dst"
+		fi
+	done
+	;;
+
+REMOVE,0)
+	${SED} -n "/^\# SYMLINK: /{s/^\# SYMLINK: //;p;}" ${SELF} |
+	while read src dst; do
+		case $src in
+		"")	continue ;;
+		esac
+		case $dst in
+		"")	continue ;;
+		[!/]*)	dst="${PKG_PREFIX}/$dst" ;;
+		esac
+
+		if ${TEST} -e "$dst"; then
+			${ECHO} "${PKGNAME}: removing $dst"
+			${RM} -f "$dst"
+		fi
+	done
+	${RM} -f ${ROOT_ACTIONS_COOKIE}
+	;;
+
+ADD,*)
+	if ${TEST} ! -f ${ROOT_ACTIONS_COOKIE}; then
+		${CAT} << EOM
+==============================================================================
+Please run the following command with superuser privileges to complete
+the installation of ${PKGNAME}:
+
+    cd ${PKG_METADATA_DIR} && ${SELF} ADD
+
+==============================================================================
+EOM
+	fi
+	;;
+
+REMOVE,*)
+	if ${TEST} -f ${ROOT_ACTIONS_COOKIE}; then
+		${CAT} << EOM
+==============================================================================
+Please run the following command with superuser privileges to begin the
+removal of ${PKGNAME}:
+
+    cd ${PKG_METADATA_DIR} && ${SELF} REMOVE
+
+Then, please run pkg_delete(1) again to complete the removal of this
+package.
+
+==============================================================================
+EOM
+		exitcode=1
+	fi
+	;;
+esac
+exit $exitcode
+
+EOF
+	${SED} -n "/^\# SYMLINK: /p" ${SELF} >> ./+ROOT_ACTIONS
+	${CHMOD} +x ./+ROOT_ACTIONS
+	;;
+esac
+
+# SYMLINK: /dev/rcd0a @EMULSUBDIR@/dev/cdrom
+# SYMLINK: /dev/rfd0a @EMULSUBDIR@/dev/fd0
+# SYMLINK: /dev/wd0d @EMULSUBDIR@/dev/hda
+# SYMLINK: /dev/wd1d @EMULSUBDIR@/dev/hdb
+# SYMLINK: /dev/wd2d @EMULSUBDIR@/dev/hdc
+# SYMLINK: /dev/wd3d @EMULSUBDIR@/dev/hdd
+# SYMLINK: /dev/sd0d @EMULSUBDIR@/dev/hde
+# SYMLINK: /dev/sd1d @EMULSUBDIR@/dev/hdf
+# SYMLINK: /dev/sd2d @EMULSUBDIR@/dev/hdg
+# SYMLINK: /dev/sd3d @EMULSUBDIR@/dev/hdh
+# SYMLINK: /dev/sd4d @EMULSUBDIR@/dev/hdi
+# SYMLINK: /dev/ttyE0 @EMULSUBDIR@/dev/tty1
+# SYMLINK: /dev/ttyE1 @EMULSUBDIR@/dev/tty2
+# SYMLINK: /dev/ttyE2 @EMULSUBDIR@/dev/tty3
+# SYMLINK: /dev/ttyE3 @EMULSUBDIR@/dev/tty4
+# SYMLINK: /dev/ttyE4 @EMULSUBDIR@/dev/tty5
+# SYMLINK: /dev/ttyE5 @EMULSUBDIR@/dev/tty6
+# SYMLINK: /dev/ttyE6 @EMULSUBDIR@/dev/tty7
+# SYMLINK: /dev/ttyE7 @EMULSUBDIR@/dev/tty8
+# SYMLINK: tty1 @EMULSUBDIR@/dev/tty0
+
+case "${STAGE}" in
+POST-INSTALL)
+	${TEST} ! -x ./+ROOT_ACTIONS ||
+		./+ROOT_ACTIONS ADD ${PKG_METADATA_DIR}
+	;;
+esac
diff --git a/emulators/suse91_vmware/Makefile b/emulators/suse91_vmware/Makefile
index 3eec3dcfcf9..f19e5fdff55 100644
--- a/emulators/suse91_vmware/Makefile
+++ b/emulators/suse91_vmware/Makefile
@@ -1,36 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:28 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/07/29 05:19:22 jlam Exp $
 
-DISTNAME=		suse_vmware-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_vmware-${SUSE_VERSION}
+PKGREVISION=	3
+CATEGORIES=	emulators
+DISTFILES=	grep-2.5.1-416.${SUSE_ARCH}.rpm
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package to support running VMware
+MAINTAINER=	pkgsrc-users@NetBSD.org
+COMMENT=	Linux compatibility package to help run VMware
 
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-DEPENDS+=	suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse91_x11
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
-
-RPMFILES=		grep-2.5.1-416.i586.rpm
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base x11
 RPMIGNOREPATH=		usr
 
-post-install:
-	@${GREP} -v '^#' ${FILESDIR}/device-links | \
-	${AWK} '{print("${LN} -fs "$$1" ${EMULDIR}/dev/"$$2)}' | \
-	${SH} -
-	@${GREP} -v '^#' ${FILESDIR}/device-links | \
-	${AWK} '{print("@exec ${LN} -fs "$$1" %D/${EMULSUBDIR}/dev/"$$2)}' \
-	  >>${PLIST_SRC}
-	@${GREP} -v '^#' ${FILESDIR}/device-links | \
-	${AWK} '{print("@unexec ${RM} -f %D/${EMULSUBDIR}/dev/"$$2)}' \
-	  >>${PLIST_SRC}
-
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_vmware/PLIST b/emulators/suse91_vmware/PLIST
deleted file mode 100644
index c5d7a7e8c18..00000000000
--- a/emulators/suse91_vmware/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/04/02 17:10:19 jdolecek Exp $
-@comment this plist intentionally left empty
diff --git a/emulators/suse91_vmware/files/device-links b/emulators/suse91_vmware/files/device-links
deleted file mode 100644
index 50b0788efdc..00000000000
--- a/emulators/suse91_vmware/files/device-links
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: device-links,v 1.1.1.1 2005/04/02 16:59:44 jdolecek Exp $
-/dev/rcd0a cdrom
-/dev/rfd0a fd0
-/dev/wd0d hda
-/dev/wd1d hdb
-/dev/wd2d hdc
-/dev/wd3d hdd
-/dev/sd0d hde
-/dev/sd1d hdf
-/dev/sd2d hdg
-/dev/sd3d hdh
-/dev/sd4d hdi
-/dev/ttyE0 tty1
-/dev/ttyE1 tty2
-/dev/ttyE2 tty3
-/dev/ttyE3 tty4
-/dev/ttyE4 tty5
-/dev/ttyE5 tty6
-/dev/ttyE6 tty7
-/dev/ttyE7 tty8
-tty1 tty0
diff --git a/emulators/suse91_x11/DESCR b/emulators/suse91_x11/DESCR
index 023c56f39b1..9ce91f0841f 100644
--- a/emulators/suse91_x11/DESCR
+++ b/emulators/suse91_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/suse91_x11/Makefile b/emulators/suse91_x11/Makefile
index 711ace7a801..be6cea81101 100644
--- a/emulators/suse91_x11/Makefile
+++ b/emulators/suse91_x11/Makefile
@@ -1,26 +1,29 @@
-# $NetBSD: Makefile,v 1.11 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.12 2007/07/29 05:19:23 jlam Exp $
 
-DISTNAME=		suse_x11-${SUSE_VERSION}
-PKGREVISION=		6
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_x11-${SUSE_VERSION}
+PKGREVISION=	7
+CATEGORIES=	emulators
+DISTFILES=	XFree86-libs-4.3.99.902-43.42.5.${SUSE_ARCH}.rpm
 
-MAINTAINER=		tron@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for X11 binaries
+MAINTAINER=	tron@NetBSD.org
+COMMENT=	Linux compatibility package for X11
 
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
+EMUL_MODULES.linux=	base
 
-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"
+# These symlinks are managed by ldconfig(8).
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libFS.so.6
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libGLw.so.1
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libI810XvMC.so.1
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libVncExt.so.2
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libXRes.so.1
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libXfontcache.so.1
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libXinerama.so.1
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libXss.so.1
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libXvMC.so.1
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libXxf86rush.so.1
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libfontenc.so.1
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libxkbfile.so.1
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libxkbui.so.1
 
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_x11/Makefile.i386 b/emulators/suse91_x11/Makefile.i386
deleted file mode 100644
index f9176057571..00000000000
--- a/emulators/suse91_x11/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $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
deleted file mode 100644
index ec0ecd79c36..00000000000
--- a/emulators/suse91_x11/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=		XFree86-libs-4.3.99.902-43.42.5.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_x11/PLIST_rpmfix.i386 b/emulators/suse91_x11/PLIST_rpmfix.i386
deleted file mode 100644
index 0aa20170dda..00000000000
--- a/emulators/suse91_x11/PLIST_rpmfix.i386
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST_rpmfix.i386,v 1.1 2006/04/28 09:08:32 joerg Exp $
-/usr/X11R6/lib/libFS.so.6
-/usr/X11R6/lib/libGLw.so.1
-/usr/X11R6/lib/libI810XvMC.so.1
-/usr/X11R6/lib/libVncExt.so.2
-/usr/X11R6/lib/libXRes.so.1
-/usr/X11R6/lib/libXfontcache.so.1
-/usr/X11R6/lib/libXinerama.so.1
-/usr/X11R6/lib/libXss.so.1
-/usr/X11R6/lib/libXvMC.so.1
-/usr/X11R6/lib/libXxf86rush.so.1
-/usr/X11R6/lib/libfontenc.so.1
-/usr/X11R6/lib/libxkbfile.so.1
-/usr/X11R6/lib/libxkbui.so.1
diff --git a/emulators/suse_linux/Makefile.application b/emulators/suse_linux/Makefile.application
deleted file mode 100644
index 45a82846424..00000000000
--- a/emulators/suse_linux/Makefile.application
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile.application,v 1.24 2007/04/19 15:30:22 xtraeme Exp $
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == "NetBSD" ||	\
-     ${OPSYS} == "FreeBSD" ||	\
-     ${OPSYS} == "DragonFly")	\
- && (${MACHINE_ARCH} == "i386" || 	\
-     ${MACHINE_ARCH} == "powerpc" ||	\
-     ${MACHINE_ARCH} == "x86_64")
-
-.  if !empty(SUSE_PREFER:M10.0)
-.    include "../../emulators/suse100_linux/vars.mk"
-.  elif !empty(SUSE_PREFER:M9.1) && (${MACHINE_ARCH} != "powerpc")
-.    include "../../emulators/suse91_linux/vars.mk"
-.  else
-.    include "../../emulators/suse_linux/unavailable.mk"
-.  endif
-
-.  if defined(RPMFILES) || defined(SUSE_COMPAT32)
-.    include "../../emulators/${SUSE_DIR_PREFIX}_linux/Makefile.common"
-.  endif
-
-EMULSUBDIR?=	emul/linux
-EMULDIR?=	${PREFIX}/${EMULSUBDIR}
-LDD=		${EMULDIR}/usr/bin/ldd
-.elif ${OPSYS} == "Linux"
-# No Linux emulation is needed
-USE_NATIVE_LINUX=		# empty
-.else
-.  include "../../emulators/suse_linux/unavailable.mk"
-.endif
diff --git a/emulators/suse_linux/PLIST_dynamic b/emulators/suse_linux/PLIST_dynamic
deleted file mode 100644
index 596e633957a..00000000000
--- a/emulators/suse_linux/PLIST_dynamic
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST_dynamic,v 1.2 2006/06/26 17:54:20 salo Exp $
-@comment PLIST created dynamically
diff --git a/emulators/suse_linux/unavailable.mk b/emulators/suse_linux/unavailable.mk
deleted file mode 100644
index 3bf272f3610..00000000000
--- a/emulators/suse_linux/unavailable.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: unavailable.mk,v 1.2 2006/07/28 22:57:38 kristerw Exp $
-
-.ifndef SUSE_UNAVAILABLE_MK
-SUSE_UNAVAILABLE_MK=1
-
-# We put a value here so that the creation of the bulk build cache files
-# works correctly on all machines.  This speeds up the marking of all
-# COMPAT_LINUX packages as not available.
-#
-SUSE_DIR_PREFIX=	suse100
-SUSE_VERSION=		0
-PKG_SKIP_REASON+=	"${PKGNAME} is not available for ${MACHINE_PLATFORM}"
-
-# By default, we can't check for missing shared libraries nor note which
-# shared libraries are provided and/or required by the package since the
-# library support is via syscall emulation.
-#
-CHECK_SHLIBS_SUPPORTED?=	no
-
-.endif # SUSE_UNAVAILABLE_MK
diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile
index af49dc32bb1..0cf0eb77da0 100644
--- a/emulators/vmware/Makefile
+++ b/emulators/vmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/03/21 16:15:58 tron Exp $
+# $NetBSD: Makefile,v 1.19 2007/07/29 05:19:24 jlam Exp $
 
 DISTNAME=	VMware-2.0.4-1142
 PKGNAME=	vmware-2.0.4
@@ -17,16 +17,14 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.vmware.com/
 COMMENT=	VMware 2.x emulator
 
-CONFLICTS=	vmware-3*
-
 DEPENDS+=	vmware-module-1.*:../../emulators/vmware-module
-DEPENDS+=	suse_vmware>=6.4nb1:../../emulators/${SUSE_DIR_PREFIX}_vmware
 
 LICENSE=	vmware-license
 
-WRKSRC=		${WRKDIR}/vmware-distrib
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	vmware
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
+WRKSRC=			${WRKDIR}/vmware-distrib
 
 # We could install it into /etc/vmware, but that would mean we install
 # it somewhere out of ${PREFIX}, which is not a good idea, and the linux
@@ -82,5 +80,4 @@ post-install:
 	${ECHO} "vmnet1.HostOnlyNetMask = \"255.255.255.0\"";		\
 	) > ${VMWARE_CFG_DIR}/config
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index 877e59af40d..389378064e8 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/03/25 14:45:19 tron Exp $
+# $NetBSD: Makefile,v 1.21 2007/07/29 05:19:25 jlam Exp $
 
 DISTNAME=	VMware-workstation-3.2.1-2242
 PKGNAME=	vmware-3.2.1pl1
@@ -10,12 +10,6 @@ MASTER_SITES=	http://download3.vmware.com/software/wkst/ \
 		http://vmware-heva.www.conxion.com/software/ \
 		ftp://mirror.aarnet.edu.au/pub/vmware/software/
 
-MAINTAINER=	jdolecek@NetBSD.org
-HOMEPAGE=	http://www.vmware.com/
-COMMENT=	VMware emulator 3.x
-
-CONFLICTS=	vmware-2.*
-
 # Binary patch to fix an problem with the nice(3) interface in an
 # newer glibc (>= v2.3.3)
 VMWARE_BIN_PATCH=	vmware-any-any-update99
@@ -24,16 +18,22 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=	${VMWARE_BIN_PATCH}.tar.gz
 SITES.${VMWARE_BIN_PATCH}.tar.gz=	ftp://ftp.cvut.cz/vmware/obsolete/
 
+MAINTAINER=	jdolecek@NetBSD.org
+HOMEPAGE=	http://www.vmware.com/
+COMMENT=	VMware emulator 3.x
+
 DEPENDS+=	vmware-module>=3.2.1.8:../../emulators/vmware-module3
-DEPENDS+=	suse_vmware>=6.4nb1:../../emulators/${SUSE_DIR_PREFIX}_vmware
 
 LICENSE=	vmware-license
 
-WRKSRC=		${WRKDIR}/vmware-distrib
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	vmware
+SUSE_VERSION_REQD=	6.4nb1
+
+WRKSRC=			${WRKDIR}/vmware-distrib
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
 # There is a kernel bug in NetBSD 3.0 for vmware.
-NOT_FOR_PLATFORM=	NetBSD-3.0*-i386
+NOT_FOR_PLATFORM=	NetBSD-3.0*-*
 
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
@@ -46,8 +46,6 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 # so use this way.
 VMWARE_CFG_DIR=		${PREFIX}/emul/linux/etc/vmware
 
-.include "../../mk/bsd.prefs.mk"
-
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-build:
@@ -110,5 +108,4 @@ post-install:
 	${ECHO} "xkeymap.usekeycodeMapIfXFree86 = true";		\
 	) > ${VMWARE_CFG_DIR}/config
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xyame/Makefile b/emulators/xyame/Makefile
index 1be1ea8ae9e..4dcf21d8a25 100644
--- a/emulators/xyame/Makefile
+++ b/emulators/xyame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:53 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2007/07/29 05:19:25 jlam Exp $
 #
 
 DISTNAME=		xyame038
@@ -11,17 +11,12 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 #HOMEPAGE=		http://www.geocities.co.jp/Stylish/2068/yame.html
 COMMENT=		Multi-system emulator (Gameboy, NES, and PC-Engine)
 
-.include "../../emulators/suse_linux/Makefile.application"
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	x11
 
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
 
-WRKSRC=		${WRKDIR}
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-
-ONLY_FOR_PLATFORM+=	*-*-i386
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
diff --git a/games/adom/Makefile b/games/adom/Makefile
index 9390f37a7d3..c86abc31cae 100644
--- a/games/adom/Makefile
+++ b/games/adom/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/12/23 10:29:49 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.14 2007/07/29 05:19:25 jlam Exp $
 
 DISTNAME=	adom-111-elf
 PKGNAME=	adom-1.1.1
@@ -11,22 +10,16 @@ MAINTAINER=	shattered@users.sourceforge.net
 HOMEPAGE=	http://www.adom.de/
 COMMENT=	Ancient Domains of Mystery - yet another roguelike game
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386 Linux-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base
 
-WRKSRC=		${WRKDIR}/adom
-NO_BUILD=	YES
-NO_CONFIGURE=	YES
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_base>=6.1:../../emulators/${SUSE_DIR_PREFIX}_base
-.endif
+WRKSRC=			${WRKDIR}/adom
+BUILD_DIRS=		# empty
 
 INSTALLATION_DIRS=	bin share/doc/adom
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/*.* ${PREFIX}/share/doc/adom
 	${INSTALL_PROGRAM} ${WRKSRC}/adom ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/*.* ${PREFIX}/share/doc/adom
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/civctp-demo/Makefile b/games/civctp-demo/Makefile
index af2d15c683a..6f811f5b6d9 100644
--- a/games/civctp-demo/Makefile
+++ b/games/civctp-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:09:13 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/07/29 05:19:25 jlam Exp $
 
 DISTNAME=	civctp-demo-10251999
 PKGNAME=	civctp-demo-19991025
@@ -12,23 +12,12 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www.lokigames.com/products/civctp/
 COMMENT=	Civilization: Call to Power - graphical strategy (linux demo)
 
-WRKSRC=			${WRKDIR}/${WRKNAME}
-NO_CONFIGURE=		yes
-
 # Someone needs to look at alpha, powerpc and sparc compat_linux
-ONLY_FOR_PLATFORM=*-*-i386
-
-.if (${MACHINE_ARCH} == "i386")
-BINTYPE=	x86/glibc-2.1
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	x11
 
-DEPENDS+=	suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
-.elif (${MACHINE_ARCH} == "alpha")
-BINTYPE=	alpha/glibc-2.1
-.elif (${MACHINE_ARCH} == "powerpc")
-BINTYPE=	ppc/glibc-2.1
-.elif (${MACHINE_ARCH} == "sparc64")
-BINTYPE=	sparc64/glibc-2.1
-.endif
+WRKSRC=		${WRKDIR}/${WRKNAME}
+BUILD_DIRS=	# empty
 
 WRKNAME=	civctp_demo
 DISTBINNAME=	civctp
@@ -38,6 +27,12 @@ DIST_SUBDIR=	lokigames
 LIBDIR=		${PREFIX}/lib/lokigames/${BINNAME}
 SHAREDIR=	${PREFIX}/share/doc/lokigames
 
+BINTYPE.i386=		x86/glibc-2.1
+BINTYPE.alpha=		alpha/glibc-2.1
+BINTYPE.powerpc=	ppc/glibc-2.1
+BINTYPE.sparc64=	sparc64/glibc-2.1
+BINTYPE=		${BINTYPE.${EMUL_ARCH}}
+
 INSTALLATION_DIRS=	bin
 
 do-build:
@@ -55,5 +50,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-README
 	cd ${WRKSRC} && ${PAX} -rw appstr.txt civpaths.txt ctp_data ${LIBDIR}
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/et/Makefile b/games/et/Makefile
index 2ccc7351db7..8c4b3bc6963 100644
--- a/games/et/Makefile
+++ b/games/et/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:30 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/07/29 05:19:25 jlam Exp $
 #
 
 DISTNAME=	et-linux-2.56-2.x86
 PKGNAME=	et-2.56
-PKGREVISION=     1
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/et/linux/
 EXTRACT_SUFX=	.run
@@ -12,19 +12,15 @@ MAINTAINER=	dhowland@users.sourceforge.net
 HOMEPAGE=	http://games.activision.com/games/wolfenstein/
 COMMENT=	Wolfenstein: Enemy Territory for Linux
 
-NO_BUILD=	yes
-ONLY_FOR_PLATFORM=	*-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base
 
 USE_TOOLS+=	gtar
-ETDIR=		${PREFIX}/lib/lokigames/et
 EXTRACT_CMD=	${TAIL} +356 ${DOWNLOADED_DISTFILE} | ${GTAR} xzf - \
 		-C ${WRKSRC}
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_base>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base
-.endif
+ETDIR=		${PREFIX}/lib/lokigames/et
+BUILD_DIRS=	# empty
 
 INSTALLATION_DIRS=	bin
 
diff --git a/games/eus-demo/Makefile b/games/eus-demo/Makefile
index e8d5180cd90..70f21445cd0 100644
--- a/games/eus-demo/Makefile
+++ b/games/eus-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:09:14 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/07/29 05:19:25 jlam Exp $
 
 DISTNAME=	eus-demo
 PKGNAME=	eus-demo-1.0
@@ -12,23 +12,12 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www.lokigames.com/products/eus/
 COMMENT=	Eric's Ultimate Solitaire (linux demo)
 
-WRKSRC=			${WRKDIR}/${WRKNAME}
-NO_CONFIGURE=		yes
-
 # Someone needs to look at alpha, powerpc and sparc compat_linux
-ONLY_FOR_PLATFORM=*-*-i386
-
-.if (${MACHINE_ARCH} == "i386")
-BINTYPE=	x86/glibc-2.1
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	x11
 
-DEPENDS+=	suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
-.elif (${MACHINE_ARCH} == "alpha")
-BINTYPE=	alpha/glibc-2.1
-.elif (${MACHINE_ARCH} == "powerpc")
-BINTYPE=	ppc/glibc-2.1
-.elif (${MACHINE_ARCH} == "sparc64")
-BINTYPE=	sparc64/glibc-2.1
-.endif
+WRKSRC=		${WRKDIR}/${WRKNAME}
+BUILD_DIRS=	# empty
 
 WRKNAME=	eus_demo
 DISTBINNAME=	EricsSolitaireDemo
@@ -38,6 +27,12 @@ DIST_SUBDIR=	lokigames
 LIBDIR=		${PREFIX}/lib/lokigames/${BINNAME}
 SHAREDIR=	${PREFIX}/share/doc/lokigames
 
+BINTYPE.i386=		x86/glibc-2.1
+BINTYPE.alpha=		alpha/glibc-2.1
+BINTYPE.powerpc=	ppc/glibc-2.1
+BINTYPE.sparc64=	sparc64/glibc-2.1
+BINTYPE=		${BINTYPE.${EMUL_ARCH}}
+
 INSTALLATION_DIRS=	bin
 
 do-build:
@@ -55,5 +50,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-README
 	cd ${WRKSRC} && ${PAX} -rw [Eai-p]* sounds ${LIBDIR}
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/majesty-demo/Makefile b/games/majesty-demo/Makefile
index db300aa7580..d0e3a292608 100644
--- a/games/majesty-demo/Makefile
+++ b/games/majesty-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:30 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/07/29 05:19:25 jlam Exp $
 #
 
 DISTNAME=	majesty_demo
@@ -16,17 +16,11 @@ EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
 			${GZCAT} | ${PAX} -O -r
 USE_TOOLS+=	gzcat pax
 
-ONLY_FOR_PLATFORM=*-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	x11
 
 WRKSRC=		${WRKDIR}
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-.if (${MACHINE_ARCH} == "i386")
-DEPENDS+=	suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
-.endif
+BUILD_DIRS=	# empty
 
 BINNAME=	maj_demo
 LGP_PATH=	${PREFIX}/lib/lgp
@@ -49,5 +43,4 @@ do-install:
 		quests ${MAJ_PATH}
 	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${BINNAME}
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/quake3arena-demo/Makefile b/games/quake3arena-demo/Makefile
index cf977b14def..5c979a62da1 100644
--- a/games/quake3arena-demo/Makefile
+++ b/games/quake3arena-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/03/04 21:29:43 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2007/07/29 05:19:25 jlam Exp $
 
 DISTNAME=	linuxq3ademo-1_11-6_x86_gz
 PKGREVISION=	3
@@ -14,29 +14,18 @@ COMMENT=	Quake 3 Arena -- first person shooter (linux demo)
 
 CONFLICTS=	quake3arena-[0-9]*
 
-.include "../../mk/bsd.prefs.mk"
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base x11 glx
 
-.if ${OPSYS} != "Linux"
-DEPENDS+=	suse_base>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base
-DEPENDS+=	suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
-DEPENDS+=	suse_glx>=6.4:../../emulators/${SUSE_DIR_PREFIX}_glx
-.include "../../emulators/suse_linux/Makefile.application"
-.else
-.include "../../mk/x11.buildlink3.mk"
-.endif
-
-NO_CONFIGURE=	yes
-EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
-								${GTAR} xzf -
 USE_TOOLS+=	gtar
-
-ONLY_FOR_PLATFORM=*-*-i386
+EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} |	\
+		${GTAR} xzf -
 
 DISTBINNAME=	q3demo
 BINNAME=	quake3arena-demo
 
-WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	lokigames
+WRKSRC=		${WRKDIR}
 LIBDIR=		${PREFIX}/lib/lokigames/${BINNAME}
 SHAREDIR=	${PREFIX}/share/doc/lokigames
 
diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile
index 2f4c159a644..b0817283d71 100644
--- a/games/quake3arena/Makefile
+++ b/games/quake3arena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2007/02/19 18:48:59 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2007/07/29 05:19:26 jlam Exp $
 
 DISTNAME=	linuxq3apoint-1.32b.x86
 PKGREVISION=	3
@@ -14,17 +14,11 @@ COMMENT=	Quake 3 Arena -- first person shooter (binary only, no data files)
 
 CONFLICTS=	quake3arena-demo-[0-9]*
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_base>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base
-DEPENDS+=	suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
-DEPENDS+=	suse_glx>=6.4:../../emulators/${SUSE_DIR_PREFIX}_glx
-.endif
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base x11 glx
 
 NO_SRC_ON_FTP=	no
 NO_BIN_ON_FTP=	no
-NO_CONFIGURE=	yes
 
 USE_TOOLS+=	gtar gunzip tail
 
@@ -33,10 +27,6 @@ USE_TOOLS+=	gtar gunzip tail
 #
 EXTRACT_CMD=	tail +266 ${DOWNLOADED_DISTFILE} | gunzip | gtar -xf -
 
-.if !make(fetch)
-ONLY_FOR_PLATFORM=*-*-i386
-.endif
-
 DISTBINNAME=	quake3.x86
 BINNAME=	quake3arena
 
@@ -63,9 +53,10 @@ do-install:
 
 	cd ${WRKSRC} && ${PAX} -rw baseq3 ${LIBDIR}
 
-.if ${OPSYS} == "FreeBSD"
+# Some platforms, e.g. FreeBSD, need to "brand" the ELF binaries to
+# the correct type.
+#
 post-install:
-	${BRANDELF} -t Linux ${LIBDIR}/${BINNAME}
-.endif
+	${BRANDELF:D${BRANDELF} -t Linux ${PREFIX}/bin/${BINNAME}:U${TRUE}}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/quake3server/Makefile b/games/quake3server/Makefile
index e9efc2053e9..f97aff360f2 100644
--- a/games/quake3server/Makefile
+++ b/games/quake3server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:31 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/07/29 05:19:26 jlam Exp $
 
 DISTNAME=	linuxq3apoint-1.32b.x86
 PKGNAME=	quake3server-1.32b
@@ -13,10 +13,9 @@ COMMENT=	Quake III Arena Dedicated Server for Linux
 
 .include "../../games/quake3server/Makefile.common"
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
-USE_TOOLS+=		gtar
-
+USE_TOOLS+=	gtar
 EXTRACT_CMD=	${SED} '1,265d' ${DOWNLOADED_DISTFILE} | ${GTAR} xzf -
+
 WRKSRC=		${WRKDIR}
 BASEDOCDIR=	${PREFIX}/share/doc/lokigames/quake3server
 RCD_SCRIPTS=	quake3server
diff --git a/games/quake3server/Makefile.common b/games/quake3server/Makefile.common
index 667d96f1ca7..7c8d0fc3b39 100644
--- a/games/quake3server/Makefile.common
+++ b/games/quake3server/Makefile.common
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile.common,v 1.4 2006/04/22 09:22:09 rillig Exp $
+# $NetBSD: Makefile.common,v 1.5 2007/07/29 05:19:26 jlam Exp $
 
-NO_BUILD=		yes
 Q3ROOTDIR=		${PREFIX}/lib/lokigames/quake3server
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 RESTRICTED=		Size; the data set is much too big
 NO_SRC_ON_CDROM=	${RESTRICTED}
@@ -10,6 +8,5 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 
-DEPENDS+=		suse_base>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base
-
-.include "../../emulators/suse_linux/Makefile.application"
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base
diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile
index b690962fb85..21137fb6359 100644
--- a/games/rollemup/Makefile
+++ b/games/rollemup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2007/02/22 19:01:18 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2007/07/29 05:19:26 jlam Exp $
 
 DISTNAME=	Rollemup
 PKGNAME=	rollemup-1.0
@@ -20,22 +20,14 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-NO_CONFIGURE=	yes
+USE_TOOLS+=		gtar
 
-PLIST_SRC=	${WRKDIR}/PLIST.src
-GAMES_DIR=	share/games
-MESSAGE_SUBST+=	GAMES_DIR=${GAMES_DIR}
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	compat x11
 
-USE_TOOLS+=	gtar
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-DEPENDS+=	suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
+PLIST_SRC=		${WRKDIR}/PLIST.src
+GAMES_DIR=		share/games
+MESSAGE_SUBST+=		GAMES_DIR=${GAMES_DIR}
 
 INSTALLATION_DIRS=	bin
 
@@ -66,5 +58,4 @@ do-install:
 	@${CHMOD} 775 ${PREFIX}/${GAMES_DIR}/Rollemup/Upload
 	@${CHMOD} 664 ${PREFIX}/${GAMES_DIR}/Rollemup/Rollemup.ini
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile
index 6505ceb7520..5c9c7492e1a 100644
--- a/games/rtcw/Makefile
+++ b/games/rtcw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:31 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/07/29 05:19:26 jlam Exp $
 
 DISTNAME=	wolf-linux-1.33.x86
 PKGNAME=	rtcw-1.33
@@ -11,28 +11,23 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://games.activision.com/games/wolfenstein/
 COMMENT=	Return to Castle Wolfenstein for Linux
 
-ONLY_FOR_PLATFORM=	*-*-i386
-NOT_FOR_PLATFORM=	NetBSD-*-*
-
-NO_BUILD=		yes
-RTCWDIR=		${PREFIX}/lib/lokigames/rtcw
 RESTRICTED=		Size; the data set is much too big
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
-EXTRACT_CMD=	${SED} '1,178d' ${DOWNLOADED_DISTFILE} | ${GTAR} xzf - \
-		    -C ${WRKSRC}
-USE_TOOLS+=	gtar
 
-.include "../../mk/bsd.prefs.mk"
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base
 
-.if ${OPSYS} != "Linux"
-DEPENDS+=	suse_base>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base
-.include "../../emulators/suse_linux/Makefile.application"
-.else
-.include "../../mk/x11.buildlink3.mk"
-.endif
+# This package needs DRI support.
+NOT_FOR_PLATFORM=	NetBSD-*-*
+
+BUILD_DIRS=	# empty
+RTCWDIR=	${PREFIX}/lib/lokigames/rtcw
+USE_TOOLS+=	gtar
+EXTRACT_CMD=	${SED} '1,178d' ${DOWNLOADED_DISTFILE} |		\
+		${GTAR} xzf - -C ${WRKSRC}
 
 pre-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/graphics/PanoTools/Makefile b/graphics/PanoTools/Makefile
index 2c85ef8f97a..9e33291fdd6 100644
--- a/graphics/PanoTools/Makefile
+++ b/graphics/PanoTools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/02/15 16:27:54 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2007/07/29 05:19:27 jlam Exp $
 #
 
 DISTNAME=		PanoTools
@@ -11,16 +11,16 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.path.unimelb.edu.au/~dersch/
 COMMENT=		View, create, edit, and remap panoramic images
 
-ONLY_FOR_PLATFORM=	Linux-*-i[3-6]86 NetBSD-*-i386 DragonFly-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base jpeg png tiff
 
 WRKSRC=			${WRKDIR}/PTLinux
+BUILD_DIRS=		# empty
 USE_JAVA=		run
-NO_BUILD=		YES
-
-.include "../../mk/bsd.prefs.mk"
 
 PKG_JVM?=		sun-jdk
 PLIST_SUBST+=		JAVA_HOME="${PKG_JAVA_HOME:C/^${PREFIX}\///}"
+
 INSTALLATION_DIRS=	bin lib
 
 do-install:
@@ -64,22 +64,5 @@ do-install:
 		${PREFIX}/share/PanoTools/Templates
 .endfor
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if ${OPSYS} != "Linux"
-DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_base
-DEPENDS+=		suse_libjpeg>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_libjpeg
-DEPENDS+=		suse_libpng>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_libpng
-DEPENDS+=		suse_libtiff>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_libtiff
-
-EMULSUBDIR=		emul/linux
-LDD=			${EMULDIR}/usr/bin/ldd
-.else
-EMULSUBDIR=
-.endif
-
-EMULDIR=		${PREFIX}/${EMULSUBDIR}
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
-
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/PanoTools/PLIST b/graphics/PanoTools/PLIST
index aa4cc9f60fc..2c9216f402b 100644
--- a/graphics/PanoTools/PLIST
+++ b/graphics/PanoTools/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2003/04/20 06:58:20 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/07/29 05:19:27 jlam Exp $
 bin/mkpthelpers
 bin/ptcrypt
 bin/pteditor
 bin/ptpicker
-${EMULSUBDIR}/lib/libpano12.so
+${EMULSUBDIRSLASH}lib/libpano12.so
 libexec/PanoTools/PTAverage
 libexec/PanoTools/PTInterpolate
 libexec/PanoTools/PTMorpher
diff --git a/lang/Cg-compiler/Makefile b/lang/Cg-compiler/Makefile
index cfae5b6df32..e5a10626829 100644
--- a/lang/Cg-compiler/Makefile
+++ b/lang/Cg-compiler/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:56 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2007/07/29 05:19:27 jlam Exp $
 #
 
 DISTNAME=	CgLinux-1.3.0408-0400
 PKGNAME=	Cg-compiler-1.3beta2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	ftp://download.nvidia.com/developer/cg/Cg_1.3/Linux/
 
@@ -11,18 +11,15 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://developer.nvidia.com/object/cg_toolkit.html
 COMMENT=	NVIDIA Cg Compiler for Linux
 
-ONLY_FOR_PLATFORM=  *-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base
+SUSE_VERSION_REQD=	7.3
 
-WRKSRC=		${WRKDIR}
-NO_BUILD=	yes
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
+RUN_LDCONFIG=		yes
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} != "Linux"
-DEPENDS+=	suse_base>=7.3:../../emulators/${SUSE_DIR_PREFIX}_base
-.endif
-
-INSTALLATION_DIRS=	bin lib ${PKGMANDIR}/man3 share
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man3 share
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/Cg
@@ -32,9 +29,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/usr/bin/cgc ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/usr/include/Cg/* ${PREFIX}/include/Cg
 	${INSTALL_DATA} ${WRKSRC}/usr/include/CgFX/* ${PREFIX}/include/CgFX
-	${INSTALL_DATA} ${WRKSRC}/usr/lib/* ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/usr/lib/* ${EMULDIR}/lib
 	${INSTALL_MAN} ${WRKSRC}/usr/share/man/man3/* ${PREFIX}/${PKGMANDIR}/man3
 	cd ${WRKSRC}/usr/local && ${PAX} -rwppm . ${PREFIX}/share/NVIDIA-Cg-linux
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/Cg-compiler/PLIST b/lang/Cg-compiler/PLIST
index 6bbbed6b948..c6633733fba 100644
--- a/lang/Cg-compiler/PLIST
+++ b/lang/Cg-compiler/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/18 21:12:51 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/07/29 05:19:27 jlam Exp $
 bin/cgc
 include/Cg/cg.h
 include/Cg/cgContextManager.h
@@ -14,10 +14,10 @@ include/Cg/cg_profiles.h
 include/CgFX/ICgFX.h
 include/CgFX/ICgFXEffect.h
 include/CgFX/cgfx_stddefs.h
-lib/libCg.so
-lib/libCgFX.so
-lib/libCgFXGL.so
-lib/libCgGL.so
+${EMULSUBDIRSLASH}lib/libCg.so
+${EMULSUBDIRSLASH}lib/libCgFX.so
+${EMULSUBDIRSLASH}lib/libCgFXGL.so
+${EMULSUBDIRSLASH}lib/libCgGL.so
 man/man3/cgCompileProgram.3
 man/man3/cgConnectParameter.3
 man/man3/cgCopyProgram.3
diff --git a/lang/blackdown-jre13/Makefile b/lang/blackdown-jre13/Makefile
index b77eb84c69a..892a599f51d 100644
--- a/lang/blackdown-jre13/Makefile
+++ b/lang/blackdown-jre13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/18 22:13:23 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/07/29 05:19:27 jlam Exp $
 #
 
 BD_BASENAME=	j2re
@@ -7,13 +7,15 @@ PKGNAME=	blackdown-jre13-1
 PKGREVISION=	2
 COMMENT=	Blackdown's Java(tm) Runtime Environment 1.3.1
 
-.if ${MACHINE_ARCH} == "arm"
-DISTNAME=	${BD_BASENAME}-${RELVERSION}-RC1-linux-arm
-.endif
+EMUL_PLATFORMS=	linux-arm
 
 .include "../../lang/blackdown-jre13/Makefile.common"
 
-ONLY_FOR_PLATFORM+=	NetBSD-*-arm Linux-*-arm
+.if ${BLACKDOWN_ARCH} == "arm"
+BLACKDOWN_REL=	rc1
+DISTNAME=	${BD_BASENAME}-${RELVERSION}-RC1-linux-arm
+EXTRACT_SUFX=	.tar.bz2
+.endif
 
 PLIST_SRC=	${PKGDIR}/PLIST
 .if ${BLACKDOWN_ARCH} == "i386"
diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common
index 5f167facbc1..30e698430c3 100644
--- a/lang/blackdown-jre13/Makefile.common
+++ b/lang/blackdown-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2007/05/13 21:38:27 wiz Exp $
+# $NetBSD: Makefile.common,v 1.28 2007/07/29 05:19:27 jlam Exp $
 #
 
 RELVERSION=	1.3.1
@@ -14,23 +14,18 @@ MASTER_SITES=	ftp://ftp.tux.org/pub/java/${BD_SUBDIR}/ \
 		ftp://mirror.aarnet.edu.au/pub/java-linux/${BD_SUBDIR}/ \
 		ftp://ftp.informatik.hu-berlin.de/pub/Java/Linux/${BD_SUBDIR}/
 
-.if ${MACHINE_ARCH} == "powerpc"
-BLACKDOWN_ARCH?=	ppc
-.elif !empty(MACHINE_ARCH:Mi[3-6]86)
-BLACKDOWN_ARCH?=	i386
-.else
-BLACKDOWN_ARCH?=	${MACHINE_ARCH}
-.endif
+EMUL_PLATFORMS+=	linux-i386 linux-powerpc linux-sparc
+EMUL_MODULES.linux+=	base
+SUSE_VERSION_REQD=	7.3
 
-.if ${BLACKDOWN_ARCH} == "arm"
-BLACKDOWN_REL=	rc1
-EXTRACT_SUFX=	.tar.bz2
-.elif ${BLACKDOWN_ARCH} == "ppc"
-DEPENDS+=	suse_base>=7.3:../../emulators/${SUSE_DIR_PREFIX}_base
-.endif
+.include "../../mk/bsd.prefs.mk"
 
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.blackdown.org/
+BLACKDOWN_ARCH=			${BLACKDOWN_ARCH.${EMUL_ARCH}}
+BLACKDOWN_ARCH.powerpc=		ppc
+BLACKDOWN_ARCH.${EMUL_ARCH}=	${EMUL_ARCH}
+
+MAINTAINER=		tech-pkg@NetBSD.org
+HOMEPAGE=		http://www.blackdown.org/
 
 RESTRICTED=		Redistribution of repackaged binaries not permitted.
 NO_SRC_ON_CDROM=	${RESTRICTED}
@@ -39,19 +34,13 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
 WRKSRC=			${WRKDIR}/${BD_BASENAME}${RELVERSION}
-CHECK_SHLIBS_SUPPORTED=	no
-
-.include "../../mk/bsd.prefs.mk"
+BUILD_DIRS=		# empty
 
 JVM_HOME=		${PREFIX}/java/blackdown-${RELVERSION}
 USE_TOOLS+=		gunzip
 
 PLIST_SUBST+=		BLACKDOWN_ARCH=${BLACKDOWN_ARCH:Q}
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-powerpc NetBSD-*-sparc \
-			Linux-*-i[3-6]86 Linux-*-powerpc Linux-*-sparc \
-			DragonFly-*-i386
-
 .if ${EXTRACT_SUFX} == ".bin"
 EXTRACT_OPTS_BIN=	--nox11
 post-fetch:
@@ -60,8 +49,6 @@ post-fetch:
 	fi
 .endif
 
-do-build:	# nothing
-
 post-build:
 	${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
 	${FIND} ${WRKSRC} -name '*.1.gz' -print | ${XARGS} ${GUNZIP_CMD}
@@ -69,5 +56,3 @@ post-build:
 do-install:
 	${INSTALL_PROGRAM_DIR} ${JVM_HOME}
 	cd ${WRKSRC} && ${PAX} -rw . ${JVM_HOME}
-
-.include "../../emulators/suse_linux/Makefile.application"
diff --git a/lang/mit-scheme-bin/Makefile b/lang/mit-scheme-bin/Makefile
index be44d0f95d7..bcfa85b8925 100644
--- a/lang/mit-scheme-bin/Makefile
+++ b/lang/mit-scheme-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/12/06 16:33:39 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/07/29 05:19:27 jlam Exp $
 #
 
 DISTNAME=		mit-scheme-7.7.1-ix86-gnu-linux
@@ -10,7 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/mit-scheme/
 COMMENT=		MIT/GNU Scheme (Linux binary)
 
-DEPENDS+=		suse_base>=6.0:../../emulators/${SUSE_DIR_PREFIX}_base
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base
 
 WRKSRC=			${WRKDIR}
 INSTALLATION_DIRS=	bin libexec
@@ -29,5 +30,4 @@ do-install:
 	cd ${WRKSRC}/lib && ${PAX} -rw mit-scheme ${PREFIX}/lib
 	${RMDIR} ${PREFIX}/lib/mit-scheme/lib
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile
index 4bf7dd1c262..7f8f83c5bc5 100644
--- a/lang/sun-jdk13/Makefile
+++ b/lang/sun-jdk13/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2006/09/25 08:00:31 ghen Exp $
+# $NetBSD: Makefile,v 1.41 2007/07/29 05:19:27 jlam Exp $
 
-DISTNAME=	j2sdk-1_3_1_19-linux-i586
+DISTNAME=	j2sdk-1_3_1_19-linux-${DIST_ARCH}
 PKGNAME=	sun-jdk13-1.0.19
 MASTER_SITES=	# empty
 
@@ -10,10 +10,12 @@ SHORT=		JDK
 
 DEPENDS+=	sun-jre13>=1.0.19:../../lang/sun-jre13
 
+WRKSRC=		${WRKDIR}/jdk1.3.1_19
 JAVA_CLASSPATH=	${JAVA_HOME}/src.jar
 JAVA_WRAPPERS=	appletviewer extcheck idlj jar jarsigner \
 		javac javadoc javah javap jdb rmic serialver
-WRKSRC=		${WRKDIR}/jdk1.3.1_19
+
+.include "../../lang/sun-jre13/Makefile.common"
 
 # Remove parts that are in common with the JRE.
 #
@@ -28,4 +30,4 @@ post-extract:
 	done
 	${LN} -sf . ${WRKSRC}/jre
 
-.include "../../lang/sun-jre13/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jdk13/PLIST.Darwin b/lang/sun-jdk13/PLIST.Darwin
deleted file mode 100644
index 99b06f3ae69..00000000000
--- a/lang/sun-jdk13/PLIST.Darwin
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2002/06/30 15:01:48 schmonz Exp $
-@comment Darwin ships with a JDK based on Sun's 1.3.1 release.
diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile
index 486ca86448e..05ad4435790 100644
--- a/lang/sun-jdk14/Makefile
+++ b/lang/sun-jdk14/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2007/04/21 20:40:52 rillig Exp $
+# $NetBSD: Makefile,v 1.36 2007/07/29 05:19:28 jlam Exp $
 
-DISTNAME=	j2sdk-1_4_2_14-linux-i586
+DISTNAME=	j2sdk-1_4_2_14-linux-${DIST_ARCH}
 PKGNAME=	sun-jdk14-2.14
 MASTER_SITES=	# empty
 
@@ -14,6 +14,8 @@ WRKSRC=		${WRKDIR}/j2sdk1.4.2_14
 JAVA_WRAPPERS+=	appletviewer extcheck idlj jar jarsigner \
 		javac javadoc javah javap jdb rmic serialver
 
+.include "../../lang/sun-jre14/Makefile.common"
+
 # Remove parts that are in common with the JRE
 #
 post-extract:
@@ -27,4 +29,4 @@ post-extract:
 	done
 	${LN} -sf . ${WRKSRC}/jre
 
-.include "../../lang/sun-jre14/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jdk15/Makefile b/lang/sun-jdk15/Makefile
index 9bdf9988cd6..91211c3c270 100644
--- a/lang/sun-jdk15/Makefile
+++ b/lang/sun-jdk15/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2007/02/07 13:07:50 abs Exp $
+# $NetBSD: Makefile,v 1.25 2007/07/29 05:19:28 jlam Exp $
 
-DISTNAME=	jdk-1_5_0_11-linux-i586
+DISTNAME=	jdk-1_5_0_11-linux-${DIST_ARCH}
 PKGNAME=	sun-jdk15-5.0.11
 MASTER_SITES=	# empty
 
@@ -8,11 +8,12 @@ SHORT_NAME=	JDK
 
 DEPENDS+=	${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre15
 
-CHECK_SHLIBS=	no	# One of the demos is broken.
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-//:S/_/./:S/_/./:S/-linux-i586//}
 JAVA_WRAPPERS=	appletviewer apt extcheck idlj jar jarsigner \
 		javac javadoc javah javap jdb rmic serialver
 
+.include "../../lang/sun-jre15/Makefile.common"
+
 # Remove parts that are in common with the JRE
 #
 post-extract:
@@ -26,4 +27,4 @@ post-extract:
 	done
 	${LN} -sf . ${WRKSRC}/jre
 
-.include "../../lang/sun-jre15/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jdk6/Makefile b/lang/sun-jdk6/Makefile
index 9fbd6c485e4..fadc51c082e 100644
--- a/lang/sun-jdk6/Makefile
+++ b/lang/sun-jdk6/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2007/05/04 04:53:31 markd Exp $
+# $NetBSD: Makefile,v 1.4 2007/07/29 05:19:28 jlam Exp $
 
-DISTNAME=	jdk-6u1-linux-i586
+DISTNAME=	jdk-6u1-linux-${DIST_ARCH}
 PKGNAME=	sun-jdk6-6.0.1
 MASTER_SITES=	# empty
 
@@ -9,11 +9,12 @@ SHORT_NAME=	JDK
 
 DEPENDS+=	${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6
 
-CHECK_SHLIBS=	no	# One of the demos is broken.
 WRKSRC=		${WRKDIR}/jdk1.6.0_01
 JAVA_WRAPPERS=	appletviewer apt extcheck idlj jar jarsigner \
 		javac javadoc javah javap jdb rmic serialver
 
+.include "../../lang/sun-jre6/Makefile.common"
+
 # Remove parts that are in common with the JRE
 #
 post-extract:
@@ -27,4 +28,4 @@ post-extract:
 	done
 	${LN} -sf . ${WRKSRC}/jre
 
-.include "../../lang/sun-jre6/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile
index e7870fd2e73..66bdddf72d8 100644
--- a/lang/sun-jre13/Makefile
+++ b/lang/sun-jre13/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2006/09/27 06:48:56 rillig Exp $
+# $NetBSD: Makefile,v 1.49 2007/07/29 05:19:28 jlam Exp $
 
-DISTNAME=	j2re-1_3_1_19-linux-i586
+DISTNAME=	j2re-1_3_1_19-linux-${DIST_ARCH}
 PKGNAME=	sun-jre13-1.0.19
 MASTER_SITES=	# empty
 
@@ -8,8 +8,11 @@ COMMENT=	Sun's Java(tm) Runtime Environment 1.3.1
 
 SHORT=		JRE
 
-JAVA_WRAPPERS=	java keytool policytool rmid rmiregistry tnameserv
 WRKSRC=		${WRKDIR}/jre1.3.1_19
+JAVA_WRAPPERS=	java keytool policytool rmid rmiregistry tnameserv
+
+.include "../../lang/sun-jre13/Makefile.common"
+
 REQD_DIRS=	${JAVA_HOME}
 REQD_DIRS+=	${JAVA_HOME}/lib
 REQD_DIRS+=	${JAVA_HOME}/lib/images
@@ -37,4 +40,4 @@ do-configure:
 		${MV} -f $$file $$file.default;				\
 	done
 
-.include "../../lang/sun-jre13/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common
index 36aec2553ec..9b27f3dfee9 100644
--- a/lang/sun-jre13/Makefile.common
+++ b/lang/sun-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2007/02/22 19:26:39 wiz Exp $
+# $NetBSD: Makefile.common,v 1.33 2007/07/29 05:19:28 jlam Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 CATEGORIES=	lang java
@@ -16,29 +16,27 @@ NO_SRC_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 
-INTERACTIVE_STAGE=	fetch
-
-CHECK_SHLIBS=	no	# expected to fail
+EMUL_PLATFORMS=		linux-i386
 
 .include "../../mk/bsd.prefs.mk"
 
-JAVA_HOME=	${LOCALBASE}/java/sun-1.3.1
-JAVA_NAME=	sun13
-
-NO_MTREE=	yes	# since we change PREFIX
-LDD=		${TRUE}
+EMUL_MODULES.linux=	locale x11
+.if !empty(EMUL_DISTRO:Msuse-[0-9].*)
+EMUL_MODULES.linux+=	compat
+.endif
 
-ONLY_FOR_PLATFORM=	*-*-i386
+DIST_ARCH.i386=		i586
+.if defined(DIST_ARCH.${EMUL_ARCH})
+DIST_ARCH=		${DIST_ARCH.${EMUL_ARCH}}
+.else
+DIST_ARCH=		${EMUL_ARCH}
+.endif
 
-.include "../../emulators/suse_linux/Makefile.application"
+INTERACTIVE_STAGE=	fetch
+BUILD_DIRS=		# empty
 
-.if !defined(USE_NATIVE_LINUX)
-.  if ${SUSE_DIR_PREFIX} == "suse91"
-DEPENDS+=	suse_locale-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_locale
-.  endif
-DEPENDS+=	suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
+JAVA_HOME=	${LOCALBASE}/java/sun-1.3.1
+JAVA_NAME=	sun13
 
 FETCH_MESSAGE= 								\
 	"The file ${DISTNAME}${EXTRACT_SUFX} containing:" 		\
@@ -58,8 +56,6 @@ post-fetch:
 		${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX};	\
 	fi
 
-do-build:	# nothing
-
 post-build:
 	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
 
@@ -68,4 +64,3 @@ do-install:
 	cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME}
 
 .include "../../mk/java-env.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre13/PLIST.Darwin b/lang/sun-jre13/PLIST.Darwin
deleted file mode 100644
index 87cd9f48e6a..00000000000
--- a/lang/sun-jre13/PLIST.Darwin
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2002/06/30 15:01:49 schmonz Exp $
-@comment Darwin ships with a JRE based on Sun's 1.3.1 release.
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index 0ec87ead9ba..e1d3a9c58f6 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2007/06/22 11:21:23 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2007/07/29 05:19:29 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
-DISTNAME=	j2re-1_4_2_14-linux-i586
+DISTNAME=	j2re-1_4_2_14-linux-${DIST_ARCH}
 PKGNAME=	sun-jre14-2.14
 PKGREVISION=	1
 MASTER_SITES=	# empty
@@ -14,6 +14,9 @@ SHORT=		JRE
 WRKSRC=		${WRKDIR}/j2re1.4.2_14
 JAVA_WRAPPERS=	java keytool orbd policytool rmid rmiregistry \
 		servertool tnameserv
+
+.include "../../lang/sun-jre14/Makefile.common"
+
 REQD_DIRS=	${JAVA_HOME}
 REQD_DIRS+=	${JAVA_HOME}/lib
 REQD_DIRS+=	${JAVA_HOME}/lib/applet
@@ -42,10 +45,21 @@ PLIST_SRC=	${WRKDIR}/PLIST
 
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} jce_policy-1_4_2.zip
+PLIST_SUBST+=	SUN_JRE14_USE_JCE=""
+
+END_MESSAGE=								\
+	""								\
+	"The file jce_policy-1_4_2.zip must be fetched into:"		\
+	"    ${DISTDIR}/jce_policy-1_4_2.zip"				\
+	""								\
+	"Under 'Other Downloads' / 'Java Cryptography Extension'"	\
+	"click 'Download' and choose the .zip file."
+.else
+PLIST_SUBST+=	SUN_JRE14_USE_JCE="@comment "
 .endif
 
 post-extract:
-	cd ${WRKSRC} && chmod -R go-w .
+	cd ${WRKSRC} && ${CHMOD} -R go-w .
 
 do-configure:
 	cd ${WRKSRC}/lib; for file in ${SFILES}; do			\
@@ -55,9 +69,6 @@ do-configure:
 pre-install:
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
 	cd ${WRKDIR}/jce ; ${PAX} -rw -pe -v . ${WRKSRC}/lib/security
-	${SED} 's/@SUN_JRE14_USE_JCE@//' ${PKGDIR}/PLIST > ${PLIST_SRC}
-.else
-	${SED} '/@SUN_JRE14_USE_JCE@/d' ${PKGDIR}/PLIST > ${PLIST_SRC}
 .endif
 
-.include "../../lang/sun-jre14/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common
index 8dbfd5a5125..db0d55b4c64 100644
--- a/lang/sun-jre14/Makefile.common
+++ b/lang/sun-jre14/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2007/04/21 20:26:13 rillig Exp $
+# $NetBSD: Makefile.common,v 1.36 2007/07/29 05:19:29 jlam Exp $
 
 CATEGORIES=	lang java
 EXTRACT_SUFX=	.bin
@@ -15,31 +15,31 @@ NO_SRC_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 
-INTERACTIVE_STAGE=	fetch
+EMUL_PLATFORMS=		linux-i386
 
 .include "../../mk/bsd.prefs.mk"
 
+EMUL_MODULES.linux=	locale x11
+.if !empty(EMUL_DISTRO:Msuse-[0-9].*)
+EMUL_MODULES.linux+=	compat
+.endif
+
+DIST_ARCH.i386=		i586
+.if defined(DIST_ARCH.${EMUL_ARCH})
+DIST_ARCH=		${DIST_ARCH.${EMUL_ARCH}}
+.else
+DIST_ARCH=		${EMUL_ARCH}
+.endif
+
+INTERACTIVE_STAGE=	fetch
+BUILD_DIRS=		# empty
+
 JAVA_HOME=	${LOCALBASE}/java/sun-1.4
 JAVA_NAME=	sun14
 JAVA_UNLIMIT=	datasize
 
 MESSAGE_SUBST+=	JAVA_HOME="${JAVA_HOME}"
 
-NO_MTREE=	yes	# since we change PREFIX
-LDD=		${TRUE}
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-.  if ${SUSE_DIR_PREFIX} == "suse91"
-DEPENDS+=	suse_locale-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_locale
-.  endif
-DEPENDS+=	suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
-
 FETCH_MESSAGE= 								\
 	"The file ${DISTNAME}${EXTRACT_SUFX} containing:"		\
 	"    ${COMMENT}"						\
@@ -55,26 +55,13 @@ FETCH_MESSAGE= 								\
 
 EXTRACT_ENV+=	HOME=${WRKDIR}/fake_home
 
-.if !empty(PKG_OPTIONS:Msun-jre-jce)
-END_MESSAGE=								\
-	""								\
-	"The file jce_policy-1_4_2.zip must be fetched into:"		\
-	"    ${DISTDIR}/jce_policy-1_4_2.zip"				\
-	""								\
-	"Under 'Other Downloads' / 'Java Cryptography Extension'"	\
-	"click 'Download' and choose the .zip file."
-.endif
-
 post-fetch:
 	@if [ ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then	\
 		${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX};	\
 	fi
 
-do-build:	# nothing
-
 do-install:
 	${INSTALL_PROGRAM_DIR} ${JAVA_HOME}
 	cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME}
 
 .include "../../mk/java-env.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre14/PLIST b/lang/sun-jre14/PLIST
index a132233a487..2eef0fc94b2 100644
--- a/lang/sun-jre14/PLIST
+++ b/lang/sun-jre14/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2007/04/21 20:40:52 rillig Exp $
+@comment $NetBSD: PLIST,v 1.21 2007/07/29 05:19:29 jlam Exp $
 bin/sun14-java
 bin/sun14-keytool
 bin/sun14-orbd
@@ -188,8 +188,8 @@ java/sun-1.4/lib/plugin.jar
 java/sun-1.4/lib/psfont.properties.ja.default
 java/sun-1.4/lib/psfontj2d.properties.default
 java/sun-1.4/lib/rt.jar
-@SUN_JRE14_USE_JCE@java/sun-1.4/lib/security/COPYRIGHT.html
-@SUN_JRE14_USE_JCE@java/sun-1.4/lib/security/README.txt
+${SUN_JRE14_USE_JCE}java/sun-1.4/lib/security/COPYRIGHT.html
+${SUN_JRE14_USE_JCE}java/sun-1.4/lib/security/README.txt
 java/sun-1.4/lib/security/US_export_policy.jar
 java/sun-1.4/lib/security/cacerts
 java/sun-1.4/lib/security/java.policy
diff --git a/lang/sun-jre15/DEINSTALL b/lang/sun-jre15/DEINSTALL
new file mode 100644
index 00000000000..d7e1875783d
--- /dev/null
+++ b/lang/sun-jre15/DEINSTALL
@@ -0,0 +1,7 @@
+# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:19:30 jlam Exp $
+
+case ${STAGE} in
+DEINSTALL)
+	${RM} -f @JAVA_HOME@/lib/@MACHINE_ARCH@/client/classes.jsa
+	;;
+esac
diff --git a/lang/sun-jre15/DEINSTALL.tmpl b/lang/sun-jre15/DEINSTALL.tmpl
deleted file mode 100644
index dfd396aafd1..00000000000
--- a/lang/sun-jre15/DEINSTALL.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: DEINSTALL.tmpl,v 1.1 2004/10/09 04:19:10 tv Exp $
-
-case ${STAGE} in
-DEINSTALL)
-	${RM} -f @JAVA_HOME@/lib/@MACHINE_ARCH@/client/classes.jsa;;
-esac
diff --git a/lang/sun-jre15/INSTALL b/lang/sun-jre15/INSTALL
new file mode 100644
index 00000000000..5a0751acb2e
--- /dev/null
+++ b/lang/sun-jre15/INSTALL
@@ -0,0 +1,7 @@
+# $NetBSD: INSTALL,v 1.1 2007/07/29 05:19:30 jlam Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+	${PREFIX}/bin/sun15-java -Xshare:dump
+	;;
+esac
diff --git a/lang/sun-jre15/INSTALL.tmpl b/lang/sun-jre15/INSTALL.tmpl
deleted file mode 100644
index fc12924153a..00000000000
--- a/lang/sun-jre15/INSTALL.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: INSTALL.tmpl,v 1.1 2004/10/09 04:19:10 tv Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	${PREFIX}/bin/sun15-java -Xshare:dump;;
-esac
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile
index ef87e0bb432..450a9c53e4d 100644
--- a/lang/sun-jre15/Makefile
+++ b/lang/sun-jre15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2007/02/18 15:42:25 tv Exp $
+# $NetBSD: Makefile,v 1.43 2007/07/29 05:19:31 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -18,33 +18,22 @@ REQD_DIRS+=	${JAVA_HOME}/lib/images
 REQD_DIRS+=	${JAVA_HOME}/lib/images/cursors
 REQD_DIRS+=	${JAVA_HOME}/lib/security
 CONF_FILES=	# empty
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-DIST_ARCH=	i586
-.sinclude "sfiles-i386.mk"
-.elif ${MACHINE_ARCH} == "x86_64"
-DIST_ARCH=	amd64
-.sinclude "sfiles-x86_64.mk"
-.endif
+
+.include "../../lang/sun-jre15/Makefile.common"
+
+.sinclude "sfiles-${EMUL_ARCH}.mk"
 
 .for FILE in ${SFILES}
 CONF_FILES+=	${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
 .endfor
 
+CHECK_FILES_SKIP+=	${JAVA_HOME}/lib/${MACHINE_ARCH}/client/classes.jsa
+
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sun-jre15
 PKG_SUPPORTED_OPTIONS=	sun-jre-jce
 
 .include "../../mk/bsd.options.mk"
 
-HEADER_TEMPLATES+=	${WRKDIR}/HEADER.tmpl
-INSTALL_TEMPLATES+=	${PKGDIR}/INSTALL.tmpl
-DEINSTALL_TEMPLATES+=	${PKGDIR}/DEINSTALL.tmpl
-FILES_SUBST+=		JAVA_HOME=${JAVA_HOME:Q}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
-
-CHECK_FILES_SKIP+=	${JAVA_HOME}/lib/${MACHINE_ARCH}/client/classes.jsa
-
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} jce_policy-1_5_0.zip
 PLIST_SUBST+=	SUN_JRE15_USE_JCE=""
@@ -61,7 +50,6 @@ do-configure:
 	cd ${WRKSRC}/lib; for file in ${SFILES}; do			\
 		${MV} -f $$file $$file.default;				\
 	done
-	@${ECHO} 'CONF_FILES="${CONF_FILES}"' >${WRKDIR}/HEADER.tmpl
 
 pre-install:
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
@@ -82,4 +70,4 @@ makesfiles:
 		-name \*.cfg -o -name \*.security |			\
 	${SED} 's/^/SFILES+=	/' >> ${PKGDIR}/sfiles-${MACHINE_ARCH}.mk
 
-.include "../../lang/sun-jre15/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre15/Makefile.common b/lang/sun-jre15/Makefile.common
index ed27bfb970a..857f0c1ebce 100644
--- a/lang/sun-jre15/Makefile.common
+++ b/lang/sun-jre15/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2007/04/26 20:07:30 tv Exp $
+# $NetBSD: Makefile.common,v 1.19 2007/07/29 05:19:31 jlam Exp $
 
 CATEGORIES=	lang java
 COMMENT=	Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
@@ -17,10 +17,26 @@ NO_SRC_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 
-INTERACTIVE_STAGE=	fetch
+EMUL_PLATFORMS=		linux-i386
 
 .include "../../mk/bsd.prefs.mk"
 
+EMUL_MODULES.linux=	locale x11
+.if !empty(EMUL_DISTRO:Msuse-[0-9].*)
+EMUL_MODULES.linux+=	compat
+.endif
+
+DIST_ARCH.i386=		i586
+DIST_ARCH.x86_64=	amd64
+.if defined(DIST_ARCH.${EMUL_ARCH})
+DIST_ARCH=		${DIST_ARCH.${EMUL_ARCH}}
+.else
+DIST_ARCH=		${EMUL_ARCH}
+.endif
+
+INTERACTIVE_STAGE=	fetch
+BUILD_DIRS=		# empty
+
 JAVA_HOME=	${LOCALBASE}/java/sun-1.5
 JAVA_NAME=	sun15
 JAVA_UNLIMIT=	datasize
@@ -34,20 +50,6 @@ EXTRACT_ENV+=	HOME=${WRKDIR}/fake_home
 # new class sharing in J2SE 5.0... -tvierling
 EXTRACT_ENV+=	UNPACK200_FLAGS=-Htrue
 
-NO_MTREE=	yes	# since we change PREFIX
-LDD=		${TRUE}
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-ONLY_FOR_PLATFORM=	*-*-i386 *-*-x86_64
-.  if ${SUSE_DIR_PREFIX} == "suse91"
-DEPENDS+=	suse_locale-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_locale
-.  endif
-DEPENDS+=	suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
-
 FETCH_MESSAGE+=	" The file ${DISTNAME}${EXTRACT_SUFX} containing ${DOWNLOAD_NAME}"
 FETCH_MESSAGE+=	""
 FETCH_MESSAGE+=	" must be fetched into:"
@@ -64,11 +66,8 @@ post-fetch:
 		${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX};	\
 	fi
 
-do-build:	# nothing
-
 do-install:
 	${INSTALL_PROGRAM_DIR} ${JAVA_HOME}
 	cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME}
 
 .include "../../mk/java-env.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre6/DEINSTALL b/lang/sun-jre6/DEINSTALL
new file mode 100644
index 00000000000..10194d4479f
--- /dev/null
+++ b/lang/sun-jre6/DEINSTALL
@@ -0,0 +1,7 @@
+# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:19:31 jlam Exp $
+
+case ${STAGE} in
+DEINSTALL)
+	${RM} -f @JAVA_HOME@/lib/@MACHINE_ARCH@/client/classes.jsa
+	;;
+esac
diff --git a/lang/sun-jre6/DEINSTALL.tmpl b/lang/sun-jre6/DEINSTALL.tmpl
deleted file mode 100644
index 95104a55d25..00000000000
--- a/lang/sun-jre6/DEINSTALL.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: DEINSTALL.tmpl,v 1.1 2007/02/18 19:11:27 tv Exp $
-
-case ${STAGE} in
-DEINSTALL)
-	${RM} -f @JAVA_HOME@/lib/@MACHINE_ARCH@/client/classes.jsa;;
-esac
diff --git a/lang/sun-jre6/INSTALL b/lang/sun-jre6/INSTALL
new file mode 100644
index 00000000000..e34560fae6c
--- /dev/null
+++ b/lang/sun-jre6/INSTALL
@@ -0,0 +1,7 @@
+# $NetBSD: INSTALL,v 1.1 2007/07/29 05:19:32 jlam Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+	${PREFIX}/bin/sun6-java -Xshare:dump
+	;;
+esac
diff --git a/lang/sun-jre6/INSTALL.tmpl b/lang/sun-jre6/INSTALL.tmpl
deleted file mode 100644
index 0b50223c715..00000000000
--- a/lang/sun-jre6/INSTALL.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: INSTALL.tmpl,v 1.1 2007/02/18 19:11:27 tv Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	${PREFIX}/bin/sun6-java -Xshare:dump;;
-esac
diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index d4f53e125a3..1d826c95136 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/04/26 20:35:33 tv Exp $
+# $NetBSD: Makefile,v 1.3 2007/07/29 05:19:32 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -19,30 +19,22 @@ REQD_DIRS+=	${JAVA_HOME}/lib/images
 REQD_DIRS+=	${JAVA_HOME}/lib/images/cursors
 REQD_DIRS+=	${JAVA_HOME}/lib/security
 CONF_FILES=	# empty
-.include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "i386"
-DIST_ARCH=	i586
-.sinclude "sfiles-i386.mk"
-.endif
+.include "../../lang/sun-jre6/Makefile.common"
+
+.sinclude "sfiles-${EMUL_ARCH}.mk"
 
 .for FILE in ${SFILES}
 CONF_FILES+=	${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
 .endfor
 
+CHECK_FILES_SKIP+=	${JAVA_HOME}/lib/${MACHINE_ARCH}/client/classes.jsa
+
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sun-jre6
 PKG_SUPPORTED_OPTIONS=	sun-jre-jce
 
 .include "../../mk/bsd.options.mk"
 
-HEADER_TEMPLATES+=	${WRKDIR}/HEADER.tmpl
-INSTALL_TEMPLATES+=	${PKGDIR}/INSTALL.tmpl
-DEINSTALL_TEMPLATES+=	${PKGDIR}/DEINSTALL.tmpl
-FILES_SUBST+=		JAVA_HOME=${JAVA_HOME:Q}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
-
-CHECK_FILES_SKIP+=	${JAVA_HOME}/lib/${MACHINE_ARCH}/client/classes.jsa
-
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} jce_policy-6.zip
 PLIST_SUBST+=	SUN_JRE6_USE_JCE=""
@@ -59,7 +51,6 @@ do-configure:
 	cd ${WRKSRC}/lib; for file in ${SFILES}; do			\
 		${MV} -f $$file $$file.default;				\
 	done
-	@${ECHO} 'CONF_FILES="${CONF_FILES}"' >${WRKDIR}/HEADER.tmpl
 
 pre-install:
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
@@ -80,4 +71,4 @@ makesfiles:
 		-name \*.cfg -o -name \*.security |			\
 	${SED} 's/^/SFILES+=	/' >> ${PKGDIR}/sfiles-${MACHINE_ARCH}.mk
 
-.include "../../lang/sun-jre6/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre6/Makefile.common b/lang/sun-jre6/Makefile.common
index cb5f40eb004..bf05be4e319 100644
--- a/lang/sun-jre6/Makefile.common
+++ b/lang/sun-jre6/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2007/06/25 23:20:58 joerg Exp $
+# $NetBSD: Makefile.common,v 1.4 2007/07/29 05:19:32 jlam Exp $
 
 CATEGORIES=	lang java
 COMMENT=	Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
@@ -16,9 +16,27 @@ NO_SRC_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 
+EMUL_PLATFORMS=		linux-i386
+
+.include "../../mk/bsd.prefs.mk"
+
+EMUL_MODULES.linux=	locale x11
+.if !empty(EMUL_DISTRO:Msuse-[0-9].*)
+EMUL_MODULES.linux+=	compat
+.endif
+
+DIST_ARCH.i386=		i586
+.if defined(DIST_ARCH.${EMUL_ARCH})
+DIST_ARCH=		${DIST_ARCH.${EMUL_ARCH}}
+.else
+DIST_ARCH=		${EMUL_ARCH}
+.endif
+
+# On DragonFly, this just seems to coredump and/or hang around.
 NOT_FOR_PLATFORM=	DragonFly-*-*
 
 INTERACTIVE_STAGE=	fetch
+BUILD_DIRS=		# empty
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -36,20 +54,6 @@ EXTRACT_ENV+=	HOME=${WRKDIR}/fake_home
 # new class sharing in Java 5+... -tvierling
 EXTRACT_ENV+=	UNPACK200_FLAGS=-Htrue
 
-NO_MTREE=	yes	# since we change PREFIX
-LDD=		${TRUE}
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-ONLY_FOR_PLATFORM=	*-*-i386
-.  if ${SUSE_DIR_PREFIX} == "suse91"
-DEPENDS+=	suse_locale-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_locale
-.  endif
-DEPENDS+=	suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
-
 FETCH_MESSAGE+=	" The file ${DISTNAME}${EXTRACT_SUFX} containing ${DOWNLOAD_NAME}"
 FETCH_MESSAGE+=	""
 FETCH_MESSAGE+=	" must be fetched into:"
@@ -66,11 +70,8 @@ post-fetch:
 		${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX};	\
 	fi
 
-do-build:	# nothing
-
 do-install:
 	${INSTALL_PROGRAM_DIR} ${JAVA_HOME}
 	cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME}
 
 .include "../../mk/java-env.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre6/PLIST.i386 b/lang/sun-jre6/PLIST.linux-i386
index 8db176eb5a5..e3273c91caf 100644
--- a/lang/sun-jre6/PLIST.i386
+++ b/lang/sun-jre6/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.i386,v 1.2 2007/04/26 20:35:33 tv Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.1 2007/07/29 05:19:33 jlam Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
diff --git a/mail/thunderbird-bin-nightly/Makefile b/mail/thunderbird-bin-nightly/Makefile
index 6af35fa1870..89474b526a5 100644
--- a/mail/thunderbird-bin-nightly/Makefile
+++ b/mail/thunderbird-bin-nightly/Makefile
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2006/09/24 16:44:36 salo Exp $
+# $NetBSD: Makefile,v 1.8 2007/07/29 05:19:33 jlam Exp $
 
 MOZILLA=	thunderbird
 
 HOMEPAGE=	http://www.mozilla.org/projects/thunderbird/
 COMMENT=	Redesign of the Mozilla mail client (nightly binary pkg)
 
-MOZ_GTK2=	YES
 MOZ_EXTRA=	# empty
 
-ONLY_FOR_PLATFORM+=	Linux-*-i386
-ONLY_FOR_PLATFORM+=	NetBSD-2.*-i386
-ONLY_FOR_PLATFORM+=	SunOS-5.[789]*-sparc
+EMUL_PLATFORMS=		linux-i386
+EMUL_PLATFORMS+=	solaris-i386 solaris-sparc
 
 .include "../../www/seamonkey-bin-nightly/Makefile.common"
diff --git a/mail/thunderbird-bin-nightly/Makefile.Linux.i386 b/mail/thunderbird-bin-nightly/Makefile.Linux.i386
deleted file mode 100644
index 2687638eb4d..00000000000
--- a/mail/thunderbird-bin-nightly/Makefile.Linux.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile.Linux.i386,v 1.8 2004/04/28 23:40:12 grant Exp $
-
-DISTNAME=	thunderbird-i686-linux-gtk2+xft
-MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/latest-trunk/
-
-MOZ_PLATFORM=	linux
diff --git a/mail/thunderbird-bin-nightly/Makefile.NetBSD.i386 b/mail/thunderbird-bin-nightly/Makefile.NetBSD.i386
deleted file mode 100644
index 8e4c0af4112..00000000000
--- a/mail/thunderbird-bin-nightly/Makefile.NetBSD.i386
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.2 2004/05/25 13:42:35 grant Exp $
-
-DISTNAME=	thunderbird-i386-unknown-netbsdelf2.0-gtk2
-MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/contrib/latest-trunk/
-EXTRACT_SUFX=	.tar.bz2
-
-MOZ_PLATFORM=	netbsd
diff --git a/mail/thunderbird-bin-nightly/Makefile.SunOS.sparc b/mail/thunderbird-bin-nightly/Makefile.SunOS.sparc
deleted file mode 100644
index b9603e8dcf9..00000000000
--- a/mail/thunderbird-bin-nightly/Makefile.SunOS.sparc
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile.SunOS.sparc,v 1.3 2004/03/05 00:45:32 grant Exp $
-
-DISTNAME=	thunderbird-sparc-sun-solaris2.7
-MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/contrib/latest-trunk/
-
-MOZ_PLATFORM=	solaris
diff --git a/mail/thunderbird-bin-nightly/Makefile.linux-i386 b/mail/thunderbird-bin-nightly/Makefile.linux-i386
new file mode 100644
index 00000000000..830d46963d3
--- /dev/null
+++ b/mail/thunderbird-bin-nightly/Makefile.linux-i386
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:19:34 jlam Exp $
+
+DISTNAME=	thunderbird-3.0a1pre.en-US.linux-i686
+EXTRACT_SUFX=	.tar.bz2 
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	linux
diff --git a/mail/thunderbird-bin-nightly/Makefile.solaris-i386 b/mail/thunderbird-bin-nightly/Makefile.solaris-i386
new file mode 100644
index 00000000000..c3e9baa61c8
--- /dev/null
+++ b/mail/thunderbird-bin-nightly/Makefile.solaris-i386
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.solaris-i386,v 1.1 2007/07/29 05:19:34 jlam Exp $
+
+SOLARIS_VERSION_REQD?=	10
+
+DISTNAME=	thunderbird-3.0a1.en-US.solaris10-nosvg-i386
+EXTRACT_SUFX=	.tar.bz2
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	solaris
diff --git a/mail/thunderbird-bin-nightly/Makefile.solaris-sparc b/mail/thunderbird-bin-nightly/Makefile.solaris-sparc
new file mode 100644
index 00000000000..bd0c4860b87
--- /dev/null
+++ b/mail/thunderbird-bin-nightly/Makefile.solaris-sparc
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.solaris-sparc,v 1.1 2007/07/29 05:19:35 jlam Exp $
+
+SOLARIS_VERSION_REQD?=	10
+
+DISTNAME=	thunderbird-3.0a1.en-US.solaris10-nosvg-sparc
+EXTRACT_SUFX=	.tar.bz2
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	solaris
diff --git a/meta-pkgs/suse100/DESCR b/meta-pkgs/suse100/DESCR
index a0846f612fa..e84df106d18 100644
--- a/meta-pkgs/suse100/DESCR
+++ b/meta-pkgs/suse100/DESCR
@@ -1,8 +1,8 @@
-The SUSE 10.0 meta-package provides a number of components for an SUSE-based
-Linux binary emulation environment, using other components of the NetBSD
-packages collection.
+The SUSE 10.0 meta-package provides a number of components for a
+SUSE-based Linux binary emulation environment.
 
 This package does not contain anything by itself -- it is a "meta-package"
-that depends on other packages.  Its sole purpose is to require dependencies
-so users can install this package only and have all the other packages pulled
-in automatically by the pkgsrc dependency mechanism.
+that depends on other packages.  Its sole purpose is to require
+dependencies so users can install this package only and have all the
+other packages pulled in automatically by the pkgsrc dependency
+mechanism.
diff --git a/meta-pkgs/suse100/Makefile b/meta-pkgs/suse100/Makefile
index ad28fe76fd8..e362687cf96 100644
--- a/meta-pkgs/suse100/Makefile
+++ b/meta-pkgs/suse100/Makefile
@@ -1,44 +1,22 @@
-# $NetBSD: Makefile,v 1.7 2007/04/19 15:30:22 xtraeme Exp $
-#
+# $NetBSD: Makefile,v 1.8 2007/07/29 05:19:35 jlam Exp $
 
-DISTNAME=	suse-10.0
-PKGREVISION=	3
-CATEGORIES=	meta-pkgs emulators
+DISTNAME=	suse-${SUSE_VERSION}
+PKGREVISION=	4
+CATEGORIES=	emulators meta-pkgs
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	SUSE-based Linux binary emulation environment
 
-# This list should contain all suse100_* packages.
-#
-DEPENDS+=	suse_base-10.0{,nb*}:../../emulators/suse100_base
-DEPENDS+=	suse_aspell-10.0{,nb*}:../../emulators/suse100_aspell
-DEPENDS+=	suse_compat-10.0{,nb*}:../../emulators/suse100_compat
-DEPENDS+=	suse_expat-10.0{,nb*}:../../emulators/suse100_expat
-DEPENDS+=	suse_fontconfig-10.0{,nb*}:../../emulators/suse100_fontconfig
-DEPENDS+=	suse_freetype2-10.0{,nb*}:../../emulators/suse100_freetype2
-DEPENDS+=	suse_gdk-pixbuf-10.0{,nb*}:../../emulators/suse100_gdk-pixbuf
-DEPENDS+=	suse_glx-10.0{,nb*}:../../emulators/suse100_glx
-DEPENDS+=	suse_gtk2-10.0{,nb*}:../../emulators/suse100_gtk2
-DEPENDS+=	suse_gtk-10.0{,nb*}:../../emulators/suse100_gtk
-DEPENDS+=	suse_libcups-10.0{,nb*}:../../emulators/suse100_libcups
-DEPENDS+=	suse_libjpeg-10.0{,nb*}:../../emulators/suse100_libjpeg
-DEPENDS+=	suse_libpng-10.0{,nb*}:../../emulators/suse100_libpng
-DEPENDS+=	suse_libtiff-10.0{,nb*}:../../emulators/suse100_libtiff
-DEPENDS+=	suse_libxml2-10.0{,nb*}:../../emulators/suse100_libxml2
-DEPENDS+=	suse_locale-10.0{,nb*}:../../emulators/suse100_locale
-DEPENDS+=	suse_openmotif-10.0{,nb*}:../../emulators/suse100_openmotif
-DEPENDS+=	suse_openssl-10.0{,nb*}:../../emulators/suse100_openssl
-DEPENDS+=	suse_slang-10.0{,nb*}:../../emulators/suse100_slang
-DEPENDS+=	suse_vmware-10.0{,nb*}:../../emulators/suse100_vmware
-DEPENDS+=	suse_x11-10.0{,nb*}:../../emulators/suse100_x11
+EMUL_MODULES.linux=	aspell base compat cups expat fontconfig	\
+			freetype2 gdk-pixbuf glx gtk gtk2 jpeg locale	\
+			motif openssl png slang tiff vmware x11 xml2
+EMUL_PKG_FMT=		plain
 
-EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
 
 do-install:	# empty
 
diff --git a/meta-pkgs/suse9/DESCR b/meta-pkgs/suse9/DESCR
index ba36805f7a6..6f592400d55 100644
--- a/meta-pkgs/suse9/DESCR
+++ b/meta-pkgs/suse9/DESCR
@@ -1,9 +1,8 @@
-The SuSE 9.1 meta-package provides a number of components for an
-SuSE-based Linux binary emulation environment, using other components
-of the NetBSD packages collection.
+The SUSE 9.1 meta-package provides a number of components for a
+SUSE-based Linux binary emulation environment.
 
-This package does not contain anything by itself -- it is a
-"meta-package" that depends on other packages.  Its sole purpose is
-to require dependencies so users can install this package only and
-have all the other packages pulled in by the port/package dependency
+This package does not contain anything by itself -- it is a "meta-package"
+that depends on other packages.  Its sole purpose is to require
+dependencies so users can install this package only and have all the
+other packages pulled in automatically by the pkgsrc dependency
 mechanism.
diff --git a/meta-pkgs/suse9/Makefile b/meta-pkgs/suse9/Makefile
index a7abed14055..14cafaa65a8 100644
--- a/meta-pkgs/suse9/Makefile
+++ b/meta-pkgs/suse9/Makefile
@@ -1,42 +1,30 @@
-# $NetBSD: Makefile,v 1.6 2006/06/30 15:38:00 salo Exp $
-#
+# $NetBSD: Makefile,v 1.7 2007/07/29 05:19:35 jlam Exp $
 
-DISTNAME=	suse-9.1
-PKGREVISION=	3
+DISTNAME=	suse-${SUSE_VERSION}
+PKGREVISION=	4
 CATEGORIES=	meta-pkgs emulators
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	jdolecek@NetBSD.org
-COMMENT=	Provides a SuSE-based Linux binary emulation environment
-
-# This list should contain all suse91_* packages.
-#
-DEPENDS+=	suse_base-9.1{,nb*}:../../emulators/suse91_base
-DEPENDS+=	suse_aspell-9.1{,nb*}:../../emulators/suse91_aspell
-DEPENDS+=	suse_compat-9.1{,nb*}:../../emulators/suse91_compat
-DEPENDS+=	suse_expat-9.1{,nb*}:../../emulators/suse91_expat
-DEPENDS+=	suse_fontconfig-9.1{,nb*}:../../emulators/suse91_fontconfig
-DEPENDS+=	suse_freetype2-9.1{,nb*}:../../emulators/suse91_freetype2
-DEPENDS+=	suse_gdk-pixbuf-9.1{,nb*}:../../emulators/suse91_gdk-pixbuf
-DEPENDS+=	suse_glx-9.1{,nb*}:../../emulators/suse91_glx
-DEPENDS+=	suse_gtk-9.1{,nb*}:../../emulators/suse91_gtk
-DEPENDS+=	suse_gtk2-9.1{,nb*}:../../emulators/suse91_gtk2
-DEPENDS+=	suse_libjpeg-9.1{,nb*}:../../emulators/suse91_libjpeg
-DEPENDS+=	suse_libpng-9.1{,nb*}:../../emulators/suse91_libpng
-DEPENDS+=	suse_libtiff-9.1{,nb*}:../../emulators/suse91_libtiff
-DEPENDS+=	suse_locale-9.1{,nb*}:../../emulators/suse91_locale
-DEPENDS+=	suse_openmotif-9.1{,nb*}:../../emulators/suse91_openmotif
-DEPENDS+=	suse_slang-9.1{,nb*}:../../emulators/suse91_slang
-DEPENDS+=	suse_vmware-9.1{,nb*}:../../emulators/suse91_vmware
-DEPENDS+=	suse_x11-9.1{,nb*}:../../emulators/suse91_x11
-
-EXTRACT_ONLY=	# empty
+COMMENT=	SUSE-based Linux binary emulation environment
+
+.include "../../emulators/suse91_linux/Makefile.common"
+
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
 
 do-install:	# empty
 
+EMUL_MODULES.linux=	aspell base compat expat fontconfig freetype2	\
+			gdk-pixbuf glx gtk gtk2 jpeg locale motif png	\
+			slang tiff x11
+
+.if ${EMUL_PLATFORM} == "linux-i386"
+EMUL_MODULES.linux+=	vmware
+.endif
+
+EMUL_PKG_FMT=		plain
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/latin-words-bin/Makefile b/misc/latin-words-bin/Makefile
index 84514180e2a..0510e4bdff8 100644
--- a/misc/latin-words-bin/Makefile
+++ b/misc/latin-words-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:49 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/07/29 05:19:35 jlam Exp $
 #
 
 DISTNAME=		words-1.97-linux
@@ -11,14 +11,10 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://users.erols.com/whitaker/wordslux.htm
 COMMENT=		Latin-to-English dictionary program (Linux binary)
 
-WRKSRC=			${WRKDIR}/words-1.97
-NO_CONFIGURE=	YES
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-DEPENDS+=	suse_base>=6.1:../../emulators/${SUSE_DIR_PREFIX}_base
-.endif
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base
 
+WRKSRC=			${WRKDIR}/words-1.97
 INSTALLATION_DIRS=	bin libexec
 
 do-build:
@@ -38,5 +34,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/latin-words
 .endfor
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/openoffice-bin/Makefile b/misc/openoffice-bin/Makefile
index 602e4039e06..ea90ee8364c 100644
--- a/misc/openoffice-bin/Makefile
+++ b/misc/openoffice-bin/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.20 2007/02/27 13:52:04 hira Exp $
+# $NetBSD: Makefile,v 1.21 2007/07/29 05:19:35 jlam Exp $
 
+DISTNAME=		openoffice-bin	# overridden below
 PKGNAME=		openoffice-bin-${OO_VER}
 PKGREVISION=		3
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=		openoffice-linux-112-services.rdb.bz2
-SITES.openoffice-linux-112-services.rdb.bz2=http://www.fs.tum.de/~mrauch/OpenOffice/download/\
+SITES.openoffice-linux-112-services.rdb.bz2=	\
+			http://www.fs.tum.de/~mrauch/OpenOffice/download/ \
 			ftp://ftp.NetBSD.org/pub/NetBSD/misc/mrauch/
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}	\
 			openoffice-linux-112-services.rdb.bz2
@@ -15,58 +17,51 @@ MAINTAINER=		mrauch@NetBSD.org
 HOMEPAGE=		http://www.openoffice.org/
 COMMENT=		Integrated office productivity suite (binary pkg)
 
-OO_VER=			1.1.5
-PLIST_SUBST+=		VER=${OO_VER:Q}
-MESSAGE_SUBST+=		VER=${OO_VER}
-
-NO_BUILD=		yes
-NO_CONFIGURE=		yes
-
 CONFLICTS+=		staroffice-[0-9]*
 CONFLICTS+=		openoffice-[0-9]*
 CONFLICTS+=		openoffice2-[0-9]*
 CONFLICTS+=		openoffice-linux-[0-9]*
 
-ONLY_FOR_PLATFORM=	NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
+OO_VER=			1.1.5
+PLIST_SUBST+=		VER=${OO_VER:Q}
+MESSAGE_SUBST+=		VER=${OO_VER}
+
 # Install fails with "_sys_thread_create() failed, errno = 14"
-#ONLY_FOR_PLATFORM+=	NetBSD-1.6*-sparc* NetBSD-[2-9]*-sparc*
-ONLY_FOR_PLATFORM+=	Linux-*-i[3-6]86
-ONLY_FOR_PLATFORM+=	SunOS-*-*
+NOT_FOR_PLATFORM+=	NetBSD-*-sparc*
 
 TEMP?=			${WRKDIR}
-CHECK_SHLIBS_SUPPORTED=	no
+BUILD_DIRS=		# empty
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
+EMUL_PLATFORMS=		linux-i386
+EMUL_PLATFORMS+=	solaris-i386 solaris-sparc
+EMUL_MODULES.linux=	compat x11
+SUSE_VERSION_REQD=	7.3
 
-.  if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
-.    if !exists(/emul/svr4/usr/lib/ld.so)
-PKG_FAIL_REASON= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
-.    endif
-DISTNAME=	OOo_${OO_VER}_SolarisSparc_install
-WRKSRC=		${WRKDIR}/OOo_${OO_VER}_Solaris_Sparc_install
-.  elif ${MACHINE_ARCH} == "i386"
-DISTNAME=	OOo_${OO_VER}_LinuxIntel_install
-.  endif
-
-.elif ${OPSYS} == "Linux" && ${MACHINE_ARCH} == "i386"
-DISTNAME=	OOo_${OO_VER}_LinuxIntel_install
+.include "../../mk/bsd.prefs.mk"
 
-.elif ${OPSYS} == "SunOS"
-.  if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
-DISTNAME=	OOo_${OO_VER}_SolarisSparc_install
-WRKSRC=		${WRKDIR}/OOo_${OO_VER}_Solaris_Sparc_install
-.  elif ${MACHINE_ARCH} == "i386"
-DISTNAME=	OOo_${OO_VER}_Solarisx86_install
-WRKSRC=		${WRKDIR}/OOo_${OO_VER}_Solaris_x86_install
-.  endif
+.if ${EMUL_PLATFORM} == "linux-i386"
+DISTNAME=		OOo_${OO_VER}_LinuxIntel_install
+.elif ${EMUL_PLATFORM} == "solaris-i386"
+DISTNAME=		OOo_${OO_VER}_Solarisx86_install
+WRKSRC=			${WRKDIR}/OOo_${OO_VER}_Solaris_x86_install
+.elif ${EMUL_PLATFORM} == "solaris-sparc"
+DISTNAME=		OOo_${OO_VER}_SolarisSparc_install
+WRKSRC=			${WRKDIR}/OOo_${OO_VER}_Solaris_Sparc_install
 .endif
 
-DISTNAME?=	OOo_${OO_VER}_LinuxIntel_install
-
 INSTALLATION_DIRS=	bin
 
+.if ${OPSYS} == "NetBSD"
+.PHONY: check-proc-cmdline
+pre-install: check-proc-cmdline
+check-proc-cmdline:
+	if ${TEST} ! -f /proc/curproc/cmdline &&			\
+	   ${TEST} ! -f ${OPSYS_EMULDIR}/proc/curproc/cmdline; then	\
+		${ECHO} "Please mount ${OPSYS_EMULDIR}/proc or /proc";	\
+		exit 1;							\
+	fi
+.endif
+
 pre-install:
 	${CP} ${WRKSRC}/setup.ins ${WRKSRC}/setup.ins.orig
 	${SED}  -e "s|/usr/bin/soffice|${PREFIX}/bin/soffice.orig|g"	\
@@ -90,24 +85,4 @@ do-install:
 	${LN} -sf ${PREFIX}/OpenOffice.org${OO_VER}/program/${i} ${PREFIX}/bin/${i}
 .endfor
 
-# everything specific to your OS/Arch goes into its own Makefile
-
-.if exists(Makefile.${OPSYS}.${MACHINE_ARCH})
-.  include "Makefile.${OPSYS}.${MACHINE_ARCH}"
-.endif
-
-.if defined(DISTNAME)
-.  if ${DISTNAME} == "OOo_${OO_VER}_SolarisSparc_install"
-PLIST_SRC=	${PKGDIR}/PLIST.SolarisSparc
-.  elif ${DISTNAME} == "OOo_${OO_VER}_Solarisx86_install"
-PLIST_SRC=	${PKGDIR}/PLIST.SolarisIntel
-.  elif ${DISTNAME} == "OOo_${OO_VER}_LinuxIntel_install"
-PLIST_SRC=	${PKGDIR}/PLIST.LinuxIntel
-.  else
-PKG_FAIL_REASON= '${PKGNAME}:  cannot figure out which PLIST to use'
-.  endif
-.else
-DISTNAME=	# Dummy to prevent error from missing DISTNAME
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/openoffice-bin/Makefile.NetBSD.i386 b/misc/openoffice-bin/Makefile.NetBSD.i386
deleted file mode 100644
index 3fe4eabbb2a..00000000000
--- a/misc/openoffice-bin/Makefile.NetBSD.i386
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.4 2007/02/22 19:26:50 wiz Exp $
-
-DEPENDS+=		suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=		suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
-
-.if !exists(/emul/linux/proc/curproc/cmdline) && !exists(/proc/curproc/cmdline)
-PKG_FAIL_REASON+=	"please mount /emul/linux/proc or /proc"
-.endif
-
-.include "../../emulators/suse_linux/Makefile.application"
diff --git a/misc/openoffice-bin/PLIST b/misc/openoffice-bin/PLIST
new file mode 100644
index 00000000000..ed76e006a42
--- /dev/null
+++ b/misc/openoffice-bin/PLIST
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.3 2007/07/29 05:19:36 jlam Exp $
+bin/scalc
+bin/sdraw
+bin/simpress
+bin/soffice
+bin/swriter
diff --git a/misc/openoffice-bin/PLIST.LinuxIntel b/misc/openoffice-bin/PLIST.linux-i386
index 816088d9f2a..ab349a38453 100644
--- a/misc/openoffice-bin/PLIST.LinuxIntel
+++ b/misc/openoffice-bin/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.LinuxIntel,v 1.3 2005/10/03 16:09:43 mrauch Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.1 2007/07/29 05:19:39 jlam Exp $
 OpenOffice.org${VER}/LICENSE
 OpenOffice.org${VER}/LICENSE.html
 OpenOffice.org${VER}/README
@@ -4825,11 +4825,6 @@ OpenOffice.org${VER}/user/gallery/sg100.sdv
 OpenOffice.org${VER}/user/gallery/sg100.thm
 OpenOffice.org${VER}/user/gallery/sg30.sdv
 OpenOffice.org${VER}/user/gallery/sg30.thm
-bin/scalc
-bin/sdraw
-bin/simpress
-bin/soffice
-bin/swriter
 @dirrm OpenOffice.org${VER}/user/wordbook
 @dirrm OpenOffice.org${VER}/user/uno_packages
 @dirrm OpenOffice.org${VER}/user/template
diff --git a/misc/openoffice-bin/PLIST.SolarisIntel b/misc/openoffice-bin/PLIST.solaris-i386
index 6e3638abafe..269cb84b5c9 100644
--- a/misc/openoffice-bin/PLIST.SolarisIntel
+++ b/misc/openoffice-bin/PLIST.solaris-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.SolarisIntel,v 1.3 2005/10/03 16:09:43 mrauch Exp $
+@comment $NetBSD: PLIST.solaris-i386,v 1.1 2007/07/29 05:19:39 jlam Exp $
 OpenOffice.org${VER}/LICENSE
 OpenOffice.org${VER}/LICENSE.html
 OpenOffice.org${VER}/README
@@ -5016,11 +5016,6 @@ OpenOffice.org${VER}/user/gallery/sg100.sdv
 OpenOffice.org${VER}/user/gallery/sg100.thm
 OpenOffice.org${VER}/user/gallery/sg30.sdv
 OpenOffice.org${VER}/user/gallery/sg30.thm
-bin/scalc
-bin/sdraw
-bin/simpress
-bin/soffice
-bin/swriter
 @dirrm OpenOffice.org${VER}/user/wordbook
 @dirrm OpenOffice.org${VER}/user/uno_packages
 @dirrm OpenOffice.org${VER}/user/template
diff --git a/misc/openoffice-bin/PLIST.SolarisSparc b/misc/openoffice-bin/PLIST.solaris-sparc
index 13e413f4a6f..169f4855aab 100644
--- a/misc/openoffice-bin/PLIST.SolarisSparc
+++ b/misc/openoffice-bin/PLIST.solaris-sparc
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.SolarisSparc,v 1.3 2005/10/03 16:09:43 mrauch Exp $
+@comment $NetBSD: PLIST.solaris-sparc,v 1.1 2007/07/29 05:19:39 jlam Exp $
 OpenOffice.org${VER}/LICENSE
 OpenOffice.org${VER}/LICENSE.html
 OpenOffice.org${VER}/README
@@ -5016,11 +5016,6 @@ OpenOffice.org${VER}/user/gallery/sg100.sdv
 OpenOffice.org${VER}/user/gallery/sg100.thm
 OpenOffice.org${VER}/user/gallery/sg30.sdv
 OpenOffice.org${VER}/user/gallery/sg30.thm
-bin/scalc
-bin/sdraw
-bin/simpress
-bin/soffice
-bin/swriter
 @dirrm OpenOffice.org${VER}/user/wordbook
 @dirrm OpenOffice.org${VER}/user/uno_packages
 @dirrm OpenOffice.org${VER}/user/template
diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile
index c51afbc93b9..ad15887437d 100644
--- a/misc/openoffice2-bin/Makefile
+++ b/misc/openoffice2-bin/Makefile
@@ -1,90 +1,62 @@
-# $NetBSD: Makefile,v 1.29 2007/06/20 18:15:31 tron Exp $
+# $NetBSD: Makefile,v 1.30 2007/07/29 05:19:40 jlam Exp $
 
+DISTNAME=		openoffice2-bin	# overridden below
 PKGNAME=		openoffice2-bin-${OO_RELEASE}
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/}
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=		mrauch@NetBSD.org
 HOMEPAGE=		http://www.openoffice.org/
 COMMENT=		Integrated office productivity suite (binary pkg)
 
-BUILD_DEPENDS+=		rpm2pkg>=2.1:../../pkgtools/rpm2pkg
-
-RPM2PKG=		${PREFIX}/sbin/rpm2pkg
-RPM2PKGARGS=		-d ${PREFIX} -f ${WRKDIR}/PLIST.nouniq -s 1
-
-OO_VER=			2.2
-OO_RELEASE=		2.2.1
-PLIST_SUBST+=		VER=${OO_VER:Q}
-MESSAGE_SUBST+=		VER=${OO_VER:Q}
-FILES_SUBST+=		VER=${OO_VER:Q}
-
-NO_CONFIGURE=		yes
-NO_BUILD=		yes
-
 CONFLICTS+=		staroffice-[0-9]*
 CONFLICTS+=		openoffice-[0-9]*
 CONFLICTS+=		openoffice-bin-[0-9]*
 CONFLICTS+=		openoffice2-[0-9]*
 CONFLICTS+=		openoffice-linux-[0-9]*
 
-ONLY_FOR_PLATFORM=	NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
-ONLY_FOR_PLATFORM+=	Linux-*-i[3-6]86 DragonFly-*-i386
+OO_VER=			2.2
+OO_RELEASE=		2.2.1
+PLIST_SUBST+=		VER=${OO_VER:Q}
+MESSAGE_SUBST+=		VER=${OO_VER:Q}
+FILES_SUBST+=		VER=${OO_VER:Q}
 
 TEMP?=			${WRKSRC}
-CHECK_SHLIBS_SUPPORTED=	no
+EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
+BUILD_DIRS=		# empty
 
 PLIST_SRC=		${PKGDIR}/PLIST.proglinks
 PLIST_SRC+=		${WRKDIR}/PLIST
 
-.include "../../mk/bsd.prefs.mk"
-
-# group together i386, i486, i586 and i686 (for Linux)
-#
-ARCH=	${MACHINE_ARCH:C/i[3-6]86/i386/g}
+EMUL_PLATFORMS=		linux-i386
+#EMUL_PLATFORMS+=	solaris-i386 solaris-sparc
+EMUL_MODULES.linux=	compat freetype2 x11
+SUSE_VERSION_REQD=	7.3
 
-.if ${OPSYS} == "NetBSD"
-DISTNAME=	OOo_${OO_RELEASE}_LinuxIntel_install_en-US
-WRKSRC=		${WRKDIR}/OOF680_m18_native_packed-1_en-US.9161
-.endif
+EMUL_PKG_FMT=		rpm
+RPMFILES=		${WRKSRC}/RPMS/*.rpm
+RPM2PKG_PREFIX=		${PREFIX}
+RPM2PKG_SUBPREFIX=	${EMULSUBDIR}
+RPM2PKG_STAGE=		do-install
+RUN_LDCONFIG=		no
 
-.if ${OPSYS} == "DragonFly"
-DISTNAME=	OOo_${OO_RELEASE}_LinuxIntel_install_en-US
-WRKSRC=		${WRKDIR}/OOF680_m18_native_packed-1_en-US.9161
-.endif
-
-.if ${OPSYS} == "Linux"
-.if ${ARCH} == "i386"
-DISTNAME=	OOo_${OO_RELEASE}_LinuxIntel_install_en-US
-WRKSRC=		${WRKDIR}/OOF680_m18_native_packed-1_en-US.9161
-.endif
-.endif
-
-.if ${OPSYS} == "SunOS"
-.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
-DISTNAME=	OOo_${OO_RELEASE}_SolarisSparc_install_en-US
-WRKSRC=		${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/packages
-.elif ${MACHINE_ARCH} == "i386"
-DISTNAME=	OOo_${OO_RELEASE}_Solarisx86_install_en-US
-WRKSRC=		${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/packages
-.endif
-.endif
-
-# everything specific to your OS/Arch goes into its own Makefile
+.include "../../mk/bsd.prefs.mk"
 
-.if exists(Makefile.${OPSYS}.${ARCH})
-.  include "Makefile.${OPSYS}.${ARCH}"
+.if ${EMUL_PLATFORM} == "linux-i386"
+DISTNAME=		OOo_${OO_RELEASE}_LinuxIntel_install_en-US
+WRKSRC=			${WRKDIR}/OOF680_m18_native_packed-1_en-US.9161
+.elif ${EMUL_PLATFORM} == "solaris-i386"
+DISTNAME=		OOo_${OO_RELEASE}_Solarisx86_install_en-US
+WRKSRC=			${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/packages
+.elif ${EMUL_PLATFORM} == "solaris-sparc"
+DISTNAME=		OOo_${OO_RELEASE}_SolarisSparc_install_en-US
+WRKSRC=			${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/packages
 .endif
 
-DISTNAME?=	OOo_${OO_RELEASE}_LinuxIntel_install_en-US
-
 .include "options.mk"
 
 do-install:
-	${RM} -f ${WRKDIR}/PLIST.nouniq
-	${RPM2PKG} ${RPM2PKGARGS} ${WRKSRC}/RPMS/*.rpm
-	uniq ${WRKDIR}/PLIST.nouniq >${WRKDIR}/PLIST
+	uniq ${RPM2PKG_PLIST} > ${WRKDIR}/PLIST
 .if defined(PKG_JVM) && !empty(PKG_JVM)
 	${RM} -f ${PREFIX}/bin/soffice
 	${SED}  -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \
diff --git a/misc/openoffice2-bin/Makefile.DragonFly.i386 b/misc/openoffice2-bin/Makefile.DragonFly.i386
deleted file mode 100644
index f5c438da215..00000000000
--- a/misc/openoffice2-bin/Makefile.DragonFly.i386
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile.DragonFly.i386,v 1.2 2006/07/02 09:28:37 ghen Exp $
-
-DEPENDS+=	suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
-DEPENDS+=	suse_freetype2>=2.0:../../emulators/${SUSE_DIR_PREFIX}_freetype2
-
-.include "../../emulators/suse_linux/Makefile.application"
diff --git a/misc/openoffice2-bin/Makefile.NetBSD.i386 b/misc/openoffice2-bin/Makefile.NetBSD.i386
deleted file mode 100644
index d16dff20592..00000000000
--- a/misc/openoffice2-bin/Makefile.NetBSD.i386
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.3 2006/07/02 09:28:37 ghen Exp $
-
-DEPENDS+=	suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
-DEPENDS+=	suse_freetype2>=2.0:../../emulators/${SUSE_DIR_PREFIX}_freetype2
-
-.include "../../emulators/suse_linux/Makefile.application"
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 3e3e7552e02..7a9888ebea9 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1915 2007/07/23 15:23:46 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1916 2007/07/29 05:19:41 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -29,6 +29,10 @@ PKG_FAIL_REASON+=	"[bsd.pkg.mk] Run \"${MAKE} help topic=make_jobs\" to get some
 # Include any preferences, if not already included, and common definitions
 .include "${.PARSEDIR}/bsd.prefs.mk"
 
+.if defined(EMUL_PLATFORMS) && !empty(EMUL_PLATFORMS)
+.  include "${.PARSEDIR}/emulator/emulator.mk"
+.endif
+
 .include "${.PARSEDIR}/flavor/bsd.flavor-vars.mk"
 .include "${.PARSEDIR}/check/bsd.check-vars.mk"
 .include "${.PARSEDIR}/depends/bsd.depends-vars.mk"
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 423de8c1888..aec02ae7965 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.253 2007/07/20 22:40:56 joerg Exp $
+# $NetBSD: bsd.prefs.mk,v 1.254 2007/07/29 05:19:41 jlam Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -581,6 +581,11 @@ PREPEND_PATH+=		${LOCALBASE}/bin
 # Wrapper framework definitions
 .include "${PKGSRCDIR}/mk/wrapper/wrapper-defs.mk"
 
+# Binary emulator framework definitions
+.if defined(EMUL_PLATFORMS) && !empty(EMUL_PLATFORMS)
+.  include "${PKGSRCDIR}/mk/emulator/emulator-vars.mk"
+.endif
+
 # Package system flavor definitions
 .include "${PKGSRCDIR}/mk/flavor/bsd.flavor-vars.mk"
 
diff --git a/mk/emulator/bsdi.mk b/mk/emulator/bsdi.mk
new file mode 100644
index 00000000000..e9f30ad257c
--- /dev/null
+++ b/mk/emulator/bsdi.mk
@@ -0,0 +1,27 @@
+# $NetBSD: bsdi.mk,v 1.1 2007/07/29 05:19:42 jlam Exp $
+#
+# BSD/OS binary emulation framework
+#
+
+EMUL_MODULES.bsdi?=	# empty
+
+# Nothing emulates BSDi -- it's only available natively.
+EMUL_TYPE.bsdi?=	native
+EMUL_DISTRO=		native
+EMULSUBDIR=		# empty
+EMULDIR=		${PREFIX}
+OPSYS_EMULDIR=		# empty
+
+# _EMUL_TYPES
+#	List of recognized BSD/OS types that a user may request.
+#
+# _EMUL_MODULES
+#	List of recognized BSD/OS "modules" that packages may request.
+#
+_EMUL_TYPES=		native
+_EMUL_TYPE=		native
+_EMUL_MODULES=		# empty
+
+.for _mod_ in ${_EMUL_MODULES}
+DEPENDS_native.${_mod_}?=       # empty
+.endfor
diff --git a/mk/emulator/emulator-vars.mk b/mk/emulator/emulator-vars.mk
new file mode 100644
index 00000000000..d5e89989c20
--- /dev/null
+++ b/mk/emulator/emulator-vars.mk
@@ -0,0 +1,156 @@
+# $NetBSD: emulator-vars.mk,v 1.1 2007/07/29 05:19:42 jlam Exp $
+#
+# This file is included by bsd.prefs.mk only if EMUL_PLATORMS is defined
+# and non-empty.
+#
+# User-settable variables:
+#
+# EMUL_TYPE.${EMUL_OPSYS}
+#	Specifies the "type" or "variant" of ${EMUL_OPSYS} to use, e.g.
+#	${EMUL_TYPE.linux} == "suse".
+#
+# EMUL_PLATFORM
+#	Specifies the platform to emulate, and is of the form
+#	${EMUL_OPSYS}-${EMUL_ARCH}, e.g. linux-i386.  By default
+#	this is the best-matching platform listed in EMUL_PLATFORMS
+#	chosen based on EMUL_PREFER.
+#
+# EMUL_PREFER
+#	The list of platforms to try to emulate in order of preference.
+#	By default, only try to emulate the native platform.  See the
+#	_EMUL_PREFER.* table below for additional preferences for various
+#	platforms.
+#
+# Package-settable variables:
+#
+# EMUL_PLATFORMS
+#	List of "${EMUL_OPSYS}-${EMUL_ARCH}" binary emulations supported
+#	by the package.  This should be set prior to the inclusion of
+#	bsd.prefs.mk.
+#
+#	Default value: undefined
+#
+# Variables defined by this file:
+#
+# EMUL_ARCH
+#	The machine architecture being emulated, e.g. i386.  If the
+#	package isn't supported on this machine, then its value is
+#	"none".
+#
+# EMUL_OPSYS
+#	The operating system being emulated, e.g. linux.  If the
+#	package isn't supported on this machine, then its value is
+#	"none".
+#
+# EMUL_DISTRO
+#	The distribution of the emulated operating system being used,
+#	e.g. native-linux, suse-10.0, etc.  If the package isn't
+#	supported on this machine, then its value is "none".
+#
+# EMULDIR
+#	Convenience variable that expands to ${PREFIX}/${EMULSUBDIR}
+#
+# EMULSUBDIR
+#       Path relative to ${PREFIX} where the files and directories
+#       are located, e.g. emul/linux.
+#
+# OPSYS_EMULDIR
+#       Path through which the platform expects to find a "chroot"
+#       installation of the files and directories, e.g. /emul/linux.
+#
+
+# _EMUL_OPSYS
+#	A table that maps ${OPSYS} to the operating system names
+#	(${EMUL_OPSYS}) used by the emulator framework.
+#
+# _EMUL_MACHINE_PLATFORM
+#	An "opsys-arch" pair that describes the "native" platform.
+#
+# _EMUL_OPSYSES
+#	A list of supported binary emulations.
+#
+# _EMUL_PREFER.*
+#	A table that maps ${_EMUL_MACHINE_PLATFORM} to a list of
+#	platforms to try to emulate on the native platform, excluding
+#	itself.
+#
+_EMUL_OPSYSES+=		bsdi
+_EMUL_OPSYS.HPUX=	hpux
+_EMUL_OPSYS.IRIX=	irix
+_EMUL_OPSYS.OSF1=	osf1
+.if !empty(OS_VERSION:M4.*)
+_EMUL_OPSYS.SunOS=	sunos
+.else
+_EMUL_OPSYS.SunOS=	solaris
+.endif
+.if defined(_EMUL_OPSYS.${OPSYS})
+_EMUL_OPSYS=		${_EMUL_OPSYS.${OPSYS}}
+.else
+_EMUL_OPSYS=		${LOWER_OPSYS}
+.endif
+
+_EMUL_MACHINE_PLATFORM=	${_EMUL_OPSYS}-${MACHINE_ARCH}
+
+_EMUL_OPSYSES+=		darwin
+_EMUL_OPSYSES+=		freebsd
+_EMUL_OPSYSES+=		hpux
+_EMUL_OPSYSES+=		irix
+_EMUL_OPSYSES+=		linux
+_EMUL_OPSYSES+=		netbsd
+_EMUL_OPSYSES+=		osf1
+_EMUL_OPSYSES+=		sunos
+_EMUL_OPSYSES+=		solaris
+
+_EMUL_PREFER.netbsd-alpha=	osf1-alpha linux-alpha
+_EMUL_PREFER.netbsd-arm=	linux-arm
+_EMUL_PREFER.netbsd-i386=	linux-i386 freebsd-i386 solaris-i386
+_EMUL_PREFER.netbsd-m68k=	sunos-m68k linux-m68k
+_EMUL_PREFER.netbsd-powerpc=	linux-powerpc
+_EMUL_PREFER.netbsd-sparc64=	solaris-sparc64 solaris-sparc sunos-sparc
+.if !empty(MACHINE_PLATFORM:MNetBSD-1.*-sparc*)
+_EMUL_PREFER.netbsd-sparc=	sunos-sparc
+.else
+_EMUL_PREFER.netbsd-sparc=	solaris-sparc sunos-sparc
+.endif
+_EMUL_PREFER.netbsd-x86_64=	linux-x86_64 linux-i386
+
+_EMUL_PREFER.solaris-sparc64=	solaris-sparc
+_EMUL_PREFER.solaris-x86_64=	solaris-i386
+
+_EMUL_PREFER.linux-sparc64=	linux-sparc
+_EMUL_PREFER.linux-x86_64=	linux-i386
+
+# Prefer "emulating" the native operating system, then fall back to
+# the other preferences listed above.
+#
+EMUL_PREFER?=		${_EMUL_MACHINE_PLATFORM}			\
+			${_EMUL_PREFER.${_EMUL_MACHINE_PLATFORM}}
+
+.for _platform_ in ${EMUL_PREFER}
+.  if !empty(EMUL_PLATFORMS:M${_platform_})
+EMUL_PLATFORM?=		${_platform_}
+.  endif
+.endfor
+EMUL_PLATFORM?=		none
+
+# _EMUL_RUN_LDCONFIG
+#	This is YesNo variable that is modified by makefiles in the
+#	emulator framework.  This is used as the default value of
+#	RUN_LDCONFIG by any package that uses the emulator framework.
+#	
+#	Default value: no
+#
+_EMUL_RUN_LDCONFIG=	no
+
+.if ${EMUL_PLATFORM} == "none"
+EMUL_ARCH?=		none
+EMUL_OPSYS?=		none
+EMUL_DISTRO?=		none
+EMULSUBDIR?=		# empty
+EMULDIR?=		${PREFIX}
+OPSYS_EMULDIR?=		# empty
+.else
+EMUL_ARCH?=		${EMUL_PLATFORM:C/.*-//}
+EMUL_OPSYS?=		${EMUL_PLATFORM:C/-.*//}
+.  include "../../mk/emulator/${EMUL_OPSYS}.mk"
+.endif
diff --git a/mk/emulator/emulator.mk b/mk/emulator/emulator.mk
new file mode 100644
index 00000000000..d58304a347d
--- /dev/null
+++ b/mk/emulator/emulator.mk
@@ -0,0 +1,116 @@
+# $NetBSD: emulator.mk,v 1.1 2007/07/29 05:19:42 jlam Exp $
+#
+# This file is included by bsd.pkg.mk.
+#
+# Package-settable variables:
+#
+# EMUL_MODULES.${EMUL_OPSYS}
+#	List of modules of ${EMUL_OPSYS} that are used by the package.
+#
+#	Default value: undefined
+#
+# EMUL_PKG_FMT
+#	Binary emulation packaging format requested by the package.
+#	Possible values: any format listed in ${_EMUL_PKG_FMTS}.
+#
+#	Default value: plain
+#
+# Variables defined by this file:
+#
+# EMULSUBDIRSLASH
+#	Expands to either ${EMULSUBDIR}/lib or just lib depending on
+#	whether EMULSUBDIR is empty or not.  It is meant to be used
+#	in PLISTs and files where one wants to avoid "//" artifacts,
+#	e.g., ${EMULSUBDIRSLASH}lib.
+#
+# Public targets:
+#
+# emul-fetch
+#	This is a public target that fetches the distfiles for all
+#	supported EMUL_PLATFORMs.
+#
+# emul-distinfo
+#	This is a public target that generates a new distinfo file
+#	that contains checksums for all supported EMUL_PLATFORMs.
+#	This target should be run after the successful completion
+#	of the ``emul-fetch'' target.
+#
+
+# If we're doing true binary emulation, then file paths found in the
+# package's binaries, libraries and scripts won't necessarily match the
+# actual paths on the file system, so skip some path checks that are
+# likely to fail.
+# 
+.if empty(EMUL_DISTRO:Mnative-*)
+CHECK_SHLIBS_SUPPORTED?=	no
+CHECK_INTERPRETER_SKIP=		*
+.endif
+
+# We're not concerned about "portability" problems if we're using
+# a package that requires binary emulation.
+#
+CHECK_PORTABILITY_SKIP=		*
+
+RUN_LDCONFIG?=		${_EMUL_RUN_LDCONFIG}
+
+FILES_SUBST+=		EMULDIR=${EMULDIR:Q}
+FILES_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
+FILES_SUBST+=		OPSYS_EMULDIR=${OPSYS_EMULDIR:Q}
+
+PLIST_SUBST+=		EMULDIR=${EMULDIR:Q}
+PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
+PLIST_SUBST+=		OPSYS_EMULDIR=${OPSYS_EMULDIR:Q}
+
+EMULSUBDIRSLASH=	${EMULSUBDIR:S/$/\//:C/^\/$//}
+FILES_SUBST+=		EMULSUBDIRSLASH=${EMULSUBDIRSLASH:Q}
+PLIST_SUBST+=		EMULSUBDIRSLASH=${EMULSUBDIRSLASH:Q}
+
+.if empty(EMUL_PLATFORMS:M${EMUL_PLATFORM})
+PKG_FAIL_REASON+=	"${PKGNAME} is not available for ${MACHINE_PLATFORM}"
+.endif
+
+# Add dependencies for each "module" that the package requests in
+# EMUL_MODULES.${EMUL_OPSYS}.
+#
+.for _mod_ in ${EMUL_MODULES.${EMUL_OPSYS}}
+.  if !defined(DEPENDS_${EMUL_DISTRO}.${_mod_})
+PKG_FAIL_REASON+=       "${EMUL_DISTRO}: unknown module ${_mod_}"
+.  else
+DEPENDS+=               ${DEPENDS_${EMUL_DISTRO}.${_mod_}}
+.  endif
+.endfor
+
+# _EMUL_PKG_FMTS
+#	List of recognized binary emulation packaging formats that
+#	packages may request.
+#
+_EMUL_PKG_FMTS=		plain
+_EMUL_PKG_FMTS+=	rpm
+
+EMUL_PKG_FMT?=		plain
+
+.include "${PKGSRCDIR}/mk/emulator/pkg-${EMUL_PKG_FMT}.mk"
+
+.PHONY: emul-fetch
+emul-fetch:
+.for _platform_ in ${EMUL_PLATFORMS}
+	${RUN} ${MAKE} ${MAKEFLAGS} fetch NO_SKIP=yes			\
+		EMUL_PLATFORM=${_platform_}
+.endfor
+
+.PHONY: emul-distinfo
+emul-distinfo:
+	${RUN} ${RM} -f ${DISTINFO_FILE}.emul
+	${RUN} ( ${ECHO} "$$""NetBSD""$$"; ${ECHO} "" )			\
+		>> ${DISTINFO_FILE}.emul
+.for _platform_ in ${EMUL_PLATFORMS}
+	${RUN}								\
+	( ${MAKE} ${MAKEFLAGS} distinfo NO_SKIP=yes			\
+		ECHO_MSG=: EMUL_PLATFORM=${_platform_} &&		\
+	  ${SED} "1,2d" ${DISTINFO_FILE} &&				\
+	  ${RM} -f ${DISTINFO_FILE} ) >> ${DISTINFO_FILE}.emul
+.endfor
+	${RUN} ${RM} -f ${DISTINFO_FILE}
+	${RUN} ${AWK} -f ${PKGSRCDIR}/mk/emulator/merge-distinfo.awk	\
+		${DISTINFO_FILE}.emul > ${DISTINFO_FILE}
+	${RUN} ${RM} -f ${DISTINFO_FILE}.emul
diff --git a/mk/emulator/freebsd.mk b/mk/emulator/freebsd.mk
new file mode 100644
index 00000000000..4784cf2efcb
--- /dev/null
+++ b/mk/emulator/freebsd.mk
@@ -0,0 +1,43 @@
+# $NetBSD: freebsd.mk,v 1.1 2007/07/29 05:19:42 jlam Exp $
+#
+# FreeBSD binary emulation framework
+#
+
+.if !empty(OPSYS:MFreeBSD*)
+EMUL_TYPE.freebsd?=	native
+.else
+EMUL_TYPE.freebsd?=	builtin
+.endif
+EMUL_MODULES.freebsd?=	# empty
+
+EMULSUBDIR=		emul/freebsd
+EMULDIR=		${PREFIX}/${EMULSUBDIR}
+OPSYS_EMULDIR=		${_OPSYS_EMULDIR.freebsd}
+
+# _EMUL_TYPES
+#	List of recognized FreeBSD types that a user may request.
+#
+# _EMUL_MODULES
+#	List of recognized FreeBSD "modules" that packages may request.
+#
+_EMUL_TYPES=		builtin
+_EMUL_TYPES+=		native
+_EMUL_TYPE?=		${EMUL_TYPE.freebsd}
+
+_EMUL_MODULES=		# empty
+
+.if ${_EMUL_TYPE} == "builtin"
+EMUL_DISTRO=		builtin-freebsd		# managed outside pkgsrc
+.elif ${_EMUL_TYPE} == "native"
+EMUL_DISTRO=		native-freebsd		# native FreeBSD installation
+EMULDIR=		${PREFIX}
+EMULSUBDIR=		# empty
+.else
+.  include "${PKGSRCDIR}/mk/emulator/freebsd-${_EMUL_TYPE}.mk"
+.endif
+
+.if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native")
+.  for _mod_ in ${_EMUL_MODULES}
+DEPENDS_${EMUL_DISTRO}.${_mod_}?=	# empty
+.  endfor
+.endif
diff --git a/mk/emulator/irix.mk b/mk/emulator/irix.mk
new file mode 100644
index 00000000000..411eb2c944d
--- /dev/null
+++ b/mk/emulator/irix.mk
@@ -0,0 +1,43 @@
+# $NetBSD: irix.mk,v 1.1 2007/07/29 05:19:42 jlam Exp $
+#
+# IRIX binary emulation framework
+#
+
+.if !empty(OPSYS:MIRIX*)
+EMUL_TYPE.irix?=	native
+.else
+EMUL_TYPE.irix?=	builtin
+.endif
+EMUL_MODULES.irix?=	# empty
+
+EMULSUBDIR=		emul/irix
+EMULDIR=		${PREFIX}/${EMULSUBDIR}
+OPSYS_EMULDIR=		${_OPSYS_EMULDIR.irix}
+
+# _EMUL_TYPES
+#	List of recognized IRIX types that a user may request.
+#
+# _EMUL_MODULES
+#	List of recognized IRIX "modules" that packages may request.
+#
+_EMUL_TYPES=		builtin
+_EMUL_TYPES+=		native
+_EMUL_TYPE?=		${EMUL_TYPE.irix}
+
+_EMUL_MODULES=		# empty
+
+.if ${_EMUL_TYPE} == "builtin"
+EMUL_DISTRO=		builtin-irix	# managed outside pkgsrc
+.elif ${_EMUL_TYPE} == "native"
+EMUL_DISTRO=		native-irix	# native IRIX installation
+EMULDIR=		${PREFIX}
+EMULSUBDIR=		# empty
+.else
+.  include "${PKGSRCDIR}/mk/emulator/irix-${_EMUL_TYPE}.mk"
+.endif
+
+.if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native")
+.  for _mod_ in ${_EMUL_MODULES}
+DEPENDS_${EMUL_DISTRO}.${_mod_}?=	# empty
+.  endfor
+.endif
diff --git a/mk/emulator/linux-suse.mk b/mk/emulator/linux-suse.mk
new file mode 100644
index 00000000000..bc181cf4614
--- /dev/null
+++ b/mk/emulator/linux-suse.mk
@@ -0,0 +1,43 @@
+# $NetBSD: linux-suse.mk,v 1.1 2007/07/29 05:19:42 jlam Exp $
+#
+# SuSE Linux
+#
+
+# Most Linux software only need suse>=6.4.
+SUSE_VERSION_REQD?=	6.4
+
+# When building the SuSE packages, force the Linux type to be the specific
+# version of SuSE that is being built.
+#
+.if defined(SUSE_PKG) && defined(SUSE_VERSION)
+EMUL_TYPE.linux=	suse-${SUSE_VERSION}
+.endif
+
+# EMUL_TYPE.linux can be "suse" or "suse-[0-9]*".  If the former, then use
+# the default SuSE version, otherwise use the specific version requested.
+#
+.if !empty(EMUL_TYPE.linux:Msuse-9.1)
+.  include "${PKGSRCDIR}/emulators/suse91_linux/emulator.mk"
+
+.elif !empty(EMUL_TYPE.linux:Msuse-9.x)
+   # use the highest version of SuSE-9.x
+.  include "${PKGSRCDIR}/emulators/suse91_linux/emulator.mk"
+
+.elif !empty(EMUL_TYPE.linux:Msuse-10.0)
+.  include "${PKGSRCDIR}/emulators/suse100_linux/emulator.mk"
+
+.elif !empty(EMUL_TYPE.linux:Msuse-10.x)
+   # use the highest version of SuSE-10.x
+.  include "${PKGSRCDIR}/emulators/suse100_linux/emulator.mk"
+
+.elif !empty(EMUL_TYPE.linux:Msuse)
+   # default to highest version of SuSE
+.  include "${PKGSRCDIR}/emulators/suse100_linux/emulator.mk"
+
+.else
+EMUL_DISTRO=		suse-0
+PKG_FAIL_REASON+=	"[linux-suse.mk] ${EMUL_TYPE.linux} is not a supported EMUL_TYPE.linux"
+.endif
+
+# XXX There should be a check here to verify that ${EMUL_DISTRO} satisfies
+# XXX suse>=${SUSE_VERSION_REQD}.
diff --git a/mk/emulator/linux.mk b/mk/emulator/linux.mk
new file mode 100644
index 00000000000..542240e5aa8
--- /dev/null
+++ b/mk/emulator/linux.mk
@@ -0,0 +1,79 @@
+# $NetBSD: linux.mk,v 1.1 2007/07/29 05:19:43 jlam Exp $
+#
+# Linux binary emulation framework
+#
+
+.if ${OPSYS} == "Linux"
+EMUL_TYPE.linux?=	native
+.else
+EMUL_TYPE.linux?=	suse
+.endif
+EMUL_MODULES.linux?=	# empty
+
+.if ((${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64")) || \
+    ((${EMUL_ARCH} == "sparc") && (${MACHINE_ARCH} == "sparc64"))
+_LINUX_BASE=		linux32
+EMULSUBDIR=		emul/linux32
+.else
+_LINUX_BASE=		linux
+EMULSUBDIR=		emul/linux
+.endif
+
+EMULDIR=		${PREFIX}/${EMULSUBDIR}
+OPSYS_EMULDIR=		${_OPSYS_EMULDIR.${_LINUX_BASE}}
+
+# _EMUL_TYPES
+#	List of recognized Linux types that a user may request.
+#
+# _EMUL_MODULES
+#	List of recognized Linux "modules" that packages may request.
+#
+_EMUL_TYPES=		builtin
+_EMUL_TYPES+=		native
+_EMUL_TYPES+=		suse
+
+.if !empty(EMUL_TYPE.linux:Msuse-*)
+_EMUL_TYPE?=		suse
+.endif
+_EMUL_TYPE?=		${EMUL_TYPE.linux}
+
+_EMUL_MODULES=		aspell
+_EMUL_MODULES+=		base
+_EMUL_MODULES+=		compat
+_EMUL_MODULES+=		cups
+_EMUL_MODULES+=		expat
+_EMUL_MODULES+=		fontconfig
+_EMUL_MODULES+=		freetype2
+_EMUL_MODULES+=		gdk-pixbuf
+_EMUL_MODULES+=		glx
+_EMUL_MODULES+=		gtk
+_EMUL_MODULES+=		gtk2
+_EMUL_MODULES+=		jpeg
+_EMUL_MODULES+=		locale
+_EMUL_MODULES+=		motif
+_EMUL_MODULES+=		openssl
+_EMUL_MODULES+=		png
+_EMUL_MODULES+=		slang
+_EMUL_MODULES+=		tiff
+_EMUL_MODULES+=		vmware
+_EMUL_MODULES+=		x11
+_EMUL_MODULES+=		xml2
+
+.if ${_EMUL_TYPE} == "builtin"
+EMUL_DISTRO=		builtin-linux	# managed outside pkgsrc
+.elif ${_EMUL_TYPE} == "native"
+EMUL_DISTRO=		native-linux	# native Linux installation
+EMULDIR=		${PREFIX}
+EMULSUBDIR=		# empty
+.else
+.  include "${PKGSRCDIR}/mk/emulator/linux-${_EMUL_TYPE}.mk"
+.endif
+
+.if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native")
+.  for _mod_ in ${_EMUL_MODULES}
+DEPENDS_native-linux.${_mod_}=	# empty
+.  endfor
+.endif
+
+LDCONFIG_ADD_CMD?=	${EMULDIR}/sbin/ldconfig -r ${EMULDIR}
+LDCONFIG_REMOVE_CMD?=	${EMULDIR}/sbin/ldconfig -r ${EMULDIR}
diff --git a/mk/emulator/merge-distinfo.awk b/mk/emulator/merge-distinfo.awk
new file mode 100644
index 00000000000..7acdcfe31e0
--- /dev/null
+++ b/mk/emulator/merge-distinfo.awk
@@ -0,0 +1,43 @@
+# $NetBSD: merge-distinfo.awk,v 1.1 2007/07/29 05:19:43 jlam Exp $
+#
+# This awk script sorts the contents of several distinfo files into a
+# single distinfo file.
+#
+
+# insertion sort
+function sort(a, nelem,   temp, i, j) {
+	for (i = 2; i <= nelem; ++i) {
+		for (j = i; a[j-1] > a[j]; --j) {
+			temp = a[j]
+			a[j] = a[j-1]
+			a[j-1] = temp
+		}
+	}
+	return
+}
+
+/^[A-Z]+/ { 
+	file = $2
+	files[file] = file
+	if (!($0 in seen)) {
+		seen[$0] = $0
+		properties[file, 0]++
+		properties[file, properties[file, 0]] = $0
+	}
+}
+
+END {
+	print "$" "NetBSD" "$"
+	print ""
+	n = 1
+	for (f in files) {
+		orderedfiles[n++] = f
+	}
+	n--;
+	sort(orderedfiles, n)
+	for (i = 1; i <= n; i++) {
+		f = orderedfiles[i]
+		for (j = 1; j <= properties[f, 0]; j++)
+			print properties[f, j]
+	}
+}
diff --git a/mk/emulator/osf1.mk b/mk/emulator/osf1.mk
new file mode 100644
index 00000000000..09d3bfb7354
--- /dev/null
+++ b/mk/emulator/osf1.mk
@@ -0,0 +1,43 @@
+# $NetBSD: osf1.mk,v 1.1 2007/07/29 05:19:43 jlam Exp $
+#
+# OSF/1 (Tru64) binary emulation framework
+#
+
+.if !empty(OPSYS:MOSF*)
+EMUL_TYPE.osf1?=	native
+.else
+EMUL_TYPE.osf1?=	builtin
+.endif
+EMUL_MODULES.osf1?=	# empty
+
+EMULSUBDIR=		emul/osf1
+EMULDIR=		${PREFIX}/${EMULSUBDIR}
+OPSYS_EMULDIR=		${_OPSYS_EMULDIR.osf1}
+
+# _EMUL_TYPES
+#	List of recognized OSF/1 types that a user may request.
+#
+# _EMUL_MODULES
+#	List of recognized OSF/1 "modules" that packages may request.
+#
+_EMUL_TYPES=		builtin
+_EMUL_TYPES+=		native
+_EMUL_TYPE?=		${EMUL_TYPE.osf1}
+
+_EMUL_MODULES=		# empty
+
+.if ${_EMUL_TYPE} == "builtin"
+EMUL_DISTRO=		builtin-osf1	# managed outside pkgsrc
+.elif ${_EMUL_TYPE} == "native"
+EMUL_DISTRO=		native-osf1	# native OSF/1 (Tru64)
+EMULDIR=		${PREFIX}
+EMULSUBDIR=		# empty
+.else
+.  include "${PKGSRCDIR}/mk/emulator/osf1-${_EMUL_TYPE}.mk"
+.endif
+
+.if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native")
+.  for _mod_ in ${_EMUL_MODULES}
+DEPENDS_${EMUL_DISTRO}.${_mod_}?=	# empty
+.  endfor
+.endif
diff --git a/mk/emulator/pkg-plain.mk b/mk/emulator/pkg-plain.mk
new file mode 100644
index 00000000000..ce8caf22073
--- /dev/null
+++ b/mk/emulator/pkg-plain.mk
@@ -0,0 +1,4 @@
+# $NetBSD: pkg-plain.mk,v 1.1 2007/07/29 05:19:43 jlam Exp $
+#
+# "Plain" archived software without any special package format.
+#
diff --git a/mk/emulator/pkg-rpm.mk b/mk/emulator/pkg-rpm.mk
new file mode 100644
index 00000000000..493badc15e5
--- /dev/null
+++ b/mk/emulator/pkg-rpm.mk
@@ -0,0 +1,110 @@
+# $NetBSD: pkg-rpm.mk,v 1.1 2007/07/29 05:19:43 jlam Exp $
+#
+# RPM package format
+#
+# Package-settable variables:
+#
+# RPM2PKG_PLIST
+#	This is the path to the PLIST created by rpm2pkg(8) which will
+#	list the files and directories extracted from the RPMs.  If
+#	this is empty, then no PLIST is created.
+#
+#	Default value: ${WRKDIR}/.PLIST.rpm2pkg
+#	
+# RPM2PKG_PREFIX
+#	This is the directory under which the contents of the RPMs will
+#	be extracted.  This directory is stripped from the paths which
+#	are stored in ${RPM2PKG_PLIST}.
+#
+#	Default value: ${WRKDIR}
+#
+# RPM2PKG_SUBPREFIX
+#	This is the subdirectory under ${RPM2PKG_PREFIX} within which
+#	the RPMs are directly extracted.  If this is empty, then the
+#	RPMs are extracted directly into ${RPM2PKG_PREFIX}.
+#
+#	Default value: empty
+#
+# RPM2PKG_STRIP
+#	This is the number of path components to strip from the head
+#	of paths of files and directories stored in the RPMs during
+#	extraction.  RPMs usually store all paths with a leading path
+#	component of ``./''.
+#
+#	Default value: 1
+#	
+# RPM2PKG_STAGE
+#	Stage at which to run the ``extract-rpm'' target.
+#
+#	Default value: do-extract
+#
+# RPMFILES
+#	The list of paths to RPMs to extract using rpm2pkg(8).
+#
+#	Default value: all *.rpm files in DISTFILES located in ${_DISTDIR}
+#
+# RPMIGNOREPATH
+#	The list of files or paths to skip during extraction of the RPMs.
+#
+#	Default value: undefined
+#
+# Public targets:
+#
+# extract-rpm
+#	Runs rpm2pkg(8) with the appropriate arguments based on the
+#	RPM* variables set in the package Makefile to extract the
+#	files listed in RPMFILES.
+#
+
+BUILD_DEPENDS+=		rpm2pkg>=2.1:../../pkgtools/rpm2pkg
+EVAL_PREFIX+=		_RPM2PKG_PREFIX=rpm2pkg
+RPM2PKG=		${_RPM2PKG_PREFIX}/sbin/rpm2pkg
+
+RPMFILES?=		${DISTFILES:M*.rpm:S/^/${_DISTDIR}\//}
+BUILD_DEFS+=		RPMFILES
+.if defined(RPMIGNOREPATH)
+BUILD_DEFS+=		RPMIGNOREPATH
+.endif
+
+RPM2PKGSTRIP?=		${RPM2PKG_STRIP}
+
+RPM2PKG_STRIP?=		1
+RPM2PKG_PREFIX?=	${WRKDIR}
+RPM2PKG_SUBPREFIX?=	# empty
+RPM2PKG_PLIST?=		${WRKDIR}/.PLIST.rpm2pkg
+
+# By default, extract the RPMs during the do-extract step.
+RPM2PKG_STAGE?=		do-extract
+
+RPM2PKG_ARGS_DFLT=	-d ${RPM2PKG_PREFIX:Q}
+.if !empty(RPM2PKG_SUBPREFIX)
+RPM2PKG_ARGS_DFLT+=	-p ${RPM2PKG_SUBPREFIX:Q}
+.endif
+.if !empty(RPM2PKG_PLIST)
+RPM2PKG_ARGS_DFLT+=	-f ${RPM2PKG_PLIST:Q}
+.endif
+.if empty(RPM2PKG_STRIP:M0)
+RPM2PKG_ARGS_DFLT+=	-s ${RPM2PKG_STRIP}
+.endif
+.for _ignoredir_ in ${RPMIGNOREPATH}
+RPM2PKG_ARGS_DFLT+=	-i ${_ignoredir_}
+.endfor
+RPM2PKG_ARGS?=		${RPM2PKG_ARGS_DFLT}
+
+PLIST_SRC_DFLT+=	${RPM2PKG_PLIST}
+
+# We handle the extraction of the RPMs in the extract-rpm target below.
+EXTRACT_ONLY?=		# empty
+
+# Usually, packages we install via RPMs also install shared libraries.
+_EMUL_RUN_LDCONFIG=	yes
+
+.PHONY: extract-rpm
+extract-rpm:
+	@${STEP_MSG} "Extracting RPM files"
+.if !empty(RPM2PKG_PLIST)
+	${RUN} ${RM} -f ${RPM2PKG_PLIST}
+.endif
+	${RUN} ${RPM2PKG} ${RPM2PKG_ARGS} ${RPMFILES}
+
+${RPM2PKG_STAGE}: extract-rpm
diff --git a/mk/emulator/solaris.mk b/mk/emulator/solaris.mk
new file mode 100644
index 00000000000..d4f73403c42
--- /dev/null
+++ b/mk/emulator/solaris.mk
@@ -0,0 +1,52 @@
+# $NetBSD: solaris.mk,v 1.1 2007/07/29 05:19:43 jlam Exp $
+#
+# Solaris (SVR4) binary emulation framework
+#
+
+.if ${OPSYS} == "SunOS"
+EMUL_TYPE.solaris?=	native
+.else
+EMUL_TYPE.solaris?=	builtin
+.endif
+EMUL_MODULES.solaris?=	# empty
+
+.if ((${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64")) || \
+    ((${EMUL_ARCH} == "sparc") && (${MACHINE_ARCH} == "sparc64"))
+_SOLARIS_BASE=		solaris32
+EMULSUBDIR=		emul/svr4_32
+.else
+_SOLARIS_BASE=		solaris
+EMULSUBDIR=		emul/svr4
+.endif
+
+EMULDIR=		${PREFIX}/${EMULSUBDIR}
+OPSYS_EMULDIR=		${_OPSYS_EMULDIR.${_SOLARIS_BASE}}
+
+# _EMUL_TYPES
+#	List of recognized Solaris types that a user may request.
+#
+# _EMUL_MODULES
+#	List of recognized Solaris "modules" that packages may request.
+#
+_EMUL_TYPES=		builtin
+_EMUL_TYPES+=		native
+#_EMUL_TYPES+=		opensolaris
+_EMUL_TYPE?=		${EMUL_TYPE.solaris}
+
+_EMUL_MODULES=		# empty
+
+.if ${_EMUL_TYPE} == "builtin"
+EMUL_DISTRO=		builtin-solaris		# managed outside pkgsrc
+.elif ${_EMUL_TYPE} == "native"
+EMUL_DISTRO=		native-solaris		# native SunOS 5.x
+EMULDIR=		${PREFIX}
+EMULSUBDIR=		# empty
+.else
+.  include "${PKGSRCDIR}/mk/emulator/solaris-${_EMUL_TYPE}.mk"
+.endif
+
+.if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native")
+.  for _mod_ in ${_EMUL_MODULES}
+DEPENDS_${EMUL_DISTRO}.${_mod_}=	# empty
+.  endfor
+.endif
diff --git a/mk/emulator/sunos.mk b/mk/emulator/sunos.mk
new file mode 100644
index 00000000000..5b60c748e1f
--- /dev/null
+++ b/mk/emulator/sunos.mk
@@ -0,0 +1,43 @@
+# $NetBSD: sunos.mk,v 1.1 2007/07/29 05:19:43 jlam Exp $
+#
+# SunOS 4.x binary emulation framework
+#
+
+.if ${OPSYS} == "SunOS"
+EMUL_TYPE.sunos?=	native
+.else
+EMUL_TYPE.sunos?=	builtin
+.endif
+EMUL_MODULES.sunos?=	# empty
+
+EMULSUBDIR=		emul/sunos
+EMULDIR=		${PREFIX}/${EMULSUBDIR}
+OPSYS_EMULDIR=		${_OPSYS_EMULDIR.sunos}
+
+# _EMUL_TYPES
+#	List of recognized SunOS types that a user may request.
+#
+# _EMUL_MODULES
+#	List of recognized SunOS "modules" that packages may request.
+#
+_EMUL_TYPES=		builtin
+_EMUL_TYPES+=		native
+_EMUL_TYPE?=		${EMUL_TYPE.sunos}
+
+_EMUL_MODULES=		# empty
+
+.if ${_EMUL_TYPE} == "builtin"
+EMUL_DISTRO=		builtin-sunos	# managed outside pkgsrc
+.elif ${_EMUL_TYPE} == "builtin"
+EMUL_DISTRO=		native-sunos	# native SunOS 4.x
+EMULDIR=		${PREFIX}
+EMULSUBDIR=		# empty
+.else
+.  include "${PKGSRCDIR}/mk/emulator/sunos-${_EMUL_TYPE}.mk"
+.endif
+
+.if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native")
+.  for _mod_ in ${_EMUL_MODULES}
+DEPENDS_${EMUL_DISTRO}.${_mod_}=	# empty
+.  endfor
+.endif
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 172e6fc1bf6..a852a90088a 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.23 2007/07/02 14:03:37 joerg Exp $
+# $NetBSD: Darwin.mk,v 1.24 2007/07/29 05:19:44 jlam Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -55,6 +55,8 @@ IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
 IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
 IMAKE_MANINSTALL?=	maninstall catinstall
 
+_OPSYS_EMULDIR.darwin=	# empty
+
 .if ${OS_VERSION:R} >= 6
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index 8ba3c17f110..f14e118ea71 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,8 +1,7 @@
-# $NetBSD: DragonFly.mk,v 1.31 2007/07/02 14:06:22 joerg Exp $
+# $NetBSD: DragonFly.mk,v 1.32 2007/07/29 05:19:44 jlam Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
-BRANDELF?=	/usr/bin/brandelf		# used by linux compat layer
 ECHO_N?=	${ECHO} -n
 IMAKE_MAKE?=	${MAKE}		# program which gets invoked by imake
 IMAKEOPTS+=	-DBuildHtmlManPages=NO
@@ -45,6 +44,8 @@ IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
 IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
 IMAKE_MANINSTALL?=	maninstall catinstall
 
+_OPSYS_EMULDIR.linux=	/compat/linux
+
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index 607df45bfda..7a4b830eb53 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,7 +1,8 @@
-# $NetBSD: FreeBSD.mk,v 1.20 2007/07/02 14:03:40 joerg Exp $
+# $NetBSD: FreeBSD.mk,v 1.21 2007/07/29 05:19:44 jlam Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
+BRANDELF?=	/usr/bin/brandelf		# used by linux compat layer
 ECHO_N?=	${ECHO} -n
 IMAKE_MAKE?=	${MAKE}		# program which gets invoked by imake
 IMAKEOPTS+=	-DBuildHtmlManPages=NO
@@ -45,6 +46,9 @@ IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
 IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
 IMAKE_MANINSTALL?=	maninstall catinstall
 
+_OPSYS_EMULDIR.freebsd=	# empty
+_OPSYS_EMULDIR.linux=	/compat/linux
+
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/HPUX.mk b/mk/platform/HPUX.mk
index 2c77de9af0c..20154a9a33a 100644
--- a/mk/platform/HPUX.mk
+++ b/mk/platform/HPUX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: HPUX.mk,v 1.5 2007/04/29 11:54:25 tnn Exp $
+# $NetBSD: HPUX.mk,v 1.6 2007/07/29 05:19:44 jlam Exp $
 #
 # Variable definitions for the HP-UX operating system.
 
@@ -40,6 +40,8 @@ IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
 IMAKE_MANNEWSUFFIX=	1
 IMAKE_MANINSTALL?=	maninstall catinstall
 
+_OPSYS_EMULDIR.hpux=	# empty
+
 .if exists(/usr/include/netinet/ip6.h)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index fcefea5647b..119df415909 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.29 2007/07/02 14:03:40 joerg Exp $
+# $NetBSD: IRIX.mk,v 1.30 2007/07/29 05:19:44 jlam Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -62,6 +62,8 @@ MANZ=			yes
 . endif
 .endif
 
+_OPSYS_EMULDIR.irix=	# empty
+
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes		# IPv6 is standard
 .else
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index 1b86f4ad36a..892e4b0b4d0 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.28 2007/07/02 14:03:40 joerg Exp $
+# $NetBSD: Linux.mk,v 1.29 2007/07/29 05:19:44 jlam Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -46,8 +46,11 @@ IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
 IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
 IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
 IMAKE_MANINSTALL?=	maninstall catinstall
-
 IMAKE_TOOLS=		gmake	# extra tools required when we use imake
+
+_OPSYS_EMULDIR.linux=	# empty
+_OPSYS_EMULDIR.linux32=	# empty
+
 .if exists(/usr/include/netinet6) || exists(/usr/include/linux/in6.h)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index 0b3fadcb905..2a37c0d2ce9 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.22 2007/07/02 14:03:40 joerg Exp $
+# $NetBSD: NetBSD.mk,v 1.23 2007/07/29 05:19:44 jlam Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -61,6 +61,16 @@ IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
 IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
 IMAKE_MANINSTALL?=	maninstall catinstall
 
+_OPSYS_EMULDIR.freebsd=		/emul/freebsd
+_OPSYS_EMULDIR.hpux=		/emul/hpux
+_OPSYS_EMULDIR.irix=		/emul/irix
+_OPSYS_EMULDIR.linux=		/emul/linux
+_OPSYS_EMULDIR.linux32=		/emul/linux32
+_OPSYS_EMULDIR.osf1=		/emul/osf1
+_OPSYS_EMULDIR.solaris=		/emul/svr4
+_OPSYS_EMULDIR.solaris32=	/emul/svr4_32
+_OPSYS_EMULDIR.sunos=		/emul/sunos
+
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/OSF1.mk b/mk/platform/OSF1.mk
index 56b11c79848..e549a35c388 100644
--- a/mk/platform/OSF1.mk
+++ b/mk/platform/OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.mk,v 1.17 2007/04/14 13:02:08 tnn Exp $
+# $NetBSD: OSF1.mk,v 1.18 2007/07/29 05:19:44 jlam Exp $
 #
 # Variable definitions for the OSF1 operating system.
 
@@ -47,6 +47,8 @@ IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
 IMAKE_MANNEWSUFFIX=	1
 IMAKE_MANINSTALL?=	maninstall catinstall
 
+_OPSYS_EMULDIR.osf1=	# empty
+
 .if exists(/usr/include/netinet/ip6.h)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index c02b41b9b39..f3d6a3cdb02 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.29 2007/07/02 14:03:41 joerg Exp $
+# $NetBSD: SunOS.mk,v 1.30 2007/07/29 05:19:44 jlam Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -48,6 +48,10 @@ IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
 IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
 IMAKE_MANINSTALL?=	maninstall
 
+_OPSYS_EMULDIR.solaris=		# empty
+_OPSYS_EMULDIR.solaris32=	# empty
+_OPSYS_EMULDIR.sunos=		# empty
+
 .if exists(/usr/include/netinet/ip6.h)
 _OPSYS_HAS_INET6=	yes		# IPv6 is standard
 .else
diff --git a/mk/plist/plist.mk b/mk/plist/plist.mk
index 5b2651e1f62..2517f0dc262 100644
--- a/mk/plist/plist.mk
+++ b/mk/plist/plist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plist.mk,v 1.29 2007/07/27 18:37:35 jlam Exp $
+# $NetBSD: plist.mk,v 1.30 2007/07/29 05:19:44 jlam Exp $
 #
 # This Makefile fragment handles the creation of PLISTs for use by
 # pkg_create(8).
@@ -49,6 +49,9 @@ PLIST_SRC_DFLT+=	${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
 .if exists(${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g})
 PLIST_SRC_DFLT+=	${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
 .endif
+.if defined(EMUL_PLATFORM) && exists(${PKGDIR}/PLIST.${EMUL_PLATFORM})
+PLIST_SRC_DFLT+=	${PKGDIR}/PLIST.${EMUL_PLATFORM}
+.endif
 .if exists(${PKGDIR}/PLIST)
 PLIST_SRC_DFLT+=	${PKGDIR}/PLIST
 .endif
diff --git a/multimedia/RealPlayerGold/DESCR b/multimedia/RealPlayerGold/DESCR
index c3b3931908c..ea7135ca765 100644
--- a/multimedia/RealPlayerGold/DESCR
+++ b/multimedia/RealPlayerGold/DESCR
@@ -1,5 +1,5 @@
-  RealPlayer for Unix allows you to play streaming audio and video over the
-Internet in real-time.  RealPlayerGold supports RealAudio, RealVideo 10,
-MP3, Ogg Vorbis and Theora, H263, AAC, and more.  Other features include
-a Mozilla compatible plugin, a themeable GTK2 user interface, accelerated
-video, and full screen playback.
+RealPlayer for Unix allows you to play streaming audio and video over
+the Internet in real-time.  RealPlayerGold supports RealAudio, RealVideo
+10, MP3, Ogg Vorbis and Theora, H263, AAC, and more.  Other features
+include a Mozilla compatible plugin, a themeable GTK2 user interface,
+accelerated video, and full screen playback.
diff --git a/multimedia/RealPlayerGold/Makefile b/multimedia/RealPlayerGold/Makefile
index 03cf0d41b95..0137223f6aa 100644
--- a/multimedia/RealPlayerGold/Makefile
+++ b/multimedia/RealPlayerGold/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2007/02/22 19:01:23 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/07/29 05:19:45 jlam Exp $
 #
 
 DISTNAME=		RealPlayer10GOLD
 # Exact version obtained from  the output of
 #   file RealPlayer10GOLD.rpm
-PKGNAME=		RealPlayerGold-${PKGVER}
+PKGNAME=		RealPlayerGold-10.0.8.805.20060718
 PKGREVISION=		2
 CATEGORIES=		multimedia
 MASTER_SITES=		http://forms.real.com/real/player/download.html?f=unix/
@@ -14,45 +14,29 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.real.com/linux/
 COMMENT=		Real Audio and Video Player
 
-PKGVER=			10.0.8.805.20060718
-RPMFILES=		${DISTNAME}${EXTRACT_SUFX}
-RPM2PKGARGS=		-d ${PREFIX} -f ${PLIST_SRC} -p ${REALPLAYER_SUBDIR} -s3
-RPM2PKGSTRIP=		3
-EXTRACT_ONLY=		# empty
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-DIST_SUBDIR=		${PKGNAME_NOREV}
-
-# Verify that the version of the distfile (which changes often without the name changing)
-# is still correct.  This helps sort out download errors vs out of date pkgsrc errors.
-post-fetch:
-	ver=`file ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${SED} -e 's;.*Player-;;g'  -e 's;-;.;g'` ; \
-		if [ "$$ver" != "${PKGVER}" ] ; then \
-			${ECHO} "It appears that real.com has made a new version ($$ver) available so this" ; \
-			${ECHO} "package will need updating to work correctly.  That likely the reason for" ; \
-			${ECHO} "the checksum failure." ; \
-		fi
-
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_base>=9.1:../../emulators/${SUSE_DIR_PREFIX}_base
-DEPENDS+=		suse_fontconfig>=9.1:../../emulators/${SUSE_DIR_PREFIX}_fontconfig
-DEPENDS+=		suse_freetype2>=9.1:../../emulators/${SUSE_DIR_PREFIX}_freetype2
-DEPENDS+=		suse_x11>=9.1:../../emulators/${SUSE_DIR_PREFIX}_x11
-DEPENDS+=		suse_gtk2>=9.1:../../emulators/${SUSE_DIR_PREFIX}_gtk2
-.endif
-
-REALPLAYER_SUBDIR=	lib
-REALPLAYER_HOME=	${PREFIX}/${REALPLAYER_SUBDIR}/RealPlayer
-
 RESTRICTED=		Redistribution not permitted
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-ONLY_FOR_PLATFORM=	*-*-i386
+PKGVER=			${PKGNAME_NOREV:S/^RealPlayerGold-//}
+DIST_SUBDIR=		${PKGNAME_NOREV}
+
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
+
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base fontconfig freetype2 gtk2 x11
+
+EMUL_PKG_FMT=		rpm
+RPM2PKG_STRIP=		3
+RPM2PKG_PREFIX=		${PREFIX}
+RPM2PKG_SUBPREFIX=	lib
+RPM2PKG_STAGE=		do-install
+RUN_LDCONFIG=		no
+
+REALPLAYER_HOME=	${PREFIX}/lib/RealPlayer
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	post-install
@@ -60,12 +44,24 @@ SUBST_FILES.paths=	${REALPLAYER_HOME}/realplay
 SUBST_SED.paths=	-e 's,/bin/true,${TRUE},g'
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
 
+# Verify that the version of the distfile (which changes often without
+# the name changing) is still correct.  This helps sort out download
+# errors vs. out-of-date-pkgsrc errors.
+#
+post-fetch:
+	ver=`file ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${SED} -e 's;.*Player-;;g'  -e 's;-;.;g'` ; \
+		if [ "$$ver" != "${PKGVER}" ] ; then \
+			${ECHO} "It appears that real.com has made a new version ($$ver) available so this" ; \
+			${ECHO} "package will need updating to work correctly.  That likely the reason for" ; \
+			${ECHO} "the checksum failure." ; \
+		fi
+
 do-build:
 	${SED} -e 's|@REALPLAYER_HOME@|${REALPLAYER_HOME}|g'		\
-		${FILESDIR}/realplay.sh > ${WRKDIR}/realplay
+		${FILESDIR}/realplay.sh > ${WRKSRC}/realplay
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/realplay ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/realplay ${PREFIX}/bin
 	${ECHO} bin/realplay >> ${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/divxplayer/Makefile b/multimedia/divxplayer/Makefile
index 7c2933302b9..bdbe4a01282 100644
--- a/multimedia/divxplayer/Makefile
+++ b/multimedia/divxplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/02/15 22:22:19 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/07/29 05:19:45 jlam Exp $
 
 DISTNAME=	divx-player-installer
 PKGNAME=	divxplayer-0.2.0
@@ -10,19 +10,13 @@ MAINTAINER=	david@silicium.ath.cx
 HOMEPAGE=	http://www.divx.com/
 COMMENT=	DivX(TM) Video Player for Linux from DivX.com
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
+DIST_SUBDIR=	${PKGNAME_NOREV}
 
-ONLY_FOR_PLATFORM= *-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	x11
 
 WRKSRC=		${WRKDIR}/divx-player-installer
-NO_BUILD=	YES
-USE_X11BASE=	YES
-
-DIST_SUBDIR=	${PKGNAME_NOREV}
+BUILD_DIRS=	# empty
 
 BINARY=		divxPlayer.bin
 DATADIR=	${PREFIX}/share/divxplayer
diff --git a/multimedia/libflashsupport/Makefile b/multimedia/libflashsupport/Makefile
index 2e373a4ebc5..b0963ab621f 100644
--- a/multimedia/libflashsupport/Makefile
+++ b/multimedia/libflashsupport/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/06/15 20:10:41 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.6 2007/07/29 05:19:45 jlam Exp $
 
 PKGNAME=	libflashsupport-1.0.2098
 DISTNAME=	libflashsupport-1-0-2098-i586
@@ -12,34 +11,23 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://labs.adobe.com/wiki/index.php/Flash_Player:Additional_Interface_Support_for_Linux
 COMMENT=	Additional Interface Support for Linux Flash Player
 
-USE_LANGUAGES=	# none
-NO_BUILD=	YES
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base openssl
+SUSE_VERSION_REQD=	9.1
 
-BUILD_DEPENDS+= rpm2pkg>=1.2:../../pkgtools/rpm2pkg
-RPM2PKG=        ${PREFIX}/sbin/rpm2pkg
-RPM2PKGARGS=	-d ${WRKDIR} -s 3 ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+EMUL_PKG_FMT=		rpm
+RPM2PKG_STRIP=		3
+RPM2PKG_PLIST=		# empty
 
-SUSE_COMPAT32=	yes
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_base>=9.1:../../emulators/${SUSE_DIR_PREFIX}_base
-DEPENDS+=		suse_openssl>=9.1:../../emulators/${SUSE_DIR_PREFIX}_openssl
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
 
 INSTALLATION_DIRS=	share/doc
 
-PLIST_SUBST=	EMULSUBDIR=${EMULSUBDIR}
-
-do-extract:
-	${RPM2PKG} ${RPM2PKGARGS}
-
 do-install:
 	${INSTALL_LIB} ${WRKDIR}/libflashsupport.so \
 		${PREFIX}/${EMULSUBDIR}/usr/lib
 	${INSTALL_DATA} ${WRKDIR}/doc/libflashsupport-1.0/README \
 		${PREFIX}/share/doc/libflashsupport.README
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libflashsupport/PLIST b/multimedia/libflashsupport/PLIST
index 94247e08011..e6a34d215de 100644
--- a/multimedia/libflashsupport/PLIST
+++ b/multimedia/libflashsupport/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2007/06/15 20:10:41 joerg Exp $
-${EMULSUBDIR}/usr/lib/libflashsupport.so
+@comment $NetBSD: PLIST,v 1.4 2007/07/29 05:19:45 jlam Exp $
+${EMULSUBDIRSLASH}usr/lib/libflashsupport.so
 share/doc/libflashsupport.README
diff --git a/multimedia/ns-flash/Makefile b/multimedia/ns-flash/Makefile
index a2e88851f7f..0c9e13f7dee 100644
--- a/multimedia/ns-flash/Makefile
+++ b/multimedia/ns-flash/Makefile
@@ -1,33 +1,44 @@
-# $NetBSD: Makefile,v 1.23 2007/07/17 09:31:53 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2007/07/29 05:19:45 jlam Exp $
 
 CATEGORIES=		multimedia www
-PKGREVISION=		2
 MASTER_SITES=		http://fpdownload.macromedia.com/get/flashplayer/current/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.flash.com/
 COMMENT=		MacroMedia Flash Player Netscape plugin
 
-ONLY_FOR_PLATFORM=	*-*-i386 SunOS-*-sparc
-NOT_FOR_PLATFORM=	SunOS-*-i386
+# Must update communicator/navigator to at least 4.76nb1
+CONFLICTS+=		communicator<=4.76nb1
+CONFLICTS+=		navigator<=4.76nb1
+
+LICENSE=		flash-license
+RESTRICTED=		Redistribution not permitted
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
 WRKSRC=			${WRKDIR}/${WRKNAME}
+BUILD_DIRS=		# empty
 DIST_SUBDIR=		flash/${FLASH_VERS}
 
-SUSE_COMPAT32=		yes
-SUSE_COMPAT32_OPT=	yes
+CRYPTO=			yes
+
+EMUL_PLATFORMS=		linux-i386
+EMUL_PLATFORMS+=	solaris-sparc
+EMUL_MODULES.linux=	compat gtk2 x11
+SUSE_VERSION_REQD=	9.0
+
 .include "../../mk/bsd.prefs.mk"
 
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
-FLASH_VERS=		9.0r31
-DEPENDS+=		suse_compat>=9.0:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=		suse_x11>=9.0:../../emulators/${SUSE_DIR_PREFIX}_x11
-DEPENDS+=		suse_gtk2>=9.0:../../emulators/${SUSE_DIR_PREFIX}_gtk2
+.if ${EMUL_PLATFORM} == "linux-i386"
+FLASH_VERS=		9.0r48
 DISTUNAME=		linux
 DISTNAME=		install_flash_player_9_${DISTUNAME}
 WRKNAME=		install_flash_player_9_${DISTUNAME}
-.elif ${MACHINE_ARCH} == "sparc" && ${OPSYS} == "SunOS"
+.elif ${EMUL_PLATFORM} == "solaris-sparc"
 FLASH_VERS=		7.0r67
+PKGREVISION=		2
 DISTUNAME=		solaris
 DISTNAME=		install_flash_player_7_${DISTUNAME}_sparc
 WRKNAME=		install_flash_player_7_${DISTUNAME}
@@ -38,30 +49,13 @@ DISTNAME=		flash_player
 .endif
 PKGNAME=		ns-flash-${FLASH_VERS:S/r/./}
 
-# Must update communicator/navigator to at least 4.76nb1
-CONFLICTS+=		communicator<=4.76nb1
-CONFLICTS+=		navigator<=4.76nb1
-
-LICENSE=		flash-license
-RESTRICTED=		Redistribution not permitted
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-NO_CONFIGURE=		yes
-NO_BUILD=		yes
-CRYPTO=			yes
-
 NS_PLUGINS_DIR=		${PREFIX}/lib/netscape/plugins
 
+.include "options.mk"
+
 do-install:
 	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
 	${INSTALL_DATA} ${WRKSRC}/flashplayer.xpt ${NS_PLUGINS_DIR}
 	${INSTALL_DATA} ${WRKSRC}/libflashplayer.so ${NS_PLUGINS_DIR}
 
-.include "options.mk"
-.if ${OPSYS} != "SunOS"
-.  include "../../emulators/suse_linux/Makefile.application"
-.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ns-flash/distinfo b/multimedia/ns-flash/distinfo
index 7db83544197..6da55f45c58 100644
--- a/multimedia/ns-flash/distinfo
+++ b/multimedia/ns-flash/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2007/02/01 13:44:14 ghen Exp $
+$NetBSD: distinfo,v 1.13 2007/07/29 05:19:45 jlam Exp $
 
-SHA1 (flash/9.0r31/install_flash_player_9_linux.tar.gz) = ffe59c81d28d8108112b7e372f652328d362a35b
-RMD160 (flash/9.0r31/install_flash_player_9_linux.tar.gz) = bad57e9349c5b1bb0b12a7dee7dea8f24af2f764
-Size (flash/9.0r31/install_flash_player_9_linux.tar.gz) = 2609703 bytes
+SHA1 (flash/9.0r48/install_flash_player_9_linux.tar.gz) = 4bba0b81462394388b4509ecdc845f469c95d6ae
+RMD160 (flash/9.0r48/install_flash_player_9_linux.tar.gz) = 4eea521f45fcd42e6916ba61ba299df8694fbc14
+Size (flash/9.0r48/install_flash_player_9_linux.tar.gz) = 2608602 bytes
 SHA1 (flash/7.0r67/install_flash_player_7_solaris_sparc.tar.gz) = f8dc29f2eee2e91c8856ee4d1bc402021ec7c694
 RMD160 (flash/7.0r67/install_flash_player_7_solaris_sparc.tar.gz) = ad5cf828d4d13bd512c106dfef73e515f4b655b0
 Size (flash/7.0r67/install_flash_player_7_solaris_sparc.tar.gz) = 1074253 bytes
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index 1dd2485b04c..51a6af45e3d 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -1,66 +1,43 @@
-# $NetBSD: Makefile,v 1.35 2007/07/03 13:31:31 sborrill Exp $
-#
+# $NetBSD: Makefile,v 1.36 2007/07/29 05:19:46 jlam Exp $
 
-# A default so lintpkgsrc is happy, overridden below
-DISTNAME=	citrix
-PKGNAME=	citrix_ica-10.6.115659
+DISTNAME=	citrix_ica-10.6.115659
 CATEGORIES=	net
-MASTER_SITES=	http://download2.citrix.com/FILES/en/products/Linux10/
+MASTER_SITES=	# empty
 
 MAINTAINER=	sborrill@NetBSD.org
 HOMEPAGE=	http://www.citrix.com/English/SS/downloads/downloads.asp?dID=2755
 COMMENT=	Citrix(R) ICA client for the Citrix(R) Presentation Server(TM)
 
-.include "../../mk/bsd.prefs.mk"
+LICENSE=		citrix_ica-license
+RESTRICTED=		License prohibits redistribution
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
-ONLY_FOR_PLATFORM=	Linux-*-i[3-6]86 NetBSD-*-i386 NetBSD-*-sparc SunOS-*-sparc
-ONLY_FOR_PLATFORM+=	DragonFly-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_PLATFORMS+=	solaris-sparc
+EMUL_MODULES.linux=	locale motif x11
 
-.if ${OPSYS} == "NetBSD"
-.  if ${MACHINE_ARCH} == "i386"
+.include "../../mk/bsd.prefs.mk"
+
+.if ${EMUL_PLATFORM} == "linux-i386"
 DISTNAME=	en.linuxx86
 PKGNAME=	citrix_ica-10.6.115659
-.  elif ${MACHINE_ARCH} == "sparc"
-DISTNAME=	en.solaris
-PKGNAME=	citrix_ica-8.46.110465
-MASTER_SITES=	http://www.citrix.com/site/resources/dynamic/software/
-EXTRACT_SUFX=	.tar.Z
-.  endif
-.elif ${OPSYS} == "SunOS"
+MASTER_SITES=	http://download2.citrix.com/FILES/en/products/Linux10/
+.elif ${EMUL_PLATFORM} == "solaris-sparc"
 DISTNAME=	en.solaris
 PKGNAME=	citrix_ica-8.46.110465
 MASTER_SITES=	http://www.citrix.com/site/resources/dynamic/software/
 EXTRACT_SUFX=	.tar.Z
-.elif ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly"
-DISTNAME=	en.linuxx86
-PKGNAME=	citrix_ica-10.0.110003
 .endif
 
-.if (${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly") && ${MACHINE_ARCH} == "i386"
-DEPENDS+=        suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11
-DEPENDS+=        suse_openmotif>=6.4:../../emulators/${SUSE_DIR_PREFIX}_openmotif
-DEPENDS+=        suse_locale>=6.4:../../emulators/${SUSE_DIR_PREFIX}_locale
-.endif
-
-LICENSE=		citrix_ica-license
-RESTRICTED=		License prohibits redistribution
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 CDIR=		${PREFIX}/lib/ICAClient
 USE_TOOLS+=	patch
 
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc"
-.  if !exists(/emul/svr4/usr/lib/ld.so)
-PKG_FAIL_REASON+=	"${PKGNAME} requires SVR4 compability - see compat_svr4(8)"
-.  endif
-.endif
-
 INSTALLATION_DIRS=	bin
 
 do-patch:
@@ -78,7 +55,14 @@ do-build:
 		> ${WRKSRC}/wfica.x
 
 pre-install:
-	if [ -d "${CDIR}" ]; then                                      \
+	${RUN} if [ `${ID} -u` != 0 ]; then				\
+		${ECHO} "";                                             \
+		${ECHO} "*** ${PKGNAME} must be installed with"		\
+			"superuser privileges ***";			\
+		${ECHO} "";                                             \
+		${FALSE};						\
+	fi
+	${RUN} if [ -d "${CDIR}" ]; then				\
 		${ECHO} "";                                             \
 		${ECHO} "*** Please remove ${CDIR} and try again ***";  \
 		${ECHO} "";                                             \
@@ -93,8 +77,4 @@ do-install:
 		< ${CDIR}/util/icalicense.sh > ${CDIR}/util/icalicense.sh.fixed
 	${MV} ${CDIR}/util/icalicense.sh.fixed ${CDIR}/util/icalicense.sh
 
-.if (${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly") && ${MACHINE_ARCH} == "i386"
-.  include "../../emulators/suse_linux/Makefile.application"
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/citrix_ica/PLIST.i386 b/net/citrix_ica/PLIST.linux-i386
index b16762a06ef..a01e0db3ca0 100644
--- a/net/citrix_ica/PLIST.i386
+++ b/net/citrix_ica/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.i386,v 1.5 2007/03/05 18:01:03 sborrill Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.1 2007/07/29 05:19:46 jlam Exp $
 lib/ICAClient/CHARICONV.DLL
 lib/ICAClient/pkginf/F.core.linuxx86
 lib/ICAClient/pkginf/Ver.core.linuxx86
diff --git a/net/citrix_ica/PLIST.sparc b/net/citrix_ica/PLIST.solaris-sparc
index 42dca2d4097..abf94b5ad4d 100644
--- a/net/citrix_ica/PLIST.sparc
+++ b/net/citrix_ica/PLIST.solaris-sparc
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.sparc,v 1.4 2007/03/05 18:01:03 sborrill Exp $
+@comment $NetBSD: PLIST.solaris-sparc,v 1.1 2007/07/29 05:19:46 jlam Exp $
 lib/ICAClient/.config/appsrv.ini
 lib/ICAClient/.config/keyboard.ini
 lib/ICAClient/.config/module.ini
diff --git a/net/edonkey2k/Makefile b/net/edonkey2k/Makefile
index f1c4ced006f..4d92e579b25 100644
--- a/net/edonkey2k/Makefile
+++ b/net/edonkey2k/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/05/22 22:22:04 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2007/07/29 05:19:47 jlam Exp $
 #
 
 DISTNAME=	donkey
@@ -12,23 +12,15 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.edonkey2000.com/
 COMMENT=	Yet another P2P file sharing tool
 
-ONLY_FOR_PLATFORM=	*-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base compat
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_base>=6.1:../../emulators/${SUSE_DIR_PREFIX}_base
-DEPENDS+=	suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
-.endif
-
-WRKSRC=		${WRKDIR}
-NO_BUILD=	YES
-NO_CONFIGURE=	YES
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
 
 INSTALLATION_DIRS=	bin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/overnet/Makefile b/net/overnet/Makefile
index 132ff73a754..d09421aef81 100644
--- a/net/overnet/Makefile
+++ b/net/overnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/05/22 22:22:04 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/07/29 05:19:47 jlam Exp $
 #
 
 DISTNAME=	overnetclc-1.0.1
@@ -12,29 +12,19 @@ MAINTAINER=	grant@NetBSD.org
 HOMEPAGE=	http://www.overnet.com/
 COMMENT=	Peer-to-peer file sharing client (binary pkg)
 
-BUILD_DEPENDS+=	rpm2pkg-[0-9]*:../../pkgtools/rpm2pkg
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	compat
 
-WRKSRC=		${WRKDIR}
-EXTRACT_ONLY=	# empty
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
 
-EVAL_PREFIX=	RPM2PKGDIR=rpm2pkg
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
+EMUL_PKG_FMT=		rpm
+RPM2PKG_PLIST=		# empty
+RPM2PKG_STRIP=		0
+RUN_LDCONFIG=		no
 
 INSTALLATION_DIRS=	bin
 
-do-extract:
-	${RPM2PKGDIR}/sbin/rpm2pkg -d ${WRKDIR}				\
-		${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/overnetclc ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/overnetclc
diff --git a/net/skype/Makefile b/net/skype/Makefile
index fa3db268811..26f7aeba152 100644
--- a/net/skype/Makefile
+++ b/net/skype/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/08/28 07:54:05 ghen Exp $
+# $NetBSD: Makefile,v 1.19 2007/07/29 05:19:47 jlam Exp $
 #
 
 DISTNAME=		skype_staticQT-1.2.0.18
@@ -12,30 +12,18 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.skype.com/
 COMMENT=		P2P VoIP software
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_base-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_base
-DEPENDS+=	suse_glx-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_glx
-DEPENDS+=	suse_fontconfig-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_fontconfig
-DEPENDS+=	suse_freetype2-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_freetype2
-DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
-.else
-.include "../../mk/x11.buildlink3.mk"
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-NO_CONFIGURE=		yes
-USE_DIRS+=		xdg-1.1
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-
 RESTRICTED=		Redistribution not allowed yet.
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 LICENSE=		skype-license
 
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base fontconfig freetype2 glx x11
+
+USE_DIRS+=		xdg-1.1
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
+
 DATADIR=		${PREFIX}/share/skype
 DOCDIR=			${PREFIX}/share/doc/skype
 
diff --git a/net/teamspeak-client/Makefile b/net/teamspeak-client/Makefile
index 683f34ce6cc..0dd8270d5d3 100644
--- a/net/teamspeak-client/Makefile
+++ b/net/teamspeak-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/05/01 11:34:05 abs Exp $
+# $NetBSD: Makefile,v 1.6 2007/07/29 05:19:47 jlam Exp $
 
 PKGNAME=		teamspeak-client-2.0.32.60
 DISTNAME=		ts2_client_rc2_2032
@@ -11,27 +11,17 @@ MAINTAINER=		abs@NetBSD.org
 HOMEPAGE=		http://www.goteamspeak.com/
 COMMENT=		Teamspeak group VoIP client
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_base-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_base
-DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
-DEPENDS+=	suse_libjpeg-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_libjpeg
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-NO_CONFIGURE=		yes
-USE_LANGUAGES=
-
-PLIST_SRC=		${WRKDIR}/PLIST
-
 RESTRICTED=		Redistribution to third parties is expressly prohibited
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 LICENSE=		teamspeak-license-200700213
 
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base jpeg x11
+
+PLIST_SRC=		${WRKDIR}/PLIST
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/setup.data/image
 LIB_DIR=	${PREFIX}/lib/teamspeak-client
 DOC_DIR=	${PREFIX}/share/doc/teamspeak-client
diff --git a/net/teamspeak-server/Makefile b/net/teamspeak-server/Makefile
index a2211a9c0c8..02a6438e5b8 100644
--- a/net/teamspeak-server/Makefile
+++ b/net/teamspeak-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/07/04 20:54:53 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2007/07/29 05:19:47 jlam Exp $
 
 PKGNAME=		teamspeak-server-2.0.23.15
 DISTNAME=		ts2_server_rc2_20201
@@ -14,26 +14,19 @@ MAINTAINER=		abs@NetBSD.org
 HOMEPAGE=		http://www.goteamspeak.com/
 COMMENT=		Teamspeak group VoIP server
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_base-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_base
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-RCD_SCRIPTS=		teamspeak
-NO_CONFIGURE=		yes
-USE_LANGUAGES=
-
-PLIST_SRC=		${WRKDIR}/PLIST
-
 RESTRICTED=             Redistribution to third parties is expressly prohibited
 NO_SRC_ON_CDROM=        ${RESTRICTED}
 NO_BIN_ON_FTP=          ${RESTRICTED}
 NO_BIN_ON_CDROM=        ${RESTRICTED}
 LICENSE=		teamspeak-license-200700213
 
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base
+
+RCD_SCRIPTS=		teamspeak
+
+PLIST_SRC=		${WRKDIR}/PLIST
+
 WRKSRC=		${WRKDIR}/tss2_rc2
 EGDIR=		${PREFIX}/share/examples
 LIB_DIR=	${PREFIX}/lib/teamspeak-server
diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index ac8b0dfc732..f5566dc1dad 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2007/02/22 19:27:03 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2007/07/29 05:19:47 jlam Exp $
 
-DISTNAME=	acroread	# Overridden below
+DISTNAME=	acroread	# overridden below
 PKGNAME=	acroread-4.05
 PKGREVISION=	5
 CATEGORIES=	print
@@ -11,63 +11,45 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.adobe.com/products/acrobat/readstep2.html
 COMMENT=	View, distribute and print PDF documents
 
-RESTRICTED=	Original installer required to redistribute.
+RESTRICTED=		Original installer required to redistribute.
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=	${RESTRICTED}
-NO_SRC_ON_FTP=	${RESTRICTED}
-LICENSE=	adobe-acrobat-license
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
+LICENSE=		adobe-acrobat-license
 
-CHECK_SHLIBS_SUPPORTED=	no
-NO_BUILD=		yes
+BUILD_DIRS=		# empty
 
-.include "../../mk/bsd.prefs.mk"
-
-# Default (should be overridden below)
-PLATFORM=	unknown
+EMUL_PLATFORMS=		linux-i386
+EMUL_PLATFORMS+=	osf1-alpha
+EMUL_PLATFORMS+=	solaris-i386 solaris-sparc
+EMUL_MODULES.linux=	x11
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-1.4[L-Z]-sparc \
-			NetBSD-1.[5-9]*-sparc NetBSD-[2-9]*-sparc \
-			SunOS-*-* DragonFly-*-i386
+.include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
-. if (${MACHINE_ARCH} == "i386")
-DEPENDS+=	suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
+.if ${EMUL_PLATFORM} == "linux-i386"
 DISTNAME=	linux-ar-405
 PLATFORM=	intellinux
 WRKSRC=		${WRKDIR}/ILINXR.install
-. elif (${MACHINE_ARCH} == "alpha")
-.  if !exists(/emul/osf1/sbin/loader)
-PKG_FAIL_REASON+=	'${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)'
-.  endif
+.elif ${EMUL_PLATFORM} == "osf1-alpha"
 DISTNAME=	fdec-rs-405
 PLATFORM=	alphaosf
 WRKSRC=		${WRKDIR}/AOSFRS.install
-. elif (${MACHINE_ARCH} == "sparc")
-.  if !exists(/emul/svr4/usr/lib/ld.so)
-PKG_FAIL_REASON+=	'${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
-.  endif
-DISTNAME=	sunsparc-rs-405
-WRKSRC=		${WRKDIR}/SSOLRS.install
-PLATFORM=	sparcsolaris
-. endif
-.include "../../emulators/suse_linux/Makefile.application"
-.elif ${OPSYS} == "SunOS"
-. if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
+.elif ${EMUL_PLATFORM} == "solaris-i386"
 DISTNAME=	sunx86-ar-405
 WRKSRC=		${WRKDIR}/SS86RS.install
 PLATFORM=	intelsolaris
-. else
+.elif ${EMUL_PLATFORM} == "solaris-sparc"
 DISTNAME=	sunsparc-rs-405
 WRKSRC=		${WRKDIR}/SSOLRS.install
 PLATFORM=	sparcsolaris
-. endif # i86pc
-
-# Solaris sparc + x86:
 PREPEND_PATH+=	/bin		# for "ed"
+
 post-patch:
 	${CHMOD} -R o+rwx ${WRKSRC}
-.endif # SunOS
+.else
+PLATFORM=	unknown
+.endif
 
 PLIST_SUBST+=	PLATFORM=${PLATFORM:Q}
 
@@ -101,8 +83,3 @@ post-install:
 .endif
 
 .include "../../mk/bsd.pkg.mk"
-
-bla:
-	@echo OPSYS=${OPSYS}
-	@echo MACHINE_ARCH=${MACHINE_ARCH}
-	@echo PLATFORM=${PLATFORM}
diff --git a/print/acroread/PLIST.DragonFly-i386 b/print/acroread/PLIST.DragonFly-i386
deleted file mode 100644
index 08ec31c2e93..00000000000
--- a/print/acroread/PLIST.DragonFly-i386
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST.DragonFly-i386,v 1.1 2006/03/13 19:29:45 joerg Exp $
-lib/netscape/plugins/nppdf.so
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1.0
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1.0
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4.0
-Acrobat4/Reader/${PLATFORM}/lib/XKeysymDB
diff --git a/print/acroread/PLIST.SunOS-x86_64 b/print/acroread/PLIST.SunOS-x86_64
deleted file mode 100644
index 7d3eb53a2ee..00000000000
--- a/print/acroread/PLIST.SunOS-x86_64
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST.SunOS-x86_64,v 1.1 2006/11/27 13:18:10 obache Exp $
-lib/netscape/plugins/nppdf.so
-Acrobat4/Reader/desktop/olwm/acroread.cetable
-Acrobat4/Reader/desktop/olwm/acroread.deskinstall
-Acrobat4/Reader/desktop/olwm/acroread.prog.icon
-Acrobat4/Reader/desktop/olwm/pdf.icon
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1.0
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1.0
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4.0
-@dirrm Acrobat4/Reader/desktop/olwm
-@dirrm Acrobat4/Reader/desktop
diff --git a/print/acroread/PLIST.NetBSD-i386 b/print/acroread/PLIST.linux-i386
index 86dfd8e11c9..bcb03c80c89 100644
--- a/print/acroread/PLIST.NetBSD-i386
+++ b/print/acroread/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.NetBSD-i386,v 1.1 2005/06/30 13:22:19 hubertf Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.1 2007/07/29 05:19:49 jlam Exp $
 lib/netscape/plugins/nppdf.so
 Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
 Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
diff --git a/print/acroread/PLIST.alpha b/print/acroread/PLIST.osf1-alpha
index f0c63a300b0..94359229c4b 100644
--- a/print/acroread/PLIST.alpha
+++ b/print/acroread/PLIST.osf1-alpha
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.alpha,v 1.2 2005/06/30 13:22:19 hubertf Exp $
+@comment $NetBSD: PLIST.osf1-alpha,v 1.1 2007/07/29 05:19:49 jlam Exp $
 Acrobat4/Reader/help/search.pdf
 Acrobat4/Reader/${PLATFORM}/lib/XKeysymDB
 Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
diff --git a/print/acroread/PLIST.SunOS-i386 b/print/acroread/PLIST.solaris-i386
index c6fc459b4dc..213d7917eac 100644
--- a/print/acroread/PLIST.SunOS-i386
+++ b/print/acroread/PLIST.solaris-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.SunOS-i386,v 1.1 2005/06/30 13:22:19 hubertf Exp $
+@comment $NetBSD: PLIST.solaris-i386,v 1.1 2007/07/29 05:19:49 jlam Exp $
 lib/netscape/plugins/nppdf.so
 Acrobat4/Reader/desktop/olwm/acroread.cetable
 Acrobat4/Reader/desktop/olwm/acroread.deskinstall
diff --git a/print/acroread/PLIST.sparc b/print/acroread/PLIST.solaris-sparc
index e67cafa9de0..d3566992eb7 100644
--- a/print/acroread/PLIST.sparc
+++ b/print/acroread/PLIST.solaris-sparc
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.sparc,v 1.2 2005/06/30 13:22:19 hubertf Exp $
+@comment $NetBSD: PLIST.solaris-sparc,v 1.1 2007/07/29 05:19:49 jlam Exp $
 lib/netscape/plugins/nppdf.so
 Acrobat4/Reader/desktop/olwm/acroread.cetable
 Acrobat4/Reader/desktop/olwm/acroread.deskinstall
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
index 64d33082d60..0e62832e953 100644
--- a/print/acroread5/Makefile
+++ b/print/acroread5/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2006/10/14 08:14:24 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2007/07/29 05:19:50 jlam Exp $
 
-DISTNAME=	acroread5	# Overridden below
+DISTNAME=	acroread5	# overridden below
 PKGNAME=	acroread5-5.10
 PKGREVISION=	4
 CATEGORIES=	print
@@ -23,40 +23,22 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 LICENSE=		adobe-acrobat-license
 
 WRKSRC=			${WRKDIR}/installers
-CHECK_SHLIBS_SUPPORTED=	no
-NO_BUILD=		yes
+BUILD_DIRS=		# empty
 
-.include "../../mk/bsd.prefs.mk"
-
-ONLY_FOR_PLATFORM=	*-*-i386 *-*-sparc*
+EMUL_PLATFORMS=		linux-i386
+EMUL_PLATFORMS+=	solaris-sparc
+EMUL_MODULES.linux=	x11
 
-# Default (overridden below)
-PLATFORM=	unknown
+.include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
-. if (${MACHINE_ARCH} == "i386")
-DEPENDS+=	suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
-DISTNAME=	linux-5010
-PLATFORM=	intellinux
-. elif (${MACHINE_ARCH} == "sparc")
-.  if !exists(/emul/svr4/usr/lib/ld.so)
-PKG_FAIL_REASON+=	'${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
-.  endif
-DISTNAME=	solaris-5010
-PLATFORM=	sparcsolaris
-. elif (${MACHINE_ARCH} == "sparc64")
-.  if !exists(/emul/svr4_32/usr/lib/ld.so)
-PKG_FAIL_REASON+=	'${PKGNAME} requires Solaris libraries - see compat_svr4_32(8)'
-.  endif
-DISTNAME=	solaris-5010
-PLATFORM=	sparcsolaris
-. endif
-.elif ${OPSYS} == "Linux"
+.if ${EMUL_PLATFORM} == "linux-i386"
 DISTNAME=	linux-5010
 PLATFORM=	intellinux
-.elif ${OPSYS} == "SunOS"
+.elif ${EMUL_PLATFORM} == "solaris-sparc"
 DISTNAME=	solaris-5010
 PLATFORM=	sparcsolaris
+.else
+PLATFORM=	unknown
 .endif
 
 PLIST_SUBST+=	PLATFORM=${PLATFORM:Q}
@@ -79,8 +61,4 @@ post-install:
 	@${ECHO_MSG} "${PREFIX}/Acrobat5/Reader/license.txt"
 	${LN} -sf ${PREFIX}/bin/acroread5 ${PREFIX}/bin/acroread
 
-# do not include the linux stuff if we are, for example, on a Solaris box
-. if (${MACHINE_ARCH} == "i386")
-.include "../../emulators/suse_linux/Makefile.application"
-.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/acroread5/PLIST.sparc b/print/acroread5/PLIST.solaris-sparc
index 0f24d25fcd8..ac27656034e 100644
--- a/print/acroread5/PLIST.sparc
+++ b/print/acroread5/PLIST.solaris-sparc
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.sparc,v 1.2 2003/05/04 18:04:22 jmmv Exp $
+@comment $NetBSD: PLIST.solaris-sparc,v 1.1 2007/07/29 05:19:50 jlam Exp $
 Acrobat5/Reader/help/search.pdf
 Acrobat5/Reader/${PLATFORM}/plug_ins/search.api
 Acrobat5/Reader/${PLATFORM}/plug_ins/acrosrch.uid
diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile
index 4ddaeb814e6..56c9442d248 100644
--- a/print/acroread7/Makefile
+++ b/print/acroread7/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2007/01/11 11:52:17 obache Exp $
+# $NetBSD: Makefile,v 1.18 2007/07/29 05:19:50 jlam Exp $
 
-DISTNAME=	acroread7	# Overridden below
+DISTNAME=	acroread7	# overridden below
 PKGNAME=	acroread7-7.0.9
 CATEGORIES=	print
 MASTER_SITES=	http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.9/enu/
@@ -22,28 +22,19 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 LICENSE=		adobe-acrobat-license
 
 WRKSRC=			${WRKDIR}/AdobeReader
-CHECK_SHLIBS_SUPPORTED=	NO
-NO_BUILD=		YES
+BUILD_DIRS=		# empty
 
-.include "../../mk/bsd.prefs.mk"
-
-ONLY_FOR_PLATFORM=	*-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	compat cups gtk2 locale
+SUSE_VERSION_REQD=	10.0
 
-# Default (overridden below)
-PLATFORM=	unknown
+.include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
-. if (${MACHINE_ARCH} == "i386")
-DEPENDS+=	suse_gtk2>=10.0:../../emulators/${SUSE_DIR_PREFIX}_gtk2
-DEPENDS+=	suse_libcups>=10.0:../../emulators/${SUSE_DIR_PREFIX}_libcups
-DEPENDS+=	suse_locale>=10.0:../../emulators/${SUSE_DIR_PREFIX}_locale
-DEPENDS+=	suse_compat>=10.0:../../emulators/${SUSE_DIR_PREFIX}_compat
-DISTNAME=	AdobeReader_enu-7.0.9-1.i386
-PLATFORM=	intellinux
-.endif
-.elif ${OPSYS} == "Linux"
+.if ${EMUL_PLATFORM} == "linux-i386"
 DISTNAME=	AdobeReader_enu-7.0.9-1.i386
 PLATFORM=	intellinux
+.else
+PLATFORM=	unknown
 .endif
 
 PLIST_SUBST+=	PLATFORM=${PLATFORM:Q}
@@ -51,8 +42,8 @@ PLIST_SUBST+=	PLATFORM=${PLATFORM:Q}
 BIN_PATCH=	${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
 
 # Additional directories to search for fonts
-BUILD_DEFS+=	ACROREAD_FONTPATH
-ACROREAD_FONTPATH?= ${PREFIX}/lib/X11/fonts/TTF
+BUILD_DEFS+=		ACROREAD_FONTPATH
+ACROREAD_FONTPATH?=	${PREFIX}/lib/X11/fonts/TTF
 
 INSTALLATION_DIRS=	bin
 
@@ -75,8 +66,4 @@ post-install:
 	${LN} -sf ${PREFIX}/bin/acroread7 ${PREFIX}/bin/acroread
 	${RM} ${PREFIX}/Acrobat7/Reader/${PLATFORM}/plug_ins/PPKLite.api
 
-# do not include the linux stuff if we are, for example, on a Solaris box
-. if (${MACHINE_ARCH} == "i386")
-.include "../../emulators/suse_linux/Makefile.application"
-.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index 8dd37997b99..ec956d6568c 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2007/07/16 20:18:58 njoly Exp $
+# $NetBSD: Makefile,v 1.43 2007/07/29 05:19:50 jlam Exp $
 
 DISTNAME=		vlp4510e
 PKGNAME=		uvscan-5.10
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		http://download.nai.com/products/evaluation/virusscan/english/cmdline/linux/v5.10/
 EXTRACT_SUFX=		.tar.Z
@@ -12,17 +13,6 @@ COMMENT=		Evaluation version of a DOS/Windows file virus scanner
 
 CONFLICTS=		uvscan-dat-[0-9]*
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-WRKSRC=			${WRKDIR}
-NO_BUILD=		yes
-NO_CONFIGURE=		yes
 LICENSE=		uvscan-license
 RESTRICTED=		restrictive 30 day evaluation license
 NO_BIN_ON_FTP=		${RESTRICTED}
@@ -30,6 +20,12 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	compat
+
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
+
 DOCDIR=			${PREFIX}/share/doc/uvscan
 EGDATDIR=		${PREFIX}/share/examples/uvscan
 UVSCANDIR=		${PREFIX}/libexec/uvscan
@@ -48,35 +44,22 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 sbin
 USE_TOOLS+=		gtar:run
 
 SUBST_CLASSES+=		paths
-SUBST_FILES.paths=	${WRKDIR}/update_dat
-SUBST_SED.paths+=	-e 's,@UVSCANDIR@,${UVSCANDIR},g'
-SUBST_SED.paths+=	-e 's,@DATFILES@,${DATFILES},g'
-SUBST_SED.paths+=	-e 's,@AWK@,${AWK},g' -e 's,@CP@,${CP},g'
-SUBST_SED.paths+=	-e 's,@BASENAME@,${BASENAME},g'
-SUBST_SED.paths+=	-e 's,@ECHO@,${ECHO},g' -e 's,@GREP@,${GREP},g'
-SUBST_SED.paths+=	-e 's,@GTAR@,${GTAR},g' -e 's,@MKDIR@,${MKDIR},g'
-SUBST_SED.paths+=	-e 's,@MV@,${MV},g' -e 's,@RM@,${RM},g'
-SUBST_SED.paths+=	-e 's,@SED@,${SED},g'
+SUBST_FILES.paths=	update_dat.sh uvscan.sh
+SUBST_VARS.paths=	AWK BASENAME CP DATFILES ECHO GTAR MKDIR MV	\
+			PREFIX RM SED UVSCAN
 SUBST_STAGE.paths=	post-patch
 
 post-extract:
-	${CP} ${FILESDIR}/update_dat.sh ${WRKDIR}/update_dat
+	${CP} ${FILESDIR}/update_dat.sh ${WRKSRC}/update_dat.sh
+	${CP} ${FILESDIR}/uvscan.sh ${WRKSRC}/uvscan.sh
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/update_dat ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/update_dat.sh ${PREFIX}/sbin/update_dat
 	${INSTALL_MAN} ${WRKSRC}/uvscan.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_SCRIPT} ${WRKSRC}/uvscan ${UVSCANDIR}
-	${RM} -f ${PREFIX}/bin/uvscan
-	${LN} -sf ../${UVSCANDIR:S/${PREFIX}\///}/uvscan ${PREFIX}/bin/uvscan
+	${INSTALL_SCRIPT} ${WRKSRC}/uvscan.sh ${PREFIX}/bin/uvscan
 	${INSTALL_DATA} ${WRKSRC}/liblnxfv.so.4 ${UVSCANDIR}
-	${RM} -f ${UVSCANDIR}/liblnxfv.so
 	${LN} -s liblnxfv.so.4 ${UVSCANDIR}/liblnxfv.so
-	${INSTALL_DATA_DIR} ${PREFIX}/emul/linux/usr/local/lib
-	for file in liblnxfv.so.4 liblnxfv.so; do			\
-		${RM} -f ${PREFIX}/emul/linux/usr/local/lib/$${file};	\
-		${LN} -s ${UVSCANDIR}/$${file}				\
-			${PREFIX}/emul/linux/usr/local/lib;		\
-	done
 	for file in license.dat messages.dat; do			\
 		${INSTALL_DATA} ${WRKSRC}/$${file} ${UVSCANDIR};	\
 	done
diff --git a/security/uvscan/PLIST b/security/uvscan/PLIST
index 0bf30eeca89..c5389965852 100644
--- a/security/uvscan/PLIST
+++ b/security/uvscan/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.8 2007/07/16 20:18:58 njoly Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/07/29 05:19:50 jlam Exp $
 bin/uvscan
-emul/linux/usr/local/lib/liblnxfv.so
-emul/linux/usr/local/lib/liblnxfv.so.4
 libexec/uvscan/uvscan
 libexec/uvscan/liblnxfv.so
 libexec/uvscan/liblnxfv.so.4
@@ -15,6 +13,5 @@ share/doc/uvscan/license.txt
 share/examples/uvscan/clean.dat
 share/examples/uvscan/names.dat
 share/examples/uvscan/scan.dat
-@dirrm emul/linux/usr/local/lib
 @dirrm share/doc/uvscan
 @dirrm share/examples/uvscan
diff --git a/security/uvscan/files/update_dat.sh b/security/uvscan/files/update_dat.sh
index 00f81f4ea5e..6879b765d26 100644
--- a/security/uvscan/files/update_dat.sh
+++ b/security/uvscan/files/update_dat.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
+#
+# $NetBSD: update_dat.sh,v 1.4 2007/07/29 05:19:50 jlam Exp $
 
 UVSCANDIR="@UVSCANDIR@"
 DAT_SITE="http://download.nai.com/products/datfiles/4.x/nai/"
diff --git a/security/uvscan/files/uvscan.sh b/security/uvscan/files/uvscan.sh
index 8a606d9249c..a8ee91269b1 100755
--- a/security/uvscan/files/uvscan.sh
+++ b/security/uvscan/files/uvscan.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
-# $NetBSD: uvscan.sh,v 1.3 2002/10/21 07:12:34 jlam Exp $
+# $NetBSD: uvscan.sh,v 1.4 2007/07/29 05:19:51 jlam Exp $
 #
 # Wrapper script to execute McAfee(R) VirusScan
 
-exec @PREFIX@/libexec/uvscan/uvscan "$@"
+LD_LIBRARY_PATH=@PREFIX@/libexec/uvscan @PREFIX@/libexec/uvscan/uvscan "$@"
diff --git a/sysutils/storage-manager/Makefile b/sysutils/storage-manager/Makefile
index 34c0efe9d60..7fce4da5650 100644
--- a/sysutils/storage-manager/Makefile
+++ b/sysutils/storage-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/01/07 09:14:13 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2007/07/29 05:19:51 jlam Exp $
 
 DISTNAME=		sm_linux_v314_install
 PKGNAME=		storage-manager-3.14
@@ -11,28 +11,21 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://opensource.adaptec.com/
 COMMENT=		Adaptec Storage Management software
 
-BUILD_DEPENDS+=		rpm>=2.5.4:../../misc/rpm
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=		suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
 RESTRICTED=		Redistribution not permitted
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+BUILD_DEPENDS+=		rpm>=2.5.4:../../misc/rpm
+
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	compat x11
+
 WRKSRC=			${WRKDIR}/sm_linux_v314_install
-_STRIPFLAG_INSTALL=	# defined
-NO_CONFIGURE=		yes
-NO_BUILD=		yes
 INTERACTIVE_STAGE=	fetch
+_STRIPFLAG_INSTALL=	# defined
+BUILD_DIRS=		# empty
 
 DOWNLOAD=		http://www.adaptec.com/worldwide/support/driverdetail.html?cat=%2fOperating+System%2fLinux&filekey=sm_linux_v314_install.rpm
 
diff --git a/www/communicator/DESCR b/www/communicator/DESCR
index 2bbc4cac445..cda7d9b05f1 100644
--- a/www/communicator/DESCR
+++ b/www/communicator/DESCR
@@ -1,5 +1,5 @@
-Communicator is a WWW and ftp browser, mail client, newsgroup reader, web
-page editor and address book organizer. The standalone browser is
-available in pkgsrc as 'navigator'. This is the commercially distributed
-version from Netscape. A freely available version of the Netscape browser
-is available in pkgsrc as 'mozilla'.
+Communicator is a WWW and ftp browser, mail client, newsgroup reader,
+web page editor and address book organizer.
+
+This is the commercially distributed version from Netscape.  A freely
+available version of the Netscape browser is available as ``firefox''.
diff --git a/www/communicator/DESCR.linux-powerpc b/www/communicator/DESCR.linux-powerpc
index 60f05d2ccdc..a915bf40ae2 100644
--- a/www/communicator/DESCR.linux-powerpc
+++ b/www/communicator/DESCR.linux-powerpc
@@ -1,4 +1,5 @@
 Communicator is a WWW and ftp browser, mail client, newsgroup reader,
-web page editor and address book organizer.  This is the distributed
-version from linuxppc.org, not Netscape.  A Newer version of the
-Netscape browser is available in pkgsrc as 'mozilla'.
+web page editor and address book organizer.
+
+This is the distributed version from linuxppc.org, not Netscape. A
+newer version of the Netscape browser is available as ``seamonkey''.
diff --git a/www/communicator/PLIST.pre b/www/communicator/PLIST.common
index ff4a7034aad..ea0f7ce141f 100644
--- a/www/communicator/PLIST.pre
+++ b/www/communicator/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.pre,v 1.1 2001/11/01 02:24:37 zuntum Exp $
+@comment $NetBSD: PLIST.common,v 1.1 2007/07/29 05:19:51 jlam Exp $
 bin/${BINNAME}-${NS_VERS}
 bin/${BINNAME}
 lib/netscape/${BINNAME}-${NS_VERS}/java/classes/ifc11.jar
diff --git a/www/communicator/PLIST.post b/www/communicator/PLIST.common_end
index a1043104420..7a84e46553f 100644
--- a/www/communicator/PLIST.post
+++ b/www/communicator/PLIST.common_end
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.post,v 1.5 2002/12/09 16:01:48 tron Exp $
+@comment $NetBSD: PLIST.common_end,v 1.1 2007/07/29 05:19:51 jlam Exp $
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}/spell
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}/plugins
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/trouble
diff --git a/www/communicator/PLIST.netbsd-alpha b/www/communicator/PLIST.netbsd-alpha
deleted file mode 100644
index 58e0c796bbe..00000000000
--- a/www/communicator/PLIST.netbsd-alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.netbsd-alpha,v 1.1 2001/11/01 02:24:36 zuntum Exp $
-lib/netscape/communicator-${NS_VERS}/plugins/libnullplugin.so
diff --git a/www/communicator/PLIST.netbsd-i386 b/www/communicator/PLIST.netbsd-i386
deleted file mode 100644
index c1aac698f3e..00000000000
--- a/www/communicator/PLIST.netbsd-i386
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.netbsd-i386,v 1.1 2001/11/01 02:24:37 zuntum Exp $
-lib/netscape/communicator-${NS_VERS}/libjsd.so
-lib/netscape/communicator-${NS_VERS}/plugins/libnullplugin.so
-lib/netscape/communicator-${NS_VERS}/netscape-dynMotif
-lib/netscape/communicator-${NS_VERS}/libnullplugin-dynMotif.so
diff --git a/www/communicator/PLIST.netbsd-sparc b/www/communicator/PLIST.netbsd-sparc
deleted file mode 100644
index ac448c72344..00000000000
--- a/www/communicator/PLIST.netbsd-sparc
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST.netbsd-sparc,v 1.1 2001/11/01 20:46:14 zuntum Exp $
-bin/communicator-${NS_VERS}_nis
-bin/netscape_nis
-lib/netscape/communicator-${NS_VERS}/netscape_nis
-lib/netscape/communicator-${NS_VERS}/libjsd.so.1.0
-lib/netscape/communicator-${NS_VERS}/dynfonts/libTrueDoc.so
-lib/netscape/communicator-${NS_VERS}/plugins/libnullplugin.so
-lib/netscape/communicator-${NS_VERS}/nls/C
-lib/netscape/communicator-${NS_VERS}/nls/nls.dir
-@dirrm lib/netscape/communicator-${NS_VERS}/dynfonts
-@dirrm lib/netscape/communicator-${NS_VERS}/nls
diff --git a/www/communicator/PLIST.osf-alpha b/www/communicator/PLIST.osf-alpha
deleted file mode 100644
index 8365700d41d..00000000000
--- a/www/communicator/PLIST.osf-alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.osf-alpha,v 1.1 2001/11/01 02:24:37 zuntum Exp $
-lib/netscape/${BINNAME}-${NS_VERS}/plugins/libnullplugin.so
diff --git a/www/communicator/PLIST.osf1-alpha b/www/communicator/PLIST.osf1-alpha
new file mode 100644
index 00000000000..69ef90cb73a
--- /dev/null
+++ b/www/communicator/PLIST.osf1-alpha
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.osf1-alpha,v 1.1 2007/07/29 05:19:52 jlam Exp $
+lib/netscape/${BINNAME}-${NS_VERS}/plugins/libnullplugin.so
diff --git a/www/firefox-bin-flash/Makefile b/www/firefox-bin-flash/Makefile
index 3c94ca20129..80b0a6c6af9 100644
--- a/www/firefox-bin-flash/Makefile
+++ b/www/firefox-bin-flash/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2006/03/29 02:16:43 markd Exp $
+# $NetBSD: Makefile,v 1.6 2007/07/29 05:19:52 jlam Exp $
+
 .include "Makefile.common"
 
 COMMENT=		Flash Player plugin for firefox-bin
 
 DEPENDS+=		firefox-bin>=0.8:../../www/firefox-bin
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox-bin-flash/Makefile.common b/www/firefox-bin-flash/Makefile.common
index aa51a54d923..703808dfa55 100644
--- a/www/firefox-bin-flash/Makefile.common
+++ b/www/firefox-bin-flash/Makefile.common
@@ -1,37 +1,35 @@
-# $NetBSD: Makefile.common,v 1.18 2007/02/22 19:27:20 wiz Exp $
+# $NetBSD: Makefile.common,v 1.19 2007/07/29 05:19:52 jlam Exp $
 
 DISTNAME=		install_flash_player_9_${DISTUNAME}
 PKGNAME=		${MOZ_BIN}-flash-${FLASH_VERS:S/r/./}
 CATEGORIES=		www graphics
-MASTER_SITES=		http://download.macromedia.com/get/flashplayer/current/
+MASTER_SITES=		http://fpdownload.macromedia.com/get/flashplayer/current/
 
 MAINTAINER?=		pkgsrc-users@NetBSD.org
 HOMEPAGE?=		http://www.flash.com/
 
-ONLY_FOR_PLATFORM=	*-*-i386
-
 DIST_SUBDIR=		flash/${FLASH_VERS}
 
+LICENSE=		flash-license
+RESTRICTED=		Redistribution not permitted
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+
+EMUL_PLATFORMS=		linux-i386
+
 .include "../../mk/bsd.prefs.mk"
 
 SUB=			english/${DISTUNAME}/${FLASH_VERS}
 
-FLASH_VERS=		9.0r31
+FLASH_VERS=		9.0r48
 DISTUNAME=		linux
 WRKNAME=		install_flash_player_9_${DISTUNAME}
 
 DISTINFO_FILE=		${.CURDIR}/../../www/firefox-bin-flash/distinfo
 
-LICENSE=		flash-license
-RESTRICTED=		Redistribution not permitted
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-NO_CONFIGURE=		yes
-NO_BUILD=		yes
-CHECK_SHLIBS_SUPPORTED=	no
+BUILD_DIRS=		# empty
 CRYPTO=			yes
 
 MOZ_NAME?=		firefox-linux
diff --git a/www/firefox-bin-flash/distinfo b/www/firefox-bin-flash/distinfo
index 082d24d21a3..e4db78565ac 100644
--- a/www/firefox-bin-flash/distinfo
+++ b/www/firefox-bin-flash/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2007/02/01 13:49:40 ghen Exp $
+$NetBSD: distinfo,v 1.9 2007/07/29 05:19:53 jlam Exp $
 
-SHA1 (flash/9.0r31/install_flash_player_9_linux.tar.gz) = ffe59c81d28d8108112b7e372f652328d362a35b
-RMD160 (flash/9.0r31/install_flash_player_9_linux.tar.gz) = bad57e9349c5b1bb0b12a7dee7dea8f24af2f764
-Size (flash/9.0r31/install_flash_player_9_linux.tar.gz) = 2609703 bytes
+SHA1 (flash/9.0r48/install_flash_player_9_linux.tar.gz) = 4bba0b81462394388b4509ecdc845f469c95d6ae
+RMD160 (flash/9.0r48/install_flash_player_9_linux.tar.gz) = 4eea521f45fcd42e6916ba61ba299df8694fbc14
+Size (flash/9.0r48/install_flash_player_9_linux.tar.gz) = 2608602 bytes
diff --git a/www/firefox-bin-nightly/Makefile b/www/firefox-bin-nightly/Makefile
index f8291e5beb5..330a7ac1fcd 100644
--- a/www/firefox-bin-nightly/Makefile
+++ b/www/firefox-bin-nightly/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2006/09/24 16:42:56 salo Exp $
+# $NetBSD: Makefile,v 1.6 2007/07/29 05:19:53 jlam Exp $
 
 MOZILLA=	firefox
 
 HOMEPAGE=	http://www.mozilla.org/projects/firefox/
 COMMENT=	Lightweight gecko-based web browser (nightly binary pkg)
 
-# see Makefile.NetBSD.i386.
-ONLY_FOR_PLATFORM+=	Linux-*-i386
-ONLY_FOR_PLATFORM+=	SunOS-5.[89]*-sparc
+EMUL_PLATFORMS=		linux-i386
+EMUL_PLATFORMS+=	solaris-i386 solaris-sparc
 
 .include "../../www/seamonkey-bin-nightly/Makefile.common"
diff --git a/www/firefox-bin-nightly/Makefile.Linux.i386 b/www/firefox-bin-nightly/Makefile.Linux.i386
deleted file mode 100644
index 0004415f723..00000000000
--- a/www/firefox-bin-nightly/Makefile.Linux.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile.Linux.i386,v 1.2 2006/09/24 16:42:56 salo Exp $
-
-DISTNAME=	${MOZILLA}-3.0a1.en-US.linux-i686
-EXTRACT_SUFX=	.tar.bz2
-MOZ_PLATFORM=	linux
-MOZ_GTK2=	yes
diff --git a/www/firefox-bin-nightly/Makefile.NetBSD.i386 b/www/firefox-bin-nightly/Makefile.NetBSD.i386
deleted file mode 100644
index f74c1d401e6..00000000000
--- a/www/firefox-bin-nightly/Makefile.NetBSD.i386
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.2 2006/09/24 16:42:56 salo Exp $
-
-.if defined(MOZILLA_USE_LINUX)
-DISTNAME=	${MOZILLA}-3.0a1.en-US.linux-i686
-EXTRACT_SUFX=	.tar.bz2
-MOZ_PLATFORM=	linux
-MOZ_GTK2=	yes
-ONLY_FOR_PLATFORM+=	NetBSD-*-i386
-.else
-DISTNAME=	${MOZILLA}-i386-unknown-netbsdelf1.6
-EXTRACT_SUFX=	.tar.bz2
-MOZ_PLATFORM=	netbsd
-ONLY_FOR_PLATFORM+=	NetBSD-1.6*-i386 NetBSD-2*-i386
-.endif
diff --git a/www/firefox-bin-nightly/Makefile.SunOS.sparc b/www/firefox-bin-nightly/Makefile.SunOS.sparc
deleted file mode 100644
index 19c82f81967..00000000000
--- a/www/firefox-bin-nightly/Makefile.SunOS.sparc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.SunOS.sparc,v 1.1 2004/03/16 14:34:39 grant Exp $
-
-DISTNAME=	${MOZILLA}-sparc-sun-solaris2.8
-
-MOZ_PLATFORM=	solaris
diff --git a/www/firefox-bin-nightly/Makefile.linux-i386 b/www/firefox-bin-nightly/Makefile.linux-i386
new file mode 100644
index 00000000000..8a61a4eb323
--- /dev/null
+++ b/www/firefox-bin-nightly/Makefile.linux-i386
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:19:54 jlam Exp $
+
+DISTNAME=	firefox-3.0a7pre.en-US.linux-i686
+EXTRACT_SUFX=	.tar.bz2
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	linux
diff --git a/www/firefox-bin-nightly/Makefile.solaris-i386 b/www/firefox-bin-nightly/Makefile.solaris-i386
new file mode 100644
index 00000000000..8da5668c29f
--- /dev/null
+++ b/www/firefox-bin-nightly/Makefile.solaris-i386
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.solaris-i386,v 1.1 2007/07/29 05:19:54 jlam Exp $
+
+SOLARIS_VERSION_REQD?=	11
+
+DISTNAME=	firefox-3.0a7pre.en-US.solaris11-i386
+EXTRACT_SUFX=	.tar.bz2
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	solaris
diff --git a/www/firefox-bin-nightly/Makefile.solaris-sparc b/www/firefox-bin-nightly/Makefile.solaris-sparc
new file mode 100644
index 00000000000..afad0e2ed35
--- /dev/null
+++ b/www/firefox-bin-nightly/Makefile.solaris-sparc
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.solaris-sparc,v 1.1 2007/07/29 05:19:54 jlam Exp $
+
+SOLARIS_VERSION_REQD?=	11
+
+DISTNAME=	firefox-3.0a7pre.en-US.solaris11-sparc
+EXTRACT_SUFX=	.tar.bz2
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	solaris
diff --git a/www/firefox-bin/Makefile b/www/firefox-bin/Makefile
index 416262e27f2..7e37075ab46 100644
--- a/www/firefox-bin/Makefile
+++ b/www/firefox-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/07/19 18:20:58 xtraeme Exp $
+# $NetBSD: Makefile,v 1.31 2007/07/29 05:19:54 jlam Exp $
 
 MOZILLA=		firefox
 MOZ_VER=		2.0.0.5
@@ -8,9 +8,8 @@ HOMEPAGE=		http://www.mozilla.com/en-US/firefox/
 COMMENT=		Lightweight gecko-based web browser (binary package)
 
 DIST_SUBDIR=		${MOZILLA}/releases/${MOZ_DIR}
-# binary package is built against GTK2
-MOZ_GTK2=		YES
 
-ONLY_FOR_PLATFORM+=	Linux-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_PLATFORMS+=	solaris-i386 solaris-sparc
 
 .include "../../www/seamonkey-bin/Makefile.common"
diff --git a/www/firefox-bin/Makefile.Linux.i386 b/www/firefox-bin/Makefile.Linux.i386
deleted file mode 100644
index d79def91e49..00000000000
--- a/www/firefox-bin/Makefile.Linux.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.Linux.i386,v 1.9 2007/05/12 13:53:12 ghen Exp $
-
-DISTNAME=		firefox-${MOZ_DISTVER}
-MOZ_DIR=		${MOZ_DISTVER}/linux-i686/en-US
-MOZ_PLATFORM=		linux
diff --git a/www/firefox-bin/Makefile.NetBSD.i386 b/www/firefox-bin/Makefile.NetBSD.i386
deleted file mode 100644
index f04d7f6fb2b..00000000000
--- a/www/firefox-bin/Makefile.NetBSD.i386
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.11 2007/05/12 13:53:12 ghen Exp $
-
-BUILD_DEFS+=		MOZILLA_USE_LINUX
-
-.if defined(MOZILLA_USE_LINUX)
-ONLY_FOR_PLATFORM+=	NetBSD-*-i386
-.  include "Makefile.Linux.i386"
-.else
-PKG_SKIP_REASON+=	"No native pre-built NetBSD binary available."
-PKG_SKIP_REASON+=	"Set MOZILLA_USE_LINUX if you want to use the Linux binary."
-.endif
diff --git a/www/firefox-bin/Makefile.SunOS.sparc b/www/firefox-bin/Makefile.SunOS.sparc
deleted file mode 100644
index 3e16ac61fbb..00000000000
--- a/www/firefox-bin/Makefile.SunOS.sparc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.SunOS.sparc,v 1.3 2005/04/18 14:24:15 wiz Exp $
-
-DISTNAME=	${MOZILLA}-${MOZ_DISTVER}-sparc-sun-solaris2.8-gtk2
-
-MOZ_PLATFORM=	solaris
diff --git a/www/firefox-bin/Makefile.linux-i386 b/www/firefox-bin/Makefile.linux-i386
new file mode 100644
index 00000000000..c12675b7ebd
--- /dev/null
+++ b/www/firefox-bin/Makefile.linux-i386
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:19:55 jlam Exp $
+
+DISTNAME=	firefox-${MOZ_DISTVER}
+MOZ_DIR=	${MOZ_DISTVER}/linux-i686/en-US
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	linux
diff --git a/www/firefox-bin/Makefile.solaris-i386 b/www/firefox-bin/Makefile.solaris-i386
new file mode 100644
index 00000000000..d61b949b056
--- /dev/null
+++ b/www/firefox-bin/Makefile.solaris-i386
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile.solaris-i386,v 1.1 2007/07/29 05:19:55 jlam Exp $
+
+.if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*)
+SOLARIS_VERSION_REQD?=	10
+.else
+SOLARIS_VERSION_REQD?=	8
+.endif
+
+# Use the Solaris 8 binaries if we're not running at least Solaris 10.
+.if !empty(SOLARIS_VERSION_REQD:M1[0-9]*)
+DISTNAME=	firefox-${MOZ_DISTVER}.en-US.solaris10-i386
+MOZ_GTK2=	yes
+.else
+DISTNAME=	firefox-${MOZ_DISTVER}.en-US.solaris8-i386-gtk1
+.endif
+
+EXTRACT_SUFX=	.tar.bz2
+MOZ_DIR=	${MOZ_DISTVER}/contrib/solaris_tarball
+
+MOZ_PLATFORM=	solaris
diff --git a/www/firefox-bin/Makefile.solaris-sparc b/www/firefox-bin/Makefile.solaris-sparc
new file mode 100644
index 00000000000..dc5407397da
--- /dev/null
+++ b/www/firefox-bin/Makefile.solaris-sparc
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile.solaris-sparc,v 1.1 2007/07/29 05:19:55 jlam Exp $
+
+.if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*)
+SOLARIS_VERSION_REQD?=	10
+.else 
+SOLARIS_VERSION_REQD?=	8
+.endif
+
+# Use the Solaris 8 binaries if we're not running at least Solaris 10.
+.if !empty(SOLARIS_VERSION_REQD:M1[0-9]*)
+DISTNAME=	firefox-${MOZ_DISTVER}.en-US.solaris10-respin-sparc
+MOZ_GTK2=	yes
+.else
+DISTNAME=	firefox-${MOZ_DISTVER}.en-US.solaris8-respin-sparc-gtk1
+.endif
+
+EXTRACT_SUFX=	.tar.bz2
+MOZ_DIR=	${MOZ_DISTVER}/contrib/solaris_tarball
+
+MOZ_PLATFORM=	solaris
diff --git a/www/firefox-bin/distinfo b/www/firefox-bin/distinfo
index 210de6e7188..7fb1277a85e 100644
--- a/www/firefox-bin/distinfo
+++ b/www/firefox-bin/distinfo
@@ -1,5 +1,17 @@
-$NetBSD: distinfo,v 1.27 2007/07/19 18:20:58 xtraeme Exp $
+$NetBSD: distinfo,v 1.28 2007/07/29 05:19:56 jlam Exp $
 
 SHA1 (firefox/releases/2.0.0.5/linux-i686/en-US/firefox-2.0.0.5.tar.gz) = 6c4cea59d41584a989f4e0f25ef34ab18ed04bfa
 RMD160 (firefox/releases/2.0.0.5/linux-i686/en-US/firefox-2.0.0.5.tar.gz) = 3e26f5e30eed3be53dc9db22d24397cbffd278ea
 Size (firefox/releases/2.0.0.5/linux-i686/en-US/firefox-2.0.0.5.tar.gz) = 9671891 bytes
+SHA1 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-i386.tar.bz2) = e3df86e0d371d9e30d5a40389f7252a46046ce97
+RMD160 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-i386.tar.bz2) = fc121b15b3b086316b473c330c620d60c6f28c2a
+Size (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-i386.tar.bz2) = 11661329 bytes
+SHA1 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-respin-sparc.tar.bz2) = 93335eebb4a1afbf54d8e9a270ba2058f3387661
+RMD160 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-respin-sparc.tar.bz2) = 189e143d59ffe658ba8843ff858a5d811f929623
+Size (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-respin-sparc.tar.bz2) = 13373878 bytes
+SHA1 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-i386-gtk1.tar.bz2) = 1edbe0fdeafa2b05a79079c9f2fc8fca151da464
+RMD160 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-i386-gtk1.tar.bz2) = d7e890fae67283de2dd2a2e9293c889f197f3ba9
+Size (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-i386-gtk1.tar.bz2) = 10927989 bytes
+SHA1 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = 9ca16078f11183929adc1c59f73a9fa599e88438
+RMD160 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = 9ab9f410d307adcfa9f61886076db87aa14dc1f4
+Size (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = 12867136 bytes
diff --git a/www/firefox15-bin/Makefile b/www/firefox15-bin/Makefile
index 17114f8b776..49eb6d3bba6 100644
--- a/www/firefox15-bin/Makefile
+++ b/www/firefox15-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/05/31 07:26:46 ghen Exp $
+# $NetBSD: Makefile,v 1.3 2007/07/29 05:19:56 jlam Exp $
 
 MOZILLA=		firefox
 MOZ_VER=		1.5.0.12
@@ -8,9 +8,8 @@ HOMEPAGE=		http://www.mozilla.com/firefox/
 COMMENT=		Lightweight gecko-based web browser (binary package)
 
 DIST_SUBDIR=		${MOZILLA}/releases/${MOZ_DIR}
-# binary package is built against GTK2
-MOZ_GTK2=		YES
 
-ONLY_FOR_PLATFORM+=	Linux-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_PLATFORMS+=	solaris-i386 solaris-sparc
 
 .include "../../www/seamonkey-bin/Makefile.common"
diff --git a/www/firefox15-bin/Makefile.Linux.i386 b/www/firefox15-bin/Makefile.Linux.i386
deleted file mode 100644
index 24deedd0809..00000000000
--- a/www/firefox15-bin/Makefile.Linux.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.Linux.i386,v 1.1.1.1 2007/05/12 13:56:51 ghen Exp $
-
-DISTNAME=	${MOZILLA}-${MOZ_DISTVER}
-MOZ_DIR=	${MOZ_VER}/linux-i686/en-US
-MOZ_PLATFORM=	linux
diff --git a/www/firefox15-bin/Makefile.NetBSD.i386 b/www/firefox15-bin/Makefile.NetBSD.i386
deleted file mode 100644
index 6ba4ed7023c..00000000000
--- a/www/firefox15-bin/Makefile.NetBSD.i386
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.1.1.1 2007/05/12 13:56:51 ghen Exp $
-
-BUILD_DEFS+=	MOZILLA_USE_LINUX
-
-.if defined(MOZILLA_USE_LINUX)
-ONLY_FOR_PLATFORM+=	NetBSD-*-i386
-.  include "Makefile.Linux.i386"
-.  if defined(SUSE_PREFER) && !empty(SUSE_PREFER:M10.0)
-DEPENDS+=	suse_compat>=10.0:../../emulators/suse100_compat
-.  endif
-.else
-PKG_SKIP_REASON+=	"No native pre-built NetBSD binary available."
-PKG_SKIP_REASON+=	"Set MOZILLA_USE_LINUX if you want to use the Linux binary."
-DISTNAME=		${MOZILLA}-${MOZ_DISTVER}-i386-unknown-netbsdelf1.6
-EXTRACT_SUFX=		.tar.bz2
-MOZ_PLATFORM=		netbsd
-
-# no 1.0 build for NetBSD
-#ONLY_FOR_PLATFORM+=	NetBSD-1.6*-i386 NetBSD-2*-i386
-.endif
diff --git a/www/firefox15-bin/Makefile.SunOS.sparc b/www/firefox15-bin/Makefile.SunOS.sparc
deleted file mode 100644
index 3def42f0199..00000000000
--- a/www/firefox15-bin/Makefile.SunOS.sparc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.SunOS.sparc,v 1.1.1.1 2007/05/12 13:56:51 ghen Exp $
-
-DISTNAME=	${MOZILLA}-${MOZ_DISTVER}-sparc-sun-solaris2.8-gtk2
-
-MOZ_PLATFORM=	solaris
diff --git a/www/firefox15-bin/Makefile.linux-i386 b/www/firefox15-bin/Makefile.linux-i386
new file mode 100644
index 00000000000..1c41b0b0785
--- /dev/null
+++ b/www/firefox15-bin/Makefile.linux-i386
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:19:57 jlam Exp $
+
+DISTNAME=	firefox-${MOZ_DISTVER}
+MOZ_DIR=	${MOZ_VER}/linux-i686/en-US
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	linux
diff --git a/www/firefox15-bin/Makefile.solaris-i386 b/www/firefox15-bin/Makefile.solaris-i386
new file mode 100644
index 00000000000..2b6358ead86
--- /dev/null
+++ b/www/firefox15-bin/Makefile.solaris-i386
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile.solaris-i386,v 1.1 2007/07/29 05:19:57 jlam Exp $
+
+.if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*)
+SOLARIS_VERSION_REQD?=	10
+.else
+SOLARIS_VERSION_REQD?=	8
+.endif
+
+# Use the Solaris 8 binaries if we're not running at least Solaris 10.
+.if !empty(SOLARIS_VERSION_REQD:M1[0-9]*)
+DISTNAME=	firefox-${MOZ_DISTVER}.en-US.solaris10-i386
+MOZ_GTK2=	yes
+.else
+DISTNAME=	firefox-${MOZ_DISTVER}.en-US.solaris8-i386-gtk1
+.endif
+
+EXTRACT_SUFX=	.tar.bz2
+MOZ_DIR=	${MOZ_DISTVER}/contrib/solaris_tarball
+
+MOZ_PLATFORM=	solaris
diff --git a/www/firefox15-bin/Makefile.solaris-sparc b/www/firefox15-bin/Makefile.solaris-sparc
new file mode 100644
index 00000000000..130d63ff654
--- /dev/null
+++ b/www/firefox15-bin/Makefile.solaris-sparc
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile.solaris-sparc,v 1.1 2007/07/29 05:19:57 jlam Exp $
+
+.if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*)
+SOLARIS_VERSION_REQD?=	10
+.else 
+SOLARIS_VERSION_REQD?=	8
+.endif
+
+# Use the Solaris 8 binaries if we're not running at least Solaris 10.
+.if !empty(SOLARIS_VERSION_REQD:M1[0-9]*)
+DISTNAME=	firefox-${MOZ_DISTVER}.en-US.solaris10-respin-sparc
+MOZ_GTK2=	yes
+.else
+DISTNAME=	firefox-${MOZ_DISTVER}.en-US.solaris8-respin-sparc-gtk1
+.endif
+
+EXTRACT_SUFX=	.tar.bz2
+MOZ_DIR=	${MOZ_DISTVER}/contrib/solaris_tarball
+
+MOZ_PLATFORM=	solaris
diff --git a/www/firefox15-bin/distinfo b/www/firefox15-bin/distinfo
index 8d483ce3f96..55c2c66f995 100644
--- a/www/firefox15-bin/distinfo
+++ b/www/firefox15-bin/distinfo
@@ -1,5 +1,17 @@
-$NetBSD: distinfo,v 1.2 2007/05/31 07:26:46 ghen Exp $
+$NetBSD: distinfo,v 1.3 2007/07/29 05:19:57 jlam Exp $
 
 SHA1 (firefox/releases/1.5.0.12/linux-i686/en-US/firefox-1.5.0.12.tar.gz) = 0de90446b22a1e175595ebd1d03a81bfedc0f235
 RMD160 (firefox/releases/1.5.0.12/linux-i686/en-US/firefox-1.5.0.12.tar.gz) = e90e7795d686ba5cdabde4143c0ca2e217806f65
 Size (firefox/releases/1.5.0.12/linux-i686/en-US/firefox-1.5.0.12.tar.gz) = 8536567 bytes
+SHA1 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-i386.tar.bz2) = 02881f43d0712a31a0d660fe3d36c5200be0e167
+RMD160 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-i386.tar.bz2) = 78a69c6d21b298ffc8fcc4c72df423ade8bbbcfb
+Size (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-i386.tar.bz2) = 10713639 bytes
+SHA1 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-respin-sparc.tar.bz2) = 06af23a41e9c1ad7273436a79f75b35cffe1fba5
+RMD160 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-respin-sparc.tar.bz2) = 04a3cc83e884caa4b44be65e051450e04b662c17
+Size (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-respin-sparc.tar.bz2) = 27288 bytes
+SHA1 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-i386-gtk1.tar.bz2) = 21b840872d5c482bef4e479afe2de3a779f45688
+RMD160 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-i386-gtk1.tar.bz2) = 3264b95c0280cbe61b7d10353e08e66bbfb1f9d5
+Size (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-i386-gtk1.tar.bz2) = 9972234 bytes
+SHA1 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = 1577403d476f1857e2bea230d2f8585f82509932
+RMD160 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = abb1639147e6a37cee7d50ea3c58bef796d5d7ad
+Size (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = 27324 bytes
diff --git a/www/navigator/DESCR b/www/navigator/DESCR
index 89a617112d1..5f8d1a6e8c0 100644
--- a/www/navigator/DESCR
+++ b/www/navigator/DESCR
@@ -1,5 +1,4 @@
-Navigator is a WWW and ftp browser. (The Netscape mail client, newsgroup
-reader, web page editor and address book organizer are available in pkgsrc
-as 'communicator'.) This is the commercially distributed version from
-Netscape.  A freely available version of the Netscape browser is available
-in pkgsrc as 'mozilla'.
+Navigator is a WWW and ftp browser.
+
+This is the commercially distributed version from Netscape.  A freely
+available version of the Netscape browser is available as ``firefox''.
diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
index e01fa83a2bd..8585851a0ca 100644
--- a/www/navigator/Makefile.common
+++ b/www/navigator/Makefile.common
@@ -1,8 +1,17 @@
-# $NetBSD: Makefile.common,v 1.85 2007/02/22 19:27:20 wiz Exp $
+# $NetBSD: Makefile.common,v 1.86 2007/07/29 05:19:57 jlam Exp $
 #
 # Common include file for communicator and navigator packages
 
-.include "../../mk/bsd.prefs.mk"
+CATEGORIES=	www
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE?=	http://www.netscape.com/browsers/index.html
+
+RESTRICTED=	No re-distribution without agreement from Netscape
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
 
 # Note - the version will be overridden for certain architectures which
 #	 do not have the latest version available (eg: SunOS sparc)
@@ -16,112 +25,102 @@ MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/${SUB}/ \
 		ftp://ftp-uk.netscape.com/pub/communicator/${SUB}/ \
 		ftp://sunsite.utk.edu/pub/netscape/communicator/${SUB}/ \
 		ftp://ftp.informatik.rwth-aachen.de/pub/mirror/ftp.netscape.com/pub/communicator/${SUB}/
-#
-# Based on OPSYS and MACHINE_ARCH, define:
-#	PLIST_ARCH	ARCH specific PLIST contents
+
+EMUL_PLATFORMS=		bsdi-i386
+EMUL_PLATFORMS+=	linux-i386
+EMUL_PLATFORMS+=	osf1-alpha
+EMUL_PLATFORMS+=	solaris-sparc
+EMUL_PLATFORMS+=	sunos-sparc
+
+EMUL_MODULES.linux=	compat x11
+
+# powerpc is "unusual"
+.if ${BINNAME} == "communicator"
+EMUL_PLATFORMS+=	linux-powerpc
+.endif
+
+.include "../../mk/bsd.prefs.mk"
+
+.if (${EMUL_PLATFORM} == "linux-powerpc" ) && (${BINNAME} == "communicator")
+PKG_FAIL_REASON+=	"There is no navigator-only package for PowerPC"
+PKG_FAIL_REASON+=	"platform.  Please cd to ../communicator and"
+PKG_FAIL_REASON+=	"install the communicator package instead."
+.endif
+
+# Based on EMUL_PLATFORM, define:
 #	DISTUNAME	Used to determine DISTNAME (tarfile on ftp server)
 #	DIST_DIR_NAME	Directory on ftp site from which to download
 #	WRKNAME		Used to determine WRKSRC (directoryname in tarfile)
-#	VENDOR_NAME	Only used in '128-bit key version' information message
 #
-.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc"
-PLIST_ARCH=	solaris-sparc
-.  if !empty(OS_VERSION:M5.5.1*) || !empty(OS_VERSION:M5.[67]*)
+.if ${EMUL_PLATFORM} == "solaris-sparc"
+.  if (${OPSYS} == "SunOS") && \
+      (!empty(OS_VERSION:M5.5.1*) || !empty(OS_VERSION:M5.[67]*))
 NS_VERS=	4.79
 PKGNAME=	${BINNAME}-${NS_VERS}
 DISTUNAME=	sparc-sun-solaris2.5.1
 DIST_DIR_NAME=	supported/sunos551
 WRKNAME=	sparc-sun-solaris2.5.1
-VENDOR_NAME=	Solaris 2.5.1
 .  else
 DISTUNAME=	sparc-sun-solaris2.8
 DIST_DIR_NAME=	supported/sunos58
 WRKNAME=	sparc-sun-solaris2.8
-VENDOR_NAME=	Solaris 2.8
 .  endif
 .  if !defined(NS_NO_FLASH)
 DEPENDS+=	ns-flash>4.0:../../multimedia/ns-flash
 .  endif
 
-.elif ${MACHINE_ARCH} == "alpha"
-.  if !exists(/emul/osf1/sbin/loader)
-PKG_FAIL_REASON+=	"${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)"
-.  endif
+.elif ${EMUL_PLATFORM} == "sunos-sparc"
+NS_VERS=	4.61
+PKGNAME=	${BINNAME}-${NS_VERS}
+NS_ENCRYPTION=	export
+LDAP_VERS=	30
+DISTUNAME=	sparc-sun-sunos4.1.3_U1
+DIST_DIR_NAME=	unsupported/sunos413
+WRKNAME=	${DISTUNAME}
+MASTER_SITES=	ftp://archive.netscape.com/archive/communicator/${SUB}/
+
+.elif ${EMUL_PLATFORM} == "osf1-alpha"
 NS_VERS=	4.78
 PKGNAME=	${BINNAME}-${NS_VERS}
-PLIST_ARCH=	osf-alpha
 DISTUNAME=	alpha-dec-osf4.0
 DIST_DIR_NAME=	supported/dec_unix40
 WRKNAME=	alpha-dec-osf4.0
-VENDOR_NAME=	Tru64 UNIX
 
-.elif ${MACHINE_ARCH} == "i386" && defined(NS_USE_BSDI)
+.elif ${EMUL_PLATFORM} == "bsdi-i386"
 NS_VERS=	4.75
 PKGREVISION=	1
 PKGNAME=	${BINNAME}-${NS_VERS}
-PLIST_ARCH=	bsdi-i386
 DISTUNAME=	x86-bsdi-bsd2
 DIST_DIR_NAME=	unsupported/bsdi21
 WRKNAME=	x86-bsdi-bsd2
-VENDOR_NAME=	BSD/OS 2.1
 
 BUILD_DEPENDS+=	binpatch>=1.0:../../pkgtools/binpatch
 
 post-install:
 	${SH} ../../www/navigator/files/binpatch-x86-bsdi-bsd2-4.75.sh \
 	    ${LOCALBASE} ${MOZILLA_HOME}/netscape
-.elif ${MACHINE_ARCH} == "i386"
+
+.elif ${EMUL_PLATFORM} == "linux-i386"
 PKGREVISION=	1
-PLIST_ARCH=	linux-i386
 DISTUNAME=	x86-unknown-linux2.2
 DIST_DIR_NAME=	supported/linux22
 WRKNAME=	x86-unknown-linux2.2
-VENDOR_NAME=	Linux 2.2
 .  if !defined(NS_NO_FLASH)
 DEPENDS+=	ns-flash>4.0:../../multimedia/ns-flash
 .  endif
-
-.if ${BINNAME} == "communicator"
+.  if ${BINNAME} == "communicator"
 BUILD_DEPENDS=	binpatch>=1.0:../../pkgtools/binpatch
 
 post-install:
 	${SH} ../../www/navigator/files/binpatch-x86-unknown-linux2.2-4.80.sh \
 	    ${LOCALBASE} ${MOZILLA_HOME}/netscape
-.endif
-.elif ((${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64") && defined(NS_USE_SUNOS))
-.  if !exists(/emul/sunos/usr/lib/ld.so)
-PKG_FAIL_REASON+=	"${PKGNAME} requires SunOS libraries - see compat_sunos(8)"
 .  endif
-NS_VERS=	4.61
-PKGNAME=	${BINNAME}-${NS_VERS}
-NS_ENCRYPTION=	export
-LDAP_VERS=	30
-PLIST_ARCH=	sunos-sparc
-DISTUNAME=	sparc-sun-sunos4.1.3_U1
-DIST_DIR_NAME=	unsupported/sunos413
-WRKNAME=	${DISTUNAME}
-VENDOR_NAME=	SunOS 4.1.3
-MASTER_SITES=	ftp://archive.netscape.com/archive/communicator/${SUB}/
-
-.elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
-PLIST_ARCH=	solaris-sparc
-.  if !exists(/emul/svr4/usr/lib/ld.so.1)
-PKG_FAIL_REASON+=	"${PKGNAME} requires Solaris libraries - see compat_svr4(8)"
-.  endif
-NS_VERS=	4.79
-PKGNAME=	${BINNAME}-${NS_VERS}
-DISTUNAME=	sparc-sun-solaris2.5.1
-DIST_DIR_NAME=	supported/sunos551
-WRKNAME=	sparc-sun-solaris2.5.1
-VENDOR_NAME=	Solaris 2.5.1
 
-# powerpc is "unusual"
-.elif ${MACHINE_ARCH} == "powerpc"
-.  if ${BINNAME} == "navigator"
-PKG_FAIL_REASON+=	"There is no navigator-only package for PowerPC"
-PKG_FAIL_REASON+=	"platform.  Please cd to ../communicator and"
-PKG_FAIL_REASON+=	"install communicator package instead."
-.  endif
+# linux-powerpc is "special" -- this is essentially an entire package
+# Makefile embedded within this Makefile.common file.  This section
+# doesn't really share much code with the other platform targets.
+#
+.elif ${EMUL_PLATFORM} == "linux-powerpc"
 NS_VERS=	4.73
 PKGNAME=	${BINNAME}-${NS_VERS}
 DISTNAME=	netscape-4.7-3.ppc
@@ -129,57 +128,22 @@ WRKSRC=		${WRKDIR}
 # was: ftp://ftp.linuxppc.org/linuxppc-halloween/software/
 MASTER_SITES=	http://www.gmd.de/ftp/mirrors3/ftp.linuxppc.org/linuxppc-halloween/software/
 EXTRACT_SUFX=	.rpm
+
 HOMEPAGE=	http://lwn.net/2000/0629/a/netscape-ppc.php3
-BUILD_DEPENDS+=	rpm2pkg>=1.2:../../pkgtools/rpm2pkg
 DESCR_SRC=	${WRKDIR}/DESCR.linux-powerpc
-PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
-RPM2PKG=	rpm2pkg
-RPM2PKGARGS=	${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
-VENDOR_NAME=	# empty.  what should be here?
+PLIST_SRC=	${RPM2PKG_PLIST}
 
-.else
-PLIST_ARCH=
-.endif
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE?=	http://www.netscape.com/browsers/index.html
-RESTRICTED=	No re-distribution without agreement from Netscape
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-
-ONLY_FOR_PLATFORM= *-*-alpha *-*-i386 *-*-powerpc *-*-sparc *-*-sparc64
-CATEGORIES=	www
-NS_NAME=	${BINNAME}-${NS_VERS}
-PKGNAME?=	${BINNAME}-${NS_VERS}
-DISTNAME?=	${BINNAME}-v${NS_VERS_SHORT}-${NS_ENCRYPTION}.${DISTUNAME}
-
-.if (${OPSYS} != "Linux" && ((${MACHINE_ARCH} == "i386" && !defined(NS_USE_BSDI)) || ${MACHINE_ARCH} == "powerpc"))
-.include "../../emulators/suse_linux/Makefile.application"
-
-DEPENDS+=	suse_compat>=6.4:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
-
-.if ${BINNAME} != "netscape"
-NO_BUILD=	YES
-
-INSTALLATION_DIRS=	bin
-
-# powerpc is "unusual"
-.  if ${MACHINE_ARCH} == "powerpc"
-do-extract:
-	${MKDIR} ${WRKSRC}
+EMUL_PKG_FMT=		rpm
+RPM2PKG_PREFIX=		${PREFIX}
+RPM2PKG_SUBPREFIX=	${EMULSUBDIR}
+RPM2PKG_STAGE=		do-install
 
 do-install:
 	${CP} ${PKGDIR}/DESCR.linux-powerpc ${WRKDIR}
-	${RM} -f ${PLIST_SRC}
-	${RPM2PKG} -d ${PREFIX} -f ${PLIST_SRC} -s 1 ${RPM2PKGARGS}
-
-	${SED} -e 's#@BINNAME@#${BINNAME}#g' \
-	       -e 's#@PREFIX@#${PREFIX}#g' \
-	    <${FILESDIR}/${BINNAME}.sh.linux-powerpc >${WRKDIR}/${BINNAME}.sh
+	${SED}	-e 's#@BINNAME@#${BINNAME}#g'				\
+	       	-e 's#@PREFIX@#${PREFIX}#g'				\
+		${FILESDIR}/${BINNAME}.sh.linux-powerpc			\
+		> ${WRKDIR}/${BINNAME}.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${NS_NAME}
 	${RM} -f ${PREFIX}/bin/${BINNAME}
 	${LN} -sf ${NS_NAME} ${PREFIX}/bin/${BINNAME}
@@ -187,7 +151,16 @@ do-install:
 	${ECHO} bin/${NS_NAME} >> ${PLIST_SRC}
 	${SORT} -r ${PLIST_SRC} > ${PLIST_SRC}.sorted
 	${MV} ${PLIST_SRC}.sorted ${PLIST_SRC}
-.  else
+.endif
+
+NS_NAME=	${BINNAME}-${NS_VERS}
+PKGNAME?=	${BINNAME}-${NS_VERS}
+DISTNAME?=	${BINNAME}-v${NS_VERS_SHORT}-${NS_ENCRYPTION}.${DISTUNAME}
+
+BUILD_DIRS=	# empty
+
+INSTALLATION_DIRS=	bin
+
 NS_VERS_SHORT=	${NS_VERS:S/.//}
 SUB=		english/${NS_VERS}/unix/${DIST_DIR_NAME}/${DIST_SDIR_NAME}
 
@@ -198,27 +171,25 @@ WRKSRC=		${WRKDIR}/${BINNAME}-v${NS_VERS_SHORT}.${WRKNAME}
 MOZILLA_HOME=	${PREFIX}/lib/netscape/${NS_NAME}
 NS_PLUGINS_DIR=	${PREFIX}/lib/netscape/plugins
 
-PLIST_SRC=	${PKGDIR}/PLIST.pre \
-		${PKGDIR}/PLIST.${PLIST_ARCH} \
-		${PKGDIR}/PLIST.post
 PLIST_SUBST+=	NS_VERS=${NS_VERS:Q} LDAP_VERS=${LDAP_VERS:Q} BINNAME=${BINNAME:Q}
 
+.if !target(do-install)
 do-install:
 	${INSTALL_DATA_DIR} ${MOZILLA_HOME}/java/classes
 	${INSTALL_SCRIPT} ${WRKSRC}/vreg ${MOZILLA_HOME}
-.    for file in ifc11.jar iiop10.jar jae40.jar java40.jar jio40.jar \
+.  for file in ifc11.jar iiop10.jar jae40.jar java40.jar jio40.jar \
        jsd10.jar ldap${LDAP_VERS}.jar resource.jar scd10.jar
 	${INSTALL_DATA} ${WRKSRC}/${file} ${MOZILLA_HOME}/java/classes
-.    endfor
+.  endfor
 	cd ${MOZILLA_HOME} && ${GZCAT} \
 		${WRKSRC}/nethelp-v${NS_VERS_SHORT}.nif | ${PAX} -r
 	cd ${MOZILLA_HOME} && ${GZCAT} \
 		${WRKSRC}/netscape-v${NS_VERS_SHORT}.nif | ${PAX} -cr \
 		'*libflashplayer.so' '*ShockwaveFlash.class' '*dynMotif*' \
 		|| ${TRUE}
-.    if ${BINNAME} == "communicator"
+.  if ${BINNAME} == "communicator"
 	cd ${MOZILLA_HOME} && ${TAR} -xpzf ${WRKSRC}/spellchk-v${NS_VERS_SHORT}.nif
-.    endif
+.  endif
 
 	${SED} -e 's#@@MOZILLA_HOME@@#${MOZILLA_HOME}#g' \
 	       -e 's#@@NS_PLUGINS_DIR@@#${NS_PLUGINS_DIR}#g' \
@@ -227,36 +198,20 @@ do-install:
 	${RM} -f ${PREFIX}/bin/${BINNAME}
 	${LN} -sf ${NS_NAME} ${PREFIX}/bin/${BINNAME}
 
-.    if ${PLIST_ARCH} == "sunos-sparc"
+.  if ${EMUL_PLATFORM} == "sunos-sparc"
 	# Bizarre magic to handle the NIS and DNS versions. Make DNS default.
 	@${SED} -e 's#MOZILLA_HOME/netscape#MOZILLA_HOME/netscape_nis#g' \
 	    <${WRKDIR}/${BINNAME}.sh >${WRKDIR}/${BINNAME}_nis.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}_nis.sh \
 	    ${PREFIX}/bin/${NS_NAME}_nis
-.      if ${BINNAME} == "communicator"
+.    if ${BINNAME} == "communicator"
 	${LN} -sf ${NS_NAME}_nis ${PREFIX}/bin/netscape_nis
-.      endif
+.    endif
 	${MV} ${MOZILLA_HOME}/netscape ${MOZILLA_HOME}/netscape_nis
 	${MV} ${MOZILLA_HOME}/netscape_dns ${MOZILLA_HOME}/netscape
-.    endif
+.  endif
 	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
 
 	${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${MOZILLA_HOME}
 	${CHMOD} -R go-w ${MOZILLA_HOME}
-.  endif
-
-.endif
-
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" && !defined(NS_USE_BSDI)
-NS_NEED_LINUX=	yes
-.elif ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc"
-NS_NEED_LINUX=	yes
-.elif ${OPSYS} == "Linux"
-NS_NEED_LINUX=	yes
-.endif
-
-.if ${BINNAME} != "netscape"
-.  if defined(NS_NEED_LINUX)
-.    include "../../emulators/suse_linux/Makefile.application"
-.  endif
 .endif
diff --git a/www/navigator/PLIST.pre b/www/navigator/PLIST.common
index ba259091c65..95c4b15e50b 100644
--- a/www/navigator/PLIST.pre
+++ b/www/navigator/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.pre,v 1.1 2001/11/01 20:42:29 zuntum Exp $
+@comment $NetBSD: PLIST.common,v 1.1 2007/07/29 05:19:58 jlam Exp $
 bin/${BINNAME}
 bin/${BINNAME}-${NS_VERS}
 lib/netscape/${BINNAME}-${NS_VERS}/LICENSE
diff --git a/www/navigator/PLIST.post b/www/navigator/PLIST.common_end
index 10ed2c04e63..b30c45b56e2 100644
--- a/www/navigator/PLIST.post
+++ b/www/navigator/PLIST.common_end
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.post,v 1.4 2002/12/09 16:01:49 tron Exp $
+@comment $NetBSD: PLIST.common_end,v 1.1 2007/07/29 05:19:58 jlam Exp $
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}/plugins
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/shared
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/navigatr
diff --git a/www/navigator/PLIST.osf-alpha b/www/navigator/PLIST.osf-alpha
deleted file mode 100644
index e57cf7d4f73..00000000000
--- a/www/navigator/PLIST.osf-alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.osf-alpha,v 1.1 2001/11/01 20:42:28 zuntum Exp $
-lib/netscape/${BINNAME}-${NS_VERS}/plugins/libnullplugin.so
diff --git a/www/navigator/PLIST.osf1-alpha b/www/navigator/PLIST.osf1-alpha
new file mode 100644
index 00000000000..753894e9d28
--- /dev/null
+++ b/www/navigator/PLIST.osf1-alpha
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.osf1-alpha,v 1.1 2007/07/29 05:19:58 jlam Exp $
+lib/netscape/${BINNAME}-${NS_VERS}/plugins/libnullplugin.so
diff --git a/www/ns-plugger-common/Makefile b/www/ns-plugger-common/Makefile
index 45b685d4265..a82179a6558 100644
--- a/www/ns-plugger-common/Makefile
+++ b/www/ns-plugger-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:15 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2007/07/29 05:19:59 jlam Exp $
 
 DISTNAME=		plugger-4.0-linux-x86-glibc
 PKGNAME=		ns-${PLUGGERNAME}-${BINNAME}-${PLUGGERVERS}
@@ -10,23 +10,22 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://fredrik.hubbe.net/plugger.html
 COMMENT=		Streaming multimedia plugin for Netscape
 
+CONFLICTS+=		plugger-[0-9]*	# obsolete all-in-one plugger package
+
 BINNAME?=		common
 
 .if ${BINNAME} != common
 DEPENDS+=		${BINNAME}-[0-9]*:../../www/${BINNAME}
+NSNAME!=		${PKG_INFO} -e ${BINNAME} || ${ECHO}
 MOZILLA_HOME=		${PREFIX}/lib/netscape/${NSNAME:C/nb[0-9]+$//:S/4.80/4.8/}
 PLIST_SUBST+=		MOZILLA_HOME=${MOZILLA_HOME:S/${PREFIX}\///}
-.else
-DEPENDS+=		suse_base>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base
 .endif
 
-CONFLICTS+=		plugger-[0-9]*	# obsolete all-in-one plugger package
-
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base
 
 WRKSRC=			${WRKDIR}/${PLUGGERFULL}
-NO_CONFIGURE=		YES
-NO_BUILD=		YES
+BUILD_DIRS=		# empty
 
 PLUGGERFULL=		${DISTNAME:C/-linux-x86-glibc//}
 PLUGGERVERS=		${PLUGGERFULL:C/.*-//}
@@ -38,21 +37,21 @@ PLIST_SUBST+=		NS_PLUGINS_DIR=${NS_PLUGINS_DIR:S/${PREFIX}\///}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man7
 
-do-install:
-.if ${BINNAME} != common
-	cd ${WRKSRC}; ${INSTALL_DATA} pluggerrc ${MOZILLA_HOME}/pluggerrc
-.else
+.PHONY: do-install-common do-install-pluggerrc
+do-install-common:
 	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR} ${DOCDIR}
 	cd ${WRKSRC}; ${INSTALL_PROGRAM} plugger.so ${NS_PLUGINS_DIR}
 	cd ${WRKSRC}; ${INSTALL_PROGRAM} plugger-4.0 ${PREFIX}/bin
 	cd ${WRKSRC}; ${INSTALL_DATA} plugger.7 ${PREFIX}/${PKGMANDIR}/man7
 	cd ${WRKSRC}; ${INSTALL_DATA} README COPYING ${DOCDIR}
-.endif
 
-.include "../../emulators/suse_linux/Makefile.application"
+do-install-pluggerrc:
+	cd ${WRKSRC}; ${INSTALL_DATA} pluggerrc ${MOZILLA_HOME}/pluggerrc
 
-.if ${BINNAME} != common
-NSNAME!=	${PKG_INFO} -e ${BINNAME} || ${ECHO}
+.if ${BINNAME} == "common"
+do-install: do-install-common
+.else
+do-install: do-install-common
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/opera-acroread/DEINSTALL b/www/opera-acroread/DEINSTALL
new file mode 100644
index 00000000000..dd9b50ced1b
--- /dev/null
+++ b/www/opera-acroread/DEINSTALL
@@ -0,0 +1,8 @@
+# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:19:59 jlam Exp $
+
+case "${STAGE}" in
+DEINSTALL)
+	dest="${EMULDIR}/usr/lib/opera/plugins/nppdf.so"
+	${RM} -f "$dest"
+	;;
+esac
diff --git a/www/opera-acroread/INSTALL b/www/opera-acroread/INSTALL
new file mode 100644
index 00000000000..a7a3ea8c50a
--- /dev/null
+++ b/www/opera-acroread/INSTALL
@@ -0,0 +1,9 @@
+# $NetBSD: INSTALL,v 1.1 2007/07/29 05:19:59 jlam Exp $
+
+case "${STAGE}" in
+POST-INSTALL)
+	src="${PKG_PREFIX}/@ACROREAD@/@ACRO_SUBDIR@/@ACRO_PLATFORM@/nppdf.so"
+	dest="${EMULDIR}/usr/lib/opera/plugins/nppdf.so"
+	${TEST} -f "$dest" || ${LN} -s "$src" "$dest"
+	;;
+esac
diff --git a/www/opera-acroread/Makefile b/www/opera-acroread/Makefile
index 897672404ac..41ba6b5158c 100644
--- a/www/opera-acroread/Makefile
+++ b/www/opera-acroread/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:20 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/07/29 05:20:00 jlam Exp $
 
-DISTNAME=	opera-acroread-1.0
-PKGREVISION=		3
+DISTNAME=		opera-acroread-1.0
+PKGREVISION=		4
 
 MAINTAINER=		jschauma@NetBSD.org
 COMMENT=		Acrobat Reader 4 plugin for opera
@@ -15,3 +15,4 @@ ACROREAD=		Acrobat4
 ACRO_SUBDIR=		Browsers
 
 .include "../../www/opera-acroread/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/opera-acroread/Makefile.common b/www/opera-acroread/Makefile.common
index b7460344456..fb1db9f715f 100644
--- a/www/opera-acroread/Makefile.common
+++ b/www/opera-acroread/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2006/07/01 20:34:11 salo Exp $
+# $NetBSD: Makefile.common,v 1.8 2007/07/29 05:20:00 jlam Exp $
 
 PKGNAME=		${DISTNAME:C|MozillaFirebird|firefox|}
 CATEGORIES=		www print
@@ -6,26 +6,27 @@ MASTER_SITES=		# empty
 DISTFILES=		# empty
 
 DEPENDS+=		opera>=7.0:../../www/opera
-DEPENDS+=		suse_openmotif>=7.3:../../emulators/${SUSE_DIR_PREFIX}_openmotif
 
-ONLY_FOR_PLATFORM=	Linux-*-i386 NetBSD-*-i386
-PLATFORM=		intellinux
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	motif
+SUSE_VERSION_REQD=	7.3
+
+ACRO_PLATFORM=		intellinux
 
 WRKSRC=			${WRKDIR}
 NO_CHECKSUM=		YES
 NO_CONFIGURE=		YES
-NO_BUILD=		YES
+BUILD_DIRS=		# empty
+
+PLIST_SRC=		${PKGSRCDIR}/www/opera-acroread/PLIST
+
+FILES_SUBST+=		ACROREAD=${ACROREAD:Q}
+FILES_SUBST+=		ACRO_SUBDIR=${ACRO_SUBDIR:Q}
+FILES_SUBST+=		ACRO_PLATFORM=${ACRO_PLATFORM:Q}
 
-PLIST_SRC=		../../www/opera-acroread/PLIST
-PLIST_SUBST+=		ACROREAD=${ACROREAD:Q}
-PLIST_SUBST+=		ACRO_SUBDIR=${ACRO_SUBDIR:Q}
-PLIST_SUBST+=		PLATFORM=${PLATFORM:Q}
-NS_PLUGINS_DIR=		${PREFIX}/emul/linux/usr/lib/opera/plugins
+DEINSTALL_TEMPLATES+=	${PKGSRCDIR}/www/opera-acroread/DEINSTALL
+INSTALL_TEMPLATES+=	${PKGSRCDIR}/www/opera-acroread/INSTALL
 
-do-install:
-	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
-	${LN} -s ${PREFIX}/${ACROREAD}/${ACRO_SUBDIR}/${PLATFORM}/nppdf.so \
-		${NS_PLUGINS_DIR}/nppdf.so
+INSTALLATION_DIRS+=	${EMULDIR}/usr/lib/opera/plugins
 
-.include "../../emulators/suse_linux/Makefile.application"
-.include "../../mk/bsd.pkg.mk"
+do-install:	# nothing
diff --git a/www/opera-acroread/PLIST b/www/opera-acroread/PLIST
index 1b88d0e9452..fe58a735097 100644
--- a/www/opera-acroread/PLIST
+++ b/www/opera-acroread/PLIST
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2005/04/18 16:20:25 jschauma Exp $
-@exec ${LN} -s %D/${ACROREAD}/${ACRO_SUBDIR}/${PLATFORM}/nppdf.so %D/emul/linux/usr/lib/opera/plugins/nppdf.so
-emul/linux/usr/lib/opera/plugins/nppdf.so
+@comment $NetBSD: PLIST,v 1.3 2007/07/29 05:20:00 jlam Exp $
+@comment this plist intentionally left empty
diff --git a/www/opera-acroread5/Makefile b/www/opera-acroread5/Makefile
index 6aa54c42fcf..29220eb15c6 100644
--- a/www/opera-acroread5/Makefile
+++ b/www/opera-acroread5/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2007/02/22 19:27:21 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/07/29 05:20:00 jlam Exp $
 
-DISTNAME=	opera-acroread5-1.0
-PKGREVISION=		3
+DISTNAME=		opera-acroread5-1.0
+PKGREVISION=		4
 
 MAINTAINER=		jschauma@NetBSD.org
 COMMENT=		Acrobat Reader 5 plugin for opera
@@ -15,3 +15,4 @@ ACROREAD=		Acrobat5
 ACRO_SUBDIR=		Browsers
 
 .include "../../www/opera-acroread/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/opera-acroread7/Makefile b/www/opera-acroread7/Makefile
index f6a46fd84b7..f5d29d06e62 100644
--- a/www/opera-acroread7/Makefile
+++ b/www/opera-acroread7/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:21 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/07/29 05:20:00 jlam Exp $
 
-DISTNAME=	opera-acroread7-1.0
-PKGREVISION=		2
+DISTNAME=		opera-acroread7-1.0
+PKGREVISION=		3
 
 MAINTAINER=		jschauma@NetBSD.org
 COMMENT=		Acrobat Reader 7 plugin for opera
@@ -15,3 +15,4 @@ ACROREAD=		Acrobat7
 ACRO_SUBDIR=		Browser
 
 .include "../../www/opera-acroread/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/opera-plugins/Makefile b/www/opera-plugins/Makefile
index db886960275..54e8258bc49 100644
--- a/www/opera-plugins/Makefile
+++ b/www/opera-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/04/19 16:11:34 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2007/07/29 05:20:00 jlam Exp $
 
 DISTNAME=	opera-plugins-1.0
 PKGREVISION=	1
@@ -12,36 +12,35 @@ COMMENT=	Plugins for the Opera browser
 
 DEPENDS+=	opera>=5.999.1:../../www/opera
 DEPENDS+=	ns-flash>=5.0.47:../../multimedia/ns-flash
-DEPENDS+=	suse_openmotif>=7.3:../../emulators/${SUSE_DIR_PREFIX}_openmotif
+
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	motif
+SUSE_VERSION_REQD=	7.3
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	YES
 NO_BUILD=	YES
 PLIST_SRC=	${WRKDIR}/PLIST
 
-EMULSUBDIR=	emul/linux
-EMULDIR=	${PREFIX}/${EMULSUBDIR}
-
 PLUGIN_DIR=	${PREFIX}/lib/netscape/plugins
+
 # The FlashPlayer plugin is the only one I got completely working so far.
 # Sun's Java Plugin fails, Acrobat and RealPlayer are not recognized by
 # name. If you get more plugins working add them (including dependences)
 # and bump the version number.
+#
 PLUGINS=	libflashplayer.so
 
-SUSE_COMPAT32=	yes
-
-INSTALLATION_DIRS=	${EMULSUBDIR}/usr/lib/opera/plugins
+INSTALLATION_DIRS=	${EMULSUBDIRSLASH}usr/lib/opera/plugins
 
 do-install:
-		${RM} -f ${PLIST_SRC}
-		${TOUCH} ${PLIST_SRC}
-		for FILE in ${PLUGINS}; do 				\
-		  ${LN} -fs ${PLUGIN_DIR}/$$FILE			\
-		    ${EMULDIR}/usr/lib/opera/plugins/$$FILE;		\
-		  ${ECHO} ${EMULSUBDIR}/usr/lib/opera/plugins/$$FILE	\
-		    >>${PLIST_SRC};					\
-		done
-
-.include "../../emulators/suse_linux/Makefile.application"
+	${RM} -f ${PLIST_SRC}
+	${TOUCH} ${PLIST_SRC}
+	for FILE in ${PLUGINS}; do 					\
+		${LN} -fs ${PLUGIN_DIR}/$$FILE				\
+			${EMULDIR}/usr/lib/opera/plugins/$$FILE;	\
+		${ECHO} ${EMULSUBDIRSLASH}usr/lib/opera/plugins/$$FILE	\
+			>>${PLIST_SRC};					\
+	done
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/opera/Makefile b/www/opera/Makefile
index 3f257c2a91d..365171ff54c 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2007/07/19 19:09:44 xtraeme Exp $
+# $NetBSD: Makefile,v 1.70 2007/07/29 05:20:00 jlam Exp $
 
 DISTNAME=		opera-${OPERA_PKG_VERSION:S/u/pl/}
 CATEGORIES=		www
@@ -14,57 +14,76 @@ MAINTAINER=		jdolecek@NetBSD.org
 HOMEPAGE=		http://www.opera.com/
 COMMENT=		Small, fast and customizable WWW client
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386 SunOS-*-sparc FreeBSD-*-i386 DragonFly-*-i386
-
 LICENSE=		opera-850-license
 
-#PKG_INSTALLATION_TYPES=	overwrite pkgviews
+EMUL_PLATFORMS=		freebsd-i386
+EMUL_PLATFORMS+=	linux-i386
+EMUL_PLATFORMS+=	solaris-sparc
 
-NO_CONFIGURE=		YES
-USE_LANGUAGES=		# empty
+EMUL_MODULES.linux=	x11
+SUSE_VERSION_REQD=	7.3
 
-.include "../../mk/bsd.prefs.mk"
+USE_LANGUAGES=		# empty
+BUILD_DIRS=		# empty
+EMUL_PKG_FMT=		plain
 
 OPERA_LANG=		en
 OPERA_VER_DATE=		20070716
 OPERA_PKG_VERSION=	9.22
 OPERA_PKG_VERSION_DIR=	922
 
-_OPERA_OPSYS?=		${OPSYS}
-_OPERA_MACHINE_ARCH?=	${MACHINE_ARCH}
-
-.if (${_OPERA_OPSYS} == NetBSD) || (${_OPERA_OPSYS} == DragonFly)
-DEPENDS+=		suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
+.include "../../mk/bsd.prefs.mk"
 
-# we need to define DIST_SUBDIR because of the inclusion of suse's Makefile.common
-DIST_SUBDIR=		# empty
-EXTRACT_ONLY=		# empty
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
+# This package installs from an RPM directly into "/usr" on a Linux
+# system, which can't be managed by pkgsrc.
+#
+NOT_FOR_PLATFORMS=      Linux-*-*
 
+.if ${EMUL_PLATFORM} == "linux-i386"
 EXTRACT_SUFX=		.rpm
 OPERA_ARCH=		.i386
 OPERA_DIR=		linux/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/${OPERA_ARCH:S/.//}/static
 OPERA_DIST_VERSION=	${OPERA_PKG_VERSION:C/beta.*//:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
 
-RPMFILES=		${DISTFILES}
-RPM2PKGSTRIP=		1
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
+
+EMUL_PKG_FMT=		rpm
+RPM2PKG_PREFIX=		${PREFIX}
+RPM2PKG_SUBPREFIX=	${EMULSUBDIR}
+RPM2PKG_STAGE=		do-install
+
+do-build:
+	${SED} -e 's#@EMULDIR@#${EMULDIR}#g'				\
+		${FILESDIR}/opera.sh > ${WRKDIR}/opera
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/opera ${PREFIX}/bin
+	${LN} -fs ${EMULDIR}/usr/share/man/man1/opera.1			\
+		${PREFIX}/${PKGMANDIR}/man1
+	${ECHO} "bin/opera" >> ${RPM2PKG_PLIST}
+	${ECHO} "${PKGMANDIR}/man1/opera.1" >> ${RPM2PKG_PLIST}
 
-.elif (${_OPERA_OPSYS} == FreeBSD)
+.elif ${EMUL_PLATFORM} == "freebsd-i386"
+ONLY_FOR_PLATFORM+=	FreeBSD-*-i386
+EXTRACT_SUFX=		.tar.bz2
 OPERA_ARCH=		.i386.freebsd
 OPERA_DIR=		unix/freebsd/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/static
 OPERA_DIST_VERSION=	${OPERA_PKG_VERSION:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
 
-WRKSRC=			${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}
+WRKSRC=			${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-655
 
 OWN_DIRS=		${PREFIX}/share/opera/plugins
 
-.elif (${_OPERA_OPSYS} == SunOS) && (${_OPERA_MACHINE_ARCH} == sparc)
+.elif ${EMUL_PLATFORM} == "solaris-sparc"
+ONLY_FOR_PLATFORM+=	SunOS-*-sparc*
 EXTRACT_SUFX=		.tar.bz2
+SOLARIS_VERSION_REQD=	8
 OPERA_ARCH=		-sol8-sparc
-OPERA_DIR=		unix/solaris/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/${_OPERA_MACHINE_ARCH}/static
+OPERA_DIR=		unix/solaris/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/sparc/static
 OPERA_DIST_VERSION=	${OPERA_PKG_VERSION:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
 
-WRKSRC=			${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-641
+WRKSRC=			${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-655
 
 BUILD_DEFS+=		INSTALL_ETC_OPERARC
 INSTALL_ETC_OPERARC?=	no
@@ -76,55 +95,23 @@ CONF_FILES+=		${PREFIX}/share/opera/config/opera6rc \
 CONF_FILES+=		${PREFIX}/share/opera/config/opera6rc.fixed \
 			/etc/opera6rc.fixed
 .  endif
+.endif
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 PLIST_SUBST+=		OPERA_VER_DATE=${OPERA_VER_DATE:Q}
 PLIST_SUBST+=		OPERA_PKG_VERSION=${OPERA_PKG_VERSION:C/u.*//}
 
-.endif
-
-.if (((${_OPERA_OPSYS} == SunOS) && (${_OPERA_MACHINE_ARCH} == sparc)) || (${_OPERA_OPSYS} == FreeBSD))
-NO_BUILD=		YES
-
+.if ${EMUL_PKG_FMT} == "plain"
 SUBST_CLASSES+=		opera
 SUBST_STAGE.opera=	post-build
 SUBST_FILES.opera=	man/opera.1
 SUBST_SED.opera=	-e 's,/usr/,${PREFIX}/,g'
 
-.endif
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
-do-build:
-.if (${_OPERA_OPSYS} == NetBSD) || (${_OPERA_OPSYS} == DragonFly)
-	@ ${SED} -e 's#@EMULDIR@#${EMULDIR}#g' ${FILESDIR}/opera.sh > \
-		${WRKDIR}/opera
-
-post-install: post-install-manpage
-	${INSTALL_SCRIPT} ${WRKDIR}/opera ${PREFIX}/bin
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(MANCOMPRESSED)
-USE_TOOLS+=		gzip
-.endif
-
-.PHONY: post-install-manpage
-post-install-manpage:
-# The SuSE common makefile defines "MANCOMPRESSED=yes".
-.  if defined(MANCOMPRESSED) && !empty(MANCOMPRESSED:M[yY][eE][sS])
-	${LN} -fs ../../${EMULSUBDIR}/usr/share/man/man1/opera.1.gz \
-		${PREFIX}/${PKGMANDIR}/man1
-.  else
-	${GUNZIP_CMD} -c ${EMULDIR}/usr/share/man/man1/opera.1.gz >
-		${PREFIX}/${PKGMANDIR}/man1/opera.1
-.  endif
-.endif
-
-.if (((${_OPERA_OPSYS} == SunOS) && (${_OPERA_MACHINE_ARCH} == sparc)) || (${_OPERA_OPSYS} == FreeBSD))
 do-install:
-	@${ECHO} "n" > ${WRKSRC}/inst.cmd
-	@${ECHO} "n" >> ${WRKSRC}/inst.cmd
-	@cd ${WRKSRC} && ${CAT} ${WRKSRC}/inst.cmd | ./install.sh --prefix=${PREFIX:Q}
+	@(${ECHO} "n"; ${ECHO} "n") > ${WRKSRC}/inst.cmd
+	@cd ${WRKSRC} && ${CAT} ${WRKSRC}/inst.cmd |			\
+		./install.sh --prefix=${PREFIX:Q}
 	@${ECHO} "=> You can ignore any previous lines about opera6rc"
 	@${ECHO}
 
@@ -132,18 +119,4 @@ post-install:
 	@${INSTALL_MAN} ${WRKSRC}/man/opera.1 ${PREFIX}/${PKGMANDIR}/man1
 .endif
 
-# regenerate distinfo for all ports supported by this package
-.PHONY: opera-distinfo
-opera-distinfo:
-	( ${ECHO} '$$'NetBSD'$$'; \
-	  ${ECHO} ''; \
-	_OPERA_OPSYS=NetBSD ${MAKE} distinfo 1>&2; \
-		${GREP} opera distinfo; \
-	_OPERA_OPSYS=FreeBSD ${MAKE} distinfo 1>&2; \
-		${GREP} opera distinfo; \
-	_OPERA_OPSYS=SunOS _OPERA_MACHINE_ARCH=sparc make distinfo 1>&2; \
-		${GREP} opera distinfo; \
-	) > distinfo.new
-	${MV} -f distinfo.new distinfo
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/opera/PLIST b/www/opera/PLIST
deleted file mode 100644
index 9e5e7ce9021..00000000000
--- a/www/opera/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/04/30 22:25:15 tron Exp $
-bin/opera
-man/man1/opera.1
diff --git a/www/opera/PLIST.FreeBSD b/www/opera/PLIST.freebsd-i386
index 5cad4879e98..178e18ec027 100644
--- a/www/opera/PLIST.FreeBSD
+++ b/www/opera/PLIST.freebsd-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.1 2005/04/30 22:25:15 tron Exp $
+@comment $NetBSD: PLIST.freebsd-i386,v 1.1 2007/07/29 05:20:01 jlam Exp $
 bin/opera
 man/man1/opera.1
 share/doc/opera/LICENSE
diff --git a/www/opera/PLIST.SunOS b/www/opera/PLIST.solaris-sparc
index 009cad1e6e4..194ad44825d 100644
--- a/www/opera/PLIST.SunOS
+++ b/www/opera/PLIST.solaris-sparc
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST.SunOS,v 1.6 2007/06/25 21:35:48 dmcmahill Exp $
+@comment $NetBSD: PLIST.solaris-sparc,v 1.1 2007/07/29 05:20:01 jlam Exp $
+bin/opera
 lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1/missingsyms.so
 lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1/opera
 lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1/spellcheck.so
@@ -6,8 +7,8 @@ lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1/works
 lib/opera/plugins/libnpp.so
 lib/opera/plugins/operaplugincleaner
 lib/opera/plugins/operapluginwrapper
+man/man1/opera.1
 share/doc/opera/LICENSE
-share/man/man1/opera.1
 share/opera/chartables-be.bin
 share/opera/config/opera6rc
 share/opera/config/opera6rc.fixed
@@ -95,7 +96,6 @@ share/opera/svg-se.dat
 @dirrm share/opera/images
 @dirrm share/opera/config
 @dirrm share/opera
-@dirrm share/man/man1
 @dirrm share/doc/opera
 @dirrm lib/opera/plugins
 @dirrm lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1
diff --git a/www/opera/distinfo b/www/opera/distinfo
index 09f02c56d29..461b15239b6 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.23 2007/07/19 19:09:44 xtraeme Exp $
+$NetBSD: distinfo,v 1.24 2007/07/29 05:20:02 jlam Exp $
 
+SHA1 (opera-9.22-20070716.1-static-qt.i386.freebsd-en.tar.bz2) = 98f0f101eb2c8b85f00faffe67790dd881dc9c2e
+RMD160 (opera-9.22-20070716.1-static-qt.i386.freebsd-en.tar.bz2) = 925a9d010b1630426a2e4de429ec1583ea3cb099
+Size (opera-9.22-20070716.1-static-qt.i386.freebsd-en.tar.bz2) = 6546833 bytes
 SHA1 (opera-9.22-20070716.1-static-qt.i386-en.rpm) = bbbaf86776497dea8d25573f8cdb666e831e2881
 RMD160 (opera-9.22-20070716.1-static-qt.i386-en.rpm) = 0ef0ae252497cc5c43835f590bc8dabd8ae8fa02
 Size (opera-9.22-20070716.1-static-qt.i386-en.rpm) = 7282798 bytes
+SHA1 (opera-9.22-20070716.1-static-qt-sol8-sparc-en.tar.bz2) = e1dc46c7d113de4716ceaab5da4594bdb43139ed
+RMD160 (opera-9.22-20070716.1-static-qt-sol8-sparc-en.tar.bz2) = b9b48b4a7280f41177b274a55b0288e19a95f4f7
+Size (opera-9.22-20070716.1-static-qt-sol8-sparc-en.tar.bz2) = 8377666 bytes
diff --git a/www/seamonkey-bin-flash/Makefile b/www/seamonkey-bin-flash/Makefile
index 3ae9432dfa8..ebc4a9b9737 100644
--- a/www/seamonkey-bin-flash/Makefile
+++ b/www/seamonkey-bin-flash/Makefile
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/02/01 14:02:32 ghen Exp $
+# $NetBSD: Makefile,v 1.2 2007/07/29 05:20:02 jlam Exp $
+
 .include "../../www/firefox-bin-flash/Makefile.common"
 
 COMMENT=		Flash Player plugin for seamonkey-bin
@@ -7,5 +8,4 @@ MOZ_NAME=		seamonkey-linux
 
 DEPENDS+=		seamonkey-bin>=1.0:../../www/seamonkey-bin
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/seamonkey-bin-nightly/Makefile b/www/seamonkey-bin-nightly/Makefile
index f44221427ab..e639216c305 100644
--- a/www/seamonkey-bin-nightly/Makefile
+++ b/www/seamonkey-bin-nightly/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/09/24 16:40:50 salo Exp $
+# $NetBSD: Makefile,v 1.2 2007/07/29 05:20:02 jlam Exp $
 
 MOZILLA=	seamonkey
 
-COMMENT=	Full featured gecko-based browser (nightly binary pkg)
+COMMENT=	Full-featured gecko-based browser suite (nightly binary pkg)
 
-ONLY_FOR_PLATFORM+=	Linux-*-i[3-6]86 NetBSD-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_PLATFORMS+=	solaris-i386 solaris-sparc
 
 .include "../../www/seamonkey-bin-nightly/Makefile.common"
diff --git a/www/seamonkey-bin-nightly/Makefile.Linux.i386 b/www/seamonkey-bin-nightly/Makefile.Linux.i386
deleted file mode 100644
index 7300da4153f..00000000000
--- a/www/seamonkey-bin-nightly/Makefile.Linux.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile.Linux.i386,v 1.1.1.1 2006/09/24 16:40:50 salo Exp $
-
-DISTNAME=	${MOZILLA}-1.5a.en-US.${MOZ_PLATFORM}-i686
-EXTRACT_SUFX=	.tar.bz2
-MOZ_PLATFORM=	linux
-MOZ_GTK2=	yes
diff --git a/www/seamonkey-bin-nightly/Makefile.NetBSD.i386 b/www/seamonkey-bin-nightly/Makefile.NetBSD.i386
deleted file mode 100644
index 78d6bab6fbf..00000000000
--- a/www/seamonkey-bin-nightly/Makefile.NetBSD.i386
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.2 2007/02/22 19:01:27 wiz Exp $
-
-BUILD_DEFS+=	MOZILLA_USE_LINUX
-
-.if defined(MOZILLA_USE_LINUX)
-DISTNAME=	${MOZILLA}-1.5a.en-US.${MOZ_PLATFORM}-i686
-EXTRACT_SUFX=	.tar.bz2
-MOZ_PLATFORM=	linux
-MOZ_GTK2=	yes
-ONLY_FOR_PLATFORM+=	NetBSD-*-i386
-.else
-PKG_SKIP_REASON+=	"No native pre-built NetBSD binary available."
-PKG_SKIP_REASON+=	"Set MOZILLA_USE_LINUX if you want to use the Linux binary."
-DISTNAME=
-EXTRACT_SUFX=	.tar.bz2
-MOZ_PLATFORM=	netbsd
-ONLY_FOR_PLATFORM+=	NetBSD-1.6*-i386 NetBSD-2*-i386
-.endif
diff --git a/www/seamonkey-bin-nightly/Makefile.SunOS.sparc b/www/seamonkey-bin-nightly/Makefile.SunOS.sparc
deleted file mode 100644
index 816e01649ce..00000000000
--- a/www/seamonkey-bin-nightly/Makefile.SunOS.sparc
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile.SunOS.sparc,v 1.2 2007/02/22 19:01:27 wiz Exp $
-
-DISTNAME=
-
-MOZ_PLATFORM=	solaris
-
-PKG_SKIP_REASON+=	"No native pre-built Solaris binary available."
diff --git a/www/seamonkey-bin-nightly/Makefile.linux-i386 b/www/seamonkey-bin-nightly/Makefile.linux-i386
new file mode 100644
index 00000000000..aaabc08f0d3
--- /dev/null
+++ b/www/seamonkey-bin-nightly/Makefile.linux-i386
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:20:03 jlam Exp $
+
+DISTNAME=	seamonkey-2.0a1pre.en-US.linux-i686
+EXTRACT_SUFX=	.tar.bz2
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	linux
diff --git a/www/seamonkey-bin-nightly/Makefile.solaris-i386 b/www/seamonkey-bin-nightly/Makefile.solaris-i386
new file mode 100644
index 00000000000..165e8f09ac6
--- /dev/null
+++ b/www/seamonkey-bin-nightly/Makefile.solaris-i386
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.solaris-i386,v 1.1 2007/07/29 05:20:03 jlam Exp $
+
+SOLARIS_VERSION_REQD=	10
+
+DISTNAME=	seamonkey-1.5a.en-US.solaris10-nosvg-i386
+EXTRACT_SUFX=	.tar.bz2
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	solaris
diff --git a/www/seamonkey-bin-nightly/Makefile.solaris-sparc b/www/seamonkey-bin-nightly/Makefile.solaris-sparc
new file mode 100644
index 00000000000..ce36f6669d0
--- /dev/null
+++ b/www/seamonkey-bin-nightly/Makefile.solaris-sparc
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.solaris-sparc,v 1.1 2007/07/29 05:20:03 jlam Exp $
+
+SOLARIS_VERSION_REQD=	10
+
+DISTNAME=	seamonkey-1.5a.en-US.solaris10-nosvg-sparc
+EXTRACT_SUFX=	.tar.bz2
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	solaris
diff --git a/www/seamonkey-bin/Makefile b/www/seamonkey-bin/Makefile
index d7a57f062f3..a146923b225 100644
--- a/www/seamonkey-bin/Makefile
+++ b/www/seamonkey-bin/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.14 2007/07/26 08:50:17 ghen Exp $
+# $NetBSD: Makefile,v 1.15 2007/07/29 05:20:03 jlam Exp $
 
 MOZILLA=		seamonkey
 MOZ_VER=		1.1.3
 MOZ_DISTVER=		${MOZ_VER}
 
 HOMEPAGE=		http://www.mozilla.org/projects/seamonkey/
-COMMENT=		Full featured gecko-based browser (binary package)
+COMMENT=		Full-featured gecko-based browser suite (binary package)
 
 DIST_SUBDIR=		${MOZILLA}/${MOZ_DISTDIR}
 
-MOZ_GTK2=		YES
-
-ONLY_FOR_PLATFORM+=	Linux-*-i386
+EMUL_PLATFORMS=		linux-i386
 
 .include "../../www/seamonkey-bin/Makefile.common"
diff --git a/www/seamonkey-bin/Makefile.Linux.i386 b/www/seamonkey-bin/Makefile.Linux.i386
deleted file mode 100644
index 12efd8a644c..00000000000
--- a/www/seamonkey-bin/Makefile.Linux.i386
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile.Linux.i386,v 1.1.1.1 2006/03/30 19:18:20 ghen Exp $
-
-DISTNAME=		${MOZILLA}-${MOZ_DISTVER}.en-US.linux-i686
-MOZ_DISTDIR=		releases/${MOZ_DIR}
-MASTER_SITES=		http://ftp.mozilla.org/pub/mozilla.org/seamonkey/${MOZ_DISTDIR}/
-
-MOZ_PLATFORM=		linux
diff --git a/www/seamonkey-bin/Makefile.NetBSD.i386 b/www/seamonkey-bin/Makefile.NetBSD.i386
deleted file mode 100644
index 5633eec5caa..00000000000
--- a/www/seamonkey-bin/Makefile.NetBSD.i386
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.1.1.1 2006/03/30 19:18:20 ghen Exp $
-
-BUILD_DEFS+=		MOZILLA_USE_LINUX
-
-.if defined(MOZILLA_USE_LINUX)
-ONLY_FOR_PLATFORM+=	NetBSD-*-i386
-.  include "Makefile.Linux.i386"
-.else
-PKG_SKIP_REASON+=	"No native pre-built NetBSD binary available."
-PKG_SKIP_REASON+=	"Set MOZILLA_USE_LINUX if you want to use the Linux binary."
-.endif
diff --git a/www/seamonkey-bin/Makefile.common b/www/seamonkey-bin/Makefile.common
index e499da044f8..0529b82edc8 100644
--- a/www/seamonkey-bin/Makefile.common
+++ b/www/seamonkey-bin/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.3 2006/11/25 21:38:51 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.4 2007/07/29 05:20:04 jlam Exp $
 
-DISTNAME=		# see Makefile.${OPSYS}.${ARCH}
+DISTNAME=		${MOZILLA}${MOX_EXTRA}-bin	# overridden below
 PKGNAME=		${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER}
 CATEGORIES=		www
 
@@ -8,25 +8,38 @@ MAINTAINER=		grant@NetBSD.org
 HOMEPAGE?=		http://www.mozilla.org/
 
 WRKSRC?=		${WRKDIR}/${MOZILLA}
-NO_CONFIGURE=		yes
+BUILD_DIRS?=		# empty
 USE_LANGUAGES=		# empty
 
 FILESDIR=		${.CURDIR}/../../www/seamonkey-bin/files
 MOZILLA_SCRIPT?=	${FILESDIR}/mozilla.sh
 
+.if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss])
+EMUL_MODULES.linux=	compat gtk2 locale
+SUSE_VERSION_REQD=	9.1
+.else
+EMUL_MODULES.linux=	compat gtk
+SUSE_VERSION_REQD=	7.3
+.endif
 
 .include "../../mk/bsd.prefs.mk"
 
-# everything specific to your OS/Arch goes into its own Makefile
-# group together i386, i486, i586 and i686 (for Linux)
-ARCH=${MACHINE_ARCH:C/i[3-6]86/i386/g}
-
-.if exists(${.CURDIR}/Makefile.${OPSYS}.${ARCH})
-.  include "${.CURDIR}/Makefile.${OPSYS}.${ARCH}"
+.if !empty(EMUL_DISTRO:Mnative-*)
+.  if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss])
+DEPENDS+=		gtk2+>=2.2:../../x11/gtk2
+.  else
+DEPENDS+=		gtk2+>=1.2:../../x11/gtk
+.  endif
 .endif
 
+# Include Makefile.${EMUL_PLATFORM} to get definitions for DISTNAME
+# and MOZ_PLATFORM.
+#
+.sinclude "${.CURDIR}/Makefile.${EMUL_PLATFORM}"
+
 MOZILLA_SHORT=		${MOZILLA}
 MOZ_DIR?=		${MOZ_VER}
+MOZ_PLATFORM?=		${LOWER_OPSYS}
 
 .if !defined(MASTER_SITES)
 _MASTER_SITES+=		http://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/releases/${MOZ_DIR}/
@@ -51,45 +64,9 @@ FILES_SUBST+=	MOZ_PLATFORM=${MOZ_PLATFORM:Q}
 MESSAGE_SUBST+=	PKGBASE=${PKGBASE}
 PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
 
-# protect against MOZ_PLATFORM being undefined so we don't bomb, but
-# instead use the result of ONLY_FOR_PLATFORM.
-.if defined(MOZ_PLATFORM)
-
-.  if ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "linux"
+.if (${OPSYS} == "NetBSD") && (${EMUL_OPSYS} == "linux")
 MESSAGE_SRC+=	${.CURDIR}/../../www/seamonkey-bin/MESSAGE.compat_linux
-.  endif
-
-# Linux builds on NetBSD
-.  if ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "linux"
-.    include "../../emulators/suse_linux/Makefile.application"
-.  elif ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "netbsd"
-# we need libstdc++.so.4 on -current.
-.    if !exists(/usr/lib/libstdc++.so.4)
-DEPENDS+=	compat16>=1.6.0:../../emulators/compat16
-_COMPAT16_LIBSTDCXX=	YES
-.    endif
-.  endif
-
-# GTK2 builds.
-.  if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss])
-.    if ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "netbsd"
-DEPENDS+=	gtk2+>=2.4:../../x11/gtk2
-.    elif ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "linux"
-DEPENDS+=	suse_compat>=9.1:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_gtk2>=9.1:../../emulators/${SUSE_DIR_PREFIX}_gtk2
-DEPENDS+=	suse_locale>=9.1:../../emulators/${SUSE_DIR_PREFIX}_locale
-.    else
-DEPENDS+=	gtk2+>=2.2:../../x11/gtk2
-.    endif
-.  elif ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "linux"
-DEPENDS+=	suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_gtk>=7.3:../../emulators/${SUSE_DIR_PREFIX}_gtk
-.  else
-# default to at least gtk-1.2.
-DEPENDS+=	gtk+>=1.2:../../x11/gtk
-.  endif
-
-.endif	# defined(MOZ_PLATFORM)
+.endif
 
 INSTALLATION_DIRS=	bin
 
@@ -107,8 +84,6 @@ post-extract:
 	@${RM} -f ${WRKSRC}/plugins/libnullplugin.so
 	${CP} ${MOZILLA_SCRIPT} ${WRKDIR}/${MOZILLA}.sh
 
-do-build:
-
 do-install:
 	${INSTALL_DATA_DIR} ${MOZILLA_LIB}
 	cd ${WRKSRC} && ${PAX} -rw -pm . ${MOZILLA_LIB}
@@ -123,8 +98,8 @@ do-install:
 # builds typically want exactly 'libgtk-1.2.so.0', etc. symlink them
 # into the mozilla directory.
 post-install:
-.if ${OPSYS} != "NetBSD"
-.  if defined(MOZ_GTK2) && ${MOZ_GTK2} == "YES"
+.if !empty(EMUL_DISTRO:Mnative-*)
+.  if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss])
 	@cd ${MOZILLA_LIB} && \
 	${LN} -s ${PREFIX}/lib/libatk-1.0.*so* .;			\
 	${LN} -s ${X11PREFIX}/lib/libgdk-x11-2.0.*so* .;		\
@@ -159,10 +134,6 @@ post-install:
 	${LN} -s libgmodule.so libgmodule-1.2.so.0
 .  endif
 .endif
-.if defined(_COMPAT16_LIBSTDCXX) && ${_COMPAT16_LIBSTDCXX} == "YES"
-	@cd ${MOZILLA_LIB} && \
-		${LN} -s ${PREFIX}/emul/netbsd16/usr/lib/libstdc++.so* .
-.endif
 	@${INSTALL_DATA_DIR} ${PREFIX}/lib/mozilla-linux/plugins
 	@${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
 	@${ECHO} bin/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM} >> ${PLIST_SRC}
diff --git a/www/seamonkey-bin/Makefile.linux-i386 b/www/seamonkey-bin/Makefile.linux-i386
new file mode 100644
index 00000000000..0b2174d3ae4
--- /dev/null
+++ b/www/seamonkey-bin/Makefile.linux-i386
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:20:04 jlam Exp $
+
+DISTNAME=	seamonkey-${MOZ_DISTVER}.en-US.linux-i686
+MOZ_DISTDIR=	releases/${MOZ_DIR}
+MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/seamonkey/${MOZ_DISTDIR}/
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	linux
author	jlam <jlam@pkgsrc.org>	2007-07-29 05:18:36 +0000
committer	jlam <jlam@pkgsrc.org>	2007-07-29 05:18:36 +0000
commit	28eeb8a5663998ab6cfc07ef15ed10e5d97cf91d (patch)
tree	45cad36d8470a568b9136017b2dd79c9efcc65bc
parent	566d930409bea6d1ac48d9e1a3be5e5e1a6296e5 (diff)
download	pkgsrc-28eeb8a5663998ab6cfc07ef15ed10e5d97cf91d.tar.gz