Page MenuHomeFreeBSD
Files F107714040

D2209.id4633.diff
No OneTemporary
Actions

D2209.id4633.diff
View Options

Index: head/astro/gpsman/Makefile
===================================================================
--- head/astro/gpsman/Makefile
+++ head/astro/gpsman/Makefile
@@ -21,11 +21,7 @@
.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
Index: head/audio/libgpod/Makefile
===================================================================
--- head/audio/libgpod/Makefile
+++ head/audio/libgpod/Makefile
@@ -46,10 +46,9 @@
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-install:
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/audio/musicpd/Makefile
===================================================================
--- head/audio/musicpd/Makefile
+++ head/audio/musicpd/Makefile
@@ -201,12 +201,6 @@
-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 \
Index: head/audio/schism/Makefile
===================================================================
--- head/audio/schism/Makefile
+++ head/audio/schism/Makefile
@@ -30,11 +30,4 @@
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>
Index: head/audio/schism/files/extrapatch-modplug__snd_gm.c
===================================================================
--- head/audio/schism/files/extrapatch-modplug__snd_gm.c
+++ head/audio/schism/files/extrapatch-modplug__snd_gm.c
@@ -1,17 +0,0 @@
---- ./modplug/snd_gm.c.orig 2010-01-01 20:22:26.000000000 +0100
-+++ ./modplug/snd_gm.c 2011-12-09 21:50:22.000000000 +0100
-@@ -10,12 +10,14 @@
- #include "mplink.h" // for 'mp', which we shouldn't need
- #include "snd_gm.h"
-
-+/*
- #if !defined(HAVE_LOG2) && !defined(__USE_ISOC99) && !defined(log2)
- static double log2(double d)
- {
- return log(d) / log(2.0);
- }
- #endif
-+*/
-
-
- #define LinearMidivol 1
Index: head/audio/schism/files/patch-modplug__snd_gm.c
===================================================================
--- head/audio/schism/files/patch-modplug__snd_gm.c
+++ head/audio/schism/files/patch-modplug__snd_gm.c
@@ -0,0 +1,17 @@
+--- ./modplug/snd_gm.c.orig 2010-01-01 20:22:26.000000000 +0100
++++ ./modplug/snd_gm.c 2011-12-09 21:50:22.000000000 +0100
+@@ -10,12 +10,14 @@
+ #include "mplink.h" // for 'mp', which we shouldn't need
+ #include "snd_gm.h"
+
++/*
+ #if !defined(HAVE_LOG2) && !defined(__USE_ISOC99) && !defined(log2)
+ static double log2(double d)
+ {
+ return log(d) / log(2.0);
+ }
+ #endif
++*/
+
+
+ #define LinearMidivol 1
Index: head/chinese/fcitx/Makefile
===================================================================
--- head/chinese/fcitx/Makefile
+++ head/chinese/fcitx/Makefile
@@ -113,10 +113,5 @@
@${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>
Index: head/chinese/fcitx/files/getline-src_lib_fcitx-utils_utils.h
===================================================================
--- head/chinese/fcitx/files/getline-src_lib_fcitx-utils_utils.h
+++ head/chinese/fcitx/files/getline-src_lib_fcitx-utils_utils.h
@@ -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
Index: head/chinese/fcitx/files/getline-src_lib_fcitx-utils_utils.c
===================================================================
--- head/chinese/fcitx/files/getline-src_lib_fcitx-utils_utils.c
+++ head/chinese/fcitx/files/getline-src_lib_fcitx-utils_utils.c
@@ -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;
Index: head/comms/linrad/Makefile
===================================================================
--- head/comms/linrad/Makefile
+++ head/comms/linrad/Makefile
@@ -55,10 +55,8 @@
${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}
Index: head/comms/usrp/Makefile
===================================================================
--- head/comms/usrp/Makefile
+++ head/comms/usrp/Makefile
@@ -36,10 +36,6 @@
.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"
Index: head/databases/datamodeler/Makefile
===================================================================
--- head/databases/datamodeler/Makefile
+++ head/databases/datamodeler/Makefile
@@ -38,10 +38,6 @@
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 \
Index: head/devel/gearmand-devel/Makefile
===================================================================
--- head/devel/gearmand-devel/Makefile
+++ head/devel/gearmand-devel/Makefile
@@ -47,12 +47,6 @@
.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
Index: head/devel/gearmand/Makefile
===================================================================
--- head/devel/gearmand/Makefile
+++ head/devel/gearmand/Makefile
@@ -45,12 +45,6 @@
.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
Index: head/devel/glib20/Makefile
===================================================================
--- head/devel/glib20/Makefile
+++ head/devel/glib20/Makefile
@@ -56,13 +56,7 @@
.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
Index: head/devel/libdispatch/Makefile
===================================================================
--- head/devel/libdispatch/Makefile
+++ head/devel/libdispatch/Makefile
@@ -84,10 +84,6 @@
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
Index: head/devel/libg19/Makefile
===================================================================
--- head/devel/libg19/Makefile
+++ head/devel/libg19/Makefile
@@ -20,10 +20,4 @@
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>
Index: head/devel/libpasori/Makefile
===================================================================
--- head/devel/libpasori/Makefile
+++ head/devel/libpasori/Makefile
@@ -21,11 +21,7 @@
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
Index: head/devel/libpasori/files/Makefile.lib
===================================================================
--- head/devel/libpasori/files/Makefile.lib
+++ head/devel/libpasori/files/Makefile.lib
@@ -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>
Index: head/devel/p4/Makefile.inc
===================================================================
--- head/devel/p4/Makefile.inc
+++ head/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
Index: head/devel/p4web/Makefile
===================================================================
--- head/devel/p4web/Makefile
+++ head/devel/p4web/Makefile
@@ -40,19 +40,9 @@
# 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
Index: head/devel/py-freebsd/Makefile
===================================================================
--- head/devel/py-freebsd/Makefile
+++ head/devel/py-freebsd/Makefile
@@ -19,11 +19,6 @@
.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
Index: head/devel/py-freebsd/files/freebsd8_patch-src-jail.c
===================================================================
--- head/devel/py-freebsd/files/freebsd8_patch-src-jail.c
+++ head/devel/py-freebsd/files/freebsd8_patch-src-jail.c
@@ -1,45 +0,0 @@
---- src/jail.c.orig 2005-05-08 06:55:00.000000000 +0000
-+++ src/jail.c 2008-12-23 13:54:31.000000000 +0000
-@@ -40,21 +40,37 @@ static PyObject *
- PyFB_jail(PyObject *self, PyObject *args)
- {
- struct jail jp;
-+ struct in_addr ia;
- char *ipaddr;
-+ int error;
-
- if (!PyArg_ParseTuple(args, "sss:jail", &(jp.path),
- &(jp.hostname), &ipaddr))
- return NULL;
-
-- jp.version = 0;
-- jp.ip_number = inet_addr(ipaddr);
--
-- if (jp.ip_number == INADDR_NONE) {
-+ ia.s_addr = inet_addr(ipaddr);
-+ if (ia.s_addr == INADDR_NONE) {
- PyErr_SetString(PyExc_ValueError, "malformed internet address");
- return NULL;
- }
-
-- if (jail(&jp) == -1)
-+ jp.version = JAIL_API_VERSION;
-+ jp.jailname = NULL;
-+ jp.ip4s = 1;
-+ jp.ip4 = malloc(jp.ip4s * sizeof(struct in_addr));
-+ if (jp.ip4 == NULL) {
-+ PyErr_SetString(PyExc_ValueError, "Cannot allocate memory");
-+ return NULL;
-+ }
-+ jp.ip4->s_addr = ia.s_addr;
-+ jp.ip6s = 0;
-+ jp.ip6 = NULL;
-+
-+ error = jail(&jp);
-+
-+ free(jp.ip4);
-+
-+ if (error == -1)
- return OSERROR();
-
- Py_RETURN_NONE;
Index: head/devel/py-freebsd/files/patch-src-jail.c
===================================================================
--- head/devel/py-freebsd/files/patch-src-jail.c
+++ head/devel/py-freebsd/files/patch-src-jail.c
@@ -0,0 +1,45 @@
+--- src/jail.c.orig 2005-05-08 06:55:00.000000000 +0000
++++ src/jail.c 2008-12-23 13:54:31.000000000 +0000
+@@ -40,21 +40,37 @@ static PyObject *
+ PyFB_jail(PyObject *self, PyObject *args)
+ {
+ struct jail jp;
++ struct in_addr ia;
+ char *ipaddr;
++ int error;
+
+ if (!PyArg_ParseTuple(args, "sss:jail", &(jp.path),
+ &(jp.hostname), &ipaddr))
+ return NULL;
+
+- jp.version = 0;
+- jp.ip_number = inet_addr(ipaddr);
+-
+- if (jp.ip_number == INADDR_NONE) {
++ ia.s_addr = inet_addr(ipaddr);
++ if (ia.s_addr == INADDR_NONE) {
+ PyErr_SetString(PyExc_ValueError, "malformed internet address");
+ return NULL;
+ }
+
+- if (jail(&jp) == -1)
++ jp.version = JAIL_API_VERSION;
++ jp.jailname = NULL;
++ jp.ip4s = 1;
++ jp.ip4 = malloc(jp.ip4s * sizeof(struct in_addr));
++ if (jp.ip4 == NULL) {
++ PyErr_SetString(PyExc_ValueError, "Cannot allocate memory");
++ return NULL;
++ }
++ jp.ip4->s_addr = ia.s_addr;
++ jp.ip6s = 0;
++ jp.ip6 = NULL;
++
++ error = jail(&jp);
++
++ free(jp.ip4);
++
++ if (error == -1)
+ return OSERROR();
+
+ Py_RETURN_NONE;
Index: head/devel/rubygem-posix-spawn/Makefile
===================================================================
--- head/devel/rubygem-posix-spawn/Makefile
+++ head/devel/rubygem-posix-spawn/Makefile
@@ -14,9 +14,4 @@
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>
Index: head/devel/xc3sprog/Makefile
===================================================================
--- head/devel/xc3sprog/Makefile
+++ head/devel/xc3sprog/Makefile
@@ -19,10 +19,4 @@
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>
Index: head/dns/nss_resinit/Makefile
===================================================================
--- head/dns/nss_resinit/Makefile
+++ head/dns/nss_resinit/Makefile
@@ -20,9 +20,7 @@
.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
Index: head/emulators/i386-wine-devel/Makefile.inc
===================================================================
--- head/emulators/i386-wine-devel/Makefile.inc
+++ head/emulators/i386-wine-devel/Makefile.inc
@@ -64,7 +64,7 @@
.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
Index: head/emulators/i386-wine/Makefile.inc
===================================================================
--- head/emulators/i386-wine/Makefile.inc
+++ head/emulators/i386-wine/Makefile.inc
@@ -57,7 +57,7 @@
.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
Index: head/emulators/qemu-devel/Makefile
===================================================================
--- head/emulators/qemu-devel/Makefile
+++ head/emulators/qemu-devel/Makefile
@@ -262,14 +262,12 @@
-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:
Index: head/emulators/qemu-sbruno/Makefile
===================================================================
--- head/emulators/qemu-sbruno/Makefile
+++ head/emulators/qemu-sbruno/Makefile
@@ -280,14 +280,12 @@
-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:
Index: head/emulators/qemu/Makefile
===================================================================
--- head/emulators/qemu/Makefile
+++ head/emulators/qemu/Makefile
@@ -149,14 +149,12 @@
-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
Index: head/ftp/proftpd/Makefile
===================================================================
--- head/ftp/proftpd/Makefile
+++ head/ftp/proftpd/Makefile
@@ -142,18 +142,6 @@
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
Index: head/ftp/proftpd/files/extra-patch-7-src-fsio.c
===================================================================
--- head/ftp/proftpd/files/extra-patch-7-src-fsio.c
+++ head/ftp/proftpd/files/extra-patch-7-src-fsio.c
@@ -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;
Index: head/ftp/proftpd/files/extra-patch-8-src-fsio.c
===================================================================
--- head/ftp/proftpd/files/extra-patch-8-src-fsio.c
+++ head/ftp/proftpd/files/extra-patch-8-src-fsio.c
@@ -1,44 +0,0 @@
---- src/fsio.c.orig 2010-04-12 21:00:00.000000000 +0200
-+++ src/fsio.c 2011-12-29 21:51:33.844925577 +0100
-@@ -50,6 +50,10 @@
- # include <acl/libacl.h>
- #endif
-
-+#if defined(__FreeBSD__)
-+#include <dlfcn.h>
-+#endif
-+
- typedef struct fsopendir fsopendir_t;
-
- struct fsopendir {
-@@ -284,7 +288,30 @@
- #endif
- }
-
-+#if defined(__FreeBSD__)
-+static int
-+enter_freebsd_restricted_mode()
-+{
-+ typedef void frmode_t();
-+ frmode_t *frmode;
-+
-+ frmode = (frmode_t *)dlfunc(
-+ RTLD_NEXT, "__FreeBSD_libc_enter_restricted_mode");
-+ if (frmode == NULL) {
-+ pr_log_pri(PR_LOG_ERR,
-+ "error: FreeBSD with vulnerable chroot (FreeBSD-SA-11:07.chroot)");
-+ return 1;
-+ }
-+ frmode();
-+ return 0;
-+}
-+#endif
-+
- static int sys_chroot(pr_fs_t *fs, const char *path) {
-+#if defined(__FreeBSD__)
-+ if (enter_freebsd_restricted_mode() != 0)
-+ return -1;
-+#endif
- if (chroot(path) < 0)
- return -1;
-
Index: head/ftp/proftpd/files/patch-8-src-fsio.c
===================================================================
--- head/ftp/proftpd/files/patch-8-src-fsio.c
+++ head/ftp/proftpd/files/patch-8-src-fsio.c
@@ -0,0 +1,44 @@
+--- src/fsio.c.orig 2010-04-12 21:00:00.000000000 +0200
++++ src/fsio.c 2011-12-29 21:51:33.844925577 +0100
+@@ -50,6 +50,10 @@
+ # include <acl/libacl.h>
+ #endif
+
++#if defined(__FreeBSD__)
++#include <dlfcn.h>
++#endif
++
+ typedef struct fsopendir fsopendir_t;
+
+ struct fsopendir {
+@@ -284,7 +288,30 @@
+ #endif
+ }
+
++#if defined(__FreeBSD__)
++static int
++enter_freebsd_restricted_mode()
++{
++ typedef void frmode_t();
++ frmode_t *frmode;
++
++ frmode = (frmode_t *)dlfunc(
++ RTLD_NEXT, "__FreeBSD_libc_enter_restricted_mode");
++ if (frmode == NULL) {
++ pr_log_pri(PR_LOG_ERR,
++ "error: FreeBSD with vulnerable chroot (FreeBSD-SA-11:07.chroot)");
++ return 1;
++ }
++ frmode();
++ return 0;
++}
++#endif
++
+ static int sys_chroot(pr_fs_t *fs, const char *path) {
++#if defined(__FreeBSD__)
++ if (enter_freebsd_restricted_mode() != 0)
++ return -1;
++#endif
+ if (chroot(path) < 0)
+ return -1;
+
Index: head/games/linux-nerogame/Makefile
===================================================================
--- head/games/linux-nerogame/Makefile
+++ head/games/linux-nerogame/Makefile
@@ -24,11 +24,6 @@
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 @@
@${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>
Index: head/graphics/aaphoto/Makefile
===================================================================
--- head/graphics/aaphoto/Makefile
+++ head/graphics/aaphoto/Makefile
@@ -30,8 +30,7 @@
.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
Index: head/graphics/rubygem-objectdetect/Makefile
===================================================================
--- head/graphics/rubygem-objectdetect/Makefile
+++ head/graphics/rubygem-objectdetect/Makefile
@@ -19,13 +19,7 @@
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>
Index: head/graphics/s10sh/files/Makefile.bsd
===================================================================
--- head/graphics/s10sh/files/Makefile.bsd
+++ head/graphics/s10sh/files/Makefile.bsd
@@ -7,14 +7,7 @@
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
Index: head/japanese/mozc-server/Makefile
===================================================================
--- head/japanese/mozc-server/Makefile
+++ head/japanese/mozc-server/Makefile
@@ -61,10 +61,6 @@
.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
Index: head/japanese/tomoe/Makefile
===================================================================
--- head/japanese/tomoe/Makefile
+++ head/japanese/tomoe/Makefile
@@ -55,12 +55,7 @@
.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
Index: head/java/sigar/Makefile
===================================================================
--- head/java/sigar/Makefile
+++ head/java/sigar/Makefile
@@ -40,14 +40,8 @@
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
Index: head/lang/ccl/Makefile
===================================================================
--- head/lang/ccl/Makefile
+++ head/lang/ccl/Makefile
@@ -24,10 +24,6 @@
.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
Index: head/lang/dmd2/Makefile
===================================================================
--- head/lang/dmd2/Makefile
+++ head/lang/dmd2/Makefile
@@ -27,10 +27,6 @@
.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
Index: head/lang/ghc/Makefile
===================================================================
--- head/lang/ghc/Makefile
+++ head/lang/ghc/Makefile
@@ -72,15 +72,6 @@
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 @@
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 @@
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 @@
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 @@
.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)
Index: head/lang/ghc/files/nopatch-rules__distdir-way-opts.mk
===================================================================
--- head/lang/ghc/files/nopatch-rules__distdir-way-opts.mk
+++ head/lang/ghc/files/nopatch-rules__distdir-way-opts.mk
@@ -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
-
Index: head/lang/nqc/Makefile
===================================================================
--- head/lang/nqc/Makefile
+++ head/lang/nqc/Makefile
@@ -22,7 +22,7 @@
.include <bsd.port.pre.mk>
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 800064
+.if ${OPSYS} == FreeBSD
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-rcxlib-RCX_USBTowerPipe_fbsd.cpp
.endif
Index: head/lang/smlnj/Makefile
===================================================================
--- head/lang/smlnj/Makefile
+++ head/lang/smlnj/Makefile
@@ -43,7 +43,7 @@
.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=
.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} )
Index: head/mail/cyrus-imapd23/Makefile
===================================================================
--- head/mail/cyrus-imapd23/Makefile
+++ head/mail/cyrus-imapd23/Makefile
@@ -115,9 +115,7 @@
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 @@
CONFIGURE_ARGS+=--disable-gssapi
.endif
-.if ${OSVERSION} >= 800037
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure
-.endif
-
CYRUS_USER?= cyrus
CYRUS_GROUP?= cyrus
Index: head/mail/cyrus-imapd23/files/extra-patch-configure
===================================================================
--- head/mail/cyrus-imapd23/files/extra-patch-configure
+++ head/mail/cyrus-imapd23/files/extra-patch-configure
@@ -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
Index: head/mail/cyrus-imapd23/files/patch-configure
===================================================================
--- head/mail/cyrus-imapd23/files/patch-configure
+++ head/mail/cyrus-imapd23/files/patch-configure
@@ -19,6 +19,24 @@
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
Index: head/mail/cyrus-imapd24/Makefile
===================================================================
--- head/mail/cyrus-imapd24/Makefile
+++ head/mail/cyrus-imapd24/Makefile
@@ -109,9 +109,7 @@
.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 @@
CONFIGURE_ARGS+=--disable-gssapi
.endif
-.if ${OSVERSION} >= 800037
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure
-.endif
-
CYRUS_USER?= cyrus
CYRUS_GROUP?= cyrus
Index: head/mail/cyrus-imapd24/files/extra-patch-configure
===================================================================
--- head/mail/cyrus-imapd24/files/extra-patch-configure
+++ head/mail/cyrus-imapd24/files/extra-patch-configure
@@ -1,22 +0,0 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig 2010-10-18 21:36:00.000000000 +0900
-+++ configure 2010-10-18 23:50:45.966557478 +0900
-@@ -9501,7 +9501,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. */
-
-@@ -9803,7 +9803,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
Index: head/mail/cyrus-imapd24/files/patch-configure
===================================================================
--- head/mail/cyrus-imapd24/files/patch-configure
+++ head/mail/cyrus-imapd24/files/patch-configure
@@ -0,0 +1,22 @@
+Index: configure
+diff -u configure.orig configure
+--- configure.orig 2010-10-18 21:36:00.000000000 +0900
++++ configure 2010-10-18 23:50:45.966557478 +0900
+@@ -9501,7 +9501,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. */
+
+@@ -9803,7 +9803,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
Index: head/mail/cyrus-imapd25/Makefile
===================================================================
--- head/mail/cyrus-imapd25/Makefile
+++ head/mail/cyrus-imapd25/Makefile
@@ -123,9 +123,7 @@
.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
Index: head/mail/milter-skem/Makefile
===================================================================
--- head/mail/milter-skem/Makefile
+++ head/mail/milter-skem/Makefile
@@ -34,10 +34,6 @@
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_*}
Index: head/mail/milter-skem/files/patch-cleanup.c
===================================================================
--- head/mail/milter-skem/files/patch-cleanup.c
+++ head/mail/milter-skem/files/patch-cleanup.c
@@ -0,0 +1,22 @@
+--- cleanup.c Sun Jan 1 08:19:39 2006
++++ newcleanup.c Sun Jan 1 08:19:18 2006
+@@ -15,6 +15,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sys/types.h>
++#include <inttypes.h>
+ #include <dirent.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+@@ -50,9 +51,9 @@
+ return NULL;
+ }
+ }
+- syslog(LOG_DEBUG, "periodic cleanup: period %ld seconds%s, "
++ syslog(LOG_DEBUG, "periodic cleanup: period %jd seconds%s, "
+ "permanent bans removed after %u seconds since last seen",
+- O.cleanupperiod.tv_sec,
++ (intmax_t)O.cleanupperiod.tv_sec,
+ O.cleanupperiod.tv_sec ? "" : " (one shot)",
+ O.permcleanup);
+ for (result = 0, select_failures = 0;
Index: head/mail/milter-skem/files/timet.patch
===================================================================
--- head/mail/milter-skem/files/timet.patch
+++ head/mail/milter-skem/files/timet.patch
@@ -1,22 +0,0 @@
---- cleanup.c Sun Jan 1 08:19:39 2006
-+++ newcleanup.c Sun Jan 1 08:19:18 2006
-@@ -15,6 +15,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/types.h>
-+#include <inttypes.h>
- #include <dirent.h>
- #include <sys/stat.h>
- #include <sys/time.h>
-@@ -50,9 +51,9 @@
- return NULL;
- }
- }
-- syslog(LOG_DEBUG, "periodic cleanup: period %ld seconds%s, "
-+ syslog(LOG_DEBUG, "periodic cleanup: period %jd seconds%s, "
- "permanent bans removed after %u seconds since last seen",
-- O.cleanupperiod.tv_sec,
-+ (intmax_t)O.cleanupperiod.tv_sec,
- O.cleanupperiod.tv_sec ? "" : " (one shot)",
- O.permcleanup);
- for (result = 0, select_failures = 0;
Index: head/math/crlibm/Makefile
===================================================================
--- head/math/crlibm/Makefile
+++ head/math/crlibm/Makefile
@@ -31,13 +31,6 @@
.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
Index: head/math/libranlip/Makefile
===================================================================
--- head/math/libranlip/Makefile
+++ head/math/libranlip/Makefile
@@ -38,10 +38,4 @@
@(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>
Index: head/math/msieve/Makefile
===================================================================
--- head/math/msieve/Makefile
+++ head/math/msieve/Makefile
@@ -46,7 +46,7 @@
CFLAGS+= -DHAS_SSE2
.endif
-.if ${OSVERSION} >= 700042 && ${ARCH} == "sparc64"
+.if ${ARCH} == "sparc64"
BROKEN= Does not compile on sparc64
.endif
Index: head/math/stp/Makefile
===================================================================
--- head/math/stp/Makefile
+++ head/math/stp/Makefile
@@ -28,8 +28,4 @@
-DFLEX_EXECUTABLE=${LOCALBASE}/bin/flex
.endif
-.if (${OSVERSION} < 802502)
-IGNORE= stp needs log2(3)
-.endif
-
.include <bsd.port.post.mk>
Index: head/misc/amfm/Makefile
===================================================================
--- head/misc/amfm/Makefile
+++ head/misc/amfm/Makefile
@@ -17,18 +17,12 @@
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>
Index: head/misc/compat7x/Makefile
===================================================================
--- head/misc/compat7x/Makefile
+++ head/misc/compat7x/Makefile
@@ -23,10 +23,6 @@
.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}
Index: head/misc/compat8x/Makefile
===================================================================
--- head/misc/compat8x/Makefile
+++ head/misc/compat8x/Makefile
@@ -24,10 +24,6 @@
.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
Index: head/misc/fxload/Makefile
===================================================================
--- head/misc/fxload/Makefile
+++ head/misc/fxload/Makefile
@@ -20,10 +20,4 @@
${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>
Index: head/misc/usbrh-libusb/Makefile
===================================================================
--- head/misc/usbrh-libusb/Makefile
+++ head/misc/usbrh-libusb/Makefile
@@ -14,13 +14,7 @@
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>
Index: head/multimedia/gstreamer-plugins/Makefile.common
===================================================================
--- head/multimedia/gstreamer-plugins/Makefile.common
+++ head/multimedia/gstreamer-plugins/Makefile.common
@@ -536,7 +536,7 @@
# 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 \
Index: head/multimedia/handbrake/Makefile
===================================================================
--- head/multimedia/handbrake/Makefile
+++ head/multimedia/handbrake/Makefile
@@ -72,8 +72,7 @@
# 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
Index: head/multimedia/mplayer2/Makefile
===================================================================
--- head/multimedia/mplayer2/Makefile
+++ head/multimedia/mplayer2/Makefile
@@ -75,10 +75,6 @@
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
Index: head/multimedia/v4l-utils/Makefile
===================================================================
--- head/multimedia/v4l-utils/Makefile
+++ head/multimedia/v4l-utils/Makefile
@@ -22,12 +22,6 @@
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 @@
${WRKSRC}/v4l2-ctl/ivtv-ctl.c \
${WRKSRC}/../include/linux/ivtv.h
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/multimedia/v4l-utils/files/extra-strnlen
===================================================================
--- head/multimedia/v4l-utils/files/extra-strnlen
+++ head/multimedia/v4l-utils/files/extra-strnlen
@@ -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;
Index: head/net-mgmt/net-snmp/Makefile
===================================================================
--- head/net-mgmt/net-snmp/Makefile
+++ head/net-mgmt/net-snmp/Makefile
@@ -51,6 +51,7 @@
--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_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
Index: head/net-mgmt/py-yapsnmp/Makefile
===================================================================
--- head/net-mgmt/py-yapsnmp/Makefile
+++ head/net-mgmt/py-yapsnmp/Makefile
@@ -24,7 +24,7 @@
.include <bsd.port.pre.mk>
-.if (${OSVERSION} >= 800000) && (${ARCH} == "i386")
+.if (${ARCH} == "i386")
CPPFLAGS+= -fstack-protector -I${LOCALBASE}/include
.endif
Index: head/net/freeradius3/Makefile
===================================================================
--- head/net/freeradius3/Makefile
+++ head/net/freeradius3/Makefile
@@ -296,10 +296,6 @@
# 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}
Index: head/net/iet/Makefile
===================================================================
--- head/net/iet/Makefile
+++ head/net/iet/Makefile
@@ -31,17 +31,11 @@
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>
Index: head/net/libpcap/Makefile
===================================================================
--- head/net/libpcap/Makefile
+++ head/net/libpcap/Makefile
@@ -130,9 +130,7 @@
# 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
Index: head/net/ndisc6/Makefile
===================================================================
--- head/net/ndisc6/Makefile
+++ head/net/ndisc6/Makefile
@@ -27,10 +27,6 @@
.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
Index: head/net/ndisc6/files/extra-patch-rdnssd__rdnssd.h
===================================================================
--- head/net/ndisc6/files/extra-patch-rdnssd__rdnssd.h
+++ head/net/ndisc6/files/extra-patch-rdnssd__rdnssd.h
@@ -1,18 +0,0 @@
---- rdnssd/rdnssd.h.orig 2011-07-23 01:03:38.000000000 +0400
-+++ rdnssd/rdnssd.h 2011-07-23 01:03:56.000000000 +0400
-@@ -32,15 +32,6 @@
- /* Belongs in <netinet/icmp6.h> */
- #define ND_OPT_RDNSS 25
-
--struct nd_opt_rdnss
--{
-- uint8_t nd_opt_rdnss_type;
-- uint8_t nd_opt_rdnss_len;
-- uint16_t nd_opt_rdnss_resserved1;
-- uint32_t nd_opt_rdnss_lifetime;
-- /* followed by one or more IPv6 addresses */
--};
--
- # ifdef __cplusplus
- extern "C" {
- # endif
Index: head/net/ndisc6/files/patch-rdnssd__rdnssd.h
===================================================================
--- head/net/ndisc6/files/patch-rdnssd__rdnssd.h
+++ head/net/ndisc6/files/patch-rdnssd__rdnssd.h
@@ -0,0 +1,18 @@
+--- rdnssd/rdnssd.h.orig 2011-07-23 01:03:38.000000000 +0400
++++ rdnssd/rdnssd.h 2011-07-23 01:03:56.000000000 +0400
+@@ -32,15 +32,6 @@
+ /* Belongs in <netinet/icmp6.h> */
+ #define ND_OPT_RDNSS 25
+
+-struct nd_opt_rdnss
+-{
+- uint8_t nd_opt_rdnss_type;
+- uint8_t nd_opt_rdnss_len;
+- uint16_t nd_opt_rdnss_resserved1;
+- uint32_t nd_opt_rdnss_lifetime;
+- /* followed by one or more IPv6 addresses */
+-};
+-
+ # ifdef __cplusplus
+ extern "C" {
+ # endif
Index: head/net/netatalk3/Makefile
===================================================================
--- head/net/netatalk3/Makefile
+++ head/net/netatalk3/Makefile
@@ -139,12 +139,6 @@
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 ; \
Index: head/net/netatalk3/pkg-plist
===================================================================
--- head/net/netatalk3/pkg-plist
+++ head/net/netatalk3/pkg-plist
@@ -1,4 +1,4 @@
-%%ATFUNCS%%bin/ad
+bin/ad
bin/afpldaptest
bin/afppasswd
%%DBUS%%bin/afpstats
Index: head/net/rtg/Makefile
===================================================================
--- head/net/rtg/Makefile
+++ head/net/rtg/Makefile
@@ -43,15 +43,11 @@
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>
Index: head/net/samba36/Makefile
===================================================================
--- head/net/samba36/Makefile
+++ head/net/samba36/Makefile
@@ -260,18 +260,13 @@
.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
Index: head/net/samba4/Makefile
===================================================================
--- head/net/samba4/Makefile
+++ head/net/samba4/Makefile
@@ -219,11 +219,9 @@
.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
Index: head/net/samba41/Makefile
===================================================================
--- head/net/samba41/Makefile
+++ head/net/samba41/Makefile
@@ -226,11 +226,9 @@
.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
Index: head/net/ssmping/Makefile
===================================================================
--- head/net/ssmping/Makefile
+++ head/net/ssmping/Makefile
@@ -14,12 +14,6 @@
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 @@
.endfor
${INSTALL_PROGRAM} ${WRKSRC}/ssmpingd ${STAGEDIR}${PREFIX}/sbin
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/net/tcpdump398/Makefile
===================================================================
--- head/net/tcpdump398/Makefile
+++ head/net/tcpdump398/Makefile
@@ -13,17 +13,8 @@
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>
Index: head/net/wmwlmon/Makefile
===================================================================
--- head/net/wmwlmon/Makefile
+++ head/net/wmwlmon/Makefile
@@ -14,16 +14,6 @@
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 @@
${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>
Index: head/net/wmwlmon/files/extra-patch-wl.c
===================================================================
--- head/net/wmwlmon/files/extra-patch-wl.c
+++ head/net/wmwlmon/files/extra-patch-wl.c
@@ -1,20 +0,0 @@
---- wl.c.orig 2008-05-12 21:42:17.000000000 -0700
-+++ wl.c 2008-05-15 21:27:36.000000000 -0700
-@@ -283,6 +283,7 @@
- int
- get_wi_signal(const char *interface)
- {
-+#if __FreeBSD__ > 600100 && __FreeBSD__ < 700052 /* wi support is broken on 7 because of struct wi_req removal*/
- int s;
- struct ifreq ifr;
- struct wi_req wreq;
-@@ -319,6 +320,9 @@
- #ifdef __FreeBSD__
- return (wreq.wi_val[1]);
- #endif
-+#else
-+ return (-1);
-+#endif
- }
-
- /*
Index: head/net/wmwlmon/files/extra-patch-wmwlmon.1
===================================================================
--- head/net/wmwlmon/files/extra-patch-wmwlmon.1
+++ head/net/wmwlmon/files/extra-patch-wmwlmon.1
@@ -1,10 +0,0 @@
---- wmwlmon.1.orig 2008-05-13 10:42:02.000000000 -0700
-+++ wmwlmon.1 2008-05-15 21:30:56.000000000 -0700
-@@ -105,7 +105,6 @@
- .It iwi(4)
- .It ral(4)
- .It upgt(4)
--.It wi(4)
- .It wpi(4)
- .El
- .Pp
Index: head/net/wmwlmon/files/patch-wl.c
===================================================================
--- head/net/wmwlmon/files/patch-wl.c
+++ head/net/wmwlmon/files/patch-wl.c
@@ -0,0 +1,20 @@
+--- wl.c.orig 2008-05-12 21:42:17.000000000 -0700
++++ wl.c 2008-05-15 21:27:36.000000000 -0700
+@@ -283,6 +283,7 @@
+ int
+ get_wi_signal(const char *interface)
+ {
++#if __FreeBSD__ > 600100 && __FreeBSD__ < 700052 /* wi support is broken on 7 because of struct wi_req removal*/
+ int s;
+ struct ifreq ifr;
+ struct wi_req wreq;
+@@ -319,6 +320,9 @@
+ #ifdef __FreeBSD__
+ return (wreq.wi_val[1]);
+ #endif
++#else
++ return (-1);
++#endif
+ }
+
+ /*
Index: head/net/wmwlmon/files/patch-wmwlmon.1
===================================================================
--- head/net/wmwlmon/files/patch-wmwlmon.1
+++ head/net/wmwlmon/files/patch-wmwlmon.1
@@ -0,0 +1,10 @@
+--- wmwlmon.1.orig 2008-05-13 10:42:02.000000000 -0700
++++ wmwlmon.1 2008-05-15 21:30:56.000000000 -0700
+@@ -105,7 +105,6 @@
+ .It iwi(4)
+ .It ral(4)
+ .It upgt(4)
+-.It wi(4)
+ .It wpi(4)
+ .El
+ .Pp
Index: head/science/gnudatalanguage/Makefile
===================================================================
--- head/science/gnudatalanguage/Makefile
+++ head/science/gnudatalanguage/Makefile
@@ -97,12 +97,6 @@
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 @@
. endif
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/security/fprint_demo/Makefile
===================================================================
--- head/security/fprint_demo/Makefile
+++ head/security/fprint_demo/Makefile
@@ -17,18 +17,12 @@
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 @@
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>
Index: head/security/fwbuilder/Makefile
===================================================================
--- head/security/fwbuilder/Makefile
+++ head/security/fwbuilder/Makefile
@@ -58,7 +58,7 @@
--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 @@
.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
Index: head/security/oidentd/Makefile
===================================================================
--- head/security/oidentd/Makefile
+++ head/security/oidentd/Makefile
@@ -23,9 +23,9 @@
.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 @@
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
Index: head/security/openbsm-devel/Makefile
===================================================================
--- head/security/openbsm-devel/Makefile
+++ head/security/openbsm-devel/Makefile
@@ -32,16 +32,12 @@
.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 @@
@${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
Index: head/security/ossec-hids-server/Makefile
===================================================================
--- head/security/ossec-hids-server/Makefile
+++ head/security/ossec-hids-server/Makefile
@@ -37,10 +37,6 @@
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}
Index: head/security/ossec-hids-server/files/extra-patch-src__os_csyslogd__csyslogd.c
===================================================================
--- head/security/ossec-hids-server/files/extra-patch-src__os_csyslogd__csyslogd.c
+++ head/security/ossec-hids-server/files/extra-patch-src__os_csyslogd__csyslogd.c
@@ -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.
Index: head/security/pam_fprint/Makefile
===================================================================
--- head/security/pam_fprint/Makefile
+++ head/security/pam_fprint/Makefile
@@ -29,13 +29,7 @@
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>
Index: head/security/pam_jail/Makefile
===================================================================
--- head/security/pam_jail/Makefile
+++ head/security/pam_jail/Makefile
@@ -21,10 +21,6 @@
${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
Index: head/sysutils/DTraceToolkit/Makefile
===================================================================
--- head/sysutils/DTraceToolkit/Makefile
+++ head/sysutils/DTraceToolkit/Makefile
@@ -18,22 +18,13 @@
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>
Index: head/sysutils/arcconf/Makefile
===================================================================
--- head/sysutils/arcconf/Makefile
+++ head/sysutils/arcconf/Makefile
@@ -30,7 +30,7 @@
.if ${OSVERSION} >= 900000
DIST_OSVER= 9
-.elif ${OSVERSION} >= 800000
+.else
DIST_OSVER= 8
.endif
Index: head/sysutils/coreutils/Makefile
===================================================================
--- head/sysutils/coreutils/Makefile
+++ head/sysutils/coreutils/Makefile
@@ -39,12 +39,6 @@
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
Index: head/sysutils/coreutils/files/extra-patch-stty.c
===================================================================
--- head/sysutils/coreutils/files/extra-patch-stty.c
+++ head/sysutils/coreutils/files/extra-patch-stty.c
@@ -1,24 +0,0 @@
---- src/stty.c.orig 2010-07-21 17:11:49.000000000 +0200
-+++ src/stty.c 2010-07-21 17:12:36.000000000 +0200
-@@ -282,10 +282,10 @@
- # ifdef TAB3
- {"tab3", output, SANE_UNSET, TAB3, TABDLY},
- # endif
--# ifdef TAB2
-+# if 0
- {"tab2", output, SANE_UNSET, TAB2, TABDLY},
- # endif
--# ifdef TAB1
-+# if 0
- {"tab1", output, SANE_UNSET, TAB1, TABDLY},
- # endif
- # ifdef TAB0
-@@ -635,7 +635,7 @@
- fputs (_("\
- * [-]onocr do not print carriage returns in the first column\n\
- [-]opost postprocess output\n\
-- * tabN horizontal tab delay style, N in [0..3]\n\
-+ * tabN horizontal tab delay style, N in [0,3]\n\
- * tabs same as tab0\n\
- * -tabs same as tab3\n\
- * vtN vertical tab delay style, N in [0..1]\n\
Index: head/sysutils/coreutils/files/patch-stty.c
===================================================================
--- head/sysutils/coreutils/files/patch-stty.c
+++ head/sysutils/coreutils/files/patch-stty.c
@@ -0,0 +1,24 @@
+--- src/stty.c.orig 2010-07-21 17:11:49.000000000 +0200
++++ src/stty.c 2010-07-21 17:12:36.000000000 +0200
+@@ -282,10 +282,10 @@
+ # ifdef TAB3
+ {"tab3", output, SANE_UNSET, TAB3, TABDLY},
+ # endif
+-# ifdef TAB2
++# if 0
+ {"tab2", output, SANE_UNSET, TAB2, TABDLY},
+ # endif
+-# ifdef TAB1
++# if 0
+ {"tab1", output, SANE_UNSET, TAB1, TABDLY},
+ # endif
+ # ifdef TAB0
+@@ -635,7 +635,7 @@
+ fputs (_("\
+ * [-]onocr do not print carriage returns in the first column\n\
+ [-]opost postprocess output\n\
+- * tabN horizontal tab delay style, N in [0..3]\n\
++ * tabN horizontal tab delay style, N in [0,3]\n\
+ * tabs same as tab0\n\
+ * -tabs same as tab3\n\
+ * vtN vertical tab delay style, N in [0..1]\n\
Index: head/sysutils/fusefs-kmod/Makefile
===================================================================
--- head/sysutils/fusefs-kmod/Makefile
+++ head/sysutils/fusefs-kmod/Makefile
@@ -27,7 +27,7 @@
.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
Index: head/sysutils/geomWatch/Makefile
===================================================================
--- head/sysutils/geomWatch/Makefile
+++ head/sysutils/geomWatch/Makefile
@@ -18,19 +18,6 @@
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>
Index: head/sysutils/hal/Makefile
===================================================================
--- head/sysutils/hal/Makefile
+++ head/sysutils/hal/Makefile
@@ -74,12 +74,6 @@
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|' \
Index: head/sysutils/hal/pkg-plist
===================================================================
--- head/sysutils/hal/pkg-plist
+++ head/sysutils/hal/pkg-plist
@@ -66,9 +66,9 @@
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
Index: head/sysutils/jaildaemon/Makefile
===================================================================
--- head/sysutils/jaildaemon/Makefile
+++ head/sysutils/jaildaemon/Makefile
@@ -17,10 +17,4 @@
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>
Index: head/sysutils/realsync/Makefile
===================================================================
--- head/sysutils/realsync/Makefile
+++ head/sysutils/realsync/Makefile
@@ -24,16 +24,10 @@
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>
Index: head/sysutils/swapexd/Makefile
===================================================================
--- head/sysutils/swapexd/Makefile
+++ head/sysutils/swapexd/Makefile
@@ -13,18 +13,13 @@
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>
Index: head/textproc/elasticsearch/Makefile
===================================================================
--- head/textproc/elasticsearch/Makefile
+++ head/textproc/elasticsearch/Makefile
@@ -67,14 +67,8 @@
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
Index: head/x11-toolkits/xview-clients/Makefile
===================================================================
--- head/x11-toolkits/xview-clients/Makefile
+++ head/x11-toolkits/xview-clients/Makefile
@@ -28,11 +28,7 @@
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 @@
${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 @@
@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>
Index: head/x11-toolkits/xview/Makefile
===================================================================
--- head/x11-toolkits/xview/Makefile
+++ head/x11-toolkits/xview/Makefile
@@ -28,7 +28,7 @@
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 @@
.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 @@
${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+' \
Index: head/x11/gmrun/Makefile
===================================================================
--- head/x11/gmrun/Makefile
+++ head/x11/gmrun/Makefile
@@ -24,19 +24,12 @@
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>
Index: head/x11/yelp/Makefile
===================================================================
--- head/x11/yelp/Makefile
+++ head/x11/yelp/Makefile
@@ -31,13 +31,7 @@
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>

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 18, 6:08 PM (17 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15880493
Default Alt Text
D2209.id4633.diff (79 KB)

Event Timeline