From b4af0c8ab01cdac01c252f4f64fc9e78c5f6d36d Mon Sep 17 00:00:00 2001 From: sturm Date: Thu, 19 Oct 2006 00:15:36 +0000 Subject: [PATCH] switch to fedora_base --- emulators/ines/Makefile | 6 +++--- emulators/mastergear/Makefile | 6 +++--- emulators/redhat/libc5/Makefile | 8 ++++++-- emulators/redhat/libc5/pkg/PLIST | 5 ++--- emulators/snes9x/Makefile | 6 +++--- emulators/vgb/Makefile | 6 +++--- emulators/vmware/3/Makefile | 8 ++++---- emulators/vmware/3/systrace.policy | 3 ++- games/adom/Makefile | 6 +++--- www/opera-flashplugin/Makefile | 6 +++--- www/opera/Makefile | 6 +++--- 11 files changed, 35 insertions(+), 31 deletions(-) diff --git a/emulators/ines/Makefile b/emulators/ines/Makefile index 46be5df6188..a7ed3c1450e 100644 --- a/emulators/ines/Makefile +++ b/emulators/ines/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.7 2005/11/09 20:09:56 fgsch Exp $ +# $OpenBSD: Makefile,v 1.8 2006/10/19 00:15:36 sturm Exp $ ONLY_FOR_ARCHS= i386 COMMENT= "emulates the Nintendo Entertainment System" -PKGNAME= ines-1.2 +PKGNAME= ines-1.2p0 DISTNAME= iNES12-Linux-80x86-bin CATEGORIES= emulators games @@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE} EXTRACT_SUFX= .tar.Z -RUN_DEPENDS= :redhat_base-*:emulators/redhat/base +RUN_DEPENDS= ::emulators/fedora/base USE_X11= Yes NO_BUILD= Yes diff --git a/emulators/mastergear/Makefile b/emulators/mastergear/Makefile index 9b1ef4ae2b1..d2f31b57308 100644 --- a/emulators/mastergear/Makefile +++ b/emulators/mastergear/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.7 2005/11/09 20:09:56 fgsch Exp $ +# $OpenBSD: Makefile,v 1.8 2006/10/19 00:15:36 sturm Exp $ ONLY_FOR_ARCHS= i386 COMMENT= "emulates the Sega GameGear and MasterSystem" -PKGNAME= mastergear-1.4 +PKGNAME= mastergear-1.4p0 DISTNAME= MG14-Linux-80x86-bin CATEGORIES= emulators games @@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE} EXTRACT_SUFX= .tar.Z -RUN_DEPENDS= :redhat_base-*:emulators/redhat/base +RUN_DEPENDS= ::emulators/fedora/base USE_X11= Yes NO_BUILD= Yes diff --git a/emulators/redhat/libc5/Makefile b/emulators/redhat/libc5/Makefile index 234258aead4..4042985f07e 100644 --- a/emulators/redhat/libc5/Makefile +++ b/emulators/redhat/libc5/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.2 2005/11/02 01:20:18 bernd Exp $ +# $OpenBSD: Makefile,v 1.3 2006/10/19 00:17:40 sturm Exp $ COMMENT= "Linux libc5" -PKGNAME= redhat_libc5-6.2p0 +PKGNAME= redhat_libc5-6.2p1 MASTER_SITES= ${MASTER_SITE_REDHAT:=redhat/linux/6.2/en/os/i386/RedHat/RPMS/} MASTER_SITES0= ${MASTER_SITE_REDHAT:=redhat/linux/updates/6.2/en/os/i386/} @@ -14,9 +14,13 @@ RPMDIR= ${FULLDISTDIR} RPMS= libc-5.3.12-31.i386.rpm \ ld.so-1.9.5-13.i386.rpm +RUN_DEPENDS= ::emulators/fedora/base + NO_BUILD= Yes NO_REGRESS= Yes +PREFIX= ${LOCALBASE}/emul/fedora + pre-install: @${INSTALL_DATA_DIR} ${PREFIX} diff --git a/emulators/redhat/libc5/pkg/PLIST b/emulators/redhat/libc5/pkg/PLIST index dc1dc931444..c17a5d8b63f 100644 --- a/emulators/redhat/libc5/pkg/PLIST +++ b/emulators/redhat/libc5/pkg/PLIST @@ -1,11 +1,9 @@ -@comment $OpenBSD: PLIST,v 1.2 2005/11/02 01:20:18 bernd Exp $ -lib/ +@comment $OpenBSD: PLIST,v 1.3 2006/10/19 00:17:40 sturm Exp $ lib/ld-linux.so.1 lib/ld-linux.so.1.9.5 lib/ld.so lib/ld.so.1.9.5 lib/libdl.so.1.9.5 -usr/ usr/i486-linux-libc5/ usr/i486-linux-libc5/lib/ usr/i486-linux-libc5/lib/libICE.so.6.3 @@ -36,6 +34,7 @@ usr/i486-linux-libc5/lib/libtermcap.so.2.0.8 usr/i486-linux-libc5/lib/libvga.so.1.2.13 usr/i486-linux-libc5/lib/libvgagl.so.1.2.13 usr/i486-linux-libc5/lib/libz.so.1.0.4 +@unexec rm -f %D/lib/libdl.so.1 @unexec rm -f %D/usr/i486-linux-libc5/lib/libICE.so.6 @unexec rm -f %D/usr/i486-linux-libc5/lib/libPEX5.so.6 @unexec rm -f %D/usr/i486-linux-libc5/lib/libSM.so.6 diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile index 717fefe6bc5..28217c3a476 100644 --- a/emulators/snes9x/Makefile +++ b/emulators/snes9x/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.7 2005/11/09 20:09:56 fgsch Exp $ +# $OpenBSD: Makefile,v 1.8 2006/10/19 00:15:36 sturm Exp $ ONLY_FOR_ARCHS= i386 COMMENT= "emulates the Super Nintendo Entertainment System" -PKGNAME= snes9x-1.37c +PKGNAME= snes9x-1.37cp0 DISTNAME= s9x.linuxc6.137.i386 CATEGORIES= emulators games @@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}/zips/ -RUN_DEPENDS= :redhat_base-*:emulators/redhat/base +RUN_DEPENDS= ::emulators/fedora/base USE_X11= Yes NO_BUILD= Yes diff --git a/emulators/vgb/Makefile b/emulators/vgb/Makefile index 06e92d744f2..78e2f8b358d 100644 --- a/emulators/vgb/Makefile +++ b/emulators/vgb/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.8 2005/11/09 20:09:56 fgsch Exp $ +# $OpenBSD: Makefile,v 1.9 2006/10/19 00:15:36 sturm Exp $ ONLY_FOR_ARCHS= i386 COMMENT= "emulates the Nintendo Gameboy" -PKGNAME= vgb-2.1 +PKGNAME= vgb-2.1p0 DISTNAME= VGB21-Linux-80x86-bin CATEGORIES= emulators games @@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE} EXTRACT_SUFX= .tar.Z -RUN_DEPENDS= :redhat_base-*:emulators/redhat/base +RUN_DEPENDS= ::emulators/fedora/base USE_X11= Yes NO_BUILD= Yes diff --git a/emulators/vmware/3/Makefile b/emulators/vmware/3/Makefile index 9d958e9bd12..0251b570c96 100644 --- a/emulators/vmware/3/Makefile +++ b/emulators/vmware/3/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.9 2006/07/16 15:13:27 mcbride Exp $ +# $OpenBSD: Makefile,v 1.10 2006/10/19 00:15:36 sturm Exp $ ONLY_FOR_ARCHS= i386 COMMENT= "VMware emulator" DISTNAME= VMware-workstation-3.2.1-2242 -PKGNAME= vmware-3.2.1_2242p4 +PKGNAME= vmware-3.2.1_2242p5 CATEGORIES= emulators MASTER_SITES= http://download3.vmware.com/software/wkst/ MASTER_SITES0= http://monkey.org/~marius/vmware-openbsd/ @@ -26,8 +26,8 @@ WANTLIB= c NO_REGRESS= Yes USE_X11= Yes -BUILD_DEPENDS+= ::emulators/redhat/base -RUN_DEPENDS+= ${BUILD_DEPENDS} +RUN_DEPENDS+= ::emulators/fedora/base +BUILD_DEPENDS+= ${RUN_DEPENDS} WRKDIST= ${WRKDIR}/vmware-openbsd VMWARE_DISTRIB= ${WRKDIR}/vmware-distrib diff --git a/emulators/vmware/3/systrace.policy b/emulators/vmware/3/systrace.policy index e28f271e485..d20337f0886 100644 --- a/emulators/vmware/3/systrace.policy +++ b/emulators/vmware/3/systrace.policy @@ -1,8 +1,9 @@ -# $OpenBSD: systrace.policy,v 1.1 2006/04/16 16:59:47 sturm Exp $ +# $OpenBSD: systrace.policy,v 1.2 2006/10/19 00:15:36 sturm Exp $ Policy: ${WRKDIR}/vmware-openbsd/vmware-any-any-update37/update, Emulation: linux linux-brk: permit linux-close: permit linux-exit: permit + linux-linux_exit_group: permit linux-fsread: permit linux-fstat64: permit linux-fswrite: filename match "${WRKDIR}" then permit diff --git a/games/adom/Makefile b/games/adom/Makefile index ae4f145c908..5e56ebffca0 100644 --- a/games/adom/Makefile +++ b/games/adom/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.20 2005/10/01 16:57:09 espie Exp $ +# $OpenBSD: Makefile,v 1.21 2006/10/19 00:18:13 sturm Exp $ # Author: Thomas Biskup COMMENT= "Ancient Domains of Mystery - roguelike" DISTNAME= adom-1.1.1 -PKGNAME= ${DISTNAME}p2 +PKGNAME= ${DISTNAME}p3 CATEGORIES= games MASTER_SITES= http://www.adom.de/adom/download/linux/ HOMEPAGE= http://www.adom.de/ @@ -37,7 +37,7 @@ pre-fetch: @echo "Your kernel must have COMPAT_LINUX (GENERIC does)" .endif -RUN_DEPENDS= :redhat_base->=8.0:emulators/redhat/base +RUN_DEPENDS= ::emulators/fedora/base do-install: @${INSTALL_DATA_DIR} ${ADOM_DOC} diff --git a/www/opera-flashplugin/Makefile b/www/opera-flashplugin/Makefile index cb771f5dbdf..9c1d1244686 100644 --- a/www/opera-flashplugin/Makefile +++ b/www/opera-flashplugin/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.4 2006/09/20 16:15:19 jolan Exp $ +# $OpenBSD: Makefile,v 1.5 2006/10/19 00:21:29 sturm Exp $ ONLY_FOR_ARCHS= i386 COMMENT= "flash support for opera" DISTNAME= flash-7.0r68 -PKGNAME= opera-flashplugin-7.0r68 +PKGNAME= opera-flashplugin-7.0r68p0 CATEGORIES= www MASTER_SITES= http://mirrors.protection.cx/~jolan/ @@ -18,7 +18,7 @@ NO_BUILD= Yes NO_REGRESS= Yes RUN_DEPENDS= :opera-*:www/opera \ - :redhat_motif-*:emulators/redhat/motif + :fedora_motif-*:emulators/fedora/motif do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/opera/plugins diff --git a/www/opera/Makefile b/www/opera/Makefile index 2021a4ebe7b..12a4049e4b2 100644 --- a/www/opera/Makefile +++ b/www/opera/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.38 2006/09/22 20:22:28 sturm Exp $ +# $OpenBSD: Makefile,v 1.39 2006/10/19 00:21:29 sturm Exp $ ONLY_FOR_ARCHS= i386 COMMENT= "fast and customizable WWW browser" -PKGNAME= opera-9.02 +PKGNAME= opera-9.02p0 DISTNAME= opera-9.02-20060919.1-static-qt.i386-en CATEGORIES= www @@ -32,7 +32,7 @@ MASTER_SITES_OPERA= ftp://ftp.opera.com/pub/opera/ \ MASTER_SITES= ${MASTER_SITES_OPERA:=linux/902/final/en/i386/static/} EXTRACT_SUFX= .tar.bz2 -RUN_DEPENDS= :redhat_base->=8.0:emulators/redhat/base +RUN_DEPENDS= ::emulators/fedora/base NO_BUILD= Yes NO_REGRESS= Yes