diff options
author | pav <pav@FreeBSD.org> | 2009-01-06 03:44:02 +0800 |
---|---|---|
committer | pav <pav@FreeBSD.org> | 2009-01-06 03:44:02 +0800 |
commit | 72173ae40a3c3cc1a23bba84b7ed08e57ae4f92e (patch) | |
tree | d1102c67d6d770e809475dae366f152130cb1883 /emulators | |
parent | 5ae596207dc0bd85ca28a43d715d82bc6b358b81 (diff) | |
download | freebsd-ports-gnome-72173ae40a3c3cc1a23bba84b7ed08e57ae4f92e.tar.gz freebsd-ports-gnome-72173ae40a3c3cc1a23bba84b7ed08e57ae4f92e.tar.zst freebsd-ports-gnome-72173ae40a3c3cc1a23bba84b7ed08e57ae4f92e.zip |
- Remove conditional checks for FreeBSD 5.x and older
Diffstat (limited to 'emulators')
30 files changed, 55 insertions, 242 deletions
diff --git a/emulators/fceu-server/Makefile b/emulators/fceu-server/Makefile index 4283b3747070..debfb2c7925a 100644 --- a/emulators/fceu-server/Makefile +++ b/emulators/fceu-server/Makefile @@ -19,12 +19,6 @@ CFLAGS+= -DSOL_TCP=6 USE_GMAKE= yes USE_SDL= sdl -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -IGNORE= does not build on FreeBSD 5.X -.endif - post-patch: @${REINPLACE_CMD} -e 's|/etc/fceu-standard.conf|${ETCDIR}/fceu-standard.conf|g' \ ${WRKSRC}/server.cpp @@ -37,4 +31,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/fceu-server.conf \ ${ETCDIR}/fceu-standard.conf -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile index 2df579756596..f9e3c854518c 100644 --- a/emulators/generator/Makefile +++ b/emulators/generator/Makefile @@ -48,13 +48,8 @@ post-patch: . endif .endif -# Generator does not automatically determine the GCC version. .if !defined(WITHOUT_OPTIMIZED_CFLAGS) -. if ${OSVERSION} < 500035 -CONFIGURE_ARGS+=--with-gcc=2 -. elif ${OSVERSION} >= 500035 CONFIGURE_ARGS+=--with-gcc=3 -. endif .else CONFIGURE_ARGS+=--without-gcc .endif diff --git a/emulators/ines/Makefile b/emulators/ines/Makefile index a022c1c599be..f74bde8307e0 100644 --- a/emulators/ines/Makefile +++ b/emulators/ines/Makefile @@ -16,6 +16,8 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Nintendo Entertainment System emlator for X +LIB_DEPENDS= c.5:${PORTSDIR}/misc/compat5x + ONLY_FOR_ARCHS= i386 ONLY_FOR_ARCHS_REASON= is an i386 binary @@ -24,12 +26,6 @@ USE_XORG= x11 xext NO_BUILD= yes STRIP= -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 600000 -LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ines ${PREFIX}/bin ${MKDIR} ${DATADIR} @@ -37,4 +33,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/CART.NES ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/*.pal ${DATADIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/emulators/linux-vmware-toolbox2/Makefile b/emulators/linux-vmware-toolbox2/Makefile index 9320d859dc18..80720dcec2e4 100644 --- a/emulators/linux-vmware-toolbox2/Makefile +++ b/emulators/linux-vmware-toolbox2/Makefile @@ -34,16 +34,10 @@ NO_LATEST_LINK= yes LINUX_FLP?= ${DISTDIR}/linux.flp MOUNT_PT?= ${WRKDIR}/mnt .if exists(${LINUX_FLP}) -.if ${OSVERSION} >= 500018 DEV_ATTACH= /usr/sbin/mdconfig -a -t vnode -f ${LINUX_FLP} -u ${MOUNT_DEV} DEV_DETACH= /usr/sbin/mdconfig -d -u ${MOUNT_DEV} MOUNT_DEV?= md0 .else -DEV_ATTACH= /usr/sbin/vnconfig -c ${MOUNT_DEV} ${LINUX_FLP} -DEV_DETACH= /usr/sbin/vnconfig -u ${MOUNT_DEV} -MOUNT_DEV?= vn0 -.endif -.else MOUNT_DEV?= fd0 .endif diff --git a/emulators/mame-devel/Makefile b/emulators/mame-devel/Makefile index 8c05a0b68b11..44216629af81 100644 --- a/emulators/mame-devel/Makefile +++ b/emulators/mame-devel/Makefile @@ -47,13 +47,6 @@ post-install: .include <bsd.port.pre.mk> -# In FreeBSD 5.x fails to build due to an internal compiler error. Using the -# version 3.4 from ports which probably fixes this error requires a hack to -# get around bsd.gcc.mk handling, so use a higher version than in base system. -.if ${OSVERSION} < 600000 -USE_GCC= 4.2+ -.endif - .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile index 8c05a0b68b11..44216629af81 100644 --- a/emulators/mame/Makefile +++ b/emulators/mame/Makefile @@ -47,13 +47,6 @@ post-install: .include <bsd.port.pre.mk> -# In FreeBSD 5.x fails to build due to an internal compiler error. Using the -# version 3.4 from ports which probably fixes this error requires a hack to -# get around bsd.gcc.mk handling, so use a higher version than in base system. -.if ${OSVERSION} < 600000 -USE_GCC= 4.2+ -.endif - .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile index 518cd90c2728..bd4035ecd410 100644 --- a/emulators/mednafen/Makefile +++ b/emulators/mednafen/Makefile @@ -47,10 +47,6 @@ FLAG_NLS= true BROKEN= does not compile on ${ARCH} due to internal compiler error .endif -.if ${OSVERSION} < 503000 -IGNORE= needs round(3), which appears in 5.3 or later -.endif - pre-configure: @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' -e \ 's|/usr/local|${LOCALBASE}|g' -e 's|/usr/X11R6|${LOCALBASE}|g' \ diff --git a/emulators/mess/Makefile b/emulators/mess/Makefile index 76f93e02f8a9..0fb4b32c41e8 100644 --- a/emulators/mess/Makefile +++ b/emulators/mess/Makefile @@ -25,13 +25,6 @@ SUB_FILES= ${PORTNAME} pkg-message .include <bsd.port.pre.mk> -# In FreeBSD 5.x fails to build due to an internal compiler error. Using the -# version 3.4 from ports which probably fixes this error requires a hack to -# get around bsd.gcc.mk handling, so use a higher version than in base system. -.if ${OSVERSION} < 600000 -USE_GCC= 4.2+ -.endif - .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile index 81ffe77b9335..e17eb585998d 100644 --- a/emulators/open-vm-tools/Makefile +++ b/emulators/open-vm-tools/Makefile @@ -55,15 +55,9 @@ USE_RC_SUBR= vmware-guestd.sh vmware-kmod.sh .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 600000 -NOTON5= "" -.else -NOTON5= "@comment " -.endif +PLIST_SUB+= LIB32DIR=${LIB32DIR} -PLIST_SUB+= NOTON5=${NOTON5} LIB32DIR=${LIB32DIR} - -SUB_LIST+= NOTON5=${NOTON5} LIB32DIR=${LIB32DIR} +SUB_LIST+= LIB32DIR=${LIB32DIR} post-patch: .if defined(WITHOUT_X11) @@ -78,10 +72,8 @@ post-install: ${MKDIR} ${PREFIX}/${LIB32DIR}/vmware-tools/modules/input ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmmemctl.ko ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmxnet.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmxnet.ko -.if ${OSVERSION} >= 600000 ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmhgfs.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmhgfs.ko ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmblock.ko -.endif @-kldxref ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers 2>/dev/null @${CAT} ${PKGMESSAGE} diff --git a/emulators/open-vm-tools/files/pkg-message.in b/emulators/open-vm-tools/files/pkg-message.in index cb7ceb70878c..ab2bf34dafe4 100644 --- a/emulators/open-vm-tools/files/pkg-message.in +++ b/emulators/open-vm-tools/files/pkg-message.in @@ -2,8 +2,8 @@ To run the Open Virtual Machine tools at startup, add the following settings to your /etc/rc.conf -%%NOTON5%%vmware_guest_vmblock_enable="YES" -%%NOTON5%%vmware_guest_vmhgfs_enable="YES" +vmware_guest_vmblock_enable="YES" +vmware_guest_vmhgfs_enable="YES" vmware_guest_vmmemctl_enable="YES" vmware_guest_vmxnet_enable="YES" vmware_guestd_enable="YES" diff --git a/emulators/open-vm-tools/files/vmware-kmod.sh.in b/emulators/open-vm-tools/files/vmware-kmod.sh.in index 6839a023b547..567910cb2ab6 100644 --- a/emulators/open-vm-tools/files/vmware-kmod.sh.in +++ b/emulators/open-vm-tools/files/vmware-kmod.sh.in @@ -23,16 +23,16 @@ vmware_guest_vmxnet_start() echo 'Loading vmxnet kernel module.' kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmxnet.ko >/dev/null 2>&1 } -%%NOTON5%%vmware_guest_vmblock_start() -%%NOTON5%%{ -%%NOTON5%% echo 'Loading vmblock kernel module.' -%%NOTON5%% kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko >/dev/null 2>&1 -%%NOTON5%%} -%%NOTON5%%vmware_guest_vmhgfs_start() -%%NOTON5%%{ -%%NOTON5%% echo 'Loading vmhgfs kernel module.' -%%NOTON5%% kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmhgfs.ko >/dev/null 2>&1 -%%NOTON5%%} +vmware_guest_vmblock_start() +{ + echo 'Loading vmblock kernel module.' + kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko >/dev/null 2>&1 +} +vmware_guest_vmhgfs_start() +{ + echo 'Loading vmhgfs kernel module.' + kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmhgfs.ko >/dev/null 2>&1 +} # VMware kernel module: vmmemctl name="vmware_guest_vmmemctl" @@ -58,27 +58,27 @@ stop_cmd=":" load_rc_config $name [ -z "$vmware_guest_vmxnet_enable" ] && vmware_guest_vmxnet_enable="NO" run_rc_command "$1" -%%NOTON5%% -%%NOTON5%%# VMware kernel module: vmblock -%%NOTON5%%name="vmware_guest_vmblock" -%%NOTON5%%rcvar=`set_rcvar` -%%NOTON5%%start_precmd="${checkvm_cmd}" -%%NOTON5%%start_cmd="vmware_guest_vmblock_start" -%%NOTON5%%stop_precmd="${checkvm_cmd}" -%%NOTON5%%stop_cmd=":" -%%NOTON5%% -%%NOTON5%%load_rc_config $name -%%NOTON5%%[ -z "$vmware_guest_vmblock_enable" ] && vmware_guest_vmblock_enable="NO" -%%NOTON5%%run_rc_command "$1" -%%NOTON5%% -%%NOTON5%%# VMware kernel module: vmhgfs -%%NOTON5%%name="vmware_guest_vmhgfs" -%%NOTON5%%rcvar=`set_rcvar` -%%NOTON5%%start_precmd="${checkvm_cmd}" -%%NOTON5%%start_cmd="vmware_guest_vmhgfs_start" -%%NOTON5%%stop_precmd="${checkvm_cmd}" -%%NOTON5%%stop_cmd=":" -%%NOTON5%% -%%NOTON5%%load_rc_config $name -%%NOTON5%%[ -z "$vmware_guest_vmhgfs_enable" ] && vmware_guest_vmhgfs_enable="NO" -%%NOTON5%%run_rc_command "$1" + +# VMware kernel module: vmblock +name="vmware_guest_vmblock" +rcvar=`set_rcvar` +start_precmd="${checkvm_cmd}" +start_cmd="vmware_guest_vmblock_start" +stop_precmd="${checkvm_cmd}" +stop_cmd=":" + +load_rc_config $name +[ -z "$vmware_guest_vmblock_enable" ] && vmware_guest_vmblock_enable="NO" +run_rc_command "$1" + +# VMware kernel module: vmhgfs +name="vmware_guest_vmhgfs" +rcvar=`set_rcvar` +start_precmd="${checkvm_cmd}" +start_cmd="vmware_guest_vmhgfs_start" +stop_precmd="${checkvm_cmd}" +stop_cmd=":" + +load_rc_config $name +[ -z "$vmware_guest_vmhgfs_enable" ] && vmware_guest_vmhgfs_enable="NO" +run_rc_command "$1" diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist index 0e6a277f5fa3..46516fa87b73 100644 --- a/emulators/open-vm-tools/pkg-plist +++ b/emulators/open-vm-tools/pkg-plist @@ -7,11 +7,11 @@ etc/vmware-tools/tools.conf %%LIB32DIR%%/libguestlib.so %%LIB32DIR%%/libguestlib.so.0 %%LIB32DIR%%/vmware-tools/modules/drivers/linker.hints -%%NOTON5%%%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko -%%NOTON5%%%%LIB32DIR%%/vmware-tools/modules/drivers/vmhgfs.ko +%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko +%%LIB32DIR%%/vmware-tools/modules/drivers/vmhgfs.ko %%LIB32DIR%%/vmware-tools/modules/drivers/vmmemctl.ko %%LIB32DIR%%/vmware-tools/modules/drivers/vmxnet.ko -%%NOTON5%%sbin/mount_vmhgfs +sbin/mount_vmhgfs sbin/vmware-guestd %%X11%%bin/vmware-toolbox %%X11%%bin/vmware-user diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile index 15e886d31e5e..ffd59dcb8a4f 100644 --- a/emulators/openmsx/Makefile +++ b/emulators/openmsx/Makefile @@ -37,15 +37,4 @@ USE_SDL= sdl image MAKE_ARGS+= INSTALL_DOC_DIR=${WRKSRC}/dummy .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 && ${ARCH} == "amd64" -BROKEN= internal compiler error on 5.x/amd64 -.endif - -post-patch: -.if ${OSVERSION} < 503000 - @${REINPLACE_CMD} -e 's/round/rint/' ${WRKSRC}/src/Math.hh -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile index 93b867eb4e6f..b6573c37016d 100644 --- a/emulators/pearpc/Makefile +++ b/emulators/pearpc/Makefile @@ -72,12 +72,6 @@ CONFIGURE_ARGS+= --enable-cpu=jitc_x86 CONFIGURE_ARGS+= --enable-cpu=generic .endif -.if ${OSVERSION} < 503001 -#USE_GCC= 3.4 -#CFLAGS+= -DFREEBSD_MB_SUPPORT -BROKEN= Missing truncf() -.endif - pre-everything:: .if !defined(WITH_OPTIMIZED_CFLAGS) @${ECHO_MSG} "" diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index 1b5d277e3fed..bd69d30e402f 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -51,12 +51,6 @@ USE_GCC= 3.4 PLIST_SUB+= DYNGEN="" .endif -.if ${OSVERSION} < 600000 -# 5.x base gcc segfaults in target-mips/op_mem.c -BUILD_DEPENDS+= gcc34:${PORTSDIR}/lang/gcc34 -CC= gcc34 -.endif - WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} CONFIGURE_ARGS+= --prefix=${PREFIX} --cc=${CC} diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 2737c77ae355..8f8fd0c60447 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -39,12 +39,6 @@ OPTIONS= KQEMU "Build with (alpha!) accelerator module" Off \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600000 -# 5.x base gcc segfaults in target-mips/op_mem.c -BUILD_DEPENDS+= gcc34:${PORTSDIR}/lang/gcc34 -CC= gcc34 -.endif - WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} diff --git a/emulators/rtc/Makefile b/emulators/rtc/Makefile index 2cce0c14ad19..01ef770668e1 100644 --- a/emulators/rtc/Makefile +++ b/emulators/rtc/Makefile @@ -34,12 +34,6 @@ SRC_BASE?= /usr/src .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500104 -PLIST_SUB+= MAKEDEV="" -.else -PLIST_SUB+= MAKEDEV="@comment " -.endif - .if !exists(${SRC_BASE}/sys/Makefile) IGNORE= needs kernel source files .endif @@ -54,9 +48,6 @@ pre-install: ${MKDIR} ${KMODDIR} post-install: -.if ${OSVERSION} < 500104 - -mknod /dev/rtc c ${CDEV_MAJOR} 0 -.endif ${INSTALL_DATA} ${WRKSRC}/rtc.h ${PREFIX}/include/ ${MKDIR} ${PREFIX}/share/examples/rtc ${INSTALL_DATA} ${WRKSRC}/test.c ${PREFIX}/share/examples/rtc/ diff --git a/emulators/rtc/pkg-plist b/emulators/rtc/pkg-plist index fc31ceb62337..976c0201bf48 100644 --- a/emulators/rtc/pkg-plist +++ b/emulators/rtc/pkg-plist @@ -2,7 +2,6 @@ etc/rc.d/rtc.sh include/rtc.h modules/rtc.ko %%EXAMPLESDIR%%/test.c -%%MAKEDEV%%@exec mknod /dev/rtc c %%CDEV_MAJOR%% 0 @exec rm -f %%DEVDIR%%/rtc @exec /usr/sbin/kldxref %D/modules @unexec /usr/sbin/kldxref %D/modules diff --git a/emulators/sdlmame-devel/Makefile b/emulators/sdlmame-devel/Makefile index 8c05a0b68b11..44216629af81 100644 --- a/emulators/sdlmame-devel/Makefile +++ b/emulators/sdlmame-devel/Makefile @@ -47,13 +47,6 @@ post-install: .include <bsd.port.pre.mk> -# In FreeBSD 5.x fails to build due to an internal compiler error. Using the -# version 3.4 from ports which probably fixes this error requires a hack to -# get around bsd.gcc.mk handling, so use a higher version than in base system. -.if ${OSVERSION} < 600000 -USE_GCC= 4.2+ -.endif - .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif diff --git a/emulators/sdlmame/Makefile b/emulators/sdlmame/Makefile index 8c05a0b68b11..44216629af81 100644 --- a/emulators/sdlmame/Makefile +++ b/emulators/sdlmame/Makefile @@ -47,13 +47,6 @@ post-install: .include <bsd.port.pre.mk> -# In FreeBSD 5.x fails to build due to an internal compiler error. Using the -# version 3.4 from ports which probably fixes this error requires a hack to -# get around bsd.gcc.mk handling, so use a higher version than in base system. -.if ${OSVERSION} < 600000 -USE_GCC= 4.2+ -.endif - .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif diff --git a/emulators/sdlmess/Makefile b/emulators/sdlmess/Makefile index 76f93e02f8a9..0fb4b32c41e8 100644 --- a/emulators/sdlmess/Makefile +++ b/emulators/sdlmess/Makefile @@ -25,13 +25,6 @@ SUB_FILES= ${PORTNAME} pkg-message .include <bsd.port.pre.mk> -# In FreeBSD 5.x fails to build due to an internal compiler error. Using the -# version 3.4 from ports which probably fixes this error requires a hack to -# get around bsd.gcc.mk handling, so use a higher version than in base system. -.if ${OSVERSION} < 600000 -USE_GCC= 4.2+ -.endif - .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif diff --git a/emulators/snespp/Makefile b/emulators/snespp/Makefile index c47c31d77467..299bdd2c07e6 100644 --- a/emulators/snespp/Makefile +++ b/emulators/snespp/Makefile @@ -23,14 +23,8 @@ PLIST_SUB= KMODDIR="${KMODDIR}" MAN4= snespp.4 MANCOMPRESSED= no -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600000 -IGNORE= versions of FreeBSD before 6.0 are not supported -.endif - do-install: @${INSTALL_MAN} ${WRKSRC}/snespp.4 ${PREFIX}/man/man4 @${INSTALL_KLD} ${WRKSRC}/snespp.ko ${KMODDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/emulators/vgb-bin/Makefile b/emulators/vgb-bin/Makefile index 8ccc54e62dae..04f82f08b599 100644 --- a/emulators/vgb-bin/Makefile +++ b/emulators/vgb-bin/Makefile @@ -18,6 +18,8 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= lioux@FreeBSD.org COMMENT= Nintendo GameBoy(tm) emulator (closed binary version of vgb) +LIB_DEPENDS= c.5:${PORTSDIR}/misc/compat5x + IA32_BINARY_PORT= yes NO_BUILD= no NO_WRKSUBDIR= no @@ -33,14 +35,4 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/VGB.html ${PREFIX}/share/doc/vgb .endif # !defined(NOPORTDOCS) -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 502100 -IGNORE= does not work for FreeBSD versions prior to 5.2.1R -.endif - -.if ${OSVERSION} >= 600000 -LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/emulators/vgba-bin/Makefile b/emulators/vgba-bin/Makefile index a6be23c8caaa..8428ae55e560 100644 --- a/emulators/vgba-bin/Makefile +++ b/emulators/vgba-bin/Makefile @@ -17,6 +17,8 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= lioux@FreeBSD.org COMMENT= Virtual GameBoy Advance is an emulator of Nintendo GameBoy Advance(TM) +LIB_DEPENDS= c.5:${PORTSDIR}/misc/compat5x + ONLY_FOR_ARCHS= i386 NO_BUILD= no NO_WRKSUBDIR= no @@ -30,14 +32,4 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/VGBA.html ${DOCSDIR} .endif # !defined(NOPORTDOCS) -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 502100 -IGNORE= Does not work for FreeBSD versions prior to 5.2.1R -.endif - -.if ${OSVERSION} >= 600000 -LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/emulators/vmware-guestd5/Makefile b/emulators/vmware-guestd5/Makefile index 74833cd0c1b4..832f6ed0afa2 100644 --- a/emulators/vmware-guestd5/Makefile +++ b/emulators/vmware-guestd5/Makefile @@ -37,12 +37,8 @@ USE_ICONV= yes USE_GETTEXT= yes USE_XORG= x11 xsxt USE_GNOME= glib12 gtk12 -.if (${OSVERSION} >= 600000) LIB_DEPENDS+= c.6:${PORTSDIR}/misc/compat6x .else -LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x -.endif -.else PLIST_SUB+= INSTALLXGTKTOOL:="@comment " .endif .else @@ -63,17 +59,9 @@ MOUNT= /sbin/mount UMOUNT= /sbin/umount .if ${ARCH} == i386 -.if (${OSVERSION} >= 600000) BITS?= 32-6 -.else -BITS?= 32 -.endif .else # ${ARCH} == amd64 -.if (${OSVERSION} >= 600000) BITS?= 64-6 -.else -BITS?= 64 -.endif .endif .if defined(VMWARE_X_PORTS) @@ -98,21 +86,12 @@ PLIST_SUB+= VMWARE_VMMEMCTL:="@comment " .endif .if defined(WITH_VMWARE_VMXNET) -.if (${OSVERSION} < 600000) -PLIST_SUB+= VMWARE_VMXNET:="" -.if ${BITS} == 32 -VMWARE_VMXNET_PATH= 5.3-i386/vmxnet.ko -.else -VMWARE_VMXNET_PATH= 5.3-amd64/vmxnet.ko -.endif -.else PLIST_SUB+= VMWARE_VMXNET:="" .if ${BITS} == 32-6 VMWARE_VMXNET_PATH= 6.0-i386/vmxnet.ko .else VMWARE_VMXNET_PATH= 6.0-amd64/vmxnet.ko .endif -.endif .else PLIST_SUB+= VMWARE_VMXNET:="@comment " .endif diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile index cda480661623..41dd2738ffbe 100644 --- a/emulators/vmware-guestd6/Makefile +++ b/emulators/vmware-guestd6/Makefile @@ -73,13 +73,7 @@ BITS?= 32 .else # ${ARCH} == amd64 BITS?= 64 .endif -.if (${OSVERSION} < 530000) && (${ARCH} == i386) -OSSFX?= -50 -.elif ${OSVERSION} < 600000 -OSSFX?= -.else # ${OSVERSION} >= 600000 OSSFX?= -6 -.endif .if defined(VMWARE_X_PORTS) @@ -104,20 +98,7 @@ PLIST_SUB+= VMWARE_VMMEMCTL="@comment " .endif .if defined(WITH_VMWARE_VMXNET) -.if (${OSVERSION} < 600000) -PLIST_SUB+= VMWARE_VMXNET="" -.if ${BITS} == 32 -.if ${OSVERSION} < 530000 -VMWARE_VMXNET_PATH= 5.0-i386/vmxnet.ko -.else -VMWARE_VMXNET_PATH= 5.3-i386/vmxnet.ko -.endif -.else -# VMware doesn't provide 5.3-amd64/vmxnet.ko -.undef WITH_VMWARE_VMXNET -PLIST_SUB+= VMWARE_VMXNET="@comment " -.endif -.elif (${OSVERSION} >= 600000) && (${OSVERSION} < 700000) +.if ${OSVERSION} < 700000 PLIST_SUB+= VMWARE_VMXNET="" .if ${BITS} == 32 VMWARE_VMXNET_PATH= 6.0-i386/vmxnet.ko diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile index 762147470990..ab08158c7a27 100644 --- a/emulators/vmware3/Makefile +++ b/emulators/vmware3/Makefile @@ -101,10 +101,8 @@ post-patch: ${CP} ${FILESDIR}/Makefile ${WRKSRC} ${CP} ${FILESDIR}/Makefile.vmmon ${WRKSRC}/vmmon-only/Makefile ${CP} ${FILESDIR}/Makefile.vmnet ${WRKSRC}/vmnet-only/Makefile -.if ${OSVERSION} > 600000 cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/fbsd6-1.patch cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/fbsd6-2.patch -.endif .if ${OSVERSION} > 700000 cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/fbsd7-1.patch cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/fbsd7-2.patch diff --git a/emulators/win4bsd/Makefile b/emulators/win4bsd/Makefile index 123268f2269e..ed69211c5439 100644 --- a/emulators/win4bsd/Makefile +++ b/emulators/win4bsd/Makefile @@ -16,6 +16,7 @@ EXTRACT_SUFX= .tbz MAINTAINER= bacon@smithers.neuro.mcw.edu COMMENT= Win4BSD Virtual Machine for Windows under BSD +LIB_DEPENDS= c.5:${PORTSDIR}/misc/compat5x RUN_DEPENDS= xwininfo:${PORTSDIR}/x11/xwininfo CONFLICTS= Win4BSD-[0-9]* @@ -35,10 +36,6 @@ SUB_FILES= pkg-message .include <bsd.port.pre.mk> -.if ${OSVERSION} > 600000 -LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x -.endif - .if !exists(/usr/src/sys/kern) IGNORE= requires system source for installing kqemu, the accelerator that provides native CPU speed in Win4BSD. Please install the system sources in /usr/src (e.g. using sysinstall), and run make again .endif diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile index 1d0d24c386f4..08509c503fe8 100644 --- a/emulators/x48/Makefile +++ b/emulators/x48/Makefile @@ -32,9 +32,7 @@ post-extract: .SILENT post-patch: @${REINPLACE_CMD} -e 's+rom.dump+${DATADIR}/gxrom-r+' \ ${WRKSRC}/src/X48.ad -.if ${OSVERSION} > 600004 @${REINPLACE_CMD} -e 's+cuaa+cuad+' ${WRKSRC}/src/X48.ad -.endif do-install: .for p in x48 dump2rom checkrom mkcard diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index 4455c41571c8..955e1ad88c78 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -111,10 +111,6 @@ ALLDOCS= ${GENERALDOCS} ${XMESSDOCS} # .include <bsd.port.pre.mk> -.if (${OSVERSION} < 600000 && ${MAMEMESS} == "mess") -BROKEN= internal gcc error on FreeBSD < 6.x -.endif - .if defined(WITH_ASM68K) ASM_COMMENT= .else |