svn commit: r383107 - in head: astro/gpsman audio/libgpod audio/musicpd audio/schism audio/schism/files chinese/fcitx chinese/fcitx/files comms/linrad comms/usrp databases/datamodeler devel/gearman...

Mathieu Arnold mat at FreeBSD.org
Fri Apr 3 11:27:12 UTC 2015 

Author: mat
Date: Fri Apr  3 11:26:48 2015
New Revision: 383107
URL: https://svnweb.freebsd.org/changeset/ports/383107

Log:
  Remove OSVERSION checks that do not make sense any more.
  
  For example (${OSVERSION} >= 900000 && ${OSVERSION} < 900021) is always true,
  as is (${OSVERSION} > 900002 || ${OSVERSION} < 900000 && ${OSVERSION} > 800107).
  
  Regarding patches, when an EXTRA_PATCHES is no longer needed, I remove it, when
  it is always needed, I renamed it, in one case, I merged two patches.
  
  Differential Revision:	https://reviews.freebsd.org/D2209

Added:
  head/audio/schism/files/patch-modplug__snd_gm.c
     - copied unchanged from r383106, head/audio/schism/files/extrapatch-modplug__snd_gm.c
  head/devel/py-freebsd/files/patch-src-jail.c
     - copied unchanged from r383009, head/devel/py-freebsd/files/freebsd8_patch-src-jail.c
  head/ftp/proftpd/files/patch-8-src-fsio.c
     - copied unchanged from r383009, head/ftp/proftpd/files/extra-patch-8-src-fsio.c
  head/mail/cyrus-imapd24/files/patch-configure
     - copied unchanged from r383009, head/mail/cyrus-imapd24/files/extra-patch-configure
  head/mail/milter-skem/files/patch-cleanup.c
     - copied unchanged from r383009, head/mail/milter-skem/files/timet.patch
  head/net/ndisc6/files/patch-rdnssd__rdnssd.h
     - copied unchanged from r383009, head/net/ndisc6/files/extra-patch-rdnssd__rdnssd.h
  head/net/wmwlmon/files/patch-wl.c
     - copied unchanged from r383009, head/net/wmwlmon/files/extra-patch-wl.c
  head/net/wmwlmon/files/patch-wmwlmon.1
     - copied unchanged from r383009, head/net/wmwlmon/files/extra-patch-wmwlmon.1
  head/sysutils/coreutils/files/patch-stty.c
     - copied unchanged from r383009, head/sysutils/coreutils/files/extra-patch-stty.c
Deleted:
  head/audio/schism/files/extrapatch-modplug__snd_gm.c
  head/chinese/fcitx/files/getline-src_lib_fcitx-utils_utils.c
  head/chinese/fcitx/files/getline-src_lib_fcitx-utils_utils.h
  head/devel/libpasori/files/Makefile.lib
  head/devel/py-freebsd/files/freebsd8_patch-src-jail.c
  head/ftp/proftpd/files/extra-patch-7-src-fsio.c
  head/ftp/proftpd/files/extra-patch-8-src-fsio.c
  head/lang/ghc/files/nopatch-rules__distdir-way-opts.mk
  head/mail/cyrus-imapd23/files/extra-patch-configure
  head/mail/cyrus-imapd24/files/extra-patch-configure
  head/mail/milter-skem/files/timet.patch
  head/multimedia/v4l-utils/files/extra-strnlen
  head/net/ndisc6/files/extra-patch-rdnssd__rdnssd.h
  head/net/wmwlmon/files/extra-patch-wl.c
  head/net/wmwlmon/files/extra-patch-wmwlmon.1
  head/security/ossec-hids-server/files/extra-patch-src__os_csyslogd__csyslogd.c
  head/sysutils/coreutils/files/extra-patch-stty.c
Modified:
  head/astro/gpsman/Makefile
  head/audio/libgpod/Makefile
  head/audio/musicpd/Makefile
  head/audio/schism/Makefile
  head/chinese/fcitx/Makefile
  head/comms/linrad/Makefile
  head/comms/usrp/Makefile
  head/databases/datamodeler/Makefile
  head/devel/gearmand-devel/Makefile
  head/devel/gearmand/Makefile
  head/devel/glib20/Makefile
  head/devel/libdispatch/Makefile
  head/devel/libg19/Makefile
  head/devel/libpasori/Makefile
  head/devel/p4/Makefile.inc
  head/devel/p4web/Makefile
  head/devel/py-freebsd/Makefile
  head/devel/rubygem-posix-spawn/Makefile
  head/devel/xc3sprog/Makefile
  head/dns/nss_resinit/Makefile
  head/emulators/i386-wine-devel/Makefile.inc
  head/emulators/i386-wine/Makefile.inc
  head/emulators/qemu-devel/Makefile
  head/emulators/qemu-sbruno/Makefile
  head/emulators/qemu/Makefile
  head/ftp/proftpd/Makefile
  head/games/linux-nerogame/Makefile
  head/graphics/aaphoto/Makefile
  head/graphics/rubygem-objectdetect/Makefile
  head/graphics/s10sh/files/Makefile.bsd
  head/japanese/mozc-server/Makefile
  head/japanese/tomoe/Makefile
  head/java/sigar/Makefile
  head/lang/ccl/Makefile
  head/lang/dmd2/Makefile
  head/lang/ghc/Makefile
  head/lang/nqc/Makefile
  head/lang/smlnj/Makefile
  head/mail/cyrus-imapd23/Makefile
  head/mail/cyrus-imapd23/files/patch-configure
  head/mail/cyrus-imapd24/Makefile
  head/mail/cyrus-imapd25/Makefile
  head/mail/milter-skem/Makefile
  head/math/crlibm/Makefile
  head/math/libranlip/Makefile
  head/math/msieve/Makefile
  head/math/stp/Makefile
  head/misc/amfm/Makefile
  head/misc/compat7x/Makefile
  head/misc/compat8x/Makefile
  head/misc/fxload/Makefile
  head/misc/usbrh-libusb/Makefile
  head/multimedia/gstreamer-plugins/Makefile.common
  head/multimedia/handbrake/Makefile
  head/multimedia/mplayer2/Makefile
  head/multimedia/v4l-utils/Makefile
  head/net-mgmt/net-snmp/Makefile
  head/net-mgmt/py-yapsnmp/Makefile
  head/net/freeradius3/Makefile
  head/net/iet/Makefile
  head/net/libpcap/Makefile
  head/net/ndisc6/Makefile
  head/net/netatalk3/Makefile
  head/net/netatalk3/pkg-plist
  head/net/rtg/Makefile
  head/net/samba36/Makefile
  head/net/samba4/Makefile
  head/net/samba41/Makefile
  head/net/ssmping/Makefile
  head/net/tcpdump398/Makefile
  head/net/wmwlmon/Makefile
  head/science/gnudatalanguage/Makefile
  head/security/fprint_demo/Makefile
  head/security/fwbuilder/Makefile
  head/security/oidentd/Makefile
  head/security/openbsm-devel/Makefile
  head/security/ossec-hids-server/Makefile
  head/security/pam_fprint/Makefile
  head/security/pam_jail/Makefile
  head/sysutils/DTraceToolkit/Makefile
  head/sysutils/arcconf/Makefile
  head/sysutils/coreutils/Makefile
  head/sysutils/fusefs-kmod/Makefile
  head/sysutils/geomWatch/Makefile
  head/sysutils/hal/Makefile
  head/sysutils/hal/pkg-plist
  head/sysutils/jaildaemon/Makefile
  head/sysutils/realsync/Makefile
  head/sysutils/swapexd/Makefile
  head/textproc/elasticsearch/Makefile
  head/x11-toolkits/xview-clients/Makefile
  head/x11-toolkits/xview/Makefile
  head/x11/gmrun/Makefile
  head/x11/yelp/Makefile

Modified: head/astro/gpsman/Makefile
==============================================================================
--- head/astro/gpsman/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/astro/gpsman/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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

Modified: head/audio/libgpod/Makefile
==============================================================================
--- head/audio/libgpod/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/audio/libgpod/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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>

Modified: head/audio/musicpd/Makefile
==============================================================================
--- head/audio/musicpd/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/audio/musicpd/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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 \

Modified: head/audio/schism/Makefile
==============================================================================
--- head/audio/schism/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/audio/schism/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -30,11 +30,4 @@ PORTSCOUT=	skipv:20100202,20101127,20101
 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>

Copied: head/audio/schism/files/patch-modplug__snd_gm.c (from r383106, head/audio/schism/files/extrapatch-modplug__snd_gm.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/schism/files/patch-modplug__snd_gm.c	Fri Apr  3 11:26:48 2015	(r383107, copy of r383106, head/audio/schism/files/extrapatch-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

Modified: head/chinese/fcitx/Makefile
==============================================================================
--- head/chinese/fcitx/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/chinese/fcitx/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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>

Modified: head/comms/linrad/Makefile
==============================================================================
--- head/comms/linrad/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/comms/linrad/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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}

Modified: head/comms/usrp/Makefile
==============================================================================
--- head/comms/usrp/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/comms/usrp/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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"

Modified: head/databases/datamodeler/Makefile
==============================================================================
--- head/databases/datamodeler/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/databases/datamodeler/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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 \

Modified: head/devel/gearmand-devel/Makefile
==============================================================================
--- head/devel/gearmand-devel/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/devel/gearmand-devel/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -47,12 +47,6 @@ TOKYOCAB_DESC=	Tokyo Cabinet support for
 
 .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

Modified: head/devel/gearmand/Makefile
==============================================================================
--- head/devel/gearmand/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/devel/gearmand/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -45,12 +45,6 @@ TOKYOCAB_DESC=	Tokyo Cabinet support for
 
 .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

Modified: head/devel/glib20/Makefile
==============================================================================
--- head/devel/glib20/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/devel/glib20/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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

Modified: head/devel/libdispatch/Makefile
==============================================================================
--- head/devel/libdispatch/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/devel/libdispatch/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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

Modified: head/devel/libg19/Makefile
==============================================================================
--- head/devel/libg19/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/devel/libg19/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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>

Modified: head/devel/libpasori/Makefile
==============================================================================
--- head/devel/libpasori/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/devel/libpasori/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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
 

Modified: head/devel/p4/Makefile.inc
==============================================================================
--- head/devel/p4/Makefile.inc	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/devel/p4/Makefile.inc	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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

Modified: head/devel/p4web/Makefile
==============================================================================
--- head/devel/p4web/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/devel/p4web/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -40,19 +40,9 @@ LIB_DEPENDS+=	libstdc++.so.6:${PORTSDIR}
 
 # 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

Modified: head/devel/py-freebsd/Makefile
==============================================================================
--- head/devel/py-freebsd/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/devel/py-freebsd/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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

Copied: head/devel/py-freebsd/files/patch-src-jail.c (from r383009, head/devel/py-freebsd/files/freebsd8_patch-src-jail.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/py-freebsd/files/patch-src-jail.c	Fri Apr  3 11:26:48 2015	(r383107, copy of r383009, head/devel/py-freebsd/files/freebsd8_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;

Modified: head/devel/rubygem-posix-spawn/Makefile
==============================================================================
--- head/devel/rubygem-posix-spawn/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/devel/rubygem-posix-spawn/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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>

Modified: head/devel/xc3sprog/Makefile
==============================================================================
--- head/devel/xc3sprog/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/devel/xc3sprog/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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>

Modified: head/dns/nss_resinit/Makefile
==============================================================================
--- head/dns/nss_resinit/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/dns/nss_resinit/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -20,9 +20,7 @@ PLIST_FILES=	lib/nss_resinit.so lib/nss_
 .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
 

Modified: head/emulators/i386-wine-devel/Makefile.inc
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.inc	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/emulators/i386-wine-devel/Makefile.inc	Fri Apr  3 11:26:48 2015	(r383107)
@@ -64,7 +64,7 @@ PLIST_SUB+=	OSREL${osrel}-COMPHOLIO="@co
 .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

Modified: head/emulators/i386-wine/Makefile.inc
==============================================================================
--- head/emulators/i386-wine/Makefile.inc	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/emulators/i386-wine/Makefile.inc	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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

Modified: head/emulators/qemu-devel/Makefile
==============================================================================
--- head/emulators/qemu-devel/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/emulators/qemu-devel/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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:

Modified: head/emulators/qemu-sbruno/Makefile
==============================================================================
--- head/emulators/qemu-sbruno/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/emulators/qemu-sbruno/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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:

Modified: head/emulators/qemu/Makefile
==============================================================================
--- head/emulators/qemu/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/emulators/qemu/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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

Modified: head/ftp/proftpd/Makefile
==============================================================================
--- head/ftp/proftpd/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/ftp/proftpd/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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

Copied: head/ftp/proftpd/files/patch-8-src-fsio.c (from r383009, head/ftp/proftpd/files/extra-patch-8-src-fsio.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ftp/proftpd/files/patch-8-src-fsio.c	Fri Apr  3 11:26:48 2015	(r383107, copy of r383009, head/ftp/proftpd/files/extra-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;
+ 

Modified: head/games/linux-nerogame/Makefile
==============================================================================
--- head/games/linux-nerogame/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/games/linux-nerogame/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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>

Modified: head/graphics/aaphoto/Makefile
==============================================================================
--- head/graphics/aaphoto/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/graphics/aaphoto/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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
 

Modified: head/graphics/rubygem-objectdetect/Makefile
==============================================================================
--- head/graphics/rubygem-objectdetect/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/graphics/rubygem-objectdetect/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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>

Modified: head/graphics/s10sh/files/Makefile.bsd
==============================================================================
--- head/graphics/s10sh/files/Makefile.bsd	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/graphics/s10sh/files/Makefile.bsd	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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
 

Modified: head/japanese/mozc-server/Makefile
==============================================================================
--- head/japanese/mozc-server/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/japanese/mozc-server/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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

Modified: head/japanese/tomoe/Makefile
==============================================================================
--- head/japanese/tomoe/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/japanese/tomoe/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -55,12 +55,7 @@ BROKEN=		Broken with gem version of glib
 .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

Modified: head/java/sigar/Makefile
==============================================================================
--- head/java/sigar/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/java/sigar/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -40,14 +40,8 @@ WRKSRC=		${WRKDIR}/amishHammer-sigar-${G
 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

Modified: head/lang/ccl/Makefile
==============================================================================
--- head/lang/ccl/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/lang/ccl/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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

Modified: head/lang/dmd2/Makefile
==============================================================================
--- head/lang/dmd2/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/lang/dmd2/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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
 

Modified: head/lang/ghc/Makefile
==============================================================================
--- head/lang/ghc/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/lang/ghc/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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)

Modified: head/lang/nqc/Makefile
==============================================================================
--- head/lang/nqc/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/lang/nqc/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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
 

Modified: head/lang/smlnj/Makefile
==============================================================================
--- head/lang/smlnj/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/lang/smlnj/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -43,7 +43,7 @@ ML_RECOMPILE_OPTIONS=	RECOMPILE POSITION
 
 .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} )

Modified: head/mail/cyrus-imapd23/Makefile
==============================================================================
--- head/mail/cyrus-imapd23/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/mail/cyrus-imapd23/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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
 

Modified: head/mail/cyrus-imapd23/files/patch-configure
==============================================================================
--- head/mail/cyrus-imapd23/files/patch-configure	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/mail/cyrus-imapd23/files/patch-configure	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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

Modified: head/mail/cyrus-imapd24/Makefile
==============================================================================
--- head/mail/cyrus-imapd24/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/mail/cyrus-imapd24/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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
 

Copied: head/mail/cyrus-imapd24/files/patch-configure (from r383009, head/mail/cyrus-imapd24/files/extra-patch-configure)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/cyrus-imapd24/files/patch-configure	Fri Apr  3 11:26:48 2015	(r383107, copy of r383009, head/mail/cyrus-imapd24/files/extra-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

Modified: head/mail/cyrus-imapd25/Makefile
==============================================================================
--- head/mail/cyrus-imapd25/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/mail/cyrus-imapd25/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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
 

Modified: head/mail/milter-skem/Makefile
==============================================================================
--- head/mail/milter-skem/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/mail/milter-skem/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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_*}

Copied: head/mail/milter-skem/files/patch-cleanup.c (from r383009, head/mail/milter-skem/files/timet.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/milter-skem/files/patch-cleanup.c	Fri Apr  3 11:26:48 2015	(r383107, copy of r383009, head/mail/milter-skem/files/timet.patch)
@@ -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;

Modified: head/math/crlibm/Makefile
==============================================================================
--- head/math/crlibm/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/math/crlibm/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -31,13 +31,6 @@ DISTFILES+=	crlibm-1.0beta3.pdf:2,4 trip
 .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
 

Modified: head/math/libranlip/Makefile
==============================================================================
--- head/math/libranlip/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/math/libranlip/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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>

Modified: head/math/msieve/Makefile
==============================================================================
--- head/math/msieve/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/math/msieve/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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
 

Modified: head/math/stp/Makefile
==============================================================================
--- head/math/stp/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/math/stp/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -28,8 +28,4 @@ CMAKE_ARGS+=	-DFL_LIBRARY=${LOCALBASE}/l
 		-DFLEX_EXECUTABLE=${LOCALBASE}/bin/flex
 .endif
 
-.if (${OSVERSION} < 802502)
-IGNORE=	stp needs log2(3)
-.endif
-
 .include <bsd.port.post.mk>

Modified: head/misc/amfm/Makefile
==============================================================================
--- head/misc/amfm/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/misc/amfm/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -17,18 +17,12 @@ LIB_DEPENDS=	libhid.so:${PORTSDIR}/devel
 
 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>

Modified: head/misc/compat7x/Makefile
==============================================================================
--- head/misc/compat7x/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/misc/compat7x/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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}

Modified: head/misc/compat8x/Makefile
==============================================================================
--- head/misc/compat8x/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/misc/compat8x/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -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

Modified: head/misc/fxload/Makefile
==============================================================================
--- head/misc/fxload/Makefile	Fri Apr  3 10:54:14 2015	(r383106)
+++ head/misc/fxload/Makefile	Fri Apr  3 11:26:48 2015	(r383107)
@@ -20,10 +20,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/a3load.hex ${STAGEDIR}${DATADIR}

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-head mailing list