diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2015-04-03 11:26:48 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-04-03 11:26:48 +0000 |
| commit | 0438143249634ab5028e53cb468d99a894c62995 (patch) | |
| tree | 204c01c7973e83331fc29d8b09e59b3e9f219bd6 | |
| parent | 68f48ea6c2e03359333e7b211625e51e06aa2026 (diff) | |
| download | ports-0438143249634ab5028e53cb468d99a894c62995.tar.gz ports-0438143249634ab5028e53cb468d99a894c62995.zip | |
Notes
111 files changed, 82 insertions, 697 deletions
diff --git a/astro/gpsman/Makefile b/astro/gpsman/Makefile index a35029e31c9a..fb4387b47f00 100644 --- a/astro/gpsman/Makefile +++ b/astro/gpsman/Makefile @@ -21,11 +21,7 @@ PORTDOCS= * .include <bsd.port.options.mk> -.if ${OSVERSION} < 800045 -GPSMAN_DEFAULT_PORT?= /dev/cuad0 -.else GPSMAN_DEFAULT_PORT?= /dev/cuau0 -.endif .if ${PORT_OPTIONS:MDOCS} SUB_FILES= pkg-message diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile index 40f7f7b221d7..2bb189b1fe64 100644 --- a/audio/libgpod/Makefile +++ b/audio/libgpod/Makefile @@ -46,10 +46,9 @@ PYTHON_CONFIGURE_WITH= python PORTDOCS= ChangeLog NEWS README* -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MIMOBILE} && (${OSVERSION} > 900002 || \ - ${OSVERSION} < 900000 && ${OSVERSION} > 800107) +.if ${PORT_OPTIONS:MIMOBILE} COMMENT:= ${COMMENT:S,iPod,&/iPhone,} LIB_DEPENDS+= libimobiledevice.so:${PORTSDIR}/comms/libimobiledevice CONFIGURE_ENV+= LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb" @@ -65,4 +64,4 @@ post-patch: post-install: ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index 428fc6cf8557..54d1c8f69085 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -201,12 +201,6 @@ post-patch: -e 's#^mpd.conf#${PORTNAME}.conf#' \ -e 's#^mpd(1)#musicpd(1)#' \ ${WRKSRC}/doc/mpd.1 ${WRKSRC}/doc/mpd.conf.5 -.if (${OSVERSION} < 800000) - ${REINPLACE_CMD} -e 's/nan[f]*(\"\")/NAN/g' \ - ${WRKSRC}/src/crossfade.c \ - ${WRKSRC}/src/player_thread.c \ - ${WRKSRC}/src/player_control.c -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/mpd \ diff --git a/audio/schism/Makefile b/audio/schism/Makefile index c2aafd2a297e..d82af440ef2c 100644 --- a/audio/schism/Makefile +++ b/audio/schism/Makefile @@ -30,11 +30,4 @@ PORTSCOUT= skipv:20100202,20101127,20101128,20110101,20120105 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/schismtracker ${STAGEDIR}${PREFIX}/bin/${PORTNAME} -.include <bsd.port.pre.mk> - -# after merging log2 and log2f into libm -.if ${OSVERSION} >= 802502 -EXTRA_PATCHES= ${FILESDIR}/extrapatch-modplug__snd_gm.c -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/schism/files/extrapatch-modplug__snd_gm.c b/audio/schism/files/patch-modplug__snd_gm.c index 73b22615aec1..73b22615aec1 100644 --- a/audio/schism/files/extrapatch-modplug__snd_gm.c +++ b/audio/schism/files/patch-modplug__snd_gm.c diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile index d213bb8a1e51..a11ff9d35927 100644 --- a/chinese/fcitx/Makefile +++ b/chinese/fcitx/Makefile @@ -113,10 +113,5 @@ post-patch: @${CP} ${_DISTDIR}/py_stroke-${_PYSTROKE_VER}.tar.gz ${WRKSRC}/src/module/pinyin-enhance/data/. @${CP} ${_DISTDIR}/py_table-${_PYTABLE_VER}.tar.gz ${WRKSRC}/src/module/pinyin-enhance/data/. @${CP} ${_DISTDIR}/table.tar.gz ${WRKSRC}/src/im/table/data/. -.if ${OSVERSION} < 800067 -# getline() is GNU extension which FreeBSD only recently adopted -EXTRA_PATCHES+= ${FILESDIR}/getline-src_lib_fcitx-utils_utils.c \ - ${FILESDIR}/getline-src_lib_fcitx-utils_utils.h -.endif .include <bsd.port.mk> diff --git a/chinese/fcitx/files/getline-src_lib_fcitx-utils_utils.c b/chinese/fcitx/files/getline-src_lib_fcitx-utils_utils.c deleted file mode 100644 index de6af574f7c6..000000000000 --- a/chinese/fcitx/files/getline-src_lib_fcitx-utils_utils.c +++ /dev/null @@ -1,25 +0,0 @@ ---- src/lib/fcitx-utils/utils.c.orig 2011-10-02 05:43:11.000000000 -0500 -+++ src/lib/fcitx-utils/utils.c 2011-11-13 16:32:39.627873790 -0600 -@@ -249,4 +249,22 @@ char* fcitx_get_process_name() - #endif - } - -+FCITX_EXPORT_API -+ssize_t getline(char ** p, size_t * cap, FILE * fp) { -+ ssize_t l; -+ if ((!*cap || !*p) && (*p = malloc(128))) *cap = 128; -+ if (!*p) return -1; -+ fgets(*p, *cap, fp); -+ l = strlen(*p); -+ while (!feof(fp) && (*p)[l - 1] != '\n') { -+ if (!(*p = realloc(*p, *cap *= 2))) { -+ *cap = 0; -+ return -1; -+ } -+ fgets(*p + l, *cap / 2, fp); -+ l += strlen(*p + l); -+ } -+ return feof(fp) ? -1 : l; -+} -+ - // kate: indent-mode cstyle; space-indent on; indent-width 0; diff --git a/chinese/fcitx/files/getline-src_lib_fcitx-utils_utils.h b/chinese/fcitx/files/getline-src_lib_fcitx-utils_utils.h deleted file mode 100644 index 7275ae7a08b5..000000000000 --- a/chinese/fcitx/files/getline-src_lib_fcitx-utils_utils.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/lib/fcitx-utils/utils.h~ 2011-10-02 05:43:11.000000000 -0500 -+++ ./src/lib/fcitx-utils/utils.h 2011-11-09 14:43:09.006406004 -0600 -@@ -120,6 +120,8 @@ extern "C" { - - char* fcitx_get_process_name(); - -+ ssize_t getline(char ** linep, size_t * linecapp, FILE * stream); -+ - #ifdef __cplusplus - } - #endif diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile index eddacc43abfc..7607cb28c5fa 100644 --- a/comms/linrad/Makefile +++ b/comms/linrad/Makefile @@ -55,10 +55,8 @@ post-patch: ${WRKSRC}/libfind1.c # NOTE: The code that actually does anything in users.c is currently # #ifdef'd out because it's just a non-working example -.if ${OSVERSION} >= 800000 @${REINPLACE_CMD} -e "s|ttyd|ttyu|" \ ${WRKSRC}/lxsys.c -.endif do-install: ${MKDIR} ${STAGEDIR}${DATADIR} diff --git a/comms/usrp/Makefile b/comms/usrp/Makefile index 2e34105cbf76..2ff190041aa4 100644 --- a/comms/usrp/Makefile +++ b/comms/usrp/Makefile @@ -36,10 +36,6 @@ USRP2_DESC= Build Ettus USRP2 firmware .include <bsd.port.pre.mk> -.if ${OSVERSION} < 800000 -IGNORE= needs libusb 1.0 -.endif - .if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen CMAKE_ARGS+= -DENABLE_DOXYGEN:STRING="ON" diff --git a/databases/datamodeler/Makefile b/databases/datamodeler/Makefile index c166a7e54990..ed0bebc9afac 100644 --- a/databases/datamodeler/Makefile +++ b/databases/datamodeler/Makefile @@ -38,10 +38,6 @@ OPTIONS_DEFINE= DOCS PORTDOCS= readme.html .endif -.if ${OSVERSION} < 802514 -IGNORE= tarball will not extract -.endif - .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}) IGNORE= due to Oracle license restrictions, you must fetch the source \ distribution manually. Please access \ diff --git a/devel/gearmand-devel/Makefile b/devel/gearmand-devel/Makefile index 395c0bfdebfa..d97cfbdec6c5 100644 --- a/devel/gearmand-devel/Makefile +++ b/devel/gearmand-devel/Makefile @@ -47,12 +47,6 @@ TOKYOCAB_DESC= Tokyo Cabinet support for persistent queue .include <bsd.port.options.mk> -# Workaround for missing sigignore that wasn't introduced until -# FreeBSD 8.0 -.if ${OSVERSION} < 800041 -BROKEN= Does not compile without POSIX spawn() support -.endif - .if ${PORT_OPTIONS:MDRIZZLE} LIB_DEPENDS+= libdrizzleso:${PORTSDIR}/databases/libdrizzle CONFIGURE_ARGS+= --enable-libdrizzle diff --git a/devel/gearmand/Makefile b/devel/gearmand/Makefile index 2a7aad4f123b..ca355a09c6a1 100644 --- a/devel/gearmand/Makefile +++ b/devel/gearmand/Makefile @@ -45,12 +45,6 @@ TOKYOCAB_DESC= Tokyo Cabinet support for persistent queue .include <bsd.port.options.mk> -# Workaround for missing sigignore that wasn't introduced until -# FreeBSD 8.0 -.if ${OSVERSION} < 800041 -BROKEN= Does not compile without POSIX spawn() support -.endif - .if ${PORT_OPTIONS:MDRIZZLE} LIB_DEPENDS+= libdrizzle.so:${PORTSDIR}/databases/libdrizzle CONFIGURE_ARGS+= --enable-libdrizzle diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 5634393b1de6..a8ad68cdf240 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -56,13 +56,7 @@ GDB_DESC= Install python gdb scripts .include <bsd.port.pre.mk> # doesn't build yet -#.if (${OSVERSION} < 800000) \ -# || (${OSVERSION} >= 800000 && ${OSVERSION} < 802000) -# || (${OSVERSION} >= 900000 && ${OSVERSION} < 900021) CONFIGURE_ARGS+=--disable-dtrace -#.else -#CONFIGURE_ARGS+=--enable-dtrace -#.endif .if empty(ICONV_LIB) CONFIGURE_ARGS+= --with-libiconv=native diff --git a/devel/libdispatch/Makefile b/devel/libdispatch/Makefile index c995418b1e46..f114677957d7 100644 --- a/devel/libdispatch/Makefile +++ b/devel/libdispatch/Makefile @@ -84,10 +84,6 @@ OPTIONS_DEFAULT= CLANG CLANG_DESC= Build with LLVM/Clang (required for blocks support) .endif -.if ${OSVERSION} <= 800107 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900002) -IGNORE= is not supported on this OS version -.endif - .if ((${OSVERSION} > 900000) && (${OSVERSION} < 1000706)) .if ${ARCH} == "powerpc BROKEN= Does not configure on powerpc-9 diff --git a/devel/libg19/Makefile b/devel/libg19/Makefile index ef507e4b00cc..47960cde8bad 100644 --- a/devel/libg19/Makefile +++ b/devel/libg19/Makefile @@ -20,10 +20,4 @@ PLIST_FILES= include/libg19.h \ lib/libg19.so.1 \ lib/libg19.so.1.0.1 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800069 -BROKEN= libusb 1.0 or newer required. -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/libpasori/Makefile b/devel/libpasori/Makefile index 8422de093004..ff5f50034f8b 100644 --- a/devel/libpasori/Makefile +++ b/devel/libpasori/Makefile @@ -21,11 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} post-extract: @${MKDIR} ${WRKSRC}/lib ${WRKSRC}/lpdump ${WRKSRC}/lptest @${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile -.if ${OSVERSION} < 800069 - @${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/lib/Makefile -.else @${CP} ${FILESDIR}/Makefile.lib.usb20 ${WRKSRC}/lib/Makefile -.endif @${CP} ${FILESDIR}/Makefile.lpdump ${WRKSRC}/lpdump/Makefile @${CP} ${FILESDIR}/Makefile.lptest ${WRKSRC}/lptest/Makefile diff --git a/devel/libpasori/files/Makefile.lib b/devel/libpasori/files/Makefile.lib deleted file mode 100644 index 2996eee3d9cc..000000000000 --- a/devel/libpasori/files/Makefile.lib +++ /dev/null @@ -1,19 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../src - -LIB= pasori -SRCS= libpasori_command.c libpasori_com_bsdugen.c \ - libpasori_polling.c -INCS= libpasori.h libpasori_com.h libpasori_command.h \ - libpasori_config.h libpasori_liblocal.h - -LIBDIR= ${LOCALBASE}/lib -INCLUDEDIR= ${LOCALBASE}/include -NO_PROFILE= -SHLIB_MAJOR= 1 - -CFLAGS+= -D__LIBPASORI_WITH_BSDUGEN -CFLAGS+= -Wall -W - -.include <bsd.lib.mk> diff --git a/devel/p4/Makefile.inc b/devel/p4/Makefile.inc index 4127a7181f60..05c2fdb6aa7c 100644 --- a/devel/p4/Makefile.inc +++ b/devel/p4/Makefile.inc @@ -4,19 +4,15 @@ .if ${ARCH} == amd64 . if ${OSVERSION} >= 1000100 PLATFORM= freebsd100x86_64 -. elif ${OSVERSION} >= 700043 -PLATFORM= freebsd70x86_64 . else -IGNORE= unsupported OS release, sorry +PLATFORM= freebsd70x86_64 . endif .elif ${ARCH} == i386 . if ${OSVERSION} >= 1000100 PLATFORM= freebsd100x86 -. elif ${OSVERSION} >= 700043 -PLATFORM= freebsd70x86 . else -IGNORE= unsupported OS release, sorry +PLATFORM= freebsd70x86 . endif .else diff --git a/devel/p4web/Makefile b/devel/p4web/Makefile index 118e62ef67da..773ececd42d0 100644 --- a/devel/p4web/Makefile +++ b/devel/p4web/Makefile @@ -40,19 +40,9 @@ LIB_DEPENDS+= libstdc++.so.6:${PORTSDIR}/misc/compat9x # Figure out what to install .if ${ARCH} == amd64 -. if ${OSVERSION} >= 700043 PLATFORM= freebsd70x86_64 -. else -IGNORE= unsupported OS release, sorry -. endif - .elif ${ARCH} == i386 -. if ${OSVERSION} >= 700043 PLATFORM= freebsd70x86 -. else -IGNORE= unsupported OS release, sorry -. endif - .else IGNORE= unsupported OS release, sorry .endif diff --git a/devel/py-freebsd/Makefile b/devel/py-freebsd/Makefile index 4bb0de6de215..84ebead9c188 100644 --- a/devel/py-freebsd/Makefile +++ b/devel/py-freebsd/Makefile @@ -19,11 +19,6 @@ USE_PYTHON= distutils autoplist .include <bsd.port.pre.mk> -# Multi-IPv4/v6/no-IP jails. -.if ${OSVERSION} >= 800056 || \ - (${OSVERSION} < 800000 && ${OSVERSION} >= 701103) -EXTRA_PATCHES+= ${FILESDIR}/freebsd8_patch-src-jail.c -.endif .if ${OSVERSION} >= 900030 EXTRA_PATCHES+= ${FILESDIR}/freebsd9_patch-src-sysctl.c .endif diff --git a/devel/py-freebsd/files/freebsd8_patch-src-jail.c b/devel/py-freebsd/files/patch-src-jail.c index 09de149a27a1..09de149a27a1 100644 --- a/devel/py-freebsd/files/freebsd8_patch-src-jail.c +++ b/devel/py-freebsd/files/patch-src-jail.c diff --git a/devel/rubygem-posix-spawn/Makefile b/devel/rubygem-posix-spawn/Makefile index 9791b8b2c0b6..3b517b02ac77 100644 --- a/devel/rubygem-posix-spawn/Makefile +++ b/devel/rubygem-posix-spawn/Makefile @@ -14,9 +14,4 @@ USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes PLIST_FILES= bin/posix-spawn-benchmark -.include <bsd.port.pre.mk> -.if ${OSVERSION} < 800000 -IGNORE= missing posix_spawnp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/xc3sprog/Makefile b/devel/xc3sprog/Makefile index bf66161a1541..4593bb8eb9d6 100644 --- a/devel/xc3sprog/Makefile +++ b/devel/xc3sprog/Makefile @@ -19,10 +19,4 @@ PLIST_FILES= bin/xc3sprog do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xc3sprog ${STAGEDIR}${PREFIX}/bin -.include <bsd.port.pre.mk> - -.if (${OSVERSION} < 800069) -BROKEN= doesn't build on FreeBSD prior libusb(8) integration to base system -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/dns/nss_resinit/Makefile b/dns/nss_resinit/Makefile index 02291ec3492d..be23d55aa1e8 100644 --- a/dns/nss_resinit/Makefile +++ b/dns/nss_resinit/Makefile @@ -20,9 +20,7 @@ PLIST_FILES= lib/nss_resinit.so lib/nss_resinit.so.1 \ .include <bsd.port.pre.mk> .if defined(WITH_COMPAT5X) -.if ${OSVERSION} > 700017 BROKEN= 7.X and later do not have compat syms for the old resolver -.endif MAKE_ARGS+= CC="${CC} -DWITH_COMPAT5X" .endif diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc index 6947ed35e618..cad3d3501a72 100644 --- a/emulators/i386-wine-devel/Makefile.inc +++ b/emulators/i386-wine-devel/Makefile.inc @@ -64,7 +64,7 @@ PLIST_SUB+= OSREL${osrel}-COMPHOLIO="@comment " .endif .endfor -.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 804000 && ${OSVERSION} < 900000) && !(${OSVERSION} >= 901000 && ${OSVERSION} < 1000000) && !(${OSVERSION} >= 1000510 && ${OSVERSION} < 1100000) && !(${OSVERSION} >= 1100048 && ${OSVERSION} < 1200000)) +.if ${OPSYS} != FreeBSD || (!(${OSVERSION} < 900000) && !(${OSVERSION} >= 901000 && ${OSVERSION} < 1000000) && !(${OSVERSION} >= 1000510 && ${OSVERSION} < 1100000) && !(${OSVERSION} >= 1100048 && ${OSVERSION} < 1200000)) IGNORE= binaries compiled for FreeBSD 8.4+, 9.1+, 10.0+ and -current only DISTFILES= .endif diff --git a/emulators/i386-wine/Makefile.inc b/emulators/i386-wine/Makefile.inc index 1b5a332fa26b..8a438a3dc71c 100644 --- a/emulators/i386-wine/Makefile.inc +++ b/emulators/i386-wine/Makefile.inc @@ -57,7 +57,7 @@ PLIST_SUB+= OSREL${osrel}="@comment " .endif .endfor -.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 804000 && ${OSVERSION} < 900000) && !(${OSVERSION} >= 901000 && ${OSVERSION} < 1000000) && !(${OSVERSION} >= 1000510 && ${OSVERSION} < 1100000) && !(${OSVERSION} >= 1100048 && ${OSVERSION} < 1200000)) +.if ${OPSYS} != FreeBSD || (!(&& ${OSVERSION} < 900000) && !(${OSVERSION} >= 901000 && ${OSVERSION} < 1000000) && !(${OSVERSION} >= 1000510 && ${OSVERSION} < 1100000) && !(${OSVERSION} >= 1100048 && ${OSVERSION} < 1200000)) IGNORE= binaries compiled for FreeBSD 8.4+, 9.1+, 10.0+ and -current only DISTFILES= .endif diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index 246a58d074b1..1c6507bf977c 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -262,14 +262,12 @@ post-patch: -e "1s|^(#! )/usr/bin/perl|\1${PERL}|" \ ${WRKSRC}/scripts/texi2pod.pl -.if ${OSVERSION} >= 800091 # XXX need to disable usb host code on head while it's not ported to the # new usb stack yet post-configure: @${REINPLACE_CMD} -E \ -e "s|^(HOST_USB=)bsd|\1stub|" \ ${WRKSRC}/config-host.mak -.endif .if !target(post-install) post-install: diff --git a/emulators/qemu-sbruno/Makefile b/emulators/qemu-sbruno/Makefile index 67e30d491d6c..5eebc783939d 100644 --- a/emulators/qemu-sbruno/Makefile +++ b/emulators/qemu-sbruno/Makefile @@ -280,14 +280,12 @@ post-patch: -e "1s|^(#! )/usr/bin/perl|\1${PERL}|" \ ${WRKSRC}/scripts/texi2pod.pl -.if ${OSVERSION} >= 800091 # XXX need to disable usb host code on head while it's not ported to the # new usb stack yet post-configure: @${REINPLACE_CMD} -E \ -e "s|^(HOST_USB=)bsd|\1stub|" \ ${WRKSRC}/config-host.mak -.endif .if !target(post-install) post-install: diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 25a53ef61e8c..c2e96a2b865d 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -149,14 +149,12 @@ post-patch: -e "1s|^(#! )/usr/bin/perl|\1${PERL}|" \ ${WRKSRC}/texi2pod.pl -.if ${OSVERSION} >= 800091 # XXX need to disable usb host code on head while it's not ported to the # new usb stack yet post-configure: @${REINPLACE_CMD} -E \ -e "s|^(HOST_USB=)bsd|\1stub|" \ ${WRKSRC}/config-host.mak -.endif post-install: @${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index db46c42c7e0e..a59b907d0854 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -142,18 +142,6 @@ MODULES+= mod_ban \ mod_wrap2_file \ mod_wrap2_sql -# FreeBSD-SA-11:07.chroot -.if ${OSVERSION} < 800000 -CHROOT_TEST != ${GREP} __FreeBSD_libc_enter_restricted_mode \ - /usr/include/unistd.h > /dev/null || ${ECHO_CMD} error -. if ${CHROOT_TEST} == "error" -BROKEN=__FreeBSD_libc_enter_restricted_mode is not supported -. endif -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-7-src-fsio.c -.else -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-8-src-fsio.c -.endif - .if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .else diff --git a/ftp/proftpd/files/extra-patch-7-src-fsio.c b/ftp/proftpd/files/extra-patch-7-src-fsio.c deleted file mode 100644 index 22e66f6f7ab2..000000000000 --- a/ftp/proftpd/files/extra-patch-7-src-fsio.c +++ /dev/null @@ -1,19 +0,0 @@ ---- src/fsio.c.orig 2010-04-12 12:00:00.000000000 -0700 -+++ src/fsio.c 2011-12-16 15:12:07.799166185 -0800 -@@ -50,6 +50,8 @@ - # include <acl/libacl.h> - #endif - -+#include <unistd.h> -+ - typedef struct fsopendir fsopendir_t; - - struct fsopendir { -@@ -287,6 +289,7 @@ - static int sys_chroot(pr_fs_t *fs, const char *path) { - if (chroot(path) < 0) - return -1; -+ __FreeBSD_libc_enter_restricted_mode(); - - session.chroot_path = (char *) path; - return 0; diff --git a/ftp/proftpd/files/extra-patch-8-src-fsio.c b/ftp/proftpd/files/patch-8-src-fsio.c index 3b085be7283c..3b085be7283c 100644 --- a/ftp/proftpd/files/extra-patch-8-src-fsio.c +++ b/ftp/proftpd/files/patch-8-src-fsio.c diff --git a/games/linux-nerogame/Makefile b/games/linux-nerogame/Makefile index b7cefbed9cc3..6a2b14ab76b8 100644 --- a/games/linux-nerogame/Makefile +++ b/games/linux-nerogame/Makefile @@ -24,11 +24,6 @@ OPTIONS_DEFINE= NVIDIA NVIDIA_DESC= Nvidia support .include <bsd.port.options.mk> -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800076 -BROKEN= does not build -.endif .if ${PORT_OPTIONS:MNVIDIA} . if !exists(${LINUXBASE}/usr/lib/libGL.so.1) @@ -57,4 +52,4 @@ do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${DATADIR}/lib ${LN} -s ${PREFIX}/lib/${PKGNAMEPREFIX}${PORTNAME}/libopenal.so ${STAGEDIR}${PREFIX}/${DATADIR}/lib/libopenal.so -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/aaphoto/Makefile b/graphics/aaphoto/Makefile index c1b253b15ad2..92c79a85bbd6 100644 --- a/graphics/aaphoto/Makefile +++ b/graphics/aaphoto/Makefile @@ -30,8 +30,7 @@ PLIST_FILES= bin/aaphoto .include <bsd.port.pre.mk> -.if (${ARCH} == "amd64" || ${ARCH} == "i386") && ${OSVERSION} >= 700000 && \ - ${COMPILER_TYPE} == gcc +.if (${ARCH} == "amd64" || ${ARCH} == "i386") && ${COMPILER_TYPE} == gcc CFLAGS+= -fopenmp -D__OPENMP__ .endif diff --git a/graphics/rubygem-objectdetect/Makefile b/graphics/rubygem-objectdetect/Makefile index fdbf91ea585b..53586cb290d6 100644 --- a/graphics/rubygem-objectdetect/Makefile +++ b/graphics/rubygem-objectdetect/Makefile @@ -19,13 +19,7 @@ USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 700000 -BROKEN= does not compile on 6.X -.endif - post-patch: ${REINPLACE_CMD} -E 's|(objectdetect)|\1/version|' ${WRKSRC}/test/test_helper.rb -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/s10sh/files/Makefile.bsd b/graphics/s10sh/files/Makefile.bsd index aae2ceabc7e2..152728510d1a 100644 --- a/graphics/s10sh/files/Makefile.bsd +++ b/graphics/s10sh/files/Makefile.bsd @@ -7,14 +7,7 @@ LDADD += -lreadline -ltermcap ${LDFLAGS} CFLAGS += -DHAVE_READLINE ${CPPFLAGS} .if !defined(WITHOUT_USB) -. if ${OSVERSION} < 800069 -USBLIB != ${LOCALBASE}/bin/libusb-config --libs -LDADD += ${USBLIB} -USBCF != ${LOCALBASE}/bin/libusb-config --cflags -CFLAGS += ${USBCF} -DHAVE_USB_SUPPORT -. else LDADD += -lusb -. endif SRCS += usb.c .endif diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile index c612837375f1..799cfd6403b5 100644 --- a/japanese/mozc-server/Makefile +++ b/japanese/mozc-server/Makefile @@ -61,10 +61,6 @@ _CCTYPE= gcc .include <bsd.port.pre.mk> -.if ${OSVERSION} < 800107 -BROKEN= Does not compile on FreeBSD 7.X -.endif - .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" BROKEN= Does not compile: segfault .endif diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile index 1eea1f9e7ab0..78d15798b130 100644 --- a/japanese/tomoe/Makefile +++ b/japanese/tomoe/Makefile @@ -55,12 +55,7 @@ BROKEN= Broken with gem version of glib2 .endif .if ${PORT_OPTIONS:MUNIHAN} -.if ${OSVERSION} >= 700042 BROKEN= Broken with Unihan with gcc 4.2 -.endif -.if ${ARCH} == "sparc64" -BROKEN= Not buildable with Unihan on sparc64 -.endif MASTER_SITES+= ftp://ftp.unicode.org/Public/UNIDATA/:unihan DISTFILES+= Unihan.zip:unihan EXTRACT_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip diff --git a/java/sigar/Makefile b/java/sigar/Makefile index 105f115caa2e..1d0e0347653b 100644 --- a/java/sigar/Makefile +++ b/java/sigar/Makefile @@ -40,14 +40,8 @@ WRKSRC= ${WRKDIR}/amishHammer-sigar-${GH_COMMIT} PLATFORM_VER= 1 . elif ${OSVERSION} >= 900000 PLATFORM_VER= 9 -. elif ${OSVERSION} >= 800000 -PLATFORM_VER= 8 -. elif ${OSVERSION} >= 700000 -PLATFORM_VER= 7 -. elif ${OSVERSION} >= 600000 -PLATFORM_VER= 6 . else -BROKEN= Unsupported FreeBSD version +PLATFORM_VER= 8 . endif .else BROKEN= ${OPSYS} platform is not supported diff --git a/lang/ccl/Makefile b/lang/ccl/Makefile index 47cb52b4d38a..6a652f44a723 100644 --- a/lang/ccl/Makefile +++ b/lang/ccl/Makefile @@ -24,10 +24,6 @@ USE_ASDF= yes .include <bsd.port.pre.mk> -.if ${ARCH} == "amd64" && ${OSVERSION} >= 700000 && ${OSVERSION} < 800000 -MANUAL_PACKAGE_BUILD=yes -.endif - .if ${ARCH} == "i386" LISP_ARCH= x8632 FX86CL= fx86cl diff --git a/lang/dmd2/Makefile b/lang/dmd2/Makefile index 853d20fcdc77..5ebd6d9fde6c 100644 --- a/lang/dmd2/Makefile +++ b/lang/dmd2/Makefile @@ -27,10 +27,6 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.if ${OSVERSION} < 800000 -BROKEN= does not compile -.endif - NOT_FOR_ARCHS= powerpc NOT_FOR_ARCHS_REASON= not yet ported to this architecture diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index e3729aaef194..756717020913 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -72,15 +72,6 @@ OPTIONS_DEFINE+= BOOTH LIB_DEPENDS+= libffi.so.6:${PORTSDIR}/devel/libffi .endif -# Earlier versions of FreeBSD 9 cannot do proper resolution for $ORIGIN (due -# to a bug in rtld(1)), so disable it by default there. This shall go away -# once 9.2 becomes the latest supported release in that branch. -.if ${OSVERSION} >= 900000 && ${OSVERSION} < 902001 -EXTRA_PATCHES+= ${PATCHDIR}/nopatch-rules__distdir-way-opts.mk - -BUILD_DEPENDS+= chrpath:${PORTSDIR}/devel/chrpath -.endif - .if empty(PORT_OPTIONS:MBOOT) BOOT_GHC_VERSION= 7.6.3 @@ -91,10 +82,8 @@ BOOT_GHC_VERSION= 7.6.3 DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd10-boot${EXTRACT_SUFX}:boot .elif ${OSVERSION} >= 900000 DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd9-boot${EXTRACT_SUFX}:boot -.elif ${OSVERSION} >= 800000 -DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd8-boot${EXTRACT_SUFX}:boot .else -IGNORE= unsupported +DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd8-boot${EXTRACT_SUFX}:boot .endif .elif ${ARCH} == "amd64" @@ -103,10 +92,8 @@ IGNORE= unsupported DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd10-boot${EXTRACT_SUFX}:boot .elif ${OSVERSION} >= 900000 DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd9-boot${EXTRACT_SUFX}:boot -.elif ${OSVERSION} >= 800000 -DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd8-boot${EXTRACT_SUFX}:boot .else -IGNORE= unsupported +DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd8-boot${EXTRACT_SUFX}:boot .endif .endif @@ -266,11 +253,6 @@ post-patch: s|%%RANLIB%%|${RANLIB}|; \ s|%%LD%%|${LD}|' \ ${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs -# FreeBSD 9.{0,1} oddity workaround, part 2 (see above) -.if ${OSVERSION} >= 900000 && ${OSVERSION} < 902001 - @${REINPLACE_CMD} -e 's|%%GHC_LIBDIR%%|${GHC_LIBDIR}|g' \ - ${WRKSRC}/rules/distdir-way-opts.mk -.endif pre-configure: @${MKDIR} ${TMPDIR} @@ -309,12 +291,6 @@ post-install: .if ${PORT_OPTIONS:MDOCS} @${LN} -sf haddock-ghc-${GHC_VERSION} ${STAGEDIR}${PREFIX}/bin/haddock .endif -# FreeBSD 9.{0,1} oddity workaround, part 3 (see above) -.if ${OSVERSION} >= 900000 && ${OSVERSION} < 902001 - @(for f in $$(${FIND} ${GHC_LIBDIR}/bin -type f; ${FIND} ${GHC_LIBDIR} -name '*.so' | ${GREP} -v libHSrts); do \ - chrpath -r $$(chrpath $$f | ${CUT} -d '=' -f2 | ${SED} 's|${GHC_LIBDIR}|${PREFIX}/${GHC_LIBDIR_REL}|g') $$f; \ - done) -.endif @(for f in ${STAGEDIR}${PREFIX}/bin/hp2ps ${GHC_LIBDIR}/unlit ${GHC_LIBDIR}/mkGmpDerivedConstants \ $$(${FIND} ${GHC_LIBDIR}/bin -type f; ${FIND} ${GHC_LIBDIR} -name '*.so'); do \ ${STRIP_CMD} $$f; done) diff --git a/lang/ghc/files/nopatch-rules__distdir-way-opts.mk b/lang/ghc/files/nopatch-rules__distdir-way-opts.mk deleted file mode 100644 index 3631fdaceda3..000000000000 --- a/lang/ghc/files/nopatch-rules__distdir-way-opts.mk +++ /dev/null @@ -1,19 +0,0 @@ ---- ./rules/distdir-way-opts.mk.orig 2014-07-10 06:27:16.000000000 +0200 -+++ ./rules/distdir-way-opts.mk 2014-07-27 23:38:27.738949283 +0200 -@@ -167,15 +167,9 @@ - - ifeq "$3" "dyn" - ifneq "$4" "0" --ifeq "$$(TargetElf)" "YES" --$1_$2_$3_GHC_LD_OPTS += \ -- -fno-use-rpaths \ -- $$(foreach d,$$($1_$2_TRANSITIVE_DEPS),-optl-Wl$$(comma)-rpath -optl-Wl$$(comma)'$$$$ORIGIN/../$$d') -optl-Wl,-zorigin --else ifeq "$$(TargetOS_CPP)" "darwin" - $1_$2_$3_GHC_LD_OPTS += \ - -fno-use-rpaths \ -- $$(foreach d,$$($1_$2_TRANSITIVE_DEPS),-optl-Wl$$(comma)-rpath -optl-Wl$$(comma)'@loader_path/../$$d') --endif -+ $$(foreach d,$$($1_$2_TRANSITIVE_DEPS),-optl-Wl$$(comma)-rpath -optl-Wl$$(comma)'%%GHC_LIBDIR%%/$$d') - endif - endif - diff --git a/lang/nqc/Makefile b/lang/nqc/Makefile index ff7ea4f695e2..6620916c687d 100644 --- a/lang/nqc/Makefile +++ b/lang/nqc/Makefile @@ -22,7 +22,7 @@ do-install: .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 800064 +.if ${OPSYS} == FreeBSD EXTRA_PATCHES+= ${FILESDIR}/extra-patch-rcxlib-RCX_USBTowerPipe_fbsd.cpp .endif diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile index 87ff55f75a45..e6d0a871a28c 100644 --- a/lang/smlnj/Makefile +++ b/lang/smlnj/Makefile @@ -43,7 +43,7 @@ ML_RECOMPILE_OPTIONS= RECOMPILE POSITION64 .if (${ARCH} == "amd64") && (${OSVERSION} >= 1000029) ONLY_FOR_ARCHS= i386 amd64 -.elif (${ARCH} == "amd64") && (${OSVERSION} >= 800000) +.elif (${ARCH} == "amd64") ONLY_FOR_ARCHS= i386 amd64 # Compilation of the i386 runtime source on older amd64 systems requires # i386 system headers from the respective FreeBSD Version, taken from @@ -181,7 +181,7 @@ RECOMPILEDIR= base/system RECOMPILEDIR= .endif -.if (${ARCH} == "amd64") && (${OSVERSION} >= 800000) && (${OSVERSION} < 1000029) +.if (${ARCH} == "amd64") && (${OSVERSION} < 1000029) MLRUNTIMEPATCHES_CMD= cd ${FILESDIR} && \ ( ${LS} do-patch-base_runtime_* extra-patch-base_runtime_* 2>&- || \ ${TRUE} ) diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index 615f5375e58d..d191b36b53a4 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -115,9 +115,7 @@ BDB_LIB_NAME= no EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure.in \ ${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 -.if ${OSVERSION} >= 800037 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal::sasl2.m4 -.endif USE_AUTOTOOLS= autoconf autoheader .endif @@ -131,10 +129,6 @@ PLIST_SUB+= MANCONF="@comment " CONFIGURE_ARGS+=--disable-gssapi .endif -.if ${OSVERSION} >= 800037 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure -.endif - CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus diff --git a/mail/cyrus-imapd23/files/extra-patch-configure b/mail/cyrus-imapd23/files/extra-patch-configure deleted file mode 100644 index 7c3f5c046a22..000000000000 --- a/mail/cyrus-imapd23/files/extra-patch-configure +++ /dev/null @@ -1,22 +0,0 @@ -Index: configure -diff -u configure.orig configure ---- configure.orig 2011-09-09 03:03:46.000000000 +0900 -+++ configure 2011-09-14 13:16:52.766364908 +0900 -@@ -9540,7 +9540,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS" -+LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} -lhx509 $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -9842,7 +9842,7 @@ - GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}" - elif test "$gss_impl" = "heimdal"; then - CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL" -- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err" -+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err -lhx509" - GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}" - elif test "$gss_impl" = "cybersafe03"; then - # Version of CyberSafe with two libraries diff --git a/mail/cyrus-imapd23/files/patch-configure b/mail/cyrus-imapd23/files/patch-configure index 32ccf2519645..a9c9bfb4a2d0 100644 --- a/mail/cyrus-imapd23/files/patch-configure +++ b/mail/cyrus-imapd23/files/patch-configure @@ -19,6 +19,24 @@ diff -u configure.orig configure LIBS="$LIBS -lpcre -lpcreposix"; $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h +@@ -9540,7 +9540,7 @@ + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS" ++LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} -lhx509 $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -9842,7 +9842,7 @@ + GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}" + elif test "$gss_impl" = "heimdal"; then + CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL" +- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err" ++ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err -lhx509" + GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}" + elif test "$gss_impl" = "cybersafe03"; then + # Version of CyberSafe with two libraries @@ -10781,7 +10784,7 @@ $as_echo "#define HAVE_UCDSNMP 1" >>confdefs.h diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index caf7909381ea..9bd466cec36b 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -109,9 +109,7 @@ BDB_LIB_NAME= no .endif .if ${PORT_OPTIONS:MDRAC} -.if ${OSVERSION} >= 800037 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal::sasl2.m4 -.endif USE_AUTOTOOLS= autoconf autoheader .endif @@ -125,10 +123,6 @@ PLIST_SUB+= MANCONF="@comment " CONFIGURE_ARGS+=--disable-gssapi .endif -.if ${OSVERSION} >= 800037 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure -.endif - CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus diff --git a/mail/cyrus-imapd24/files/extra-patch-configure b/mail/cyrus-imapd24/files/patch-configure index 4d3deee12dcf..4d3deee12dcf 100644 --- a/mail/cyrus-imapd24/files/extra-patch-configure +++ b/mail/cyrus-imapd24/files/patch-configure diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile index 44eaed5179a4..dabe98bcf40c 100644 --- a/mail/cyrus-imapd25/Makefile +++ b/mail/cyrus-imapd25/Makefile @@ -123,9 +123,7 @@ PLIST_SUB+= CLAMAV="@comment " .if ${PORT_OPTIONS:MDRAC} IGNORE= DRAC is not available -# .if ${OSVERSION} >= 800037 # EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal__sasl2.m4 -# .endif # USE_AUTOTOOLS= autoconf autoheader .endif diff --git a/mail/milter-skem/Makefile b/mail/milter-skem/Makefile index 163fcb6dd106..1b133c3176c5 100644 --- a/mail/milter-skem/Makefile +++ b/mail/milter-skem/Makefile @@ -34,10 +34,6 @@ OPTIONS_DEFAULT= SKEM_NETINET BROKEN= Does not compile on powerpc .endif -.if ${OSVERSION} >= 700011 -EXTRA_PATCHES= files/timet.patch -.endif - MAKE_ENV+= PTHREAD_LIBS="-lpthread" .for o in ${PORT_OPTIONS:MSKEM_*} diff --git a/mail/milter-skem/files/timet.patch b/mail/milter-skem/files/patch-cleanup.c index d125f076815b..d125f076815b 100644 --- a/mail/milter-skem/files/timet.patch +++ b/mail/milter-skem/files/patch-cleanup.c diff --git a/math/crlibm/Makefile b/math/crlibm/Makefile index eaead4a1a667..b9847f6eef6d 100644 --- a/math/crlibm/Makefile +++ b/math/crlibm/Makefile @@ -31,13 +31,6 @@ DISTFILES+= crlibm-1.0beta3.pdf:2,4 tripledoubleprocedures-1.0beta3.pdf:3,4 .endif post-patch: -#7-STABLE has log2() in libm after r226457 on 17 Oct 2011, but -#there was no accompanying __FreeBSD_version bump -.if ${OSVERSION} < 802502 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900027) - @${REINPLACE_CMD} \ - -e '/testfun_libm[[:blank:]]*=[[:blank:]]*log2;/s/log2/NULL/' \ - ${WRKSRC}/tests/test_common.c -.endif @${REINPLACE_CMD} -e 's/\($$(AM_CFLAGS)\) \($$(CFLAGS)\)/\2 \1/' \ ${WRKSRC}/tests/Makefile.in diff --git a/math/libranlip/Makefile b/math/libranlip/Makefile index c1fe9519b07f..666c1962b7d3 100644 --- a/math/libranlip/Makefile +++ b/math/libranlip/Makefile @@ -38,10 +38,4 @@ test: build @(cd ${WRKSRC}/examples && ./${_prog}) .endfor -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 700000 -BROKEN= fails to build -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/math/msieve/Makefile b/math/msieve/Makefile index 1292ada9efcb..22babaed5e3f 100644 --- a/math/msieve/Makefile +++ b/math/msieve/Makefile @@ -46,7 +46,7 @@ CFLAGS+= -DHAS_SSE CFLAGS+= -DHAS_SSE2 .endif -.if ${OSVERSION} >= 700042 && ${ARCH} == "sparc64" +.if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif diff --git a/math/stp/Makefile b/math/stp/Makefile index cd6ae6b76ea0..df578ff61dbf 100644 --- a/math/stp/Makefile +++ b/math/stp/Makefile @@ -28,8 +28,4 @@ CMAKE_ARGS+= -DFL_LIBRARY=${LOCALBASE}/lib/libfl.a \ -DFLEX_EXECUTABLE=${LOCALBASE}/bin/flex .endif -.if (${OSVERSION} < 802502) -IGNORE= stp needs log2(3) -.endif - .include <bsd.port.post.mk> diff --git a/misc/amfm/Makefile b/misc/amfm/Makefile index e9a82f5339d7..ae435de23041 100644 --- a/misc/amfm/Makefile +++ b/misc/amfm/Makefile @@ -17,18 +17,12 @@ LIB_DEPENDS= libhid.so:${PORTSDIR}/devel/libhid NO_WRKSUBDIR= yes -.include <bsd.port.pre.mk> - EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= -p EXTRACT_AFTER_ARGS= ${WRKDIR} -.if ${OSVERSION} <= 800097 -BROKEN= does not build -.endif - do-install: @${INSTALL} ${WRKSRC}/amfm ${STAGEDIR}${PREFIX}/bin/amfm @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/amfm -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/compat7x/Makefile b/misc/compat7x/Makefile index 797043ba6c50..8868f0a1d01f 100644 --- a/misc/compat7x/Makefile +++ b/misc/compat7x/Makefile @@ -23,10 +23,6 @@ USE_LDCONFIG= ${TARGET_DIR} .include <bsd.port.pre.mk> -.if ${OSVERSION} < 700000 -IGNORE= is for FreeBSD 7.x and newer -.endif - .if ${ARCH} == amd64 PLIST_SUB+= LDCONFIG_LIB32="${LDCONFIG} -32" USE_LDCONFIG32= ${TARGET32_DIR} diff --git a/misc/compat8x/Makefile b/misc/compat8x/Makefile index aea1e8d6d829..cbe2c0bce28d 100644 --- a/misc/compat8x/Makefile +++ b/misc/compat8x/Makefile @@ -24,10 +24,6 @@ USE_LDCONFIG= ${TARGET_DIR} .include <bsd.port.pre.mk> -.if ${OSVERSION} < 800000 -IGNORE= is for FreeBSD 8.x and newer -.endif - # libstdc++.so.6 could be necessary to run an 8.x binary .if ${OSVERSION} >= 1000054 RUN_DEPENDS= ${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x diff --git a/misc/fxload/Makefile b/misc/fxload/Makefile index 47c8fbef987d..67627f0798c9 100644 --- a/misc/fxload/Makefile +++ b/misc/fxload/Makefile @@ -20,10 +20,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/a3load.hex ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${FILESDIR}/xilinx.conf ${STAGEDIR}${PREFIX}/etc/devd -.include <bsd.port.pre.mk> - -.if (${OSVERSION} < 800069) -BROKEN= doesn't build on FreeBSD prior libusb(8) integration to base system -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/usbrh-libusb/Makefile b/misc/usbrh-libusb/Makefile index faff61b4a656..1269cc02dca0 100644 --- a/misc/usbrh-libusb/Makefile +++ b/misc/usbrh-libusb/Makefile @@ -14,13 +14,7 @@ COMMENT= Yet another reads temperatures and humidity from a Strawberry Linux USB PLIST_FILES= bin/usbrh -.include <bsd.port.pre.mk> - -.if ${OSVERSION} <= 800097 -BROKEN= does not build -.endif - do-install: @${INSTALL_SCRIPT} ${WRKSRC}/usbrh ${STAGEDIR}${PREFIX}/bin/usbrh -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common index 8fbce72982e5..9d4aa2dff23f 100644 --- a/multimedia/gstreamer-plugins/Makefile.common +++ b/multimedia/gstreamer-plugins/Makefile.common @@ -536,7 +536,7 @@ gst_twolame_DIST= ugly # gst_v4l2 gst_gst_v4l2_LIB_DEPENDS+= libv4l2.so:${PORTSDIR}/multimedia/libv4l -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 800000 +.if ${OPSYS} == FreeBSD gst_gst_v4l2_RUN_DEPENDS+= webcamd:${PORTSDIR}/multimedia/webcamd .endif gst_gst_v4l2_PLIST_FILES= ${GST_LIB_DIR}/libgstvideo4linux2.la \ diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index 8145d1b6189c..ceba25f06462 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -72,8 +72,7 @@ OPTIONS_DEFAULT= X11 # Recent GNU binutils are required to handle inline SSSE3 asm (in x264), and # to support --exclude-libs option for ld(1) when building GUI program -.if ${PORT_OPTIONS:MX11} || ${OSVERSION} < 802509 || \ - ${OSVERSION} >= 900000 && ${OSVERSION} < 900033 +.if ${PORT_OPTIONS:MX11} BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:${PORTSDIR}/devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin diff --git a/multimedia/mplayer2/Makefile b/multimedia/mplayer2/Makefile index 1ff68a53966c..74717a72af1d 100644 --- a/multimedia/mplayer2/Makefile +++ b/multimedia/mplayer2/Makefile @@ -75,10 +75,6 @@ CONFLICTS= mplayer-1.* BROKEN= Does not compile on sparc64 .endif -.if ${OSVERSION} < 803000 -CONFIGURE_ARGS+= --disable-ssse3 -.endif - WITH_CDROM_DEVICE?= /dev/cd0 #On i386, gcc runs out of general purpose registers when diff --git a/multimedia/v4l-utils/Makefile b/multimedia/v4l-utils/Makefile index ec44f480ce35..f547ad293fed 100644 --- a/multimedia/v4l-utils/Makefile +++ b/multimedia/v4l-utils/Makefile @@ -22,12 +22,6 @@ USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME}/utils -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800000 -EXTRA_PATCHES= ${FILESDIR}/extra-strnlen -.endif - post-patch: @${RM} ${WRKSRC}/../include/linux/videodev2.h @${REINPLACE_CMD} -e 's|#include <sys/klog.h>||g' \ @@ -39,4 +33,4 @@ post-patch: ${WRKSRC}/v4l2-ctl/ivtv-ctl.c \ ${WRKSRC}/../include/linux/ivtv.h -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/multimedia/v4l-utils/files/extra-strnlen b/multimedia/v4l-utils/files/extra-strnlen deleted file mode 100644 index 3954167d8bad..000000000000 --- a/multimedia/v4l-utils/files/extra-strnlen +++ /dev/null @@ -1,45 +0,0 @@ -copied from src/lib/libc/string/strnlen.c -Copyright (c) 2009 David Schultz <das@FreeBSD.org> - ---- v4l2-compliance/v4l2-compliance.cpp.orig 2011-06-04 11:03:04.000000000 +0200 -+++ v4l2-compliance/v4l2-compliance.cpp 2011-06-04 11:03:34.000000000 +0200 -@@ -56,6 +56,18 @@ enum Option { - OptLast = 256 - }; - -+static size_t -+strnlen(const char *s, size_t maxlen) -+{ -+ size_t len; -+ -+ for (len = 0; len < maxlen; len++, s++) { -+ if (!*s) -+ break; -+ } -+ return (len); -+} -+ - static char options[OptLast]; - - static int app_result; ---- v4l2-compliance/v4l2-test-controls.cpp.orig 2011-06-04 11:12:52.000000000 +0200 -+++ v4l2-compliance/v4l2-test-controls.cpp 2011-06-04 11:13:06.000000000 +0200 -@@ -32,6 +32,18 @@ - #include <vector> - #include "v4l2-compliance.h" - -+static size_t -+strnlen(const char *s, size_t maxlen) -+{ -+ size_t len; -+ -+ for (len = 0; len < maxlen; len++, s++) { -+ if (!*s) -+ break; -+ } -+ return (len); -+} -+ - static int checkQCtrl(struct node *node, struct test_queryctrl &qctrl) - { - struct v4l2_querymenu qmenu; diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index c96468c7e272..f4bfbd45f10c 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -51,6 +51,7 @@ CONFIGURE_ARGS+=--enable-shared --enable-internal-md5 \ --with-logfile="${NET_SNMP_LOGFILE}" \ --with-persistent-directory="${NET_SNMP_PERSISTENTDIR}" \ --with-gnu-ld --with-libwrap \ + --with-libs="-lssp_nonshared" \ --with-ldflags="-lm -lkvm -ldevstat -L${PKG_PREFIX}/lib -L${LOCALBASE}/lib ${LCRYPTO}" SUB_FILES= pkg-message @@ -145,15 +146,7 @@ NET_SNMP_SYS_CONTACT?= nobody@nowhere.invalid NET_SNMP_SYS_LOCATION?= somewhere NET_SNMP_LOGFILE?= /var/log/snmpd.log NET_SNMP_PERSISTENTDIR?=/var/net-snmp -NET_SNMP_WITH_MIB_MODULE_LIST+= host disman/event-mib mibII/mta_sendmail mibII/tcpTable ucd-snmp/diskio - -.if ${OSVERSION} >= 700028 -NET_SNMP_WITH_MIB_MODULE_LIST+= sctp-mib -.endif - -.if ${OSVERSION} >= 800000 -CONFIGURE_ARGS+= --with-libs="-lssp_nonshared" -.endif +NET_SNMP_WITH_MIB_MODULE_LIST+= host disman/event-mib mibII/mta_sendmail mibII/tcpTable ucd-snmp/diskio sctp-mib .if ${OSVERSION} >= 1000000 && ${OSVERSION} < 1100062 CFLAGS+= -D_WANT_IFADDR diff --git a/net-mgmt/py-yapsnmp/Makefile b/net-mgmt/py-yapsnmp/Makefile index 2f74da463fbb..427a942a52cc 100644 --- a/net-mgmt/py-yapsnmp/Makefile +++ b/net-mgmt/py-yapsnmp/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--enable-site-packages-prefix=${PREFIX} .include <bsd.port.pre.mk> -.if (${OSVERSION} >= 800000) && (${ARCH} == "i386") +.if (${ARCH} == "i386") CPPFLAGS+= -fstack-protector -I${LOCALBASE}/include .endif diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index c2fc03eb5ba1..6aecbbc62e48 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -296,10 +296,6 @@ WITH_OPENSSL_PORT=yes # if we're installing, place sample configs into ${EXAMPLESDIR} MAKE_ARGS+= raddbdir="${EXAMPLESDIR}/raddb" R=${STAGEDIR} -.if ${ARCH} == "sparc64" && ${OSVERSION} < 700000 -BROKEN= Does not build on sparc64-6 -.endif - FREERADIUS_LIBDIR= lib/freeradius-${PORTVERSION} PLIST_SUB+= LIBDIR="${FREERADIUS_LIBDIR}" USE_LDCONFIG= ${PREFIX}/${FREERADIUS_LIBDIR} diff --git a/net/iet/Makefile b/net/iet/Makefile index 436d4760854b..c285cb7364b8 100644 --- a/net/iet/Makefile +++ b/net/iet/Makefile @@ -31,17 +31,11 @@ MAKE_ENV+= KMODDIR=${KMODDIR} DATADIR=${DATADIR} SYSDIR="${SRC_BASE}/sys" IET_CONF_FILES= ietd.conf initiators.allow initiators.deny targets.allow -.include <bsd.port.pre.mk> - .if !exists(${SRC_BASE}/sys/Makefile) IGNORE= requires kernel sources to build .endif -.if ${OSVERSION} < 800107 -BROKEN= requires 8.0-RELEASE or higher -.endif - pre-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${KMODDIR} ${STAGEDIR}${ETCDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile index c314c1763eb3..c50fd56e5dec 100644 --- a/net/libpcap/Makefile +++ b/net/libpcap/Makefile @@ -130,9 +130,7 @@ post-install: # package will be run on a system that does not have cloning (7.x). # Always use bpf device, but specify CFLAGS if we have cloning. CONFIGURE_ARGS+= --with-pcap=bpf -.if ${OSVERSION} > 800043 CFLAGS+= -DHAVE_DEVICE_CLONING=1 -.endif .if ${ARCH} == "amd64" || ${ARCH} == "sparc64" CFLAGS+= -fPIC diff --git a/net/ndisc6/Makefile b/net/ndisc6/Makefile index f59ec5a8576e..32e78ba93a02 100644 --- a/net/ndisc6/Makefile +++ b/net/ndisc6/Makefile @@ -27,10 +27,6 @@ OPTIONS_DEFINE= DOCS NLS .include <bsd.port.options.mk> -.if ${OSVERSION} >= 803000 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-rdnssd__rdnssd.h -.endif - .if ${PORT_OPTIONS:MNLS} USES+= gettext LDFLAGS+= -lintl diff --git a/net/ndisc6/files/extra-patch-rdnssd__rdnssd.h b/net/ndisc6/files/patch-rdnssd__rdnssd.h index 1aa03c3104b9..1aa03c3104b9 100644 --- a/net/ndisc6/files/extra-patch-rdnssd__rdnssd.h +++ b/net/ndisc6/files/patch-rdnssd__rdnssd.h diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index bfc886a27f2f..651aaef59a5b 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -139,12 +139,6 @@ CONFIGURE_ARGS+=--enable-tcp-wrappers CONFIGURE_ARGS+=--disable-tcp-wrappers .endif -.if ${OSVERSION} < 800031 -PLIST_SUB+= ATFUNCS="@comment " -.else -PLIST_SUB+= ATFUNCS="" -.endif - post-patch: @${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}| ; \ s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g ; \ diff --git a/net/netatalk3/pkg-plist b/net/netatalk3/pkg-plist index eb900d779e5f..79c64827cf44 100644 --- a/net/netatalk3/pkg-plist +++ b/net/netatalk3/pkg-plist @@ -1,4 +1,4 @@ -%%ATFUNCS%%bin/ad +bin/ad bin/afpldaptest bin/afppasswd %%DBUS%%bin/afpstats diff --git a/net/rtg/Makefile b/net/rtg/Makefile index 65c314ae75bb..c99a9e3ab911 100644 --- a/net/rtg/Makefile +++ b/net/rtg/Makefile @@ -43,15 +43,11 @@ WANT_PHP_WEB= yes USE_PHP= mysqli spl .endif -.include <bsd.port.pre.mk> - -.if ( ${OSVERSION} >= 800040 ) CFLAGS+= -fstack-protector LDFLAGS+= -fstack-protector -.endif post-patch: @${MV} ${WRKSRC}/etc/rtg.conf ${WRKSRC}/etc/rtg.conf.sample @${MV} ${WRKSRC}/etc/routers ${WRKSRC}/etc/routers.sample -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/samba36/Makefile b/net/samba36/Makefile index bef80df98900..09b88eb3c71a 100644 --- a/net/samba36/Makefile +++ b/net/samba36/Makefile @@ -260,18 +260,13 @@ CONFIGURE_ARGS+= --disable-fam .if ${PORT_OPTIONS:MACL_SUPPORT} CONFIGURE_ARGS+= --with-acl-support -. if ${OSVERSION} > 800000 WANT_EXP_MODULES+= vfs_zfsacl LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/sysutils/libsunacl -. endif .else CONFIGURE_ARGS+= --without-acl-support .endif .if ${PORT_OPTIONS:MAIO_SUPPORT} -.if ${OSVERSION} < 700055 -IGNORE= an AIO support requires 7.0-RELEASE or later. Disable AIO support -.endif CONFIGURE_ARGS+= --with-aio-support .else CONFIGURE_ARGS+= --without-aio-support diff --git a/net/samba4/Makefile b/net/samba4/Makefile index 11277457e24b..942d7316dd6d 100644 --- a/net/samba4/Makefile +++ b/net/samba4/Makefile @@ -219,11 +219,9 @@ WANT_EXP_MODULES= idmap_ad vfs_cacheprime gpext_scripts gpext_security gpext_reg .endif .if ${PORT_OPTIONS:MACL_SUPPORT} -. if ${OSVERSION} > 800000 LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/sysutils/libsunacl WANT_EXP_MODULES+= vfs_zfsacl SAMBA4_MODULES+= vfs_zfsacl -. endif CONFIGURE_ARGS+= --with-acl-support .else CONFIGURE_ARGS+= --without-acl-support diff --git a/net/samba41/Makefile b/net/samba41/Makefile index 91e145c58e3e..86c335aed84e 100644 --- a/net/samba41/Makefile +++ b/net/samba41/Makefile @@ -226,11 +226,9 @@ WANT_EXP_MODULES= idmap_ad vfs_cacheprime gpext_scripts gpext_security gpext_reg .endif .if ${PORT_OPTIONS:MACL_SUPPORT} -. if ${OSVERSION} > 800000 LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/sysutils/libsunacl WANT_EXP_MODULES+= vfs_zfsacl SAMBA4_MODULES+= vfs_zfsacl -. endif CONFIGURE_ARGS+= --with-acl-support .else CONFIGURE_ARGS+= --without-acl-support diff --git a/net/ssmping/Makefile b/net/ssmping/Makefile index dfdb1c9a15e6..e4a64632840d 100644 --- a/net/ssmping/Makefile +++ b/net/ssmping/Makefile @@ -14,12 +14,6 @@ PLIST_FILES= bin/ssmping bin/asmping bin/mcfirst sbin/ssmpingd \ man/man1/asmping.1.gz man/man1/mcfirst.1.gz \ man/man1/ssmping.1.gz -.include <bsd.port.pre.mk> - -.if ${OSVERSION} <= 800000 -IGNORE= does not work with FreeBSD 7.x -.endif - do-install: .for f in ssmping asmping mcfirst ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin @@ -27,4 +21,4 @@ do-install: .endfor ${INSTALL_PROGRAM} ${WRKSRC}/ssmpingd ${STAGEDIR}${PREFIX}/sbin -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/tcpdump398/Makefile b/net/tcpdump398/Makefile index 89bc1f02a06b..0b5cb34bd315 100644 --- a/net/tcpdump398/Makefile +++ b/net/tcpdump398/Makefile @@ -13,17 +13,8 @@ PLIST_FILES= bin/tcpdump398 man/man1/tcpdump398.1.gz USES= tar:bzip2 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800000 -IGNORE= comes with the base OS, only applicable for 8.0 and higher -.endif - -post-build: - ${GUNZIP_CMD} ${WRKSRC}/tcpdump.1.gz - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tcpdump ${STAGEDIR}${PREFIX}/bin/tcpdump398 - ${INSTALL_MAN} ${WRKSRC}/tcpdump.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/tcpdump398.1 + ${INSTALL_MAN} ${WRKSRC}/tcpdump.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1/tcpdump398.1.gz -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/wmwlmon/Makefile b/net/wmwlmon/Makefile index 042726c08fa7..fbb365ba05a3 100644 --- a/net/wmwlmon/Makefile +++ b/net/wmwlmon/Makefile @@ -14,16 +14,6 @@ USE_XORG= x11 xpm PLIST_FILES= bin/wmwlmon man/man1/wmwlmon.1.gz -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 700052 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-wl.c ${PATCHDIR}/extra-patch-wmwlmon.1 -pre-everything:: - @${ECHO_CMD} "===========================================================" - @${ECHO_CMD} "On FreeBSD > 700052 there is no wi(4) support in ${PORTNAME}" - @${ECHO_CMD} "===========================================================" -.endif - post-patch: ${REINPLACE_CMD} -e 's#/usr/X11R6#${LOCALBASE}#g' \ -e 's#/usr/local#${LOCALBASE}#g' ${WRKSRC}/Makefile @@ -32,4 +22,4 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmwlmon ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/wmwlmon.1 ${STAGEDIR}${MANPREFIX}/man/man1 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/wmwlmon/files/extra-patch-wl.c b/net/wmwlmon/files/patch-wl.c index 01a400729411..01a400729411 100644 --- a/net/wmwlmon/files/extra-patch-wl.c +++ b/net/wmwlmon/files/patch-wl.c diff --git a/net/wmwlmon/files/extra-patch-wmwlmon.1 b/net/wmwlmon/files/patch-wmwlmon.1 index b41194fab860..b41194fab860 100644 --- a/net/wmwlmon/files/extra-patch-wmwlmon.1 +++ b/net/wmwlmon/files/patch-wmwlmon.1 diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile index 44cbc52251e4..bd83101366f6 100644 --- a/science/gnudatalanguage/Makefile +++ b/science/gnudatalanguage/Makefile @@ -97,12 +97,6 @@ PLIST= pkg-plist.pymod CMAKE_ARGS+= -DPYTHON_MODULE:BOOL=NO .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800503 -BROKEN= Does not build with ancient binutils -.endif - .if defined(BUILD_PYTHON_MODULE) do-install: ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} @@ -129,4 +123,4 @@ regression-test: install . endif .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/fprint_demo/Makefile b/security/fprint_demo/Makefile index 94a67978bda4..94b53109a1c5 100644 --- a/security/fprint_demo/Makefile +++ b/security/fprint_demo/Makefile @@ -17,18 +17,12 @@ LIB_DEPENDS= libfprint.so:${PORTSDIR}/security/libfprint USE_AUTOTOOLS= autoconf automake AUTOMAKE_ARGS= -a GNU_CONFIGURE= yes -USES= pkgconfig +USES= pkgconfig desktop-file-utils USE_GNOME= atk glib20 gtk20 pango INSTALLS_ICONS= yes WRKSRC= ${WRKDIR} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800069 -IGNORE= libfprint will not compile on FreeBSD < 8 -.endif - CONFIGURE_ENV+= CRYPTO_CFLAGS=-I${OPENSSLINC} \ CRYPTO_LIBS=-lcrypto CFLAGS+= -DHAVE_MEMMEM @@ -36,14 +30,4 @@ CFLAGS+= -DHAVE_MEMMEM pre-configure: cd ${WRKDIR} && ${ACLOCAL} -post-install: - @-update-desktop-database - @${ECHO} - @${ECHO} ========================================================================= - @${ECHO} - @${CAT} ${PKGMESSAGE} - @${ECHO} - @${ECHO} ========================================================================= - @${ECHO} - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile index d648ec2f7d5b..13279a16f058 100644 --- a/security/fwbuilder/Makefile +++ b/security/fwbuilder/Makefile @@ -58,7 +58,7 @@ CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --with-qtdir=${QTDIR} \ --prefix=${PREFIX} MAKE_ARGS+= QTDIR="${QTDIR}" \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ -MAKE_ENV= INSTALL_ROOT=${STAGEDIR} +MAKE_ENV= INSTALL_ROOT=${STAGEDIR} CCACHE_DISABLE=yes USE_LDCONFIG= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}" @@ -66,10 +66,6 @@ PORTDOCS= * .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 800107 -MAKE_ENV+= CCACHE_DISABLE=yes -.endif - .if ${OSVERSION} >= 1000055 # IMPORTANT: Newer versions of rcs will NOT work with fwbuilder. RUN_DEPENDS= rcs:${PORTSDIR}/devel/rcs57 diff --git a/security/oidentd/Makefile b/security/oidentd/Makefile index 103d570b76fb..662e6079dcb7 100644 --- a/security/oidentd/Makefile +++ b/security/oidentd/Makefile @@ -23,9 +23,9 @@ PLIST_FILES+= man/man${man:E}/${man}.gz .endfor USE_CSTD= gnu89 -OPTIONS_DEFINE= IPV6 MASQ -OPTIONS_DEFAULT= MASQ -MASQ_DESC= Enable NAT/IP masq support +OPTIONS_DEFINE= IPV6 + +CONFIGURE_ARGS=--disable-masq .include <bsd.port.options.mk> @@ -35,10 +35,6 @@ CONFIGURE_ARGS+=--disable-ipv6 CATEGORIES+= ipv6 .endif -.if ! ${PORT_OPTIONS:MMASQ} || ${OSVERSION} >= 800000 -CONFIGURE_ARGS+=--disable-masq -.endif - post-patch: @${REINPLACE_CMD} -e 's,/etc/,${PREFIX}&,g' ${WRKSRC}/src/oidentd.h @${REINPLACE_CMD} -e 's|\[5-9\]||g;s|\[4-9\]||g' ${WRKSRC}/configure diff --git a/security/openbsm-devel/Makefile b/security/openbsm-devel/Makefile index d619b415a04e..d72fce8e123e 100644 --- a/security/openbsm-devel/Makefile +++ b/security/openbsm-devel/Makefile @@ -32,16 +32,12 @@ VARAUDIT= /var/audit .include <bsd.port.pre.mk> -.if ${OSVERSION} < 902000 && ${OSVERSION} >= 800000 +.if ${OSVERSION} < 902000 NEEDVARDIRS= "" .else NEEDVARDIRS= "@comment " .endif -.if ${OSVERSION} <= 800000 -IGNORE= requires FreeBSD 8.x or above -.endif - .if ${OSVERSION} >= 1000000 IGNORE= is not needed under FreeBSD 10.x or higher .endif @@ -50,7 +46,7 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libauditd.so.0.0.0 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libbsm.so.0.0.0 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/auditfilter_noop.so.0.0.0 -.if ${OSVERSION} < 902000 && ${OSVERSION} >= 800000 +.if ${OSVERSION} < 902000 @${MKDIR} -m 0770 \ ${STAGEDIR}${VARAUDIT}/dist ${STAGEDIR}${VARAUDIT}/remote .endif diff --git a/security/ossec-hids-server/Makefile b/security/ossec-hids-server/Makefile index 283cc422c493..72e98a29e098 100644 --- a/security/ossec-hids-server/Makefile +++ b/security/ossec-hids-server/Makefile @@ -37,10 +37,6 @@ PLIST_SUB= PORTNAME=${PORTNAME} PORTDOCS= BUGS CONFIG CONTRIBUTORS INSTALL LICENSE .include <bsd.port.pre.mk> -.if ${OSVERSION} < 800067 -# Add string function that didn't exist until 8.x -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src__os_csyslogd__csyslogd.c -.endif .if !defined(CLIENT_ONLY) .if ${PORT_OPTIONS:MMYSQL} diff --git a/security/ossec-hids-server/files/extra-patch-src__os_csyslogd__csyslogd.c b/security/ossec-hids-server/files/extra-patch-src__os_csyslogd__csyslogd.c deleted file mode 100644 index 73ee689e1595..000000000000 --- a/security/ossec-hids-server/files/extra-patch-src__os_csyslogd__csyslogd.c +++ /dev/null @@ -1,19 +0,0 @@ ---- ./src/os_csyslogd/csyslogd.c.orig 2013-01-15 16:31:13.000000000 -0500 -+++ ./src/os_csyslogd/csyslogd.c 2013-01-15 16:32:23.000000000 -0500 -@@ -23,7 +23,16 @@ - #include "csyslogd.h" - #include "os_net/os_net.h" - -+#ifndef HAVE_STRNLEN -+size_t strnlen(char *s, size_t maxlen) -+{ -+ size_t i; - -+ for (i= 0; i < maxlen && *s != '\0'; i++, s++) -+ ; -+ return i; -+} -+#endif - - /* OS_SyslogD: Monitor the alerts and sends them via syslog. - * Only return in case of error. diff --git a/security/pam_fprint/Makefile b/security/pam_fprint/Makefile index e3ac18550049..983332629e97 100644 --- a/security/pam_fprint/Makefile +++ b/security/pam_fprint/Makefile @@ -29,13 +29,7 @@ PLIST_FILES+= bin/pam_fprint_enroll \ SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800069 -IGNORE= dependency libfprint will not compile on FreeBsd < 8 -.endif - pre-configure: cd ${WRKDIR} && ${ACLOCAL} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/pam_jail/Makefile b/security/pam_jail/Makefile index 376abe30c0e2..e6bdd91512f4 100644 --- a/security/pam_jail/Makefile +++ b/security/pam_jail/Makefile @@ -21,10 +21,6 @@ do-install: ${LN} -sf pam_jail.so.1 ${STAGEDIR}${PREFIX}/lib/pam_jail.so ${INSTALL_MAN} ${WRKSRC}/pam_jail.8 ${STAGEDIR}${PREFIX}/man/man8/ -.if ${OSVERSION} < 800000 -BROKEN= jail version not supported -.endif - .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif diff --git a/sysutils/DTraceToolkit/Makefile b/sysutils/DTraceToolkit/Makefile index cddab2525438..3adaea17076d 100644 --- a/sysutils/DTraceToolkit/Makefile +++ b/sysutils/DTraceToolkit/Makefile @@ -18,22 +18,13 @@ SHEBANG_LANG+= sh SHEBANG_FILES= hotkernel procsystime opensnoop Apps/shellsnoop NO_BUILD= YES -.include <bsd.port.pre.mk> - -.if ${OSVERSION} <= 701000 -IGNORE= needs to have dtrace enabled kernel -.endif - do-install: ${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}; ${TAR} --exclude '*.orig' -cf - . ) | \ (cd ${STAGEDIR}${DATADIR}/; ${TAR} xvf -) - -post-install: ${LN} -fs ${DATADIR}/hotkernel ${STAGEDIR}${PREFIX}/bin/hotkernel ${LN} -fs ${DATADIR}/procsystime ${STAGEDIR}${PREFIX}/bin/procsystime ${LN} -fs ${DATADIR}/opensnoop ${STAGEDIR}${PREFIX}/bin/opensnoop ${LN} -fs ${DATADIR}/Apps/shellsnoop ${STAGEDIR}${PREFIX}/bin/shellsnoop - @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/arcconf/Makefile b/sysutils/arcconf/Makefile index c46fe9f5fffd..5a4d2489798b 100644 --- a/sysutils/arcconf/Makefile +++ b/sysutils/arcconf/Makefile @@ -30,7 +30,7 @@ IGNORE= installs incompatible binaries for FreeBSD .if ${OSVERSION} >= 900000 DIST_OSVER= 9 -.elif ${OSVERSION} >= 800000 +.else DIST_OSVER= 8 .endif diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile index a2e7fc064ec0..5108d74caad1 100644 --- a/sysutils/coreutils/Makefile +++ b/sysutils/coreutils/Makefile @@ -39,12 +39,6 @@ NLS_CONFIGURE_ENABLE= nls GMP_LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp GMP_CONFIGURE_WITH= gmp -.include <bsd.port.options.mk> - -.if ${OSVERSION} >= 800039 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-stty.c -.endif - post-build: @${REINPLACE_CMD} -e "s/ lib / /g" ${WRKSRC}/Makefile @${TOUCH} ${WRKSRC}/doc/coreutils.info diff --git a/sysutils/coreutils/files/extra-patch-stty.c b/sysutils/coreutils/files/patch-stty.c index ba2723bb64c8..ba2723bb64c8 100644 --- a/sysutils/coreutils/files/extra-patch-stty.c +++ b/sysutils/coreutils/files/patch-stty.c diff --git a/sysutils/fusefs-kmod/Makefile b/sysutils/fusefs-kmod/Makefile index e5e65521d9e1..248beedab219 100644 --- a/sysutils/fusefs-kmod/Makefile +++ b/sysutils/fusefs-kmod/Makefile @@ -27,7 +27,7 @@ SUB_FILES= pkg-message .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 800000 && ${OSVERSION} < 900000 +.if ${OSVERSION} < 900000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-8-fuse_vfsops.c EXTRA_PATCHES+= ${FILESDIR}/extra-patch-8-fuse_vnops.c .endif diff --git a/sysutils/geomWatch/Makefile b/sysutils/geomWatch/Makefile index 13f6b79ed9f5..a79626eeb3d9 100644 --- a/sysutils/geomWatch/Makefile +++ b/sysutils/geomWatch/Makefile @@ -18,19 +18,6 @@ SUB_FILES= pkg-message USE_RC_SUBR= ${PORTNAME} -.include <bsd.port.pre.mk> +MAKE_ARGS= WITH_ZFS=28 -.if ${OSVERSION} < 700036 -MAKE_ARGS+= WITHOUT_ZFS=yes -.elif ${OSVERSION} < 702102 || \ - (${OSVERSION} >= 800000 && ${OSVERSION} < 800054) -MAKE_ARGS+= WITH_ZFS=6 -.elif (${OSVERSION} >= 702102 && ${OSVERSION} < 800000) || \ - (${OSVERSION} >= 800054 && ${OSVERSION} < 802506) || \ - (${OSVERSION} >= 900000 && ${OSVERSION} < 900033) -MAKE_ARGS+= WITH_ZFS=13 -.else -MAKE_ARGS+= WITH_ZFS=28 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index 84ca0a14523b..dae15d3a5864 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -74,12 +74,6 @@ FIXED_MOUNTPOINTS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-tools_hal-storage-mount RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode .endif -.if ${OSVERSION} >= 800063 -PLIST_SUB+= USB2="" -.else -PLIST_SUB+= USB2="@comment " -.endif - post-patch: @${REINPLACE_CMD} -e 's/==/=/g' ${WRKSRC}/tools/hal-luks* @${REINPLACE_CMD} -e '/^scriptdir = /s|[(]libexecdir[)]/scripts|(libexecdir)/hal/scripts|' \ diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist index ae346da97ca8..ac70ee7c0fe6 100644 --- a/sysutils/hal/pkg-plist +++ b/sysutils/hal/pkg-plist @@ -66,9 +66,9 @@ libexec/hald-probe-mouse libexec/hald-probe-scsi libexec/hald-probe-smbios libexec/hald-probe-storage -%%USB2%%libexec/hald-probe-usb2-device -%%USB2%%libexec/hald-probe-usb2-interface -%%USB2%%libexec/hald-probe-video4linux +libexec/hald-probe-usb2-device +libexec/hald-probe-usb2-interface +libexec/hald-probe-video4linux libexec/hald-probe-volume libexec/hald-runner man/man1/hal-disable-polling.1.gz diff --git a/sysutils/jaildaemon/Makefile b/sysutils/jaildaemon/Makefile index 870bfb603c90..fc5d2f680532 100644 --- a/sysutils/jaildaemon/Makefile +++ b/sysutils/jaildaemon/Makefile @@ -17,10 +17,4 @@ PLIST_FILES= bin/jaildaemon \ MAKE_ENV= DESTDIR=${STAGEDIR} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800000 -IGNORE= requires jail_get function from FreeBSD 8 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/realsync/Makefile b/sysutils/realsync/Makefile index 6ff80a890e6c..558a459ace1d 100644 --- a/sysutils/realsync/Makefile +++ b/sysutils/realsync/Makefile @@ -24,16 +24,10 @@ PLIST_FILES= sbin/realsync \ etc/realsync.cfg.example \ man/man8/realsync.8.gz -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 804000 -IGNORE= does not work on FreeBSD < 8.4 -.endif - do-install: @${INSTALL_SCRIPT} ${WRKSRC}/realsync ${STAGEDIR}${PREFIX}/sbin/realsync ${INSTALL_MAN} ${WRKSRC}/man8/realsync.8 ${STAGEDIR}${PREFIX}/man/man8/realsync.8 ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/realsync ${STAGEDIR}${PREFIX}/etc/rc.d/realsync ${INSTALL_DATA} ${WRKSRC}/config/${PORTNAME}.cfg.example ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.cfg.example -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/swapexd/Makefile b/sysutils/swapexd/Makefile index 08dee419769b..9c6e28d695be 100644 --- a/sysutils/swapexd/Makefile +++ b/sysutils/swapexd/Makefile @@ -13,18 +13,13 @@ WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_FILES= sbin/${PORTNAME} etc/rc.d/swapexd "@sample etc/swapexd.conf.sample" -.include <bsd.port.pre.mk> - post-patch: @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/rc.d/swapexd @${REINPLACE_CMD} -e "s,/etc/,${PREFIX}/etc/,g" ${WRKSRC}/swapexd.h -.if ${OSVERSION} < 800076 - @${REINPLACE_CMD} -e "s,swapctl -s -m ,swapctl -s -h ,g" ${WRKSRC}/swapexd.c -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/swapexd ${STAGEDIR}${PREFIX}/etc/rc.d -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/elasticsearch/Makefile b/textproc/elasticsearch/Makefile index af81790392da..401ed38a5d34 100644 --- a/textproc/elasticsearch/Makefile +++ b/textproc/elasticsearch/Makefile @@ -67,14 +67,8 @@ ELASTIC_LOGDIR= /var/log/elasticsearch PLATFORM_VER= 1 . elif ${OSVERSION} >= 900000 PLATFORM_VER= 9 -. elif ${OSVERSION} >= 800000 -PLATFORM_VER= 8 -. elif ${OSVERSION} >= 700000 -PLATFORM_VER= 7 -. elif ${OSVERSION} >= 600000 -PLATFORM_VER= 6 . else -BROKEN= Unsupported FreeBSD version +PLATFORM_VER= 8 . endif .else BROKEN= ${OPSYS} platform is not supported diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile index e7771fd25992..b3441170301a 100644 --- a/x11-toolkits/xview-clients/Makefile +++ b/x11-toolkits/xview-clients/Makefile @@ -28,11 +28,7 @@ ALL_TARGET= Clients X11BASE2FIX= clients/olwmslave/help_file.c lib/libxview/help/help_file.c \ lib/libxview/misc/gettext.h lib/libxview/textsw/txt_e_menu.c -.include <bsd.port.pre.mk> - -.if ${OSVERSION} > 800089 CFLAGS+= -DCOMPAT_43TTY -.endif IMAKECPPFLAGS+= -DXVDestDir=${STAGEDIR}${PREFIX} @@ -44,10 +40,6 @@ pre-configure: ${WRKSRC}/config/XView.cf @${REINPLACE_CMD} -e "s,CcCmd cc,CcCmd ${CC}," \ ${WRKSRC}/config/XView.tmpl -.if ${OSVERSION} < 800090 - @${REINPLACE_CMD} -e "s/-DCOMPAT_43TTY//" \ - ${WRKSRC}/config/XView.tmpl -.endif @${REINPLACE_CMD} -e 's+/usr/X11/+${PREFIX}/+g;' \ ${WRKSRC}/clients/olwm/screen.c ${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+' \ @@ -62,4 +54,4 @@ do-install: @cd ${WRKSRC}/clients; ${MAKE} install install.man @${INSTALL_DATA} ${WRKSRC}/misc/support/textedit.info ${STAGEDIR}${PREFIX}/lib/help/textedit.info -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile index 1bf21352d8ef..1b2588f524d6 100644 --- a/x11-toolkits/xview/Makefile +++ b/x11-toolkits/xview/Makefile @@ -28,7 +28,7 @@ IMAKEINCLUDE= "-I${WRKSRC}/config -I${LOCALBASE}/lib/X11/config" MAKE_ENV+= IMAKEINCLUDE=${IMAKEINCLUDE} ALL_TARGET= World SUB_FILES= pkg-message -CFLAGS+= -Wno-return-type +CFLAGS+= -Wno-return-type -DCOMPAT_43TTY DESTDIRNAME= NONEXISTENT X11BASE2FIX= clients/olwmslave/help_file.c lib/libxview/help/help_file.c \ @@ -38,10 +38,6 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.if ${OSVERSION} > 800089 -CFLAGS+= -DCOMPAT_43TTY -.endif - post-extract: @${MV} ${WRKSRC}/xview.man ${WRKSRC}/XView.man @@ -50,10 +46,6 @@ pre-configure: ${WRKSRC}/config/XView.cf @${REINPLACE_CMD} -e "s,CcCmd cc,CcCmd ${CC}," \ ${WRKSRC}/config/XView.tmpl -.if ${OSVERSION} < 800090 - @${REINPLACE_CMD} -e "s/-DCOMPAT_43TTY//" \ - ${WRKSRC}/config/XView.tmpl -.endif @${REINPLACE_CMD} -e 's+/usr/X11/+${PREFIX}/+g;' \ ${WRKSRC}/clients/olwm/screen.c ${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+' \ diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile index c523bcb3b242..da160e8ec9f8 100644 --- a/x11/gmrun/Makefile +++ b/x11/gmrun/Makefile @@ -24,19 +24,12 @@ CONFIGURE_ARGS= --disable-stlport PORTDOCS= README PLIST_FILES= bin/gmrun %%DATADIR%%/gmrunrc -.include <bsd.port.pre.mk> - post-patch: -.if ( ${OSVERSION} >= 800501 && ${OSVERSION} < 900000 ) || ( ${OSVERSION} >= 900006 ) @${REINPLACE_CMD} -e '/my_alphasort/s#const void\*#const struct dirent**#g' \ ${WRKSRC}/src/gtkcompletionline.cc -.else - @${REINPLACE_CMD} -e '/select_executables_only(const /s#const ##' \ - ${WRKSRC}/src/gtkcompletionline.cc -.endif post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index 2f2d44f303d4..a1ae4bc2ddc6 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -31,13 +31,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -fstack-protector GLIB_SCHEMAS= org.gnome.yelp.gschema.xml INSTALL_TARGET= install-strip -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 900012 || (${OSVERSION} >= 800505 && ${OSVERSION} < 900000) CONFIGURE_ENV+= YELP_LZMA_CFLAGS="-I/usr/include" \ YELP_LZMA_LIBS="-L/usr/lib -llzma" -.else -LIB_DEPENDS+= liblzma.so:${PORTSDIR}/archivers/xz -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> |