- Remove conditional checks for FreeBSD 6.X

PR:		ports/165608
Submitted by:	pgollucci
Approved by:	portmgr (hat)

10 files changed, 7 insertions, 62 deletions

diff --git a/emulators/dynamips-community/Makefile b/emulators/dynamips-community/Makefile
index c5657211f7c9..797806ff4e0a 100644
--- a/emulators/dynamips-community/Makefile
+++ b/emulators/dynamips-community/Makefile
@@ -62,19 +62,6 @@ BROKEN=		Does not compile: uses i386 asm
 DYNAMIPS_ARCH=	"nojit"
 .endif
 
-# It required libpcap version 0.9.4 or is higher.
-.if ${OSVERSION} < 602100 || (${OSVERSION} >= 700000 && ${OSVERSION} < 700021)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
-MAKE_ENV+=	PCAP_LIB=${LOCALBASE}/lib/libpcap.a
-#.warning Do not overlook, make libpcap with LIBPCAP_OVERWRITE_BASE parameter, for use with shared library.
-#LIB_DEPENDS+=	pcap.\(0.9.\)?[2-9]:${PORTSDIR}/net/libpcap
-#MAKE_ENV+=	PCAP_LIB=-lpcap.2
-.endif
-
-.if ${OSVERSION} < 700013
-MAKE_ENV+=	HAS_POSIX_MEMALIGN=0
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}.${DYNAMIPS_CODE} ${PREFIX}/bin/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/${DYNAMIPS_CODE}/nvram_export ${PREFIX}/bin
diff --git a/mail/spamilter/Makefile b/mail/spamilter/Makefile
index f257660c046b..89c17f2acf2b 100644
--- a/mail/spamilter/Makefile
+++ b/mail/spamilter/Makefile
@@ -20,6 +20,7 @@ LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--have-resn
 USE_RC_SUBR=	spamilter.sh
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -57,10 +58,6 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
-.if ${OSVERSION} >= 700015 || (${OSVERSION} < 700000 && ${OSVERSION} >= 601103)
-CONFIGURE_ARGS+=	--have-resn
-.endif
-
 PLIST_FILES+=	bin/dnsblchk bin/dnsblupd bin/ipfwmtad bin/mxlookup \
 		bin/spamilter \
 		bin/spamilter-system-report bin/spamilter-user-report
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 12a8b693f93b..bf7e69d48f5d 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -27,6 +27,7 @@ CONFIGURE_ARGS?=--disable-gtkui \
 		--disable-nm
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		PTHREAD_LIB="${PTHREAD_LIBS}"
+CFLAGS+=	-D_XOPEN_SOURCE_EXTENDED
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 
 .if !defined(PIDGIN_SLAVE)
@@ -93,10 +94,6 @@ PLIST_SUB+=		TCL:="@comment not installed: "
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 700032 || (${OSVERSION} < 700000 && ${OSVERSION} > 602106)
-CFLAGS+=	-D_XOPEN_SOURCE_EXTENDED
-.endif
-
 .if !defined(PIDGIN_SLAVE)
 .if ${HAVE_GNOME:Mgconf2}!="" || exists(${LOCALBASE}/bin/gconftool-2)
 USE_GNOME+=	gconf2
diff --git a/net-mgmt/spectools/Makefile b/net-mgmt/spectools/Makefile
index a910ed35dc28..04952c696d76 100644
--- a/net-mgmt/spectools/Makefile
+++ b/net-mgmt/spectools/Makefile
@@ -48,12 +48,6 @@ PLIST_SUB+=	NCURSES="@comment "
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 602101
-IGNORE=	is unsupported on systems prior to FreeBSD v602101
-.elif ${OSVERSION} > 700000 && ${OSVERSION} < 700027
-IGNORE=	is unsupported on systems prior to FreeBSD v700027
-.endif
-
 .if ${OSVERSION} < 800069
 LIB_DEPENDS+=	usb-0.1:${PORTSDIR}/devel/libusb
 .endif
diff --git a/net/mpd-l2tp-ipv6pd-client/Makefile b/net/mpd-l2tp-ipv6pd-client/Makefile
index 1f2de9001727..e9bcccd3f2e2 100644
--- a/net/mpd-l2tp-ipv6pd-client/Makefile
+++ b/net/mpd-l2tp-ipv6pd-client/Makefile
@@ -66,10 +66,6 @@ PLIST_SUB=	CONF_DIR=${CONF_DIR} \
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.if ${OSVERSION} < 602106 || (${OSVERSION} >= 700000 && ${OSVERSION} < 700031)
-IGNORE=		does not work with old ng_ksocket
-.endif
-
 do-build:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/setting
 	@${DIALOG} --clear
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 5f6b91a10c93..36a4716a6937 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -34,6 +34,7 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 TIN_EDITOR?=	/usr/bin/ee
+TIN_SCREEN?=	ncursesw
 
 OPTIONS=	GNUPG	"Enable message signing via GnuPG" On \
 		ISPELL	"Enable spell checking via ispell" On \
@@ -43,12 +44,6 @@ OPTIONS=	GNUPG	"Enable message signing via GnuPG" On \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 602107 || (${OSVERSION} >= 700000 && ${OSVERSION} < 700033)
-TIN_SCREEN?=	ncurses
-.else
-TIN_SCREEN?=	ncursesw
-.endif
-
 # --with-mime-default-charset=US-ASCII needed to build tin in the non-ascii
 # national environment.
 CONFIGURE_ARGS+=--with-nntp-default-server=news \
diff --git a/security/ike/Makefile b/security/ike/Makefile
index 9b2b5631ab28..872655fe0fca 100644
--- a/security/ike/Makefile
+++ b/security/ike/Makefile
@@ -68,15 +68,7 @@ post-patch:
 . if ${OSVERSION} < 800000
 	@${ECHO_MSG} "===> -------------------------------------------------------------------------"
 	@${ECHO_MSG} "===> WARNING: You will need to patch your kernel for NAT-T functionality!"
-.  if ${OSVERSION} < 600000
-	@${ECHO_MSG} "===>   There is no known NAT-T patch for FreeBSD 1 - 5!!!"
-.  endif
-.  if ${OSVERSION} > 600000 && ${OSVERSION} < 699999
-	@${ECHO_MSG} "===>   http://ipsec-tools.sf.net/freebsd6-natt.diff"
-.  endif
-.  if ${OSVERSION} > 700000 && ${OSVERSION} < 799999
 	@${ECHO_MSG} "===>   http://people.freebsd.org/~vanhu/NAT-T/patch-natt-7.2-2009-05-12.diff"
-.  endif
 	@${ECHO_MSG} "===> You may need to edit the patch if it fails to apply cleanly."
 	@${ECHO_MSG} "===> -------------------------------------------------------------------------"
 	@sleep 3
diff --git a/sysutils/devcpu/Makefile b/sysutils/devcpu/Makefile
index 2e07edb8a1d0..f6844ed629d1 100644
--- a/sysutils/devcpu/Makefile
+++ b/sysutils/devcpu/Makefile
@@ -38,10 +38,6 @@ MAN8=		cpu_microcode_tool.8
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 601000
-IGNORE=		not supported
-.endif
-
 .if ${OSVERSION} >= 701102
 IGNORE=		already included into base system
 .endif
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 46a516dc213b..ae25f93edf06 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -33,7 +33,9 @@ CONFIGURE_ARGS= --with-zlib --libdir="${L_LIB}" \
 		--enable-idna \
 		--enable-ipv6 \
 		--with-mime-libdir=${PREFIX}/etc \
-		--with-libiconv-prefix=${LOCALBASE}
+		--with-libiconv-prefix=${LOCALBASE} \
+		--with-screen=ncursesw
+
 MAKE_JOBS_UNSAFE=	yes
 
 .ifndef NO_OPENSSL
@@ -42,12 +44,6 @@ USE_OPENSSL=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 602107 || (${OSVERSION} >= 700000 && ${OSVERSION} < 700033)
-CONFIGURE_ARGS+=	--with-screen=ncurses
-.else
-CONFIGURE_ARGS+=	--with-screen=ncursesw
-.endif
-
 .ifdef USE_OPENSSL
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
 .endif
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 06444831f86c..8a94f282d078 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -25,6 +25,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-zlib --libdir="${L_LIB}" \
 		--enable-nsl-fork --enable-persistent-cookies \
 		--enable-nested-tables --enable-gzip-help \
+		--with-screen=ncursesw
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -35,12 +36,6 @@ OPTIONS=	SSL		"SSL support" on \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 602107 || (${OSVERSION} >= 700000 && ${OSVERSION} < 700033)
-CONFIGURE_ARGS+=	--with-screen=ncurses
-.else
-CONFIGURE_ARGS+=	--with-screen=ncursesw
-.endif
-
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS='@comment '