Subject: Preliminary patch for Linux emulation
To: None <tech-pkg@netbsd.org>
From: None <joerg@britannica.bec.de>
List: tech-pkg
Date: 12/09/2005 21:15:09
--EeQfGwPcQSOJBaQU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi all,
attached is a preliminary patch to rework the OS handling in the Linux
packages. It does change the platform list in some cases, which needs
review. Esp. the x86_64 and ppc would need testing.
But before I invest more time, I'd ask whether this is considered a good
idea and improvement or not. One thing about the use of USE_NATIVE_LINUX
vs. OPSYS matching. At least under FreeBSD and DragonFly it is possible
to chroot and jail a Linux root, so allowing direct dependencies can be
a bit nicer instead of having to fake uname.
Joerg
--EeQfGwPcQSOJBaQU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="pkgsrc-linux.diff"
Index: archivers/rar-linux/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/archivers/rar-linux/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- archivers/rar-linux/Makefile 30 Oct 2005 13:10:38 -0000 1.12
+++ archivers/rar-linux/Makefile 9 Dec 2005 17:09:24 -0000
@@ -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"
Index: archivers/stuffit/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/archivers/stuffit/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- archivers/stuffit/Makefile 9 Oct 2005 18:35:25 -0000 1.21
+++ archivers/stuffit/Makefile 9 Dec 2005 17:09:24 -0000
@@ -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"
Index: archivers/unace22/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/archivers/unace22/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- archivers/unace22/Makefile 16 Jun 2005 06:57:37 -0000 1.11
+++ archivers/unace22/Makefile 9 Dec 2005 17:09:24 -0000
@@ -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
Index: cad/eagle/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/cad/eagle/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- cad/eagle/Makefile 16 Jun 2005 06:57:41 -0000 1.13
+++ cad/eagle/Makefile 9 Dec 2005 17:09:24 -0000
@@ -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"
Index: chat/aim/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/aim/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- chat/aim/Makefile 5 Dec 2005 20:49:52 -0000 1.10
+++ chat/aim/Makefile 9 Dec 2005 17:09:25 -0000
@@ -10,12 +10,17 @@
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
@@ -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"
Index: chat/ymessenger/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/ymessenger/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- chat/ymessenger/Makefile 5 Dec 2005 20:49:54 -0000 1.9
+++ chat/ymessenger/Makefile 9 Dec 2005 17:09:25 -0000
@@ -9,11 +9,14 @@
HOMEPAGE= http://messenger.yahoo.com/
COMMENT= Yahoo! instant messaging client
+.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
@@ -35,5 +38,4 @@
post-install:
${LN} -fs ../${EMULSUBDIR}/usr/local/bin/ymessenger ${PREFIX}/bin
-.include "../../emulators/suse_linux/Makefile.application"
.include "../../mk/bsd.pkg.mk"
Index: emulators/m1/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/m1/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emulators/m1/Makefile 28 Sep 2005 20:52:20 -0000 1.3
+++ emulators/m1/Makefile 9 Dec 2005 17:09:27 -0000
@@ -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"
Index: emulators/ski/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/ski/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- emulators/ski/Makefile 5 Oct 2005 11:58:50 -0000 1.1.1.1
+++ emulators/ski/Makefile 9 Dec 2005 17:09:27 -0000
@@ -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"
Index: emulators/suse91_aspell/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_aspell/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- emulators/suse91_aspell/Makefile 6 Nov 2005 14:52:43 -0000 1.4
+++ emulators/suse91_aspell/Makefile 9 Dec 2005 17:09:27 -0000
@@ -10,9 +10,13 @@
HOMEPAGE= http://www.suse.com/
COMMENT= Linux compatibility package for Aspell library
+.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
@@ -20,5 +24,4 @@
RPMFILES= aspell-0.50.5-38.4.${SUSE_ARCH}.rpm
-.include "../../emulators/suse91_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
Index: emulators/suse91_base/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_base/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- emulators/suse91_base/Makefile 5 Dec 2005 20:50:12 -0000 1.17
+++ emulators/suse91_base/Makefile 9 Dec 2005 17:09:27 -0000
@@ -11,8 +11,6 @@
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
Index: emulators/suse91_compat/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_compat/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- emulators/suse91_compat/Makefile 11 Apr 2005 21:45:44 -0000 1.5
+++ emulators/suse91_compat/Makefile 9 Dec 2005 17:09:27 -0000
@@ -11,8 +11,6 @@
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
Index: emulators/suse91_expat/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_expat/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emulators/suse91_expat/Makefile 11 Apr 2005 21:45:44 -0000 1.3
+++ emulators/suse91_expat/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,8 +12,6 @@
DEPENDS+= suse_base>=${SUSE_VERSION}:../../emulators/suse91_base
-ONLY_FOR_PLATFORM= NetBSD-*-i386 FreeBSD-*-i386
-
EXTRACT_ONLY= # empty
NO_BUILD= YES
LIBTOOLIZE_PLIST= NO
Index: emulators/suse91_fontconfig/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_fontconfig/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- emulators/suse91_fontconfig/Makefile 11 Apr 2005 21:45:44 -0000 1.2
+++ emulators/suse91_fontconfig/Makefile 9 Dec 2005 17:09:27 -0000
@@ -11,8 +11,6 @@
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
Index: emulators/suse91_freetype2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_freetype2/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emulators/suse91_freetype2/Makefile 6 Nov 2005 14:52:44 -0000 1.3
+++ emulators/suse91_freetype2/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,8 +12,6 @@
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
Index: emulators/suse91_glx/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_glx/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- emulators/suse91_glx/Makefile 5 Dec 2005 20:50:12 -0000 1.4
+++ emulators/suse91_glx/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,8 +12,6 @@
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
Index: emulators/suse91_gtk/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_gtk/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emulators/suse91_gtk/Makefile 28 Sep 2005 14:31:06 -0000 1.3
+++ emulators/suse91_gtk/Makefile 9 Dec 2005 17:09:27 -0000
@@ -11,8 +11,6 @@
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
Index: emulators/suse91_gtk2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_gtk2/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- emulators/suse91_gtk2/Makefile 5 Dec 2005 20:50:12 -0000 1.10
+++ emulators/suse91_gtk2/Makefile 9 Dec 2005 17:09:27 -0000
@@ -17,8 +17,6 @@
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
Index: emulators/suse91_libjpeg/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_libjpeg/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- emulators/suse91_libjpeg/Makefile 11 Apr 2005 21:45:44 -0000 1.4
+++ emulators/suse91_libjpeg/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,8 +12,6 @@
DEPENDS+= suse_base>=${SUSE_VERSION}:../../emulators/suse91_base
-ONLY_FOR_PLATFORM= NetBSD-*-i386 FreeBSD-*-i386
-
EXTRACT_ONLY= # empty
NO_BUILD= YES
LIBTOOLIZE_PLIST= NO
Index: emulators/suse91_libpng/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_libpng/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- emulators/suse91_libpng/Makefile 6 Nov 2005 14:52:44 -0000 1.5
+++ emulators/suse91_libpng/Makefile 9 Dec 2005 17:09:27 -0000
@@ -10,10 +10,6 @@
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
Index: emulators/suse91_libtiff/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_libtiff/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- emulators/suse91_libtiff/Makefile 6 Nov 2005 14:52:44 -0000 1.4
+++ emulators/suse91_libtiff/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,8 +12,6 @@
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
Index: emulators/suse91_linux/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_linux/Makefile.common,v
retrieving revision 1.12
diff -u -r1.12 Makefile.common
--- emulators/suse91_linux/Makefile.common 3 Apr 2005 21:23:15 -0000 1.12
+++ emulators/suse91_linux/Makefile.common 9 Dec 2005 17:09:27 -0000
@@ -3,6 +3,10 @@
.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}/
Index: emulators/suse91_locale/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_locale/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- emulators/suse91_locale/Makefile 11 Apr 2005 21:45:45 -0000 1.2
+++ emulators/suse91_locale/Makefile 9 Dec 2005 17:09:27 -0000
@@ -13,8 +13,6 @@
CONFLICTS= linux-locale-[0-9]*
-ONLY_FOR_PLATFORM= NetBSD-*-i386 FreeBSD-*-i386
-
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
Index: emulators/suse91_openmotif/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_openmotif/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- emulators/suse91_openmotif/Makefile 6 Nov 2005 14:52:44 -0000 1.5
+++ emulators/suse91_openmotif/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,8 +12,6 @@
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
Index: emulators/suse91_slang/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_slang/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- emulators/suse91_slang/Makefile 5 Dec 2005 20:50:12 -0000 1.4
+++ emulators/suse91_slang/Makefile 9 Dec 2005 17:09:27 -0000
@@ -11,8 +11,6 @@
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
Index: emulators/suse91_vmware/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_vmware/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emulators/suse91_vmware/Makefile 5 Dec 2005 20:50:12 -0000 1.3
+++ emulators/suse91_vmware/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,8 +12,6 @@
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
Index: emulators/suse91_x11/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_x11/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- emulators/suse91_x11/Makefile 6 Nov 2005 14:52:44 -0000 1.6
+++ emulators/suse91_x11/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,9 +12,6 @@
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
Index: emulators/suse_audio/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_audio/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- emulators/suse_audio/Makefile 11 Apr 2005 21:45:45 -0000 1.14
+++ emulators/suse_audio/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,8 +12,6 @@
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
Index: emulators/suse_base/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_base/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- emulators/suse_base/Makefile 16 Aug 2005 00:30:41 -0000 1.55
+++ emulators/suse_base/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,11 +12,6 @@
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
Index: emulators/suse_compat/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_compat/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- emulators/suse_compat/Makefile 11 Apr 2005 21:45:45 -0000 1.22
+++ emulators/suse_compat/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,8 +12,6 @@
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
Index: emulators/suse_devel/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_devel/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- emulators/suse_devel/Makefile 5 Dec 2005 20:50:12 -0000 1.24
+++ emulators/suse_devel/Makefile 9 Dec 2005 17:09:27 -0000
@@ -15,8 +15,6 @@
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
Index: emulators/suse_fileutils/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_fileutils/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emulators/suse_fileutils/Makefile 5 Dec 2005 20:50:12 -0000 1.3
+++ emulators/suse_fileutils/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,8 +12,6 @@
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
Index: emulators/suse_freetype2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_freetype2/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- emulators/suse_freetype2/Makefile 5 Dec 2005 20:50:12 -0000 1.10
+++ emulators/suse_freetype2/Makefile 9 Dec 2005 17:09:27 -0000
@@ -14,8 +14,6 @@
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
Index: emulators/suse_glx/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_glx/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- emulators/suse_glx/Makefile 11 Apr 2005 21:45:45 -0000 1.17
+++ emulators/suse_glx/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,8 +12,6 @@
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
Index: emulators/suse_gtk/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_gtk/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- emulators/suse_gtk/Makefile 11 Apr 2005 21:45:45 -0000 1.15
+++ emulators/suse_gtk/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,8 +12,6 @@
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
Index: emulators/suse_libc5/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_libc5/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- emulators/suse_libc5/Makefile 11 Apr 2005 21:45:45 -0000 1.29
+++ emulators/suse_libc5/Makefile 9 Dec 2005 17:09:27 -0000
@@ -13,8 +13,6 @@
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
Index: emulators/suse_libjpeg/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_libjpeg/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- emulators/suse_libjpeg/Makefile 11 Apr 2005 21:45:45 -0000 1.17
+++ emulators/suse_libjpeg/Makefile 9 Dec 2005 17:09:27 -0000
@@ -13,8 +13,6 @@
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
Index: emulators/suse_libpng/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_libpng/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- emulators/suse_libpng/Makefile 11 Apr 2005 21:45:45 -0000 1.17
+++ emulators/suse_libpng/Makefile 9 Dec 2005 17:09:27 -0000
@@ -14,8 +14,6 @@
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
Index: emulators/suse_libtiff/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_libtiff/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- emulators/suse_libtiff/Makefile 11 Apr 2005 21:45:45 -0000 1.7
+++ emulators/suse_libtiff/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,8 +12,6 @@
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
Index: emulators/suse_linux/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_linux/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- emulators/suse_linux/Makefile 19 Jul 2005 10:23:42 -0000 1.29
+++ emulators/suse_linux/Makefile 9 Dec 2005 17:09:27 -0000
@@ -24,7 +24,7 @@
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
Index: emulators/suse_linux/Makefile.application
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_linux/Makefile.application,v
retrieving revision 1.16
diff -u -r1.16 Makefile.application
--- emulators/suse_linux/Makefile.application 28 Apr 2005 22:33:36 -0000 1.16
+++ emulators/suse_linux/Makefile.application 9 Dec 2005 17:09:27 -0000
@@ -2,7 +2,7 @@
.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.
Index: emulators/suse_linux/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_linux/Makefile.common,v
retrieving revision 1.21
diff -u -r1.21 Makefile.common
--- emulators/suse_linux/Makefile.common 3 Apr 2005 21:23:15 -0000 1.21
+++ emulators/suse_linux/Makefile.common 9 Dec 2005 17:09:27 -0000
@@ -3,6 +3,13 @@
.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/
Index: emulators/suse_openmotif/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_openmotif/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- emulators/suse_openmotif/Makefile 11 Apr 2005 21:45:45 -0000 1.10
+++ emulators/suse_openmotif/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,8 +12,6 @@
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
Index: emulators/suse_slang/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_slang/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- emulators/suse_slang/Makefile 5 Dec 2005 20:50:12 -0000 1.10
+++ emulators/suse_slang/Makefile 9 Dec 2005 17:09:27 -0000
@@ -13,8 +13,6 @@
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
Index: emulators/suse_vmware/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_vmware/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- emulators/suse_vmware/Makefile 5 Dec 2005 20:50:12 -0000 1.14
+++ emulators/suse_vmware/Makefile 9 Dec 2005 17:09:27 -0000
@@ -13,8 +13,6 @@
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
Index: emulators/suse_x11/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_x11/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- emulators/suse_x11/Makefile 11 Apr 2005 21:45:45 -0000 1.28
+++ emulators/suse_x11/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,8 +12,6 @@
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
Index: emulators/suse_xforms/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_xforms/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- emulators/suse_xforms/Makefile 11 Apr 2005 21:45:45 -0000 1.20
+++ emulators/suse_xforms/Makefile 9 Dec 2005 17:09:27 -0000
@@ -12,8 +12,6 @@
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
Index: emulators/xyame/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/xyame/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emulators/xyame/Makefile 16 Jun 2005 06:57:52 -0000 1.3
+++ emulators/xyame/Makefile 9 Dec 2005 17:09:27 -0000
@@ -10,7 +10,11 @@
#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 @@
${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"
Index: games/adom/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/adom/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- games/adom/Makefile 10 Nov 2005 06:24:49 -0000 1.8
+++ games/adom/Makefile 9 Dec 2005 17:09:28 -0000
@@ -17,9 +17,9 @@
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 @@
${INSTALL_DATA} ${WRKSRC}/*.* ${PREFIX}/share/doc/adom
${INSTALL_PROGRAM} ${WRKSRC}/adom ${PREFIX}/bin
-.include "../../emulators/suse_linux/Makefile.application"
.include "../../mk/bsd.pkg.mk"
Index: games/et/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/et/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- games/et/Makefile 15 Jul 2005 18:27:50 -0000 1.6
+++ games/et/Makefile 9 Dec 2005 17:09:28 -0000
@@ -13,18 +13,17 @@
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
Index: games/majesty-demo/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/majesty-demo/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- games/majesty-demo/Makefile 15 Jul 2005 18:27:50 -0000 1.7
+++ games/majesty-demo/Makefile 9 Dec 2005 17:09:28 -0000
@@ -19,9 +19,13 @@
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
Index: games/quake3arena/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/quake3arena/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- games/quake3arena/Makefile 15 Jul 2005 18:27:51 -0000 1.23
+++ games/quake3arena/Makefile 9 Dec 2005 17:09:28 -0000
@@ -14,14 +14,12 @@
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
Index: mk/java-vm.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/java-vm.mk,v
retrieving revision 1.43
diff -u -r1.43 java-vm.mk
--- mk/java-vm.mk 5 Dec 2005 22:07:07 -0000 1.43
+++ mk/java-vm.mk 9 Dec 2005 17:09:37 -0000
@@ -86,25 +86,26 @@
# 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-*-*
Index: multimedia/RealPlayerGold/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/RealPlayerGold/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- multimedia/RealPlayerGold/Makefile 4 Oct 2005 15:28:25 -0000 1.7
+++ multimedia/RealPlayerGold/Makefile 9 Dec 2005 17:09:37 -0000
@@ -20,7 +20,7 @@
.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
Index: multimedia/divxplayer/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/divxplayer/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- multimedia/divxplayer/Makefile 5 Dec 2005 20:50:41 -0000 1.5
+++ multimedia/divxplayer/Makefile 9 Dec 2005 17:09:37 -0000
@@ -9,10 +9,14 @@
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 @@
${PREFIX}/bin/${BINARY:S/.bin$//}
.include "../../mk/x11.buildlink3.mk"
-.include "../../emulators/suse_linux/Makefile.application"
.include "../../mk/bsd.pkg.mk"
Index: net/citrix_ica/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/citrix_ica/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- net/citrix_ica/Makefile 5 Dec 2005 20:50:44 -0000 1.24
+++ net/citrix_ica/Makefile 9 Dec 2005 17:09:38 -0000
@@ -13,7 +13,8 @@
.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 @@
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 @@
< ${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
Index: net/edonkey2k/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/edonkey2k/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- net/edonkey2k/Makefile 17 Jun 2005 03:50:24 -0000 1.11
+++ net/edonkey2k/Makefile 9 Dec 2005 17:09:38 -0000
@@ -11,11 +11,11 @@
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
Index: net/overnet/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/overnet/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- net/overnet/Makefile 28 Sep 2005 20:52:24 -0000 1.9
+++ net/overnet/Makefile 9 Dec 2005 17:09:38 -0000
@@ -22,14 +22,14 @@
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 @@
${INSTALL_DATA} ${WRKSRC}/usr/share/overnetclc/contact.dat \
${PREFIX}/share/overnetclc
-.include "../../emulators/suse_linux/Makefile.application"
.include "../../mk/bsd.pkg.mk"
Index: net/skype/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/skype/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- net/skype/Makefile 5 Dec 2005 20:50:49 -0000 1.11
+++ net/skype/Makefile 9 Dec 2005 17:09:38 -0000
@@ -11,15 +11,14 @@
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
Index: security/uvscan/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/uvscan/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- security/uvscan/Makefile 3 Dec 2005 20:18:52 -0000 1.29
+++ security/uvscan/Makefile 9 Dec 2005 17:09:43 -0000
@@ -12,9 +12,13 @@
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 @@
${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}; \
done
-.include "../../emulators/suse_linux/Makefile.application"
.include "../../mk/bsd.pkg.mk"
Index: www/asWedit/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/asWedit/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- www/asWedit/Makefile 17 Jun 2005 03:50:40 -0000 1.16
+++ www/asWedit/Makefile 9 Dec 2005 17:09:45 -0000
@@ -10,9 +10,13 @@
#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 @@
${INSTALL_DATA} ${WRKSRC}/${docs} ${PREFIX}/share/doc/asWedit
.endfor
-.include "../../emulators/suse_linux/Makefile.application"
.include "../../mk/bsd.pkg.mk"
--EeQfGwPcQSOJBaQU--