pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc First step at reworking Linux binary packages.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/20badee9a47d
branches:  trunk
changeset: 504508:20badee9a47d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Dec 12 14:43:23 2005 +0000

description:
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.

diffstat:

 archivers/rar-linux/Makefile              |  10 ++++------
 archivers/stuffit/Makefile                |   9 ++++-----
 archivers/unace22/Makefile                |   9 ++++-----
 cad/eagle/Makefile                        |   9 ++++-----
 chat/aim/Makefile                         |  16 ++++++++++------
 chat/ymessenger/Makefile                  |  14 ++++++++------
 emulators/m1/Makefile                     |   7 +++++--
 emulators/ski/Makefile                    |   7 +++----
 emulators/suse91_aspell/Makefile          |  15 +++++++++------
 emulators/suse91_base/Makefile            |   4 +---
 emulators/suse91_compat/Makefile          |   4 +---
 emulators/suse91_expat/Makefile           |   4 +---
 emulators/suse91_fontconfig/Makefile      |   4 +---
 emulators/suse91_freetype2/Makefile       |   4 +---
 emulators/suse91_glx/Makefile             |   4 +---
 emulators/suse91_gtk/Makefile             |   4 +---
 emulators/suse91_gtk2/Makefile            |   4 +---
 emulators/suse91_libjpeg/Makefile         |   4 +---
 emulators/suse91_libpng/Makefile          |   6 +-----
 emulators/suse91_libtiff/Makefile         |   4 +---
 emulators/suse91_linux/Makefile.common    |   6 +++++-
 emulators/suse91_locale/Makefile          |   4 +---
 emulators/suse91_openmotif/Makefile       |   4 +---
 emulators/suse91_slang/Makefile           |   4 +---
 emulators/suse91_vmware/Makefile          |   4 +---
 emulators/suse91_x11/Makefile             |   5 +----
 emulators/suse_audio/Makefile             |   4 +---
 emulators/suse_base/Makefile              |   7 +------
 emulators/suse_compat/Makefile            |   4 +---
 emulators/suse_devel/Makefile             |   4 +---
 emulators/suse_fileutils/Makefile         |   4 +---
 emulators/suse_freetype2/Makefile         |   4 +---
 emulators/suse_glx/Makefile               |   4 +---
 emulators/suse_gtk/Makefile               |   4 +---
 emulators/suse_libc5/Makefile             |   4 +---
 emulators/suse_libjpeg/Makefile           |   4 +---
 emulators/suse_libpng/Makefile            |   4 +---
 emulators/suse_libtiff/Makefile           |   4 +---
 emulators/suse_linux/Makefile             |   4 ++--
 emulators/suse_linux/Makefile.application |   5 +++--
 emulators/suse_linux/Makefile.common      |   9 ++++++++-
 emulators/suse_openmotif/Makefile         |   4 +---
 emulators/suse_slang/Makefile             |   4 +---
 emulators/suse_vmware/Makefile            |   4 +---
 emulators/suse_x11/Makefile               |   4 +---
 emulators/suse_xforms/Makefile            |   4 +---
 emulators/xyame/Makefile                  |   7 +++++--
 games/adom/Makefile                       |   7 +++----
 games/et/Makefile                         |   9 ++++-----
 games/majesty-demo/Makefile               |   6 +++++-
 games/quake3arena/Makefile                |   8 +++-----
 lang/sun-jre13/Makefile.common            |  25 ++++++++++++++-----------
 lang/sun-jre14/Makefile.common            |  24 ++++++++++++------------
 lang/sun-jre15/Makefile.common            |  23 +++++++++++------------
 mk/java-vm.mk                             |  15 ++++++++-------
 multimedia/RealPlayerGold/Makefile        |   4 ++--
 multimedia/divxplayer/Makefile            |   9 ++++++---
 net/citrix_ica/Makefile                   |  11 ++++++-----
 net/edonkey2k/Makefile                    |   8 ++++----
 net/overnet/Makefile                      |  11 +++++------
 net/skype/Makefile                        |   7 +++----
 security/uvscan/Makefile                  |  11 +++++++----
 sysutils/storage-manager/Makefile         |  10 +++++++---
 www/asWedit/Makefile                      |  11 +++++++----
 64 files changed, 214 insertions(+), 250 deletions(-)

diffs (truncated from 1564 to 300 lines):

diff -r 4ab532badba6 -r 20badee9a47d archivers/rar-linux/Makefile
--- a/archivers/rar-linux/Makefile      Mon Dec 12 14:03:20 2005 +0000
+++ b/archivers/rar-linux/Makefile      Mon Dec 12 14:43:23 2005 +0000
@@ -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 @@
 
 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 @@
        ${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 -r 4ab532badba6 -r 20badee9a47d archivers/stuffit/Makefile
--- a/archivers/stuffit/Makefile        Mon Dec 12 14:03:20 2005 +0000
+++ b/archivers/stuffit/Makefile        Mon Dec 12 14:43:23 2005 +0000
@@ -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 @@
 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_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 @@
        ${INSTALL_DATA} ${WRKSRC}/doc/unstuff/* \
                ${PREFIX}/share/doc/stuffit/unstuff/
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff -r 4ab532badba6 -r 20badee9a47d archivers/unace22/Makefile
--- a/archivers/unace22/Makefile        Mon Dec 12 14:03:20 2005 +0000
+++ b/archivers/unace22/Makefile        Mon Dec 12 14:43:23 2005 +0000
@@ -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 @@
 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 -r 4ab532badba6 -r 20badee9a47d cad/eagle/Makefile
--- a/cad/eagle/Makefile        Mon Dec 12 14:03:20 2005 +0000
+++ b/cad/eagle/Makefile        Mon Dec 12 14:43:23 2005 +0000
@@ -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 @@
 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 @@
        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 -r 4ab532badba6 -r 20badee9a47d chat/aim/Makefile
--- a/chat/aim/Makefile Mon Dec 12 14:03:20 2005 +0000
+++ b/chat/aim/Makefile Mon Dec 12 14:43:23 2005 +0000
@@ -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@localhost
 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 @@
 PLIST_SRC=     ${WRKDIR}/PLIST.rpm
 PLIST_SUBST+=  EMULSUBDIR=${EMULSUBDIR:Q}
 
-DIST_SUBDIR=   .
-RPMFILES=      ${DISTFILES}
-
 INSTALLATION_DIRS=     bin
 
 do-install:
@@ -36,5 +41,4 @@
                -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 -r 4ab532badba6 -r 20badee9a47d chat/ymessenger/Makefile
--- a/chat/ymessenger/Makefile  Mon Dec 12 14:03:20 2005 +0000
+++ b/chat/ymessenger/Makefile  Mon Dec 12 14:43:23 2005 +0000
@@ -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 @@
 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 @@
 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 -r 4ab532badba6 -r 20badee9a47d emulators/m1/Makefile
--- a/emulators/m1/Makefile     Mon Dec 12 14:03:20 2005 +0000
+++ b/emulators/m1/Makefile     Mon Dec 12 14:43:23 2005 +0000
@@ -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 @@
 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 @@
        ${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 -r 4ab532badba6 -r 20badee9a47d emulators/ski/Makefile
--- a/emulators/ski/Makefile    Mon Dec 12 14:03:20 2005 +0000
+++ b/emulators/ski/Makefile    Mon Dec 12 14:43:23 2005 +0000
@@ -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 @@
 
 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 @@
        ${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 -r 4ab532badba6 -r 20badee9a47d emulators/suse91_aspell/Makefile
--- a/emulators/suse91_aspell/Makefile  Mon Dec 12 14:03:20 2005 +0000
+++ b/emulators/suse91_aspell/Makefile  Mon Dec 12 14:43:23 2005 +0000
@@ -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 @@
 HOMEPAGE=              http://www.suse.com/
 COMMENT=               Linux compatibility package for Aspell library
 
-DEPENDS+=              suse_base>=${SUSE_VERSION}:../../emulators/suse91_base
+RPMFILES=              aspell-0.50.5-38.4.${SUSE_ARCH}.rpm
+
+.include "../../emulators/suse_linux/Makefile.application"
 
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
+.if !defined(USE_NATIVE_LINUX)
+DEPENDS+=              suse_base>=${SUSE_VERSION}:../../emulators/suse91_base
+.endif
+
+ONLY_FOR_PLATFORM=      *-*-i386
 
 EXTRACT_ONLY=          # empty



Home | Main Index | Thread Index | Old Index