First step at reworking Linux binary packages.

Change most pkgs to depend on either
emulators/suse_linux/Makefile.application (normal pkgs) or
Makefile.common (suse91 and suse themselves) to filter out Operating
Systems without Linux ABI support. Use CPU masks to limit the pkg to
supported platforms.

64 files changed, 211 insertions, 247 deletions

diff --git a/archivers/rar-linux/Makefile b/archivers/rar-linux/Makefile
index 1358e44507f..c5b44fb5a33 100644
--- a/archivers/rar-linux/Makefile
+++ b/archivers/rar-linux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/10/30 13:10:38 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/12 14:43:23 joerg Exp $
 #
 
 DISTNAME=		rarlinux-3.5.1
@@ -13,16 +13,15 @@ COMMENT=		RAR command line archiver (Linux binary)
 
 LICENSE=		rar-license
 
-ONLY_FOR_PLATFORM=	NetBSD-1.5Z[A-Z]-i386 NetBSD-1.6*-i386 \
-			NetBSD-[2-9]*-i386 Linux-*-i[3-6]86
+ONLY_FOR_PLATFORM=	*-*-i386
 WRKSRC=			${WRKDIR}/rar
 
 # old name of the package
 CONFLICTS=		rarlinux-[0-9]*
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../emulators/suse_linux/Makefile.application"
 
-.if ${OPSYS} == "NetBSD"
+.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
@@ -41,5 +40,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/doc/rar-linux
 	${INSTALL_DATA} ${WRKSRC}/rarfiles.lst ${PREFIX}/share/doc/rar-linux
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/stuffit/Makefile b/archivers/stuffit/Makefile
index 13ba17f274e..d206e056643 100644
--- a/archivers/stuffit/Makefile
+++ b/archivers/stuffit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/10/09 18:35:25 ben Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/12 14:43:23 joerg Exp $
 
 DISTNAME=		stuffit520.611linux-i386
 PKGNAME=		stuffit-5.2.0.611
@@ -9,9 +9,9 @@ MAINTAINER=		ben@NetBSD.org
 HOMEPAGE=		http://www.stuffit.com/unix/stuffit/
 COMMENT=		Stuffit Archive Creator and Expander
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../emulators/suse_linux/Makefile.application"
 
-.if ${OPSYS} == "NetBSD"
+.if !defined(USE_NATIVE_LINUX)
 DEPENDS+=		suse_base>=6:../../emulators/${SUSE_DIR_PREFIX}_base
 .endif
 
@@ -21,7 +21,7 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-ONLY_FOR_PLATFORM=	Linux-*-i386 NetBSD-*-i386
+ONLY_FOR_PLATFORM=	*-*-i386
 
 WRKSRC=			${WRKDIR}
 CHECK_SHLIBS=		NO
@@ -41,5 +41,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/unstuff/* \
 		${PREFIX}/share/doc/stuffit/unstuff/
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unace22/Makefile b/archivers/unace22/Makefile
index 965c449bdd5..27ab017c972 100644
--- a/archivers/unace22/Makefile
+++ b/archivers/unace22/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:37 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/12 14:43:23 joerg Exp $
 #
 
 DISTNAME=	linunace22
@@ -17,14 +17,13 @@ MAINTAINER=	dillo@NetBSD.org
 HOMEPAGE=	http://www.winace.com/
 COMMENT=	Extract, list and test files in ACE archives (2.2 linux binary)
 
-ONLY_FOR_PLATFORM=	NetBSD-1.5Z[A-Z]-i386 NetBSD-1.6*-i386 \
-			NetBSD-[2-9]*-i386 Linux-*-i[3-6]86
+ONLY_FOR_PLATFORM=	*-*-i386
 
 WRKSRC=		${WRKDIR}
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../emulators/suse_linux/Makefile.application"
 
-.if ${OPSYS} == "NetBSD"
+.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
diff --git a/cad/eagle/Makefile b/cad/eagle/Makefile
index 7802bdfbf7e..2b1bce8e8cf 100644
--- a/cad/eagle/Makefile
+++ b/cad/eagle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/16 06:57:41 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/12 14:43:23 joerg Exp $
 #
 
 DISTNAME=		eagle-lin-eng-4.14
@@ -11,13 +11,13 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.cadsoft.de/
 COMMENT=		Easy to use printed circuit board editor
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../emulators/suse_linux/Makefile.application"
 
-.if ${OPSYS} != "Linux"
+.if !defined(USE_NATIVE_LINUX)
 DEPENDS+=		suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
 .endif
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386 Linux-*-i386
+ONLY_FOR_PLATFORM=	*-*-i386
 CHECK_SHLIBS=		NO		# this is Linux software
 
 RESTRICTED=		"Redistribution not permitted"
@@ -38,5 +38,4 @@ do-install:
 	cd ${WRKSRC} && ${CP} -R ${WRKSRC}/* ${PREFIX}/eagle
 	${INSTALL_SCRIPT} ${WRKDIR}/eagle ${PREFIX}/bin
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/aim/Makefile b/chat/aim/Makefile
index 162dc738ecd..cc99a4239c9 100644
--- a/chat/aim/Makefile
+++ b/chat/aim/Makefile
@@ -1,21 +1,29 @@
-# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:52 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/12 14:43:23 joerg Exp $
 
 DISTNAME=	aim-1.5.286
 CATEGORIES=	chat
 MASTER_SITES=	http://ftp.newaol.com/aimgen/380469/
 EXTRACT_SUFX=	-1.i386.rpm
 
+DIST_SUBDIR=	.
+RPMFILES=	${DISTFILES}
+
 MAINTAINER=	fredb@NetBSD.org
 HOMEPAGE=	http://www.aim.com/
 COMMENT=	AOL Instant Messenger (SM)
 
 BUILD_DEPENDS+=	rpm2pkg>=1.2:../../pkgtools/rpm2pkg
+
+.include "../../emulators/suse_linux/Makefile.application"
+
+.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
+.endif
 
-ONLY_FOR_PLATFORM= NetBSD-*-i386
+ONLY_FOR_PLATFORM= *-*-i386
 
 WRKSRC=		${WRKDIR}
 CHECK_SHLIBS=	NO
@@ -25,9 +33,6 @@ EXTRACT_ONLY=	# nothing
 PLIST_SRC=	${WRKDIR}/PLIST.rpm
 PLIST_SUBST+=	EMULSUBDIR=${EMULSUBDIR:Q}
 
-DIST_SUBDIR=	.
-RPMFILES=	${DISTFILES}
-
 INSTALLATION_DIRS=	bin
 
 do-install:
@@ -36,5 +41,4 @@ do-install:
 		-p ${EMULSUBDIR} ${DISTDIR}/${DISTFILES}
 	${LN} -fs ../${EMULSUBDIR}/usr/bin/aim ${PREFIX}/bin/aim
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/ymessenger/Makefile b/chat/ymessenger/Makefile
index f0e0aba7722..e6232cb3824 100644
--- a/chat/ymessenger/Makefile
+++ b/chat/ymessenger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:54 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/12 14:43:23 joerg Exp $
 
 DISTNAME=		ymessenger-0.93.0
 CATEGORIES=		chat
@@ -9,11 +9,16 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://messenger.yahoo.com/
 COMMENT=		Yahoo! instant messaging client
 
+RPMFILES=		${DISTFILES}
+
+.include "../../emulators/suse_linux/Makefile.application"
+
+.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
+.endif
 
-ONLY_FOR_PLATFORM=	NetBSD-1.4[Y-Z]-i386 NetBSD-1.4Z[A-Z]-i386 \
-			NetBSD-1.[5-9]*-i386 NetBSD-[2-9]*-i386
+ONLY_FOR_PLATFORM=	*-*-i386
 
 CHECK_SHLIBS=		no
 
@@ -30,10 +35,7 @@ NO_BUILD=		yes
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
 
-RPMFILES=		${DISTFILES}
-
 post-install:
 	${LN} -fs ../${EMULSUBDIR}/usr/local/bin/ymessenger ${PREFIX}/bin
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/m1/Makefile b/emulators/m1/Makefile
index e7fe2652523..9a002594f10 100644
--- a/emulators/m1/Makefile
+++ b/emulators/m1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/09/28 20:52:20 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/12 14:43:23 joerg Exp $
 #
 
 DISTNAME=	m1074b2-lnx
@@ -11,7 +11,11 @@ MAINTAINER=	wiz@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"
+
+.if !defined(USE_NATIVE_LINUX)
 DEPENDS+=	suse_base>=6.4:../../emulators/${SUSE_DIR_PREFIX}_compat
+.endif
 
 ONLY_FOR_PLATFORM=	*-*-i386
 
@@ -28,5 +32,4 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/m1
 	${INSTALL_DATA} ${WRKSRC}/m1.ini ${PREFIX}/share/examples/m1
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile
index 7f3a2283a9a..58a35fd8c98 100644
--- a/emulators/ski/Makefile
+++ b/emulators/ski/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2005/10/05 11:58:50 skrll Exp $
+#	$NetBSD: Makefile,v 1.2 2005/12/12 14:43:23 joerg Exp $
 
 DISTNAME=		ski-0.9.81-l6-i686
 CATEGORIES=		emulators
@@ -16,9 +16,9 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 
 ONLY_FOR_PLATFORM=	*-*-i386
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../emulators/suse_linux/Makefile.application"
 
-.if ${OPSYS} != "Linux"
+.if !defined(USE_NATIVE_LINUX)
 DEPENDS+=		suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
 .endif
 
@@ -42,5 +42,4 @@ do-install:
 	${INSTALL_MAN} ${WRKDIR}/nue/usr/man/man1/*ski*.1 ${PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKDIR}/nue/usr/X11R6/lib/X11/app-defaults/XSki ${PREFIX}/lib/X11/app-defaults/XSki
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_aspell/Makefile b/emulators/suse91_aspell/Makefile
index 1674fd09afe..f163c3d5d0c 100644
--- a/emulators/suse91_aspell/Makefile
+++ b/emulators/suse91_aspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/11/06 14:52:43 salo Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/12 14:43:23 joerg Exp $
 
 DISTNAME=		suse_aspell-${SUSE_VERSION}
 PKGREVISION=		1
@@ -10,15 +10,18 @@ MAINTAINER=		jdolecek@NetBSD.org
 HOMEPAGE=		http://www.suse.com/
 COMMENT=		Linux compatibility package for Aspell library
 
+RPMFILES=		aspell-0.50.5-38.4.${SUSE_ARCH}.rpm
+
+.include "../../emulators/suse_linux/Makefile.application"
+
+.if !defined(USE_NATIVE_LINUX)
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse91_base
+.endif
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
+ONLY_FOR_PLATFORM=      *-*-i386
 
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-RPMFILES=		aspell-0.50.5-38.4.${SUSE_ARCH}.rpm
-
-.include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_base/Makefile b/emulators/suse91_base/Makefile
index 2a92e987a7d..e3bb9fce409 100644
--- a/emulators/suse91_base/Makefile
+++ b/emulators/suse91_base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:12 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/12 14:43:23 joerg Exp $
 
 DISTNAME=		suse_base-${SUSE_VERSION}
 PKGREVISION=		8
@@ -11,8 +11,6 @@ HOMEPAGE=		http://www.suse.com/
 COMMENT=		Linux compatibility package
 
 CONFLICTS=		linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]*
-ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-i386 NetBSD-3.99*-x86_64 \
-			NetBSD-[4-9]*-x86_64 FreeBSD-*-i386
 
 EXTRACT_ONLY=		# empty
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse91_compat/Makefile b/emulators/suse91_compat/Makefile
index ffe37f3dbec..12796eb70a2 100644
--- a/emulators/suse91_compat/Makefile
+++ b/emulators/suse91_compat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:44 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/12 14:43:23 joerg Exp $
 
 DISTNAME=		suse_compat-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -11,8 +11,6 @@ COMMENT=		Linux compatibility package with old shared libraries
 
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse91_base
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse91_expat/Makefile b/emulators/suse91_expat/Makefile
index 9ba288b37ff..91dac346d33 100644
--- a/emulators/suse91_expat/Makefile
+++ b/emulators/suse91_expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:44 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/12 14:43:23 joerg Exp $
 
 DISTNAME=		suse_expat-${SUSE_VERSION}
 PKGREVISION=		1
@@ -12,8 +12,6 @@ COMMENT=		Linux compatibility package for expat binaries
 
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse91_base
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 LIBTOOLIZE_PLIST=	NO
diff --git a/emulators/suse91_fontconfig/Makefile b/emulators/suse91_fontconfig/Makefile
index 70baae1f245..a75e904ac19 100644
--- a/emulators/suse91_fontconfig/Makefile
+++ b/emulators/suse91_fontconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:44 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/12 14:43:23 joerg Exp $
 
 DISTNAME=		suse_fontconfig-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -11,8 +11,6 @@ COMMENT=		Linux compatibility package for fontconfig binaries
 
 DEPENDS+=		suse_expat>=${SUSE_VERSION}:../../emulators/suse91_expat
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse91_freetype2/Makefile b/emulators/suse91_freetype2/Makefile
index 9d08b88e918..569e1625464 100644
--- a/emulators/suse91_freetype2/Makefile
+++ b/emulators/suse91_freetype2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/11/06 14:52:44 salo Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/12 14:43:23 joerg Exp $
 
 DISTNAME=		suse_freetype2-${SUSE_VERSION}
 PKGREVISION=		1
@@ -12,8 +12,6 @@ COMMENT=		Linux compatibility package for FreeType2 library
 
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse91_base
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse91_glx/Makefile b/emulators/suse91_glx/Makefile
index 7f8adb3453c..21fdc9e7375 100644
--- a/emulators/suse91_glx/Makefile
+++ b/emulators/suse91_glx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:12 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		suse_glx-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -12,8 +12,6 @@ COMMENT=		Linux compatibility package for the GL library
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse91_base
 DEPENDS+=		suse_x11>=${SUSE_VERSION}:../../emulators/suse91_x11
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 LIBTOOLIZE_PLIST=	NO
diff --git a/emulators/suse91_gtk/Makefile b/emulators/suse91_gtk/Makefile
index a9d728bbc7c..b44ebbe7456 100644
--- a/emulators/suse91_gtk/Makefile
+++ b/emulators/suse91_gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/09/28 14:31:06 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		suse_gtk-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -11,8 +11,6 @@ COMMENT=		Linux compatibility package for GTK binaries
 
 DEPENDS+=		suse_x11>=${SUSE_VERSION}:../../emulators/suse91_x11
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse91_gtk2/Makefile b/emulators/suse91_gtk2/Makefile
index 5303cb4a2fd..3ac93660d17 100644
--- a/emulators/suse91_gtk2/Makefile
+++ b/emulators/suse91_gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:12 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		suse_gtk2-${SUSE_VERSION}
 PKGREVISION=		4
@@ -17,8 +17,6 @@ DEPENDS+=		suse_libpng>=${SUSE_VERSION}:../../emulators/suse91_libpng
 DEPENDS+=		suse_libtiff>=${SUSE_VERSION}:../../emulators/suse91_libtiff
 DEPENDS+=		suse_x11>=${SUSE_VERSION}:../../emulators/suse91_x11
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 USE_PKGINSTALL=		YES
 NO_BUILD=		YES
diff --git a/emulators/suse91_libjpeg/Makefile b/emulators/suse91_libjpeg/Makefile
index 07465acd9a1..f6c7d038346 100644
--- a/emulators/suse91_libjpeg/Makefile
+++ b/emulators/suse91_libjpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:44 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		suse_libjpeg-${SUSE_VERSION}
 PKGREVISION=		1
@@ -12,8 +12,6 @@ COMMENT=		Linux compatibility package for the JPEG library
 
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse91_base
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 LIBTOOLIZE_PLIST=	NO
diff --git a/emulators/suse91_libpng/Makefile b/emulators/suse91_libpng/Makefile
index 2d050a020f0..0a8ab639c97 100644
--- a/emulators/suse91_libpng/Makefile
+++ b/emulators/suse91_libpng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/11/06 14:52:44 salo Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		suse_libpng-${SUSE_VERSION}
 PKGREVISION=		2
@@ -10,10 +10,6 @@ MAINTAINER=		jdolecek@NetBSD.org
 HOMEPAGE=		http://www.suse.com/
 COMMENT=		Linux compatibility package for the PNG library
 
-DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse91_base
-
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse91_libtiff/Makefile b/emulators/suse91_libtiff/Makefile
index 3aa0d2d651b..f8c32ae0445 100644
--- a/emulators/suse91_libtiff/Makefile
+++ b/emulators/suse91_libtiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/11/06 14:52:44 salo Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		suse_libtiff-${SUSE_VERSION}
 PKGREVISION=		2
@@ -12,8 +12,6 @@ COMMENT=		Linux compatibility package for the TIFF library
 
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse91_base
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse91_linux/Makefile.common b/emulators/suse91_linux/Makefile.common
index 3b38687854f..a15549df5cc 100644
--- a/emulators/suse91_linux/Makefile.common
+++ b/emulators/suse91_linux/Makefile.common
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile.common,v 1.12 2005/04/03 21:23:15 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.13 2005/12/12 14:43:24 joerg Exp $
 
 .include "../../emulators/suse91_linux/vars.mk"
 .include "../../emulators/suse91_linux/arch.mk"
 
+ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-i386 NetBSD-3.99*-x86_64 \
+			NetBSD-[4-9]*-x86_64 FreeBSD-*-i386 \
+			DragonFly-*-i386
+
 _SUSE_FTP_SUBDIR=	suse/${SUSE_ARCH_DIR}/9.1/suse/${SUSE_ARCH}/
 _SUSE_FTP_SUBDIR_UPD=	suse/${SUSE_ARCH_DIR}/update/9.1/rpm/${SUSE_ARCH}/
 
diff --git a/emulators/suse91_locale/Makefile b/emulators/suse91_locale/Makefile
index 0dde1b74af4..6bdc3eb1470 100644
--- a/emulators/suse91_locale/Makefile
+++ b/emulators/suse91_locale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:45 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		suse_locale-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -13,8 +13,6 @@ DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse91_base
 
 CONFLICTS=		linux-locale-[0-9]*
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse91_openmotif/Makefile b/emulators/suse91_openmotif/Makefile
index 0a7f3ab1e2e..65734188fa2 100644
--- a/emulators/suse91_openmotif/Makefile
+++ b/emulators/suse91_openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/11/06 14:52:44 salo Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		suse_openmotif-${SUSE_VERSION}
 PKGREVISION=		2
@@ -12,8 +12,6 @@ COMMENT=		Linux compatibility package for the Motif library
 
 DEPENDS+=		suse_x11>=${SUSE_VERSION}:../../emulators/suse91_x11
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse91_slang/Makefile b/emulators/suse91_slang/Makefile
index ddbf1b2bf2d..690260a2a7d 100644
--- a/emulators/suse91_slang/Makefile
+++ b/emulators/suse91_slang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:12 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		suse_slang-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -11,8 +11,6 @@ COMMENT=		Linux compatibility package for slang library
 
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse_base
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 NetBSD-*-powerpc FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse91_vmware/Makefile b/emulators/suse91_vmware/Makefile
index 8a65af42173..8c4127eb729 100644
--- a/emulators/suse91_vmware/Makefile
+++ b/emulators/suse91_vmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:12 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		suse_vmware-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -12,8 +12,6 @@ COMMENT=		Linux compatibility package to support running VMware
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse91_base
 DEPENDS+= 		suse_x11>=${SUSE_VERSION}:../../emulators/suse91_x11
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse91_x11/Makefile b/emulators/suse91_x11/Makefile
index 1ac52d1af1d..f0ae3ebad7c 100644
--- a/emulators/suse91_x11/Makefile
+++ b/emulators/suse91_x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/11/06 14:52:44 salo Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		suse_x11-${SUSE_VERSION}
 PKGREVISION=		3
@@ -12,9 +12,6 @@ COMMENT=		Linux compatibility package for X11 binaries
 
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse91_base
 
-ONLY_FOR_PLATFORM=	NetBSD-[2-9]*-i386 NetBSD-[3-9]*-x86_64 \
-			FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_audio/Makefile b/emulators/suse_audio/Makefile
index 93bfcf48cc3..ceae22faac4 100644
--- a/emulators/suse_audio/Makefile
+++ b/emulators/suse_audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:45 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		audiofile
 PKGNAME=		suse_audio-${SUSE_VERSION}
@@ -12,8 +12,6 @@ COMMENT=		Linux compatibility package for audio libraries
 
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse_base
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 NetBSD-*-powerpc FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_base/Makefile b/emulators/suse_base/Makefile
index 4eee4ca0607..d407ab1294c 100644
--- a/emulators/suse_base/Makefile
+++ b/emulators/suse_base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2005/08/16 00:30:41 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.56 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		suse_base-${SUSE_VERSION}
 PKGREVISION=		7
@@ -12,11 +12,6 @@ HOMEPAGE=		http://www.suse.com/
 COMMENT=		Linux compatibility package
 
 CONFLICTS=		linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]*
-ONLY_FOR_PLATFORM=	NetBSD-1.5Z[C-Z]-i386 NetBSD-1.6*-i386
-ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-i386
-ONLY_FOR_PLATFORM+=	NetBSD-1.6[L-Z]-powerpc NetBSD-1.6Z[A-Z]-powerpc
-ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-powerpc
-ONLY_FOR_PLATFORM+=	FreeBSD-*-i386
 
 EXTRACT_ONLY=		# empty
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_compat/Makefile b/emulators/suse_compat/Makefile
index 6214a54ff51..452e861bbaa 100644
--- a/emulators/suse_compat/Makefile
+++ b/emulators/suse_compat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:45:45 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		compat
 PKGNAME=		suse_${DISTNAME}-${SUSE_VERSION}
@@ -12,8 +12,6 @@ COMMENT=		Linux compatibility package with old shared libraries
 
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse_base
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 NetBSD-*-powerpc FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_devel/Makefile b/emulators/suse_devel/Makefile
index a6d24a87bfb..31afbf65fa5 100644
--- a/emulators/suse_devel/Makefile
+++ b/emulators/suse_devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:12 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		suse_devel-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -15,8 +15,6 @@ COMMENT=		Linux compatibility package - development tools
 
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse_base
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 NetBSD-*-powerpc FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_fileutils/Makefile b/emulators/suse_fileutils/Makefile
index fd286a4d428..31fbe9fcd6d 100644
--- a/emulators/suse_fileutils/Makefile
+++ b/emulators/suse_fileutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:12 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		suse_fileutils-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -12,8 +12,6 @@ COMMENT=		Linux compatibility package - fileutils
 
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse_base
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 NetBSD-*-powerpc
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_freetype2/Makefile b/emulators/suse_freetype2/Makefile
index ac1c17e8107..6a0c7ea1ce3 100644
--- a/emulators/suse_freetype2/Makefile
+++ b/emulators/suse_freetype2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:12 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		freetype2
 PKGNAME=		suse_${DISTNAME}-${SUSE_VERSION}
@@ -14,8 +14,6 @@ COMMENT=		Linux compatibility package for the FreeType2 library
 
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse_base
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 NetBSD-*-powerpc FreeBSD-*-i386
-
 NO_BUILD=		YES
 EXTRACT_ONLY=		# empty
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_glx/Makefile b/emulators/suse_glx/Makefile
index 97642a1cb2f..f6e71241de9 100644
--- a/emulators/suse_glx/Makefile
+++ b/emulators/suse_glx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:45 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		glx
 PKGNAME=		suse_${DISTNAME}-${SUSE_VERSION}
@@ -12,8 +12,6 @@ COMMENT=		Linux compatibility package for GLX binaries
 
 DEPENDS+=		suse_x11>=${SUSE_VERSION}:../../emulators/suse_x11
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 NetBSD-*-powerpc FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_gtk/Makefile b/emulators/suse_gtk/Makefile
index b41d7cdbbf7..d7995d7d141 100644
--- a/emulators/suse_gtk/Makefile
+++ b/emulators/suse_gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:45 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		suse_gtk-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -12,8 +12,6 @@ COMMENT=		Linux compatibility package for GTK binaries
 
 DEPENDS+=		suse_x11>=${SUSE_VERSION}:../../emulators/suse_x11
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 NetBSD-*-powerpc FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_libc5/Makefile b/emulators/suse_libc5/Makefile
index 695a9137e51..dd2a0a19e86 100644
--- a/emulators/suse_libc5/Makefile
+++ b/emulators/suse_libc5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/04/11 21:45:45 tv Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		shlibs5
 PKGNAME=		suse_libc5-${SUSE_VERSION}
@@ -13,8 +13,6 @@ COMMENT=		Linux compatibility package for libc5 binaries
 
 DEPENDS+=		suse_compat>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_compat
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_libjpeg/Makefile b/emulators/suse_libjpeg/Makefile
index 68afd520835..75207ae8702 100644
--- a/emulators/suse_libjpeg/Makefile
+++ b/emulators/suse_libjpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:45 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/12 14:43:24 joerg Exp $
 
 DISTNAME=		libjpeg
 PKGNAME=		suse_${DISTNAME}-${SUSE_VERSION}
@@ -13,8 +13,6 @@ COMMENT=		Linux compatibility package for the JPEG library
 
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse_base
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 NetBSD-*-powerpc FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 LIBTOOLIZE_PLIST=	NO
diff --git a/emulators/suse_libpng/Makefile b/emulators/suse_libpng/Makefile
index a1e2f5ebb62..05825c83b07 100644
--- a/emulators/suse_libpng/Makefile
+++ b/emulators/suse_libpng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:45 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/12 14:43:25 joerg Exp $
 
 DISTNAME=		libpng
 PKGREVISION=		1
@@ -14,8 +14,6 @@ COMMENT=		Linux compatibility package for the PNG library
 
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse_base
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 NetBSD-*-powerpc FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_libtiff/Makefile b/emulators/suse_libtiff/Makefile
index 386bf25da58..15f8bdd69d8 100644
--- a/emulators/suse_libtiff/Makefile
+++ b/emulators/suse_libtiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:45 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/12 14:43:25 joerg Exp $
 
 DISTNAME=		libtiff
 PKGNAME=		suse_${DISTNAME}-${SUSE_VERSION}
@@ -12,8 +12,6 @@ COMMENT=		Linux compatibility package for the TIFF library
 
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse_base
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 NetBSD-*-powerpc FreeBSD-*-i386
-
 NO_BUILD=		YES
 EXTRACT_ONLY=		# empty
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_linux/Makefile b/emulators/suse_linux/Makefile
index 4c4bf013f76..bc94d7fd119 100644
--- a/emulators/suse_linux/Makefile
+++ b/emulators/suse_linux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/07/19 10:23:42 grant Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/12 14:43:25 joerg Exp $
 
 DISTNAME=		suse_linux-7.3
 CATEGORIES=		emulators
@@ -24,7 +24,7 @@ DEPENDS+=		suse_libc5>=7.3:../../emulators/suse_libc5
 
 ONLY_FOR_PLATFORM=	NetBSD-1.5Z[C-Z]-i386 NetBSD-1.6*-i386 \
 			NetBSD-[2-9]*-i386 NetBSD-*-powerpc \
-			FreeBSD-*-i386
+			FreeBSD-*-i386 DrgaonFly-*-i386
 
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
diff --git a/emulators/suse_linux/Makefile.application b/emulators/suse_linux/Makefile.application
index b85327714c7..4b7eb1b3a65 100644
--- a/emulators/suse_linux/Makefile.application
+++ b/emulators/suse_linux/Makefile.application
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.application,v 1.16 2005/04/28 22:33:36 jlam Exp $
+# $NetBSD: Makefile.application,v 1.17 2005/12/12 14:43:25 joerg Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD") && \
+.if (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly") && \
     (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc")
 
 .  if !empty(SUSE_PREFER:M9.1)
@@ -17,6 +17,7 @@
 
 .elif ${OPSYS} == "Linux"
 # No Linux emulation is needed
+USE_NATIVE_LINUX=		# empty
 .else
 # we put a value here so that the creation of the bulk
 # build cache files works correctly on non-i386 machines.
diff --git a/emulators/suse_linux/Makefile.common b/emulators/suse_linux/Makefile.common
index f8874a1bb4e..e74ded30822 100644
--- a/emulators/suse_linux/Makefile.common
+++ b/emulators/suse_linux/Makefile.common
@@ -1,8 +1,15 @@
-# $NetBSD: Makefile.common,v 1.21 2005/04/03 21:23:15 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.22 2005/12/12 14:43:25 joerg Exp $
 
 .include "../../emulators/suse_linux/vars.mk"
 .include "../../emulators/suse_linux/arch.mk"
 
+ONLY_FOR_PLATFORM=	NetBSD-1.5Z[C-Z]-i386 NetBSD-1.6*-i386
+ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-i386
+ONLY_FOR_PLATFORM+=	NetBSD-1.6[L-Z]-powerpc NetBSD-1.6Z[A-Z]-powerpc
+ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-powerpc
+ONLY_FOR_PLATFORM+=	FreeBSD-*-i386
+ONLY_FOR_PLATFORM+=	DragonFly-*-i386
+
 MASTER_SITE_SUSE?=	ftp://ftp.suse.com/pub/suse/discontinued/${SUSE_ARCH}/${SUSE_VERSION}/suse/
 #			ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/suse/discontinued/${SUSE_ARCH}/${SUSE_VERSION}/suse/
 #			ftp://gd.tuwien.ac.at/linux/suse.com/suse/discontinued/${SUSE_ARCH}/${SUSE_VERSION}/suse/
diff --git a/emulators/suse_openmotif/Makefile b/emulators/suse_openmotif/Makefile
index c0eb21d22a0..945b1e09074 100644
--- a/emulators/suse_openmotif/Makefile
+++ b/emulators/suse_openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:45 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/12 14:43:25 joerg Exp $
 
 DISTNAME=		openmotif
 PKGNAME=		suse_${DISTNAME}-${SUSE_VERSION}
@@ -12,8 +12,6 @@ COMMENT=		Linux compatibility package for the Motif libraries
 
 DEPENDS+=		suse_x11>=${SUSE_VERSION}:../../emulators/suse_x11
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 NetBSD-*-powerpc FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_slang/Makefile b/emulators/suse_slang/Makefile
index bf454b1fff9..dff6630fcf1 100644
--- a/emulators/suse_slang/Makefile
+++ b/emulators/suse_slang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:12 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/12 14:43:25 joerg Exp $
 
 DISTNAME=		slang
 PKGREVISION=		1
@@ -13,8 +13,6 @@ COMMENT=		Linux compatibility package for slang library
 
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse_base
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 NetBSD-*-powerpc FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_vmware/Makefile b/emulators/suse_vmware/Makefile
index afa7e1b499d..06b95ed22f8 100644
--- a/emulators/suse_vmware/Makefile
+++ b/emulators/suse_vmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:12 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/12 14:43:25 joerg Exp $
 
 DISTNAME=		fileutils-4.1-154.i386
 PKGNAME=		suse_vmware-${SUSE_VERSION}
@@ -13,8 +13,6 @@ COMMENT=		Linux compatibility package to support running VMware
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse_base
 DEPENDS+= 		suse_x11>=${SUSE_VERSION}:../../emulators/suse_x11
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_x11/Makefile b/emulators/suse_x11/Makefile
index ff38982cbf2..d55346e690a 100644
--- a/emulators/suse_x11/Makefile
+++ b/emulators/suse_x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:45 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/12 14:43:25 joerg Exp $
 
 DISTNAME=		suse_x11-${SUSE_VERSION}
 PKGREVISION=		2
@@ -12,8 +12,6 @@ COMMENT=		Linux compatibility package for X11 binaries
 
 DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/suse_base
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 NetBSD-*-powerpc FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_xforms/Makefile b/emulators/suse_xforms/Makefile
index d9e41496f92..d72243b23c0 100644
--- a/emulators/suse_xforms/Makefile
+++ b/emulators/suse_xforms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:45:45 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/12 14:43:25 joerg Exp $
 
 DISTNAME=		xforms
 PKGNAME=		suse_${DISTNAME}-${SUSE_VERSION}
@@ -12,8 +12,6 @@ COMMENT=		Linux compatibility package for xforms binaries
 
 DEPENDS+=		suse_x11>=${SUSE_VERSION}:../../emulators/suse_x11
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 NetBSD-*-powerpc FreeBSD-*-i386
-
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/xyame/Makefile b/emulators/xyame/Makefile
index 64d068d3ca5..79335a165c6 100644
--- a/emulators/xyame/Makefile
+++ b/emulators/xyame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/16 06:57:52 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/12 14:43:25 joerg Exp $
 #
 
 DISTNAME=		xyame038
@@ -10,7 +10,11 @@ MAINTAINER=		wiz@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"
+
+.if !defined(USE_NATIVE_LINUX)
 DEPENDS+=		suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
+.endif
 
 WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
@@ -25,5 +29,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xyame ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/yame.6 ${PREFIX}/man/man6/xyame.6
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/adom/Makefile b/games/adom/Makefile
index 90c692a847e..56d7555230e 100644
--- a/games/adom/Makefile
+++ b/games/adom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/11/10 06:24:49 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/12 14:43:25 joerg Exp $
 #
 
 DISTNAME=	adom-111-elf
@@ -17,9 +17,9 @@ NO_BUILD=	YES
 NO_CONFIGURE=	YES
 CHECK_SHLIBS=	NO
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../emulators/suse_linux/Makefile.application"
 
-.if ${OPSYS} == "NetBSD"
+.if !defined(USE_NATIVE_LINUX)
 DEPENDS+=	suse_base>=6.1:../../emulators/${SUSE_DIR_PREFIX}_base
 .endif
 
@@ -30,5 +30,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.* ${PREFIX}/share/doc/adom
 	${INSTALL_PROGRAM} ${WRKSRC}/adom ${PREFIX}/bin
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/et/Makefile b/games/et/Makefile
index 3fa699212af..2929eec7497 100644
--- a/games/et/Makefile
+++ b/games/et/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:50 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/12 14:43:25 joerg Exp $
 #
 
 DISTNAME=       et-linux-2.56-2.x86
@@ -13,18 +13,17 @@ COMMENT=        Wolfenstein: Enemy Territory for Linux
 
 NO_BUILD=	yes
 USE_PKGINSTALL=	yes
-ONLY_FOR_PLATFORM=	FreeBSD-*-i386 Linux-*-i386
+ONLY_FOR_PLATFORM=	*-*-i386
 
 USE_TOOLS+=	gtar
 ETDIR=		${PREFIX}/lib/lokigames/et
 EXTRACT_CMD=	${TAIL} +356 ${DOWNLOADED_DISTFILE} | ${GTAR} xzf - \
 		-C ${WRKSRC}
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../emulators/suse_linux/Makefile.application"
 
-.if ${OPSYS} != "Linux"
+.if !defined(USE_NATIVE_LINUX)
 DEPENDS+=       suse_base>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base
-.include "../../emulators/suse_linux/Makefile.application"
 .endif
 
 INSTALLATION_DIRS=	bin
diff --git a/games/majesty-demo/Makefile b/games/majesty-demo/Makefile
index 2006677cb98..7b259b3494a 100644
--- a/games/majesty-demo/Makefile
+++ b/games/majesty-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:50 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/12 14:43:25 joerg Exp $
 #
 
 DISTNAME=	majesty_demo
@@ -19,9 +19,13 @@ ONLY_FOR_PLATFORM=*-*-i386
 
 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
 
 BINNAME=	maj_demo
 LGP_PATH=	${PREFIX}/lib/lgp
diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile
index 90f2dc3bc5c..02444941f0a 100644
--- a/games/quake3arena/Makefile
+++ b/games/quake3arena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/15 18:27:51 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/12 14:43:25 joerg Exp $
 
 DISTNAME=	linuxq3apoint-1.32b.x86
 PKGREVISION=	1
@@ -14,14 +14,12 @@ COMMENT=	Quake 3 Arena -- first person shooter (binary only, no data files)
 
 CONFLICTS=	quake3arena-demo-[0-9]*
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../emulators/suse_linux/Makefile.application"
 
-.if ${OPSYS} != Linux
+.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
-.include "../../emulators/suse_linux/Makefile.application"
-.else
 .endif
 
 NO_SRC_ON_FTP=	no
diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common
index 31c573cc3fc..c62e29b6ce7 100644
--- a/lang/sun-jre13/Makefile.common
+++ b/lang/sun-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2005/09/28 19:04:44 rillig Exp $
+# $NetBSD: Makefile.common,v 1.26 2005/12/12 14:43:25 joerg Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 CATEGORIES=	lang java
@@ -39,7 +39,19 @@ PLIST_SRC=	${PKGDIR}/PLIST.Darwin
 NO_MTREE=	yes	# since we change PREFIX
 LDD=		${TRUE}
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386 Linux-*-i[3-6]86 Darwin-*-*
+ONLY_FOR_PLATFORM=	*-*-i386 Darwin-*-*
+
+.if ${OPSYS} != "Darwin"
+.  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
+.endif
 
 _FETCH_MESSAGE= 							\
 	${ECHO} "======================================================================"; \
@@ -80,14 +92,5 @@ do-install:
 	cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME}
 .endif
 
-.if ${OPSYS} == "NetBSD"
-.  include "../../emulators/suse_linux/Makefile.application"
-.  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
-
 .include "../../mk/java-env.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common
index ab3886712d8..d68666e1862 100644
--- a/lang/sun-jre14/Makefile.common
+++ b/lang/sun-jre14/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2005/08/14 10:15:55 dillo Exp $
+# $NetBSD: Makefile.common,v 1.27 2005/12/12 14:43:25 joerg Exp $
 
 CATEGORIES=	lang java
 EXTRACT_SUFX=	.bin
@@ -28,8 +28,17 @@ MESSAGE_SUBST+=	JAVA_HOME="${JAVA_HOME}"
 NO_MTREE=	yes	# since we change PREFIX
 LDD=		${TRUE}
 
-ONLY_FOR_PLATFORM=	NetBSD-1.6[U-Z]*-i386 NetBSD-[2-9]*-i386
-ONLY_FOR_PLATFORM+=	Linux-*-i[3-6]86
+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= 							\
 	${ECHO} "======================================================================"; \
@@ -65,14 +74,5 @@ do-install:
 	${INSTALL_PROGRAM_DIR} ${JAVA_HOME}
 	cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME}
 
-.if ${OPSYS} == "NetBSD"
-.  include "../../emulators/suse_linux/Makefile.application"
-.  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
-
 .include "../../mk/java-env.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre15/Makefile.common b/lang/sun-jre15/Makefile.common
index 40daef074cf..1c0e5f7651b 100644
--- a/lang/sun-jre15/Makefile.common
+++ b/lang/sun-jre15/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/10/27 22:57:27 tv Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/12/12 14:43:25 joerg Exp $
 
 CATEGORIES=	lang java
 COMMENT=	Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
@@ -35,8 +35,16 @@ EXTRACT_ENV.bin+= UNPACK200_FLAGS=-Htrue
 NO_MTREE=	yes	# since we change PREFIX
 LDD=		${TRUE}
 
-ONLY_FOR_PLATFORM=	NetBSD-1.6[U-Z]*-i386 NetBSD-[2-9]*-i386
-ONLY_FOR_PLATFORM+=	Linux-*-i[3-6]86
+.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= 							\
 	${ECHO} "======================================================================"; \
@@ -64,14 +72,5 @@ do-install:
 	${INSTALL_PROGRAM_DIR} ${JAVA_HOME}
 	cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME}
 
-.if ${OPSYS} == "NetBSD"
-.  include "../../emulators/suse_linux/Makefile.application"
-.  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
-
 .include "../../mk/java-env.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index 6caa0970fde..d61d9a274cc 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.43 2005/12/05 22:07:07 rillig Exp $
+# $NetBSD: java-vm.mk,v 1.44 2005/12/12 14:43:26 joerg Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -86,25 +86,26 @@ _PKG_JVM_DEFAULT?=	kaffe
 # These lists are copied from the JVM package Makefiles.
 _ONLY_FOR_PLATFORMS.blackdown-jdk13= \
 	NetBSD-*-i386 NetBSD-*-powerpc NetBSD-*-sparc \
-	Linux-*-i[3-6]86 Linux-*-powerpc Linux-*-sparc
+	Linux-*-i[3-6]86 Linux-*-powerpc Linux-*-sparc \
+	DragonFly-*-i386
 .if !empty(USE_JAVA:M[rR][uU][nN])
 _ONLY_FOR_PLATFORMS.blackdown-jdk13+= \
 	NetBSD-*-arm Linux-*-arm
 .endif
 _ONLY_FOR_PLATFORMS.jdk= \
-	NetBSD-*-i386 Linux-*-i[3-6]86
+	NetBSD-*-i386 Linux-*-i[3-6]86 DragonFly-*-i386
 _ONLY_FOR_PLATFORMS.jdk14= \
-	NetBSD-[2-9].*-i386
+	NetBSD-[2-9].*-i386 DragonFly-*-i386
 _ONLY_FOR_PLATFORMS.kaffe= \
 	*-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k *-*-mips* *-*-sparc *-*-powerpc
 _ONLY_FOR_PLATFORMS.sun-jdk13= \
-	NetBSD-*-i386 Linux-*-i[3-6]86 Darwin-*-*
+	NetBSD-*-i386 Linux-*-i[3-6]86 Darwin-*-* DragonFly-*-i386
 _ONLY_FOR_PLATFORMS.sun-jdk14= \
 	NetBSD-1.5Z[A-Z]-i386 NetBSD-1.[6-9]*-i386 NetBSD-[2-9].*-i386 \
-	Linux-*-i[3-6]86
+	Linux-*-i[3-6]86 DragonFly-*-i386
 _ONLY_FOR_PLATFORMS.sun-jdk15= \
 	NetBSD-1.5Z[A-Z]-i386 NetBSD-1.[6-9]*-i386 NetBSD-[2-9].*-i386 \
-	Linux-*-i[3-6]86
+	Linux-*-i[3-6]86 DragonFly-*-i386
 #_ONLY_FOR_PLATFORMS.win32-jdk= \
 #	Interix-*-*
 
diff --git a/multimedia/RealPlayerGold/Makefile b/multimedia/RealPlayerGold/Makefile
index 34cf8e45a9c..d9ba35f04b4 100644
--- a/multimedia/RealPlayerGold/Makefile
+++ b/multimedia/RealPlayerGold/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/10/04 15:28:25 rpaulo Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/12 14:43:26 joerg Exp $
 #
 
 DISTNAME=		RealPlayer10GOLD
@@ -20,7 +20,7 @@ DIST_SUBDIR=		${PKGNAME_NOREV}
 
 .include "../../emulators/suse_linux/Makefile.application"
 
-.if ${OPSYS} != "Linux"
+.if !defined(USE_NATIVE_LINUX)
 DEPENDS+=		suse_base>=9.1:../../emulators/suse91_base
 DEPENDS+=		suse_fontconfig>=9.1:../../emulators/suse91_fontconfig
 DEPENDS+=		suse_freetype2>=9.1:../../emulators/suse91_freetype2
diff --git a/multimedia/divxplayer/Makefile b/multimedia/divxplayer/Makefile
index 7699705cbad..4e594f95569 100644
--- a/multimedia/divxplayer/Makefile
+++ b/multimedia/divxplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:41 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/12 14:43:26 joerg Exp $
 
 DISTNAME=	divx-player-installer
 PKGNAME=	divxplayer-0.2.0
@@ -9,10 +9,14 @@ 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_linux>=7.3:../../emulators/suse_linux
 DEPENDS+=	suse_x11>=7.3:../../emulators/suse_linux
+.endif
 
-ONLY_FOR_PLATFORM= NetBSD-*-i386
+ONLY_FOR_PLATFORM= *-*-i386
 
 WRKSRC=		${WRKDIR}/divx-player-installer
 CHECK_SHLIBS=	NO
@@ -39,5 +43,4 @@ do-install:
 		${PREFIX}/bin/${BINARY:S/.bin$//}
 
 .include "../../mk/x11.buildlink3.mk"
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index f7fa29acefa..7869028a5b7 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:44 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/12 14:43:26 joerg Exp $
 #
 
 # A default so lintpkgsrc is happy, overridden below
@@ -13,7 +13,8 @@ COMMENT=	Citrix(R) client for the Microsoft Windows Terminal Server
 
 .include "../../mk/bsd.prefs.mk"
 
-ONLY_FOR_PLATFORM=      Linux-*-i[3-6]86 NetBSD-*-i386 NetBSD-*-sparc SunOS-*-sparc
+ONLY_FOR_PLATFORM=      Linux-*-i[3-6]86 NetBSD-*-i386 NetBSD-*-sparc SunOS-*-sparc 
+ONLY_FOR_PLATFORM=	DragonFly-*-i386
 
 .if ${OPSYS} == "NetBSD"
 .  if ${MACHINE_ARCH} == "i386"
@@ -28,13 +29,13 @@ EXTRACT_SUFX=   .tar.Z
 DISTNAME=	solaris
 PKGNAME=	citrix_ica-7.02.78662
 EXTRACT_SUFX=	.tar.Z
-.elif ${OPSYS} == "Linux"
+.elif ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly"
 DISTNAME=	linuxx86
 PKGNAME=	citrix_ica-7.00.77757
 .endif
 
 # see http://www.citrix.com/download/unix-downloads.htm
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
+.if (${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly") && ${MACHINE_ARCH} == "i386"
 DEPENDS+=        suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11
 .endif
 
@@ -89,7 +90,7 @@ do-install:
 		< ${CDIR}/util/icalicense.sh > ${CDIR}/util/icalicense.sh.fixed
 	${MV} ${CDIR}/util/icalicense.sh.fixed ${CDIR}/util/icalicense.sh
 
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
+.if (${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly") && ${MACHINE_ARCH} == "i386"
 .  include "../../emulators/suse_linux/Makefile.application"
 .endif
 
diff --git a/net/edonkey2k/Makefile b/net/edonkey2k/Makefile
index 7d98d440a57..dece9c293a0 100644
--- a/net/edonkey2k/Makefile
+++ b/net/edonkey2k/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/17 03:50:24 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/12 14:43:26 joerg Exp $
 #
 
 DISTNAME=	donkey
@@ -11,11 +11,11 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.edonkey2000.com/
 COMMENT=	Yet another P2P file sharing tool
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386 Linux-*-i386
+ONLY_FOR_PLATFORM=	*-*-i386
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../emulators/suse_linux/Makefile.application"
 
-.if ${OPSYS} == "NetBSD"
+.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
diff --git a/net/overnet/Makefile b/net/overnet/Makefile
index 3e678fd5e2a..aca711ee95c 100644
--- a/net/overnet/Makefile
+++ b/net/overnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/09/28 20:52:24 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/12 14:43:26 joerg Exp $
 #
 
 DISTNAME=	overnetclc-1.0.1
@@ -22,14 +22,14 @@ CHECK_SHLIBS=	no
 
 EVAL_PREFIX=	RPM2PKGDIR=rpm2pkg
 
-ONLY_FOR_PLATFORM=	Linux-*-i[3-6]86 NetBSD-*-i386
-
-.include "../../mk/bsd.prefs.mk"
+.include "../../emulators/suse_linux/Makefile.application"
 
-.if ${OPSYS} != "Linux"
+.if !defined(USE_NATIVE_LINUX)
 DEPENDS+=	suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat
 .endif
 
+ONLY_FOR_PLATFORM=	*-*-i386
+
 INSTALLATION_DIRS=	bin
 
 do-extract:
@@ -47,5 +47,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/usr/share/overnetclc/contact.dat	\
 		${PREFIX}/share/overnetclc
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/skype/Makefile b/net/skype/Makefile
index be78c2e56c6..ac497294a24 100644
--- a/net/skype/Makefile
+++ b/net/skype/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:49 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/12 14:43:26 joerg Exp $
 #
 
 DISTNAME=		skype_staticQT-1.2.0.18
@@ -11,15 +11,14 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.skype.com/
 COMMENT=		P2P VoIP software
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../emulators/suse_linux/Makefile.application"
 
-.if ${OPSYS} != "Linux"
+.if !defined(USE_NATIVE_LINUX)
 DEPENDS+=	suse_base>=9.1:../../emulators/suse91_base
 DEPENDS+=	suse_glx>=9.1:../../emulators/suse91_glx
 DEPENDS+=	suse_fontconfig>=9.1:../../emulators/suse91_fontconfig
 DEPENDS+=	suse_freetype2>=9.1:../../emulators/suse91_freetype2
 DEPENDS+=	suse_x11>=9.1:../../emulators/suse91_x11
-.include "../../emulators/suse_linux/Makefile.application"
 .else
 .include "../../mk/x11.buildlink3.mk"
 .endif
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index 18aeb4db9a4..1dbb4af2e0a 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/12/03 20:18:52 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/12 14:43:26 joerg Exp $
 
 DISTNAME=		vlnx424e
 PKGNAME=		uvscan-4.24.1
@@ -12,9 +12,13 @@ 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=	NetBSD-*-i386
+ONLY_FOR_PLATFORM=	*-*-i386
 CHECK_SHLIBS=		NO
 
 WRKSRC=			${WRKDIR}
@@ -78,5 +82,4 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR};		\
 	done
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/storage-manager/Makefile b/sysutils/storage-manager/Makefile
index 67bf0cafca3..bae8493dc90 100644
--- a/sysutils/storage-manager/Makefile
+++ b/sysutils/storage-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/09/28 20:52:27 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/12 14:43:26 joerg Exp $
 
 DISTNAME=		sm_linux_v314_install
 PKGNAME=		storage-manager-3.14
@@ -11,10 +11,15 @@ 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=	NetBSD-*-i386
+ONLY_FOR_PLATFORM=	*-*-i386
 
 RESTRICTED=		"Redistribution not permitted"
 NO_SRC_ON_FTP=		${RESTRICTED}
@@ -87,5 +92,4 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/dpteng ${PREFIX}/etc/rc.d/dpteng
 	${INSTALL_SCRIPT} ${WRKDIR}/dptelog ${PREFIX}/etc/rc.d/dptelog
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/asWedit/Makefile b/www/asWedit/Makefile
index c6c356ae46b..5c41b15a052 100644
--- a/www/asWedit/Makefile
+++ b/www/asWedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/17 03:50:40 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/12 14:43:26 joerg Exp $
 
 DISTNAME=		${PKGNAME}-i386.linux
 PKGNAME=		asWedit-4.0.1
@@ -10,9 +10,13 @@ MAINTAINER=		tech-pkg@NetBSD.org
 #HOMEPAGE=		http://www.advasoft.com/asWedit.html
 COMMENT=		Motif HTML and text editor
 
+.include "../../emulators/suse_linux/Makefile.application"
+
+.if !defined(USE_NATIVE_LINUX)
 DEPENDS+=		suse_libc5>=7.3nb1:../../emulators/suse_libc5
+.endif
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
+ONLY_FOR_PLATFORM=	*-*-i386
 
 RESTRICTED=		"No re-distribution"
 NO_SRC_ON_FTP=		${RESTRICTED}
@@ -42,5 +46,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${docs} ${PREFIX}/share/doc/asWedit
 .endfor
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"