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, 18 insertions, 19 deletions

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