- Remove conditional checks for FreeBSD 5.x and older

29 files changed, 18 insertions, 167 deletions

diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
index 36853a86622c..924bdb9d91f8 100644
--- a/net/isc-dhcp30-server/Makefile
+++ b/net/isc-dhcp30-server/Makefile
@@ -192,11 +192,6 @@ PLIST_SUB+=	LDAP=""
 PLIST_SUB+=	LDAP="@comment "
 .endif
 REINPLACE_SUB=	PREFIX=${PREFIX}
-.if ${OSVERSION} >= 502100
-SUB_LIST+=	NOLOGIN=/usr/sbin/nologin
-.else
-SUB_LIST+=	NOLOGIN=/sbin/nologin
-.endif
 .if !defined(WITHOUT_DHCP_PARANOIA)
 SUB_LIST+=	PARANOIA=YES
 .else
diff --git a/net/isc-dhcp30-server/files/isc-dhcpd.in b/net/isc-dhcp30-server/files/isc-dhcpd.in
index 70ba25b92d99..c1e482945ad2 100644
--- a/net/isc-dhcp30-server/files/isc-dhcpd.in
+++ b/net/isc-dhcp30-server/files/isc-dhcpd.in
@@ -274,7 +274,7 @@ safe_useradd ()
 	local _user _group _home _shell _gecos
 
 	_user=$1 _group=$2 _gecos=${3:-"& daemon"}
-	_home=${4:-/nonexistent} _shell=${5:-%%NOLOGIN%%}
+	_home=${4:-/nonexistent} _shell=${5:-/usr/sbin/nologin}
 
 	if [ -n "${_group}" ]; then
 		if pw group show ${_group} 2>/dev/null; then
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index 80889dded7eb..194fcbe13a3b 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -148,11 +148,6 @@ DATADIR=	/var/db
 PLIST_SUB+=	SCHEMA_DIR="${SCHEMA_DIR:S,^${PREFIX}/,,}"
 PLIST_SUB+=	LDAP="@comment "
 REINPLACE_SUB=	PREFIX=${PREFIX}
-.if ${OSVERSION} >= 502100
-SUB_LIST+=	NOLOGIN=/usr/sbin/nologin
-.else
-SUB_LIST+=	NOLOGIN=/sbin/nologin
-.endif
 .if !defined(WITHOUT_DHCP_PARANOIA)
 SUB_LIST+=	PARANOIA=YES
 .else
diff --git a/net/isc-dhcp31-server/files/isc-dhcpd.in b/net/isc-dhcp31-server/files/isc-dhcpd.in
index 70ba25b92d99..c1e482945ad2 100644
--- a/net/isc-dhcp31-server/files/isc-dhcpd.in
+++ b/net/isc-dhcp31-server/files/isc-dhcpd.in
@@ -274,7 +274,7 @@ safe_useradd ()
 	local _user _group _home _shell _gecos
 
 	_user=$1 _group=$2 _gecos=${3:-"& daemon"}
-	_home=${4:-/nonexistent} _shell=${5:-%%NOLOGIN%%}
+	_home=${4:-/nonexistent} _shell=${5:-/usr/sbin/nologin}
 
 	if [ -n "${_group}" ]; then
 		if pw group show ${_group} 2>/dev/null; then
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
index 5efec3822b3c..1b0612f4d53d 100644
--- a/net/isc-dhcp40-server/Makefile
+++ b/net/isc-dhcp40-server/Makefile
@@ -185,11 +185,6 @@ PLIST_SUB+=	LDAP=""
 PLIST_SUB+=	LDAP="@comment "
 .endif
 REINPLACE_SUB=	PREFIX=${PREFIX}
-.if ${OSVERSION} >= 502100
-SUB_LIST+=	NOLOGIN=/usr/sbin/nologin
-.else
-SUB_LIST+=	NOLOGIN=/sbin/nologin
-.endif
 .if !defined(WITHOUT_DHCP_PARANOIA)
 SUB_LIST+=	PARANOIA=YES
 .else
diff --git a/net/isc-dhcp40-server/files/isc-dhcpd.in b/net/isc-dhcp40-server/files/isc-dhcpd.in
index 70ba25b92d99..c1e482945ad2 100644
--- a/net/isc-dhcp40-server/files/isc-dhcpd.in
+++ b/net/isc-dhcp40-server/files/isc-dhcpd.in
@@ -274,7 +274,7 @@ safe_useradd ()
 	local _user _group _home _shell _gecos
 
 	_user=$1 _group=$2 _gecos=${3:-"& daemon"}
-	_home=${4:-/nonexistent} _shell=${5:-%%NOLOGIN%%}
+	_home=${4:-/nonexistent} _shell=${5:-/usr/sbin/nologin}
 
 	if [ -n "${_group}" ]; then
 		if pw group show ${_group} 2>/dev/null; then
diff --git a/net/libnss-mysql/Makefile b/net/libnss-mysql/Makefile
index 82c3d78533f5..44e61638bcd2 100644
--- a/net/libnss-mysql/Makefile
+++ b/net/libnss-mysql/Makefile
@@ -21,9 +21,4 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_MYSQL=	yes
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500112
-IGNORE=		NSS modules only supported on FreeBSD 5.1 or later
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index c05c9a6402e0..b8e85590d874 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -37,10 +37,6 @@ LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 600000
-LIB_DEPENDS+=	readline.[5-9]:${PORTSDIR}/devel/readline
-.endif
-
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
diff --git a/net/mad_fcl/Makefile b/net/mad_fcl/Makefile
index 9fbf0fbf2617..e4671d806da6 100644
--- a/net/mad_fcl/Makefile
+++ b/net/mad_fcl/Makefile
@@ -27,12 +27,6 @@ DOC_FILES=	fdt-example.xml flute-sdp-example.sdp
 PORTDOCS=	${DOC_FILES} README.TXT
 PLIST_FILES=	bin/flute
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 502120
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-alclib_defines.h
-.endif
-
 pre-patch:
 	# Fixing the end-of-lines:
 	for f in `${FIND} ${WRKSRC}/.. -type f` ; do \
@@ -53,4 +47,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README.TXT ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/mad_fcl/files/extra-patch-alclib_defines.h b/net/mad_fcl/files/extra-patch-alclib_defines.h
deleted file mode 100644
index ec087dfb42bc..000000000000
--- a/net/mad_fcl/files/extra-patch-alclib_defines.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/net/mad_fcl/files/Attic/extra-patch-alclib_defines.h,v 1.1 2004-08-26 21:42:04 sem Exp $
-
---- alclib/defines.h.orig	Fri Jun 25 13:18:59 2004
-+++ alclib/defines.h	Fri Jun 25 13:35:11 2004
-@@ -29,7 +29,7 @@
- #define SSM
- 
- /* Use ZLIB compression library */
--#define USE_ZLIB
-+/*#define USE_ZLIB */
- 
- /* Use  OpenSSL library for MD5*/
- #define USE_OPENSSL
diff --git a/net/nocatsplash/Makefile b/net/nocatsplash/Makefile
index 2fc767df26da..ac62afcfc57c 100644
--- a/net/nocatsplash/Makefile
+++ b/net/nocatsplash/Makefile
@@ -19,12 +19,6 @@ COMMENT=	Open 802.11 Splash Screen
 
 USE_GNOME=	glib12
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 502105
-IGNORE=		Requires 5.x or later for pf(4) firewall support
-.endif
-
 CONFLICTS=	nocatauth-server-*
 
 GNU_CONFIGURE=	yes
@@ -41,4 +35,4 @@ CONFIGURE_ARGS+=	--with-mode=${AUTHMODE}
 CONFIGURE_ARGS+=	--with-docroot=${DOCROOT}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/openbgpd/Makefile b/net/openbgpd/Makefile
index 4c58cb6e622d..bbb11e8cc529 100644
--- a/net/openbgpd/Makefile
+++ b/net/openbgpd/Makefile
@@ -41,16 +41,6 @@ MAN8=		bgpctl.8	\
 SUBDIRS=	bgpd \
 		bgpctl
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 600000
-IGNORE=		requires strtonum in libc
-.endif
-
-.if ${OSVERSION} < 500037
-IGNORE=		requires macros present in <sys/tree.h>
-.endif
-
 post-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/if_media.h ${WRKSRC}/bgpctl/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/hash.h ${WRKSRC}/bgpd/
@@ -96,4 +86,4 @@ post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/pfflowd/Makefile b/net/pfflowd/Makefile
index 1fe3a47b767b..535c0ba64e44 100644
--- a/net/pfflowd/Makefile
+++ b/net/pfflowd/Makefile
@@ -21,10 +21,6 @@ PLIST_FILES=	sbin/pfflowd
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 502119
-IGNORE=		only for 5.3 and above
-.endif
-
 .if ${OSVERSION} < 700049
 MAKE_ENV+=	OLD_PFSYNC=1
 EXTRA_PATCHES+=	${FILESDIR}/pf37-pfflowd.c
diff --git a/net/pptpclient/Makefile b/net/pptpclient/Makefile
index 07eb1be179cd..0456fce6482e 100644
--- a/net/pptpclient/Makefile
+++ b/net/pptpclient/Makefile
@@ -18,13 +18,7 @@ USE_PERL5=	yes
 
 MAN8=		pptp.8
 
-.include <bsd.port.pre.mk>
-
 MAKE_ARGS=	DEBUG=""
-.if ${OSVERSION} < 500041
-MAKE_ARGS+=	INCLUDE="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pptp ${PREFIX}/sbin
@@ -33,4 +27,4 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}/ppp.conf ${PREFIX}/share/examples/pptpclient
 	${INSTALL_MAN} ${WRKSRC}/pptp.8 ${PREFIX}/man/man8
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/proxychains/Makefile b/net/proxychains/Makefile
index c7f62d164184..533249a893d7 100644
--- a/net/proxychains/Makefile
+++ b/net/proxychains/Makefile
@@ -18,10 +18,6 @@ USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 600000
-BROKEN=		Does not compile on 4.x and 5.x
-.endif
-
 .if ${OSVERSION} < 700017
 EXTRA_PATCHES=	${PATCHDIR}/gethostbyaddr-proto-int
 .endif
diff --git a/net/py-pcap/Makefile b/net/py-pcap/Makefile
index 302b22de5d10..f5268e510247 100644
--- a/net/py-pcap/Makefile
+++ b/net/py-pcap/Makefile
@@ -24,10 +24,4 @@ USE_PYDISTUTILS=	yes
 USE_PYTHON_PREFIX=	yes
 PYDISTUTILS_PKGNAME=	pylibpcap
 
-.include <bsd.port.pre.mk>
-
-.if ( ${OSVERSION} < 500038 )
-IGNORE=		needs libpcap 0.7 or higher
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/py-twitter/Makefile b/net/py-twitter/Makefile
index 84ac201b82b8..ab0746335ce8 100644
--- a/net/py-twitter/Makefile
+++ b/net/py-twitter/Makefile
@@ -24,10 +24,4 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	python_twitter
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 600000
-BROKEN=		Leaves egg file behind on deinstall
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index a25546b7dc80..661639579093 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -129,17 +129,7 @@ SUB_LIST=	RCLDCONFIG=ldconfig
 SUB_LIST=	RCLDCONFIG=
 .endif
 
-.if ${OSVERSION} < 600000
-BUILD_DEPENDS+=${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
-CONFIGURE_ENV+=MAKEINFO=${LOCALBASE}/bin/makeinfo
-.endif
-
-USE_RC_SUBR=	watchquagga.sh
-.if ${OSVERSION} >= 600101
-USE_RC_SUBR+=	quagga.sh
-.else
-USE_RCORDER=	quagga.sh
-.endif
+USE_RC_SUBR=	quagga.sh watchquagga.sh
 
 SUB_LIST+=	LOCALSTATE_DIR=${LOCALSTATE_DIR} \
 		SYSCONF_DIR=${SYSCONF_DIR}
diff --git a/net/relayd/Makefile b/net/relayd/Makefile
index 7aec37473953..46032fdc179a 100644
--- a/net/relayd/Makefile
+++ b/net/relayd/Makefile
@@ -53,9 +53,6 @@ do-install:
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 502106
-IGNORE=	is of no use for you because your system is too old and doesn't have pf
-.endif
 .if (${OSVERSION} < 700049) && !defined(I_KNOW_WHAT_I_AM_DOING)
 IGNORE=	needs a patched kernel to work correctly (http://www.openbsd.org/cgi-bin/cvsweb/src/sys/net/pf_table.c.diff?r1=1.67&r2=1.68)
 .endif
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 2c3d619b730f..929a0b124cf3 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -169,12 +169,8 @@ CONFIGURE_ARGS+=	--without-utmp
 CONFIGURE_ARGS+=	--with-winbind
 PLIST_SUB+=		WINBIND=""
 SUB_LIST+=		WINBIND=""
-.	if ${OSVERSION} >= 500112
 WITH_WINBIND_NSS=	yes
 PLIST_SUB+=		WINBIND_NSS=""
-.	else
-PLIST_SUB+=		WINBIND_NSS="@comment "
-.	endif
 .else
 CONFIGURE_ARGS+=	--without-winbind
 PLIST_SUB+=		WINBIND="@comment " WINBIND_NSS="@comment "
@@ -213,9 +209,6 @@ CONFIGURE_ARGS+=	--disable-fam
 .endif
 
 .if defined(WITH_ACL_SUPPORT)
-.if ${OSVERSION} < 500018
-IGNORE=			an ACL support requires 5.1-RELEASE or later. Disable ACL support
-.endif
 CONFIGURE_ARGS+=	--with-acl-support
 .else
 CONFIGURE_ARGS+=	--without-acl-support
@@ -405,8 +398,8 @@ pre-configure:
 	@${FIND} ${WRKDIR}/${DISTNAME} -type d | ${XARGS} ${CHMOD} u+w,a+rx
 	@${FIND} ${WRKDIR}/${DISTNAME} -type f | ${XARGS} ${CHMOD} u+w,a+r
 
-# This would speedup compilation for gcc 3.4(available in FreeBSD 5.2) and higher
-.if !defined(WITHOUT_PCH) && ${OSVERSION} >= 502126
+# This would speedup compilation
+.if !defined(WITHOUT_PCH)
 pre-build:
 	cd ${WRKSRC} && ${MAKE} pch
 .endif
diff --git a/net/samba32-devel/Makefile b/net/samba32-devel/Makefile
index d24b81f93667..187fa216b089 100644
--- a/net/samba32-devel/Makefile
+++ b/net/samba32-devel/Makefile
@@ -157,12 +157,8 @@ CONFIGURE_ARGS+=	--without-utmp
 CONFIGURE_ARGS+=	--with-winbind
 PLIST_SUB+=		WINBIND=""
 SUB_LIST+=		WINBIND=""
-.	if ${OSVERSION} >= 500112
 WITH_WINBIND_NSS=	yes
 PLIST_SUB+=		WINBIND_NSS=""
-.	else
-PLIST_SUB+=		WINBIND_NSS="@comment "
-.	endif
 .else
 CONFIGURE_ARGS+=	--without-winbind
 PLIST_SUB+=		WINBIND="@comment " WINBIND_NSS="@comment "
@@ -198,9 +194,6 @@ CONFIGURE_ARGS+=	--disable-fam
 .endif
 
 .if defined(WITH_ACL_SUPPORT)
-.if ${OSVERSION} < 500018
-IGNORE=			an ACL support requires 5.1-RELEASE or later. Disable ACL support
-.endif
 CONFIGURE_ARGS+=	--with-acl-support
 .else
 CONFIGURE_ARGS+=	--without-acl-support
diff --git a/net/samba32/Makefile b/net/samba32/Makefile
index d24b81f93667..187fa216b089 100644
--- a/net/samba32/Makefile
+++ b/net/samba32/Makefile
@@ -157,12 +157,8 @@ CONFIGURE_ARGS+=	--without-utmp
 CONFIGURE_ARGS+=	--with-winbind
 PLIST_SUB+=		WINBIND=""
 SUB_LIST+=		WINBIND=""
-.	if ${OSVERSION} >= 500112
 WITH_WINBIND_NSS=	yes
 PLIST_SUB+=		WINBIND_NSS=""
-.	else
-PLIST_SUB+=		WINBIND_NSS="@comment "
-.	endif
 .else
 CONFIGURE_ARGS+=	--without-winbind
 PLIST_SUB+=		WINBIND="@comment " WINBIND_NSS="@comment "
@@ -198,9 +194,6 @@ CONFIGURE_ARGS+=	--disable-fam
 .endif
 
 .if defined(WITH_ACL_SUPPORT)
-.if ${OSVERSION} < 500018
-IGNORE=			an ACL support requires 5.1-RELEASE or later. Disable ACL support
-.endif
 CONFIGURE_ARGS+=	--with-acl-support
 .else
 CONFIGURE_ARGS+=	--without-acl-support
diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile
index ed61891d6606..1682031f1086 100644
--- a/net/siproxd/Makefile
+++ b/net/siproxd/Makefile
@@ -27,9 +27,7 @@ PORTDOCS=	${PORTDOCS1} ${PORTDOCS2}
 .include <bsd.port.pre.mk>
 
 post-patch:
-.if ${OSVERSION} >= 500041
 	@${REINPLACE_CMD} -e 's,-lgnugetopt,,g' ${WRKSRC}/${CONFIGURE_SCRIPT}
-.endif
 .if !defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
 	${WRKSRC}/doc/siproxd.conf.example
diff --git a/net/slbd/Makefile b/net/slbd/Makefile
index b1f0d53e4822..50ccaa0c5f72 100644
--- a/net/slbd/Makefile
+++ b/net/slbd/Makefile
@@ -27,10 +27,4 @@ post-install:
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 502106
-IGNORE=	is of no use for you because your system is too old and doesn't have pf
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/wire/Makefile b/net/wire/Makefile
index 334ae72ae07c..58f545bd21df 100644
--- a/net/wire/Makefile
+++ b/net/wire/Makefile
@@ -25,7 +25,7 @@ MAN1=		wire.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500018 || exists(${LOCALBASE}/lib/libreadline.so.5)
+.if exists(${LOCALBASE}/lib/libreadline.so.5)
 LIB_DEPENDS+=	readline.5:${PORTSDIR}/devel/readline
 .endif
 
diff --git a/net/wmwave/Makefile b/net/wmwave/Makefile
index c32f579d1deb..70a5f515eea4 100644
--- a/net/wmwave/Makefile
+++ b/net/wmwave/Makefile
@@ -35,10 +35,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 600007
-IGNORE=		needs API available in FreeBSD 6.X and later
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/wmwlmon/Makefile b/net/wmwlmon/Makefile
index 3ef2a36ab738..63b5ccc8a3a5 100644
--- a/net/wmwlmon/Makefile
+++ b/net/wmwlmon/Makefile
@@ -22,9 +22,7 @@ PLIST_FILES=	bin/wmwlmon
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 600100
-IGNORE=		needs WLAN infrastructure from 6.0-RELEASE or newer
-.elif ${OSVERSION} >= 700052
+.if ${OSVERSION} >= 700052
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-wl.c ${PATCHDIR}/extra-patch-wmwlmon.1
 pre-everything::
 	@${ECHO_CMD} "==========================================================="
diff --git a/net/xmlrpc++/Makefile b/net/xmlrpc++/Makefile
index 78722f7e26ba..94c0db60541e 100644
--- a/net/xmlrpc++/Makefile
+++ b/net/xmlrpc++/Makefile
@@ -20,13 +20,6 @@ COMMENT=	A C++ implementation of the XML-RPC protocol
 USE_GCC=	3.4
 USE_GMAKE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 501103
-# Work around bsd.port.mk bug: Does not currently set up MAKE_ENV for gcc 3.2 and 3.3
-MAKE_ENV+=	CC="${CC}" CXX="${CXX}"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|^CXX|#CXX|" -e "s|^CXXFLAGS|#CXXFLAGS|" \
 		-e "s|tests$$||" ${WRKSRC}/Makefile
@@ -36,4 +29,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/XmlRpc*.h ${PREFIX}/include/xmlrpc++
 	${INSTALL_PROGRAM} ${WRKSRC}/libXmlRpc.a ${PREFIX}/lib
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/yate-devel/Makefile b/net/yate-devel/Makefile
index 967ab1475e70..32b6c668bece 100644
--- a/net/yate-devel/Makefile
+++ b/net/yate-devel/Makefile
@@ -120,12 +120,6 @@ PLIST_SUB+=	WITH_FAX=""
 PLIST_SUB+=	WITH_FAX="@comment "
 .endif
 
-.if ${OSVERSION} >= 500036
-PLIST_SUB+=	NEWGCC=""
-.else
-PLIST_SUB+=	NEWGCC="@comment "
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 		${WRKSRC}/modules/Makefile.in