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.

4 files changed, 15 insertions, 15 deletions

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