From 1f6a39a84e10fec37df3728c67f6821cc88e7231 Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 12 Dec 2005 14:43:23 +0000 Subject: 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. --- archivers/rar-linux/Makefile | 10 ++++------ archivers/stuffit/Makefile | 9 ++++----- archivers/unace22/Makefile | 9 ++++----- 3 files changed, 12 insertions(+), 16 deletions(-) (limited to 'archivers') 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 -- cgit v1.2.3