- Remove conditional checks for FreeBSD 5.x and older

svn path=/head/; revision=225293
2024-11-19 00:13:33 +00:00 · 2009-01-05 19:44:02 +00:00 · 2009-01-05 19:44:02 +00:00 · d095d4a965 · 2021-03-31 03:12:20 +00:00
commit d095d4a965
parent c0a7a1f972
130 changed files with 128 additions and 1221 deletions
--- a/devel/ZendOptimizer/Makefile
+++ b/devel/ZendOptimizer/Makefile
@ -24,17 +24,10 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 .include <bsd.port.pre.mk>

 # Check for FreeBSD version
-.if ${OSVERSION} < 600000
-.if ${ARCH} != "i386"
-IGNORE=		this port is for FreeBSD 6 or above
-.endif
-VER=		5.4
-.else
 VER=		6.0
 .if ${OSVERSION} >= 700043
 LIB_DEPENDS+=	m.4:${PORTSDIR}/misc/compat6x
 .endif
-.endif

 .if ${PHP_VER} == 4
 ZEND_PATH=	4.4.x
--- a/devel/ZendOptimizer/distinfo
+++ b/devel/ZendOptimizer/distinfo
@ -1,6 +1,3 @@
-MD5 (ZendOptimizer-3.3.0a-freebsd5.4-i386.tar.gz) = 9e2edcc3b4c6be5fe667b6cf8ce3fb2c
-SHA256 (ZendOptimizer-3.3.0a-freebsd5.4-i386.tar.gz) = 113fa0bf3ef65ac3d15c11efb19b45bd8b3b8445d4f346c9a30855d812925916
-SIZE (ZendOptimizer-3.3.0a-freebsd5.4-i386.tar.gz) = 9318300
 MD5 (ZendOptimizer-3.3.0a-freebsd6.0-i386.tar.gz) = 44fa8d594d968a0ed612abc96c40c9d9
 SHA256 (ZendOptimizer-3.3.0a-freebsd6.0-i386.tar.gz) = 5670b73057b5fdbccfdb09ecf1b7280f9a6014b5bb353d3d7b9ec0eaea079796
 SIZE (ZendOptimizer-3.3.0a-freebsd6.0-i386.tar.gz) = 9353326
--- a/devel/ace+tao/Makefile
+++ b/devel/ace+tao/Makefile
@ -113,9 +113,7 @@ do-build:

 test:
 .if defined(WITH_TESTS)
-.if ${OSVERSION} >= 500036
 	/sbin/kldload aio || ${TRUE}
-.endif
 	@if [ -f ${ACE_TESTS_COOKIE} ]; then \
 		${ECHO_MSG} "===> Running tests."; \
 		${ECHO_MSG} "===> ACE tests:"; \
--- a/devel/asis/Makefile
+++ b/devel/asis/Makefile
@ -23,9 +23,7 @@ USE_LDCONFIG=	yes

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} >= 500039
 WITHOUT_CPU_CFLAGS=	yes
-.endif
 CFLAGS=		-O2 -pipe
 USE_GMAKE=	yes
 MAKEFILE=	"${FILESDIR}/Makefile.bsd"
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@ -29,13 +29,8 @@ OPTIONS=	REDIRECT "Define malloc(3)-family replacements" off \

 .if defined(WITH_THREADING)
 CONFIGURE_ARGS+=	--enable-threads=posix --enable-thread-local-alloc
-.if ${OSVERSION} < 502102
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		LIBS="${LIBS} ${PTHREAD_LIBS:C/-pthread/-lc_r/}"
-.else
 CONFIGURE_ENV=	CFLAGSS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 		LIBS="${LIBS} ${PTHREAD_LIBS:C/-pthread/-lpthread/}"
-.endif
 .if defined(WITH_PARALLEL_MARK)
 CONFIGURE_ARGS+=	--enable-parallel-mark
 .endif
--- a/devel/cgdb/Makefile
+++ b/devel/cgdb/Makefile
@ -30,10 +30,6 @@ CONFIGURE_ARGS+=	--with-readline=${LOCALBASE}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 .endif

-.if ${OSVERSION} < 600000
-BROKEN=		Does not compile on 5.x with old texinfo in base
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|dev_ptmx=yes|dev_ptmx=no|' ${WRKSRC}/configure

--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@ -47,14 +47,6 @@ USE_GL=		yes
 #BROKEN=		"Does not compile on !i386 and !amd64"
 #.endif

-.if ${OSVERSION} < 500032
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-RUN_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-CPPFLAGS+=	-I${LOCALBASE}/include/stlport
-LDFLAGS+=	-lstlport_gcc
-CFLAGS+=	-O0
-.endif
-
 post-patch:
 	@${GREP} -lR "SDL/SDL" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's|SDL/SDL|SDL|g'
--- a/devel/codeworker/Makefile
+++ b/devel/codeworker/Makefile
@ -28,13 +28,7 @@ CFLAGS+=	-Dstricmp=strcasecmp

 PLIST_FILES=	bin/codeworker

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500035
-CFLAGS+=	-fpermissive
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/codeworker ${PREFIX}/bin

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/cross-binutils/Makefile
+++ b/devel/cross-binutils/Makefile
@ -88,12 +88,6 @@ FIXREFS=	${SH} -c '${REINPLACE_CMD} -E \

 .include <bsd.port.pre.mk>

-.if defined(TGTARCH)
-. if ${OSVERSION} < 600000
-BROKEN=		Does not compile
-. endif
-.endif
-
 post-patch:
 #
 # Patch and rename info files
--- a/devel/crow/Makefile
+++ b/devel/crow/Makefile
@ -27,10 +27,4 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 600000
-BROKEN=		Fails to compile
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/cscout/Makefile
+++ b/devel/cscout/Makefile
@ -26,9 +26,7 @@ MAN1=	cscout.1 cswc.1

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} < 600000
-IGNORE =	fails to work on versions of FreeBSD before 6.0 (it installs FreeBSD 6.x binaries)
-.elif ${OSVERSION} >= 700000
+.if ${OSVERSION} >= 700000
 LIB_DEPENDS+=	c.6:${PORTSDIR}/misc/compat6x
 .endif

--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@ -75,10 +75,6 @@ MAN5=		directfbrc.5
 BROKEN=		Does not compile on alpha
 .endif

-.if ${OSVERSION} < 600000
-BROKEN=		5.x not supported
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/-lc_r/${PTHREAD_LIBS}/g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' ${WRKSRC}/configure.in
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@ -25,10 +25,4 @@ USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 502126
-IGNORE=		freebsd 3.*, 4.*, 5.0, 5.1 are not supported
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/eiffelstudio/Makefile
+++ b/devel/eiffelstudio/Makefile
@ -24,6 +24,8 @@ DISTNAME=	Eiffel${PORTVERSION:S/.//}_gpl_64493-freebsd-${EIFFEL_ARCH}
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	A Complete Integrated Development Environment for Eiffel

+LIB_DEPENDS=	c.5:${PORTSDIR}/misc/compat5x
+
 USE_GNOME=	gtk20
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/Eiffel${PORTVERSION:S/.//}
@ -38,12 +40,6 @@ SUB_LIST+=	EIFFEL_HOST="${EIFFEL_HOST}"

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} < 530000
-IGNORE=		needs FreeBSD 5.3 or higher
-.elif ${OSVERSION} >= 600000
-LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
-.endif
-
 # Try native version first, then try i386 compatibility framework.
 .for arch in ${ARCH}
 . if ${NATIVE_ARCHS:M${arch}} != ""
--- a/devel/elfrc/Makefile
+++ b/devel/elfrc/Makefile
@ -27,10 +27,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 600000
-IGNORE=		lack of ELF definitions (STV_DEFAULT) on FreeBSD < 6.0
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@ -28,12 +28,6 @@ MAN1=		geany.1

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} > 502010
-GNU_REGEX_H=	gnu/regex.h
-.else
-GNU_REGEX_H=	gnuregex.h
-.endif
-
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
@ -52,7 +46,7 @@ CONFIGURE_ARGS+=--disable-vte
 post-patch:
 	@${REINPLACE_CMD} -e 's|gcc|${CC} ${CFLAGS}|' ${WRKSRC}/scintilla/Makefile.in
 .for file in tagmanager/lregex.c src/encodings.c
-	@${REINPLACE_CMD} -e 's|<regex\.h>|<${GNU_REGEX_H}>|g' ${WRKSRC}/${file}
+	@${REINPLACE_CMD} -e 's|<regex\.h>|<gnu/regex.h>|g' ${WRKSRC}/${file}
 .endfor
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in
--- a/devel/gsoap/Makefile
+++ b/devel/gsoap/Makefile
@ -24,10 +24,6 @@ ONLY_FOR_ARCHS=	i386 amd64

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} < 600000
-IGNORE=	does not compile: needs gethostbyname_r()
-.endif
-
 .if ${ARCH} == "amd64"
 CFLAGS+=	-fPIC
 .endif
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@ -37,7 +37,7 @@ OPTIONS=	FUSE "Enable fuse" on \

 .include <bsd.port.pre.mk>

-.if defined(WITH_FUSE) && ${OSVERSION} >= 600000
+.if defined(WITH_FUSE)
 LIB_DEPENDS+=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
 RUN_DEPENDS+=	mount_fusefs:${PORTSDIR}/sysutils/fusefs-kmod
 PLIST_SUB+=	FUSE=""
--- a/devel/jtag/Makefile
+++ b/devel/jtag/Makefile
@ -33,13 +33,6 @@ PORTDOCS=	*

 .include <bsd.port.pre.mk>

-#
-# We haven't this on FreeBSD version prior to 5.1
-#
-.if ${OSVERSION} < 501000
-CFLAGS+=	-Duseconds_t=long
-.endif
-
 .if exists(${LOCALBASE}/lib/libreadline.so.5)
 LIB_DEPENDS+=	readline.5:${PORTSDIR}/devel/readline
 .endif
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@ -29,6 +29,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \

 INFO=		libgtop2

+PKGMESSAGE=	${FILESDIR}/pkg-message
+
 .include <bsd.port.pre.mk>

 .if ( ${OSVERSION} >= 800000 && ${OSVERSION} < 800019 ) || \
@ -36,18 +38,12 @@ INFO=		libgtop2
 RUN_DEPENDS+=	lsof:${PORTSDIR}/sysutils/lsof
 .endif

-.if ${OSVERSION} >= 600000
-PKGMESSAGE=	${FILESDIR}/pkg-message
-.endif
-
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f

 post-install:
 	@${CHGRP} kmem ${PREFIX}/bin/libgtop_server2
 	@${CHMOD} 2555 ${PREFIX}/bin/libgtop_server2
-.if ${OSVERSION} >= 600000
 	@${CAT} ${PKGMESSAGE}
-.endif

 .include <bsd.port.post.mk>
--- a/devel/libhoard/Makefile
+++ b/devel/libhoard/Makefile
@ -22,14 +22,8 @@ ALL_TARGET=	freebsd

 PLIST_FILES=	lib/libhoard.so lib/libhoard.so.1

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 501100
-IGNORE=		you must have a FreeBSD 5.1-RELEASE or better
-.endif
-
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libhoard.so ${PREFIX}/lib/libhoard.so.1
 	${LN} -sf ${PREFIX}/lib/libhoard.so.1 ${PREFIX}/lib/libhoard.so

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/liboil/Makefile
+++ b/devel/liboil/Makefile
@ -23,19 +23,10 @@ CFLAGS:=	${CFLAGS:N-O*} -O2

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} < 600000 && !defined(WITH_3DNOW_GCC40)
-BUILD_DEPENDS+=	gcc34:${PORTSDIR}/lang/gcc34
-RUN_DEPENDS+=	gcc34:${PORTSDIR}/lang/gcc34
-CC:=	gcc34
-CXX:=	g++34
-.endif
-
 .if defined(WITH_3DNOW_GCC40) && ${OSVERSION} < 700042
 USE_GCC=	4.1+
-.if ${OSVERSION} < 600000
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 .endif
-.endif

 pre-everything::
 .if ${MACHINE_CPU:M3dnow}!="" && ${OSVERSION} < 700042
--- a/devel/linux-js/Makefile
+++ b/devel/linux-js/Makefile
@ -29,10 +29,6 @@ MAKE_ENV=	WITHOUT_DEBUG=yes

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} < 503001
-IGNORE=		requires FreeBSD 5.3 or superior
-.endif
-
 .if !exists(/usr/src/sys/Makefile)
 IGNORE=		requires kernel source files
 .endif
--- a/devel/linuxthreads/Makefile
+++ b/devel/linuxthreads/Makefile
@ -28,7 +28,7 @@ ONLY_FOR_ARCHS=	i386
 .if ${OSVERSION} >= 700042
 USING_GCC4=	true
 MAKE_ENV+=	USING_GCC4=true
-.elif ${OSVERSION} >= 500035
+.else
 USING_GCC3=	true
 MAKE_ENV+=	USING_GCC3=true
 .endif
@ -230,12 +230,12 @@ post-install:

 #	@sh ${PKGINSTALL} ${PKGNAME} POST-INSTALL

-.if (defined(NOPROFILE) && ${OSVERSION} < 600007 ) || (defined(NO_PROFILE) && ${OSVERSION} >= 600007 )
+.if defined(NO_PROFILE)
 PLIST_SUB=	PROFILE:="@comment "
 .else
 PLIST_SUB=	PROFILE:=""
 .endif
-.if (defined(NOPIC) && ${OSVERSION} < 600007 ) || (defined(NO_PIC) && ${OSVERSION} >= 600007 )
+.if defined(NO_PIC)
 PLIST_SUB+=	PIC:="@comment "
 .else
 PLIST_SUB+=	PIC:=""
@ -245,7 +245,7 @@ PLIST_SUB+=	PICARCHIVE:=""
 .else
 PLIST_SUB+=	PICARCHIVE:="@comment "
 .endif
-.if defined(INSTALL_PIC_ARCHIVE) || ${OSVERSION} >= 501101
+.if defined(INSTALL_PIC_ARCHIVE)
 PLIST_SUB+=	LIBLGCC_R_PICARCHIVE:=""
 .else
 PLIST_SUB+=	LIBLGCC_R_PICARCHIVE:="@comment "
@ -282,10 +282,8 @@ PLIST_SUB+=	LTHREADSHMAJOR:="2"
 .endif
 .if ${OSVERSION} >= 700042
 PLIST_SUB+=	LIBSTDCPPMAJOR:="6"
-.elif ${OSVERSION} >= 600033
-PLIST_SUB+=	LIBSTDCPPMAJOR:="5"
 .else
-PLIST_SUB+=	LIBSTDCPPMAJOR:="4"
+PLIST_SUB+=	LIBSTDCPPMAJOR:="5"
 .endif

 .include <bsd.port.post.mk>
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@ -18,6 +18,7 @@ COMMENT=	GNU m4
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g
+CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"

 .if defined(WITH_CHANGEWORD)
 CONFIGURE_ARGS+=	--enable-changeword
@ -28,17 +29,8 @@ MAN1=	gm4.1

 EXAMPLESDIR=	share/examples/gm4

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 600000
-BUILD_DEPENDS+=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
-CONFIGURE_ENV+=	MAKEINFO="${LOCALBASE}/bin/makeinfo --no-split"
-.else
-CONFIGURE_ENV+=	MAKEINFO="makeinfo --no-split"
-.endif
-
 post-install:
 	@${MKDIR} ${PREFIX}/${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${PREFIX}/${EXAMPLESDIR}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/ncurses-devel/Makefile
+++ b/devel/ncurses-devel/Makefile
@ -94,10 +94,6 @@ EXAMPLES_CPP=	Makefile NEWS PROBLEMS README-first cursesapp.cc \

 .include "${.CURDIR}/Makefile.man"

-.if ${OSVERSION} < 503000
-WITHOUT_WIDEC=	yes
-.endif
-
 CONFIGURE_ARGS_WIDEC=--enable-widec
 .if defined(WITH_EXTCOLORS)
 CONFIGURE_ARGS_WIDEC+=--enable-ext-colors
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@ -81,10 +81,6 @@ EXAMPLES_CPP=	Makefile NEWS PROBLEMS README-first cursesapp.cc \

 .include "${.CURDIR}/Makefile.man"

-.if ${OSVERSION} < 503000
-WITHOUT_WIDEC=	yes
-.endif
-
 CONFIGURE_ARGS_WIDEC=--enable-widec
 .if defined(WITH_EXTCOLORS)
 CONFIGURE_ARGS_WIDEC+=--enable-ext-colors
--- a/devel/p4/Makefile
+++ b/devel/p4/Makefile
@ -39,15 +39,11 @@ PLIST_FILES=	${BIN_FILES:S+^+bin/+g} \
 .include <bsd.port.pre.mk>

 # Figure out what to install
-.if ${ARCH} == amd64 && ${OSVERSION} >= 504000 && ${OSVERSION} < 600000
-PLATFORM=	freebsd54x86_64
-.elif ${ARCH} == amd64 && ${OSVERSION} >= 600000
+.if ${ARCH} == amd64
 PLATFORM=	freebsd60x86_64
-.elif ${ARCH} == i386 && ${OSVERSION} >= 504000 && ${OSVERSION} < 600000
-PLATFORM=	freebsd54x86
-.elif ${ARCH} == i386 && ${OSVERSION} >= 600000
+.elif ${ARCH} == i386
 PLATFORM=	freebsd60x86
-.elif ${ARCH} == sparc64 && ${OSVERSION} >= 601000
+.elif ${ARCH} == sparc64
 PLATFORM=	freebsd61sparc64
 .else
 IGNORE=		unsupported OS release, sorry
--- a/devel/p4/distinfo.freebsd54x86
+++ b/devel/p4/distinfo.freebsd54x86
@ -1,15 +0,0 @@
-MD5 (perforce/08.2_1/i386/p4) = b83fca632e6be3721b43ab83285d88f2
-SHA256 (perforce/08.2_1/i386/p4) = 809ee98fdf4a0bdc67dde689334a22dd0930a734d898bcebc04b0a8287311868
-SIZE (perforce/08.2_1/i386/p4) = 544684
-MD5 (perforce/08.2_1/i386/p4d) = 0b547f61b2522b0e19562fe551cb4e5b
-SHA256 (perforce/08.2_1/i386/p4d) = c081020937f9524745613eadf76f5e570a05ac032c304593ec25448fb83ef213
-SIZE (perforce/08.2_1/i386/p4d) = 1577536
-MD5 (perforce/08.2_1/i386/p4ftpd) = a4047079042bd7b26e895b337f91f389
-SHA256 (perforce/08.2_1/i386/p4ftpd) = 45555206e265a5cf087efcae88184247e54ecebeb70435fa06c8d6d3af9f1e4e
-SIZE (perforce/08.2_1/i386/p4ftpd) = 707280
-MD5 (perforce/08.2_1/i386/p4p) = d77b98d78485bac6632e738df3f8a515
-SHA256 (perforce/08.2_1/i386/p4p) = 9dbcd5076d864caa9e79404e2c388624558b8b7352648c8fb0c0a663e2ab9e18
-SIZE (perforce/08.2_1/i386/p4p) = 493800
-MD5 (perforce/08.2_1/i386/p4web) = 83a671908b01485897e46a1be8148991
-SHA256 (perforce/08.2_1/i386/p4web) = 731d92ffc9a8b80f3d99e500fd1f324d190812431e367bd9525f60b5af9f9993
-SIZE (perforce/08.2_1/i386/p4web) = 2362664
--- a/devel/p4/distinfo.freebsd54x86_64
+++ b/devel/p4/distinfo.freebsd54x86_64
@ -1,15 +0,0 @@
-MD5 (perforce/08.2_1/amd64/p4) = 460ae9678427306e8b2a488612d0d25a
-SHA256 (perforce/08.2_1/amd64/p4) = bc49a62bf9efebe5816f4b211d8883a2adec7fc3785a84d3e42f9e7c82f7dc3b
-SIZE (perforce/08.2_1/amd64/p4) = 607432
-MD5 (perforce/08.2_1/amd64/p4d) = 1381c7f990a9686ff5cdd90bc07c9f21
-SHA256 (perforce/08.2_1/amd64/p4d) = b789d55903cedfa94129be8459a5f13acd6ee7651361b1bdcfe2ce02dcb93e2f
-SIZE (perforce/08.2_1/amd64/p4d) = 1740000
-MD5 (perforce/08.2_1/amd64/p4ftpd) = b1f2d5dc4e5968c8a04d2c43fb9f186c
-SHA256 (perforce/08.2_1/amd64/p4ftpd) = 2ab63f3cee095fea0ffe39956cdc1fa9644738890e874ac8e88167b99b5f4195
-SIZE (perforce/08.2_1/amd64/p4ftpd) = 743824
-MD5 (perforce/08.2_1/amd64/p4p) = 83657cf66faacfdb0d721f2daa2497c2
-SHA256 (perforce/08.2_1/amd64/p4p) = 0a9a3f4c4abbd4700903616e1132ffa42bdab2994e0bbcd006a47e148c02ae59
-SIZE (perforce/08.2_1/amd64/p4p) = 586600
-MD5 (perforce/08.2_1/amd64/p4web) = 2459a171a4c8bcda63eb494753752f88
-SHA256 (perforce/08.2_1/amd64/p4web) = 706d2fa78537d4eef0392cd1e1661caa9d47c6c4a1a5e9ffc9a32e79f2811c8b
-SIZE (perforce/08.2_1/amd64/p4web) = 2425768
--- a/devel/p4api/Makefile
+++ b/devel/p4api/Makefile
@ -22,6 +22,7 @@ COMMENT=	Perforce API (static libraries and header files)
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/p4api-2008.1.158777

+PLATFORM=	freebsd60
 VERSION=	08.1

 .include <bsd.port.pre.mk>
@ -36,12 +37,6 @@ IGNORE=		"Unsupported platform, sorry."

 TAR_FILES=	p4api.tgz

-.if ${OSVERSION} >= 600034
-PLATFORM=	freebsd60
-.else
-PLATFORM=	freebsd54
-.endif
-
 DOCVER=		${VERSION:S/.//}

 do-install:
--- a/devel/p4api/distinfo
+++ b/devel/p4api/distinfo
@ -10,15 +10,3 @@ SIZE (perforce/08.1/i386-freebsd60/p4api.tgz) = 594445
 MD5 (perforce/08.1/i386-freebsd60/p4api.pdf) = f4953a608f95f52683c6b83c08bc5d84
 SHA256 (perforce/08.1/i386-freebsd60/p4api.pdf) = 672ce46eb76f57198d410bedc616ac856fe68065527c2f835b6f3c8b65bfc78a
 SIZE (perforce/08.1/i386-freebsd60/p4api.pdf) = 1318445
-MD5 (perforce/08.1/amd64-freebsd54/p4api.pdf) = f4953a608f95f52683c6b83c08bc5d84
-SHA256 (perforce/08.1/amd64-freebsd54/p4api.pdf) = 672ce46eb76f57198d410bedc616ac856fe68065527c2f835b6f3c8b65bfc78a
-SIZE (perforce/08.1/amd64-freebsd54/p4api.pdf) = 1318445
-MD5 (perforce/08.1/i386-freebsd54/p4api.pdf) = f4953a608f95f52683c6b83c08bc5d84
-SHA256 (perforce/08.1/i386-freebsd54/p4api.pdf) = 672ce46eb76f57198d410bedc616ac856fe68065527c2f835b6f3c8b65bfc78a
-SIZE (perforce/08.1/i386-freebsd54/p4api.pdf) = 1318445
-MD5 (perforce/08.1/i386-freebsd54/p4api.tgz) = 206137fdd0129e7d56378c4a3e6a12fb
-SHA256 (perforce/08.1/i386-freebsd54/p4api.tgz) = 886a4b113bcdd8c9f07aaa4a1fa88b9fca254486026c0b69d8e0453b32db1013
-SIZE (perforce/08.1/i386-freebsd54/p4api.tgz) = 593933
-MD5 (perforce/08.1/amd64-freebsd54/p4api.tgz) = 9e79a43355f0c8fb23dd2c5b3c1b3616
-SHA256 (perforce/08.1/amd64-freebsd54/p4api.tgz) = 30513087739f376d114e0796e6da51a36c8acec5ef1b4a144f9f73428c6a1b31
-SIZE (perforce/08.1/amd64-freebsd54/p4api.tgz) = 616862
--- a/devel/p4d/Makefile
+++ b/devel/p4d/Makefile
@ -39,15 +39,11 @@ PLIST_FILES=	${BIN_FILES:S+^+bin/+g} \
 .include <bsd.port.pre.mk>

 # Figure out what to install
-.if ${ARCH} == amd64 && ${OSVERSION} >= 504000 && ${OSVERSION} < 600000
-PLATFORM=	freebsd54x86_64
-.elif ${ARCH} == amd64 && ${OSVERSION} >= 600000
+.if ${ARCH} == amd64
 PLATFORM=	freebsd60x86_64
-.elif ${ARCH} == i386 && ${OSVERSION} >= 504000 && ${OSVERSION} < 600000
-PLATFORM=	freebsd54x86
-.elif ${ARCH} == i386 && ${OSVERSION} >= 600000
+.elif ${ARCH} == i386
 PLATFORM=	freebsd60x86
-.elif ${ARCH} == sparc64 && ${OSVERSION} >= 601000
+.elif ${ARCH} == sparc64
 PLATFORM=	freebsd61sparc64
 .else
 IGNORE=		unsupported OS release, sorry
--- a/devel/p4d/distinfo.freebsd54x86
+++ b/devel/p4d/distinfo.freebsd54x86
@ -1,15 +0,0 @@
-MD5 (perforce/08.2_1/i386/p4) = b83fca632e6be3721b43ab83285d88f2
-SHA256 (perforce/08.2_1/i386/p4) = 809ee98fdf4a0bdc67dde689334a22dd0930a734d898bcebc04b0a8287311868
-SIZE (perforce/08.2_1/i386/p4) = 544684
-MD5 (perforce/08.2_1/i386/p4d) = 0b547f61b2522b0e19562fe551cb4e5b
-SHA256 (perforce/08.2_1/i386/p4d) = c081020937f9524745613eadf76f5e570a05ac032c304593ec25448fb83ef213
-SIZE (perforce/08.2_1/i386/p4d) = 1577536
-MD5 (perforce/08.2_1/i386/p4ftpd) = a4047079042bd7b26e895b337f91f389
-SHA256 (perforce/08.2_1/i386/p4ftpd) = 45555206e265a5cf087efcae88184247e54ecebeb70435fa06c8d6d3af9f1e4e
-SIZE (perforce/08.2_1/i386/p4ftpd) = 707280
-MD5 (perforce/08.2_1/i386/p4p) = d77b98d78485bac6632e738df3f8a515
-SHA256 (perforce/08.2_1/i386/p4p) = 9dbcd5076d864caa9e79404e2c388624558b8b7352648c8fb0c0a663e2ab9e18
-SIZE (perforce/08.2_1/i386/p4p) = 493800
-MD5 (perforce/08.2_1/i386/p4web) = 83a671908b01485897e46a1be8148991
-SHA256 (perforce/08.2_1/i386/p4web) = 731d92ffc9a8b80f3d99e500fd1f324d190812431e367bd9525f60b5af9f9993
-SIZE (perforce/08.2_1/i386/p4web) = 2362664
--- a/devel/p4d/distinfo.freebsd54x86_64
+++ b/devel/p4d/distinfo.freebsd54x86_64
@ -1,15 +0,0 @@
-MD5 (perforce/08.2_1/amd64/p4) = 460ae9678427306e8b2a488612d0d25a
-SHA256 (perforce/08.2_1/amd64/p4) = bc49a62bf9efebe5816f4b211d8883a2adec7fc3785a84d3e42f9e7c82f7dc3b
-SIZE (perforce/08.2_1/amd64/p4) = 607432
-MD5 (perforce/08.2_1/amd64/p4d) = 1381c7f990a9686ff5cdd90bc07c9f21
-SHA256 (perforce/08.2_1/amd64/p4d) = b789d55903cedfa94129be8459a5f13acd6ee7651361b1bdcfe2ce02dcb93e2f
-SIZE (perforce/08.2_1/amd64/p4d) = 1740000
-MD5 (perforce/08.2_1/amd64/p4ftpd) = b1f2d5dc4e5968c8a04d2c43fb9f186c
-SHA256 (perforce/08.2_1/amd64/p4ftpd) = 2ab63f3cee095fea0ffe39956cdc1fa9644738890e874ac8e88167b99b5f4195
-SIZE (perforce/08.2_1/amd64/p4ftpd) = 743824
-MD5 (perforce/08.2_1/amd64/p4p) = 83657cf66faacfdb0d721f2daa2497c2
-SHA256 (perforce/08.2_1/amd64/p4p) = 0a9a3f4c4abbd4700903616e1132ffa42bdab2994e0bbcd006a47e148c02ae59
-SIZE (perforce/08.2_1/amd64/p4p) = 586600
-MD5 (perforce/08.2_1/amd64/p4web) = 2459a171a4c8bcda63eb494753752f88
-SHA256 (perforce/08.2_1/amd64/p4web) = 706d2fa78537d4eef0392cd1e1661caa9d47c6c4a1a5e9ffc9a32e79f2811c8b
-SIZE (perforce/08.2_1/amd64/p4web) = 2425768
--- a/devel/p4ftpd/Makefile
+++ b/devel/p4ftpd/Makefile
@ -39,15 +39,11 @@ PLIST_FILES=	${BIN_FILES:S+^+bin/+g} \
 .include <bsd.port.pre.mk>

 # Figure out what to install
-.if ${ARCH} == amd64 && ${OSVERSION} >= 504000 && ${OSVERSION} < 600000
-PLATFORM=	freebsd54x86_64
-.elif ${ARCH} == amd64 && ${OSVERSION} >= 600000
+.if ${ARCH} == amd64
 PLATFORM=	freebsd60x86_64
-.elif ${ARCH} == i386 && ${OSVERSION} >= 504000 && ${OSVERSION} < 600000
-PLATFORM=	freebsd54x86
-.elif ${ARCH} == i386 && ${OSVERSION} >= 600000
+.elif ${ARCH} == i386
 PLATFORM=	freebsd60x86
-.elif ${ARCH} == sparc64 && ${OSVERSION} >= 601000
+.elif ${ARCH} == sparc64
 PLATFORM=	freebsd61sparc64
 .else
 IGNORE=		unsupported OS release, sorry
--- a/devel/p4ftpd/distinfo.freebsd54x86
+++ b/devel/p4ftpd/distinfo.freebsd54x86
@ -1,15 +0,0 @@
-MD5 (perforce/08.2_1/i386/p4) = b83fca632e6be3721b43ab83285d88f2
-SHA256 (perforce/08.2_1/i386/p4) = 809ee98fdf4a0bdc67dde689334a22dd0930a734d898bcebc04b0a8287311868
-SIZE (perforce/08.2_1/i386/p4) = 544684
-MD5 (perforce/08.2_1/i386/p4d) = 0b547f61b2522b0e19562fe551cb4e5b
-SHA256 (perforce/08.2_1/i386/p4d) = c081020937f9524745613eadf76f5e570a05ac032c304593ec25448fb83ef213
-SIZE (perforce/08.2_1/i386/p4d) = 1577536
-MD5 (perforce/08.2_1/i386/p4ftpd) = a4047079042bd7b26e895b337f91f389
-SHA256 (perforce/08.2_1/i386/p4ftpd) = 45555206e265a5cf087efcae88184247e54ecebeb70435fa06c8d6d3af9f1e4e
-SIZE (perforce/08.2_1/i386/p4ftpd) = 707280
-MD5 (perforce/08.2_1/i386/p4p) = d77b98d78485bac6632e738df3f8a515
-SHA256 (perforce/08.2_1/i386/p4p) = 9dbcd5076d864caa9e79404e2c388624558b8b7352648c8fb0c0a663e2ab9e18
-SIZE (perforce/08.2_1/i386/p4p) = 493800
-MD5 (perforce/08.2_1/i386/p4web) = 83a671908b01485897e46a1be8148991
-SHA256 (perforce/08.2_1/i386/p4web) = 731d92ffc9a8b80f3d99e500fd1f324d190812431e367bd9525f60b5af9f9993
-SIZE (perforce/08.2_1/i386/p4web) = 2362664
--- a/devel/p4ftpd/distinfo.freebsd54x86_64
+++ b/devel/p4ftpd/distinfo.freebsd54x86_64
@ -1,15 +0,0 @@
-MD5 (perforce/08.2_1/amd64/p4) = 460ae9678427306e8b2a488612d0d25a
-SHA256 (perforce/08.2_1/amd64/p4) = bc49a62bf9efebe5816f4b211d8883a2adec7fc3785a84d3e42f9e7c82f7dc3b
-SIZE (perforce/08.2_1/amd64/p4) = 607432
-MD5 (perforce/08.2_1/amd64/p4d) = 1381c7f990a9686ff5cdd90bc07c9f21
-SHA256 (perforce/08.2_1/amd64/p4d) = b789d55903cedfa94129be8459a5f13acd6ee7651361b1bdcfe2ce02dcb93e2f
-SIZE (perforce/08.2_1/amd64/p4d) = 1740000
-MD5 (perforce/08.2_1/amd64/p4ftpd) = b1f2d5dc4e5968c8a04d2c43fb9f186c
-SHA256 (perforce/08.2_1/amd64/p4ftpd) = 2ab63f3cee095fea0ffe39956cdc1fa9644738890e874ac8e88167b99b5f4195
-SIZE (perforce/08.2_1/amd64/p4ftpd) = 743824
-MD5 (perforce/08.2_1/amd64/p4p) = 83657cf66faacfdb0d721f2daa2497c2
-SHA256 (perforce/08.2_1/amd64/p4p) = 0a9a3f4c4abbd4700903616e1132ffa42bdab2994e0bbcd006a47e148c02ae59
-SIZE (perforce/08.2_1/amd64/p4p) = 586600
-MD5 (perforce/08.2_1/amd64/p4web) = 2459a171a4c8bcda63eb494753752f88
-SHA256 (perforce/08.2_1/amd64/p4web) = 706d2fa78537d4eef0392cd1e1661caa9d47c6c4a1a5e9ffc9a32e79f2811c8b
-SIZE (perforce/08.2_1/amd64/p4web) = 2425768
--- a/devel/p4p/Makefile
+++ b/devel/p4p/Makefile
@ -39,15 +39,11 @@ PLIST_FILES=	${BIN_FILES:S+^+bin/+g} \
 .include <bsd.port.pre.mk>

 # Figure out what to install
-.if ${ARCH} == amd64 && ${OSVERSION} >= 504000 && ${OSVERSION} < 600000
-PLATFORM=	freebsd54x86_64
-.elif ${ARCH} == amd64 && ${OSVERSION} >= 600000
+.if ${ARCH} == amd64
 PLATFORM=	freebsd60x86_64
-.elif ${ARCH} == i386 && ${OSVERSION} >= 504000 && ${OSVERSION} < 600000
-PLATFORM=	freebsd54x86
-.elif ${ARCH} == i386 && ${OSVERSION} >= 600000
+.elif ${ARCH} == i386
 PLATFORM=	freebsd60x86
-.elif ${ARCH} == sparc64 && ${OSVERSION} >= 601000
+.elif ${ARCH} == sparc64
 PLATFORM=	freebsd61sparc64
 .else
 IGNORE=		unsupported OS release, sorry
--- a/devel/p4p/distinfo.freebsd54x86
+++ b/devel/p4p/distinfo.freebsd54x86
@ -1,15 +0,0 @@
-MD5 (perforce/08.2_1/i386/p4) = b83fca632e6be3721b43ab83285d88f2
-SHA256 (perforce/08.2_1/i386/p4) = 809ee98fdf4a0bdc67dde689334a22dd0930a734d898bcebc04b0a8287311868
-SIZE (perforce/08.2_1/i386/p4) = 544684
-MD5 (perforce/08.2_1/i386/p4d) = 0b547f61b2522b0e19562fe551cb4e5b
-SHA256 (perforce/08.2_1/i386/p4d) = c081020937f9524745613eadf76f5e570a05ac032c304593ec25448fb83ef213
-SIZE (perforce/08.2_1/i386/p4d) = 1577536
-MD5 (perforce/08.2_1/i386/p4ftpd) = a4047079042bd7b26e895b337f91f389
-SHA256 (perforce/08.2_1/i386/p4ftpd) = 45555206e265a5cf087efcae88184247e54ecebeb70435fa06c8d6d3af9f1e4e
-SIZE (perforce/08.2_1/i386/p4ftpd) = 707280
-MD5 (perforce/08.2_1/i386/p4p) = d77b98d78485bac6632e738df3f8a515
-SHA256 (perforce/08.2_1/i386/p4p) = 9dbcd5076d864caa9e79404e2c388624558b8b7352648c8fb0c0a663e2ab9e18
-SIZE (perforce/08.2_1/i386/p4p) = 493800
-MD5 (perforce/08.2_1/i386/p4web) = 83a671908b01485897e46a1be8148991
-SHA256 (perforce/08.2_1/i386/p4web) = 731d92ffc9a8b80f3d99e500fd1f324d190812431e367bd9525f60b5af9f9993
-SIZE (perforce/08.2_1/i386/p4web) = 2362664
--- a/devel/p4p/distinfo.freebsd54x86_64
+++ b/devel/p4p/distinfo.freebsd54x86_64
@ -1,15 +0,0 @@
-MD5 (perforce/08.2_1/amd64/p4) = 460ae9678427306e8b2a488612d0d25a
-SHA256 (perforce/08.2_1/amd64/p4) = bc49a62bf9efebe5816f4b211d8883a2adec7fc3785a84d3e42f9e7c82f7dc3b
-SIZE (perforce/08.2_1/amd64/p4) = 607432
-MD5 (perforce/08.2_1/amd64/p4d) = 1381c7f990a9686ff5cdd90bc07c9f21
-SHA256 (perforce/08.2_1/amd64/p4d) = b789d55903cedfa94129be8459a5f13acd6ee7651361b1bdcfe2ce02dcb93e2f
-SIZE (perforce/08.2_1/amd64/p4d) = 1740000
-MD5 (perforce/08.2_1/amd64/p4ftpd) = b1f2d5dc4e5968c8a04d2c43fb9f186c
-SHA256 (perforce/08.2_1/amd64/p4ftpd) = 2ab63f3cee095fea0ffe39956cdc1fa9644738890e874ac8e88167b99b5f4195
-SIZE (perforce/08.2_1/amd64/p4ftpd) = 743824
-MD5 (perforce/08.2_1/amd64/p4p) = 83657cf66faacfdb0d721f2daa2497c2
-SHA256 (perforce/08.2_1/amd64/p4p) = 0a9a3f4c4abbd4700903616e1132ffa42bdab2994e0bbcd006a47e148c02ae59
-SIZE (perforce/08.2_1/amd64/p4p) = 586600
-MD5 (perforce/08.2_1/amd64/p4web) = 2459a171a4c8bcda63eb494753752f88
-SHA256 (perforce/08.2_1/amd64/p4web) = 706d2fa78537d4eef0392cd1e1661caa9d47c6c4a1a5e9ffc9a32e79f2811c8b
-SIZE (perforce/08.2_1/amd64/p4web) = 2425768
--- a/devel/p4v/Makefile
+++ b/devel/p4v/Makefile
@ -30,10 +30,6 @@ MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} < 600000
-IGNORE=		please upgrade to FreeBSD 6.x or newer
-.endif
-
 P4V_BIN= \
 	bin/assistant bin/p4v bin/p4v.bin

--- a/devel/p4web/Makefile
+++ b/devel/p4web/Makefile
@ -39,15 +39,11 @@ PLIST_FILES=	${BIN_FILES:S+^+bin/+g} \
 .include <bsd.port.pre.mk>

 # Figure out what to install
-.if ${ARCH} == amd64 && ${OSVERSION} >= 504000 && ${OSVERSION} < 600000
-PLATFORM=	freebsd54x86_64
-.elif ${ARCH} == amd64 && ${OSVERSION} >= 600000
+.if ${ARCH} == amd64
 PLATFORM=	freebsd60x86_64
-.elif ${ARCH} == i386 && ${OSVERSION} >= 504000 && ${OSVERSION} < 600000
-PLATFORM=	freebsd54x86
-.elif ${ARCH} == i386 && ${OSVERSION} >= 600000
+.elif ${ARCH} == i386
 PLATFORM=	freebsd60x86
-.elif ${ARCH} == sparc64 && ${OSVERSION} >= 601000
+.elif ${ARCH} == sparc64
 PLATFORM=	freebsd61sparc64
 .else
 IGNORE=		unsupported OS release, sorry
--- a/devel/p4web/distinfo.freebsd54x86
+++ b/devel/p4web/distinfo.freebsd54x86
@ -1,15 +0,0 @@
-MD5 (perforce/08.2_1/i386/p4) = b83fca632e6be3721b43ab83285d88f2
-SHA256 (perforce/08.2_1/i386/p4) = 809ee98fdf4a0bdc67dde689334a22dd0930a734d898bcebc04b0a8287311868
-SIZE (perforce/08.2_1/i386/p4) = 544684
-MD5 (perforce/08.2_1/i386/p4d) = 0b547f61b2522b0e19562fe551cb4e5b
-SHA256 (perforce/08.2_1/i386/p4d) = c081020937f9524745613eadf76f5e570a05ac032c304593ec25448fb83ef213
-SIZE (perforce/08.2_1/i386/p4d) = 1577536
-MD5 (perforce/08.2_1/i386/p4ftpd) = a4047079042bd7b26e895b337f91f389
-SHA256 (perforce/08.2_1/i386/p4ftpd) = 45555206e265a5cf087efcae88184247e54ecebeb70435fa06c8d6d3af9f1e4e
-SIZE (perforce/08.2_1/i386/p4ftpd) = 707280
-MD5 (perforce/08.2_1/i386/p4p) = d77b98d78485bac6632e738df3f8a515
-SHA256 (perforce/08.2_1/i386/p4p) = 9dbcd5076d864caa9e79404e2c388624558b8b7352648c8fb0c0a663e2ab9e18
-SIZE (perforce/08.2_1/i386/p4p) = 493800
-MD5 (perforce/08.2_1/i386/p4web) = 83a671908b01485897e46a1be8148991
-SHA256 (perforce/08.2_1/i386/p4web) = 731d92ffc9a8b80f3d99e500fd1f324d190812431e367bd9525f60b5af9f9993
-SIZE (perforce/08.2_1/i386/p4web) = 2362664
--- a/devel/p4web/distinfo.freebsd54x86_64
+++ b/devel/p4web/distinfo.freebsd54x86_64
@ -1,15 +0,0 @@
-MD5 (perforce/08.2_1/amd64/p4) = 460ae9678427306e8b2a488612d0d25a
-SHA256 (perforce/08.2_1/amd64/p4) = bc49a62bf9efebe5816f4b211d8883a2adec7fc3785a84d3e42f9e7c82f7dc3b
-SIZE (perforce/08.2_1/amd64/p4) = 607432
-MD5 (perforce/08.2_1/amd64/p4d) = 1381c7f990a9686ff5cdd90bc07c9f21
-SHA256 (perforce/08.2_1/amd64/p4d) = b789d55903cedfa94129be8459a5f13acd6ee7651361b1bdcfe2ce02dcb93e2f
-SIZE (perforce/08.2_1/amd64/p4d) = 1740000
-MD5 (perforce/08.2_1/amd64/p4ftpd) = b1f2d5dc4e5968c8a04d2c43fb9f186c
-SHA256 (perforce/08.2_1/amd64/p4ftpd) = 2ab63f3cee095fea0ffe39956cdc1fa9644738890e874ac8e88167b99b5f4195
-SIZE (perforce/08.2_1/amd64/p4ftpd) = 743824
-MD5 (perforce/08.2_1/amd64/p4p) = 83657cf66faacfdb0d721f2daa2497c2
-SHA256 (perforce/08.2_1/amd64/p4p) = 0a9a3f4c4abbd4700903616e1132ffa42bdab2994e0bbcd006a47e148c02ae59
-SIZE (perforce/08.2_1/amd64/p4p) = 586600
-MD5 (perforce/08.2_1/amd64/p4web) = 2459a171a4c8bcda63eb494753752f88
-SHA256 (perforce/08.2_1/amd64/p4web) = 706d2fa78537d4eef0392cd1e1661caa9d47c6c4a1a5e9ffc9a32e79f2811c8b
-SIZE (perforce/08.2_1/amd64/p4web) = 2425768
--- a/devel/p5-File-ExtAttr/Makefile
+++ b/devel/p5-File-ExtAttr/Makefile
@ -18,10 +18,4 @@ PERL_CONFIGURE=		5.8.0+

 MAN3=			File::ExtAttr.3 File::ExtAttr::Tie.3

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500018
-IGNORE=			extended attributes require FreeBSD 5.x at least after 20010326
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/papi/Makefile
+++ b/devel/papi/Makefile
@ -58,10 +58,6 @@ CONFIGURE_ARGS+=	--without-debug
 CONFIGURE_ARGS+=	--with-debug
 .endif

-.if ${OSVERSION} < 600000
-IGNORE=	requires FreeBSD 6 or later
-.endif
-
 MAN1=	papi_avail.1 \
 	papi_clockres.1 \
 	papi_command_line.1 \
--- a/devel/perforce/Makefile
+++ b/devel/perforce/Makefile
@ -39,15 +39,11 @@ PLIST_FILES=	${BIN_FILES:S+^+bin/+g} \
 .include <bsd.port.pre.mk>

 # Figure out what to install
-.if ${ARCH} == amd64 && ${OSVERSION} >= 504000 && ${OSVERSION} < 600000
-PLATFORM=	freebsd54x86_64
-.elif ${ARCH} == amd64 && ${OSVERSION} >= 600000
+.if ${ARCH} == amd64
 PLATFORM=	freebsd60x86_64
-.elif ${ARCH} == i386 && ${OSVERSION} >= 504000 && ${OSVERSION} < 600000
-PLATFORM=	freebsd54x86
-.elif ${ARCH} == i386 && ${OSVERSION} >= 600000
+.elif ${ARCH} == i386
 PLATFORM=	freebsd60x86
-.elif ${ARCH} == sparc64 && ${OSVERSION} >= 601000
+.elif ${ARCH} == sparc64
 PLATFORM=	freebsd61sparc64
 .else
 IGNORE=		unsupported OS release, sorry
--- a/devel/perforce/distinfo.freebsd54x86
+++ b/devel/perforce/distinfo.freebsd54x86
@ -1,15 +0,0 @@
-MD5 (perforce/08.2_1/i386/p4) = b83fca632e6be3721b43ab83285d88f2
-SHA256 (perforce/08.2_1/i386/p4) = 809ee98fdf4a0bdc67dde689334a22dd0930a734d898bcebc04b0a8287311868
-SIZE (perforce/08.2_1/i386/p4) = 544684
-MD5 (perforce/08.2_1/i386/p4d) = 0b547f61b2522b0e19562fe551cb4e5b
-SHA256 (perforce/08.2_1/i386/p4d) = c081020937f9524745613eadf76f5e570a05ac032c304593ec25448fb83ef213
-SIZE (perforce/08.2_1/i386/p4d) = 1577536
-MD5 (perforce/08.2_1/i386/p4ftpd) = a4047079042bd7b26e895b337f91f389
-SHA256 (perforce/08.2_1/i386/p4ftpd) = 45555206e265a5cf087efcae88184247e54ecebeb70435fa06c8d6d3af9f1e4e
-SIZE (perforce/08.2_1/i386/p4ftpd) = 707280
-MD5 (perforce/08.2_1/i386/p4p) = d77b98d78485bac6632e738df3f8a515
-SHA256 (perforce/08.2_1/i386/p4p) = 9dbcd5076d864caa9e79404e2c388624558b8b7352648c8fb0c0a663e2ab9e18
-SIZE (perforce/08.2_1/i386/p4p) = 493800
-MD5 (perforce/08.2_1/i386/p4web) = 83a671908b01485897e46a1be8148991
-SHA256 (perforce/08.2_1/i386/p4web) = 731d92ffc9a8b80f3d99e500fd1f324d190812431e367bd9525f60b5af9f9993
-SIZE (perforce/08.2_1/i386/p4web) = 2362664
--- a/devel/perforce/distinfo.freebsd54x86_64
+++ b/devel/perforce/distinfo.freebsd54x86_64
@ -1,15 +0,0 @@
-MD5 (perforce/08.2_1/amd64/p4) = 460ae9678427306e8b2a488612d0d25a
-SHA256 (perforce/08.2_1/amd64/p4) = bc49a62bf9efebe5816f4b211d8883a2adec7fc3785a84d3e42f9e7c82f7dc3b
-SIZE (perforce/08.2_1/amd64/p4) = 607432
-MD5 (perforce/08.2_1/amd64/p4d) = 1381c7f990a9686ff5cdd90bc07c9f21
-SHA256 (perforce/08.2_1/amd64/p4d) = b789d55903cedfa94129be8459a5f13acd6ee7651361b1bdcfe2ce02dcb93e2f
-SIZE (perforce/08.2_1/amd64/p4d) = 1740000
-MD5 (perforce/08.2_1/amd64/p4ftpd) = b1f2d5dc4e5968c8a04d2c43fb9f186c
-SHA256 (perforce/08.2_1/amd64/p4ftpd) = 2ab63f3cee095fea0ffe39956cdc1fa9644738890e874ac8e88167b99b5f4195
-SIZE (perforce/08.2_1/amd64/p4ftpd) = 743824
-MD5 (perforce/08.2_1/amd64/p4p) = 83657cf66faacfdb0d721f2daa2497c2
-SHA256 (perforce/08.2_1/amd64/p4p) = 0a9a3f4c4abbd4700903616e1132ffa42bdab2994e0bbcd006a47e148c02ae59
-SIZE (perforce/08.2_1/amd64/p4p) = 586600
-MD5 (perforce/08.2_1/amd64/p4web) = 2459a171a4c8bcda63eb494753752f88
-SHA256 (perforce/08.2_1/amd64/p4web) = 706d2fa78537d4eef0392cd1e1661caa9d47c6c4a1a5e9ffc9a32e79f2811c8b
-SIZE (perforce/08.2_1/amd64/p4web) = 2425768
--- a/devel/py-kqueue/Makefile
+++ b/devel/py-kqueue/Makefile
@ -25,10 +25,6 @@ MAKE_ENV=		MAINCC=${CC}

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} < 500010
-IGNORE="requires new kqueue API"
-.endif
-
 post-patch:
 .if ${PYTHON_REL} >= 230
 	@${REINPLACE_CMD} -e 's,@DEFS@,,' ${WRKSRC}/Makefile.pre.in
--- a/devel/py-zope.interface/Makefile
+++ b/devel/py-zope.interface/Makefile
@ -23,10 +23,4 @@ PYDISTUTILS_NOEGGINFO=	yes
 PYDISTUTILS_PKGNAME=	zope.interface
 PYEASYINSTALL_ARCHDEP=	yes

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 600000
-MANUAL_PACKAGE_BUILD=	does not build in tinderbox environment
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/py-zopeInterface/Makefile
+++ b/devel/py-zopeInterface/Makefile
@ -23,10 +23,4 @@ PYDISTUTILS_NOEGGINFO=	yes
 PYDISTUTILS_PKGNAME=	zope.interface
 PYEASYINSTALL_ARCHDEP=	yes

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 600000
-MANUAL_PACKAGE_BUILD=	does not build in tinderbox environment
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/qsa/Makefile
+++ b/devel/qsa/Makefile
@ -42,10 +42,6 @@ OPTIONS=	IDE "Enable the QSA Workbench (embedded scripting IDE)" on
 CONFIGURE_ARGS+=-no-ide
 .endif

-.if ${OSVERSION} < 502124
-EXTRA_PATCHES=	${PATCHDIR}/extrapatch-src_engine_qsoperations.cpp
-.endif
-
 pre-configure:
 # Adjust installation directories for the documentation and the qmake feature extension
 	@${REINPLACE_CMD} -e 's|$$$$QSA_INSTALL_PREFIX/doc/html|$$$$QSA_INSTALL_PREFIX/share/doc/qsa/html|g' \
--- a/devel/qsa/files/extrapatch-src_engine_qsoperations.cpp
+++ b/devel/qsa/files/extrapatch-src_engine_qsoperations.cpp
@ -1,16 +0,0 @@
--- src/engine/qsoperations.cpp.orig	Mon Jul 12 15:04:29 2004
-+++ src/engine/qsoperations.cpp	Mon Jul 12 15:23:49 2004
-@@ -61,6 +61,13 @@
- }
- #endif
- 
-+#ifdef __FreeBSD__
-+extern "C" {
-+    int isnan( double );
-+    int isinf( double );
-+}
-+#endif
-+
- using namespace QS;
- 
- bool QS::isNaN( double d )
--- a/devel/root/Makefile
+++ b/devel/root/Makefile
@ -220,9 +220,7 @@ CONFIGURE_ARGS+=	--disable-srp

 ### Rules and version dependend variables

-.if ${OSVERSION} < 500016
-BROKEN=			"Does not compile / Needs thread support"
-.elif ${OSVERSION} >= 700000
+.if ${OSVERSION} >= 700000
 BROKEN=			Does not compile
 .endif

--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@ -26,7 +26,8 @@ USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_ICONV=	yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
 		PTHREAD_LIBS="${PTHREAD_LIBS}"		\
-		LDFLAGS="${LDFLAGS}"
+		LDFLAGS="${LDFLAGS}"			\
+		ac_cv_header_libusbhid_h=no

 CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@ -63,10 +64,6 @@ OPTIONS+=	XLIB		"XLib (xorg) graphics support"		On

 MAN3!=		${CAT} ${FILESDIR}/man3

-.if ${OSVERSION} >= 500111
-CONFIGURE_ENV+=	ac_cv_header_libusbhid_h=no
-.endif
-
 .if defined(WITHOUT_AALIB)
 CONFIGURE_ARGS+=--disable-video-aalib
 .else
--- a/devel/sdts++/Makefile
+++ b/devel/sdts++/Makefile
@ -26,11 +26,4 @@ MAKE_ARGS=	CXX="${CXX}"

 INFO=		sdts++

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500035
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-CFLAGS+=	-ftemplate-depth-25
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@ -149,10 +149,6 @@ PLIST_SUB+=		WITH_JAVA=""
 PLIST_SUB+=		WITH_JAVA="@comment "
 .endif

-.if defined(WITH_JAVA) && ${OSVERSION} < 503000
-BROKEN="Java bindings are supported only on FreeBSD 5.3 or newer"
-.endif
-
 .if !defined(SWIG_BINDINGS)
 CONFIGURE_ARGS+=	--without-swig
 .endif
--- a/devel/thrift/Makefile
+++ b/devel/thrift/Makefile
@ -25,12 +25,6 @@ CONFIGURE_ARGS=	--with-boost=${LOCALBASE} \
 		--with-event=${LOCALBASE}
 CONFIGURE_ENV+=	${MAKE_ENV}

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 600000
-BROKEN=		Incorrect plist
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -i '' -e 's=lib/py ==' ${WRKSRC}/*.*

@ -41,4 +35,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/thrift.pdf ${DOCSDIR}
 .endif

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/umem/Makefile
+++ b/devel/umem/Makefile
@ -23,11 +23,4 @@ post-patch:

 MAN3=		umem_alloc.3 umem_cache_create.3 umem_debug.3

-.include <bsd.port.pre.mk>
-
-# pthread
-.if ${OSVERSION} < 502102
-IGNORE=		requires FreeBSD 5.2.1 or above
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/valgrind-snapshot/Makefile
+++ b/devel/valgrind-snapshot/Makefile
@ -35,16 +35,10 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 .if ${OSVERSION} >= 800000
 IGNORE=	FreeBSD 8.0 is supported yet
 .elif ${OSVERSION} >= 700000
-PLIST_SUB+=	RELENG_5="@comment "
 PLIST_SUB+=	RELENG_6="@comment "
 PLIST_SUB+=	RELENG_7=""
-.elif ${OSVERSION} >= 600000
-PLIST_SUB+=	RELENG_5="@comment "
-PLIST_SUB+=	RELENG_6=""
-PLIST_SUB+=	RELENG_7="@comment "
 .else
-PLIST_SUB+=	RELENG_5=""
-PLIST_SUB+=	RELENG_6="@comment "
+PLIST_SUB+=	RELENG_6=""
 PLIST_SUB+=	RELENG_7="@comment "
 .endif

--- a/devel/valgrind-snapshot/pkg-plist
+++ b/devel/valgrind-snapshot/pkg-plist
@ -13,10 +13,6 @@ lib/valgrind/glibc-2.1.supp
 lib/valgrind/glibc-2.2.supp
 lib/valgrind/glibc-2.3.supp
 lib/valgrind/hp2ps
-%%RELENG_5%%lib/valgrind/libc_r.so.5
-%%RELENG_5%%lib/valgrind/libkse.so.1
-%%RELENG_5%%lib/valgrind/libpthread.so.1
-%%RELENG_5%%lib/valgrind/libthr.so.1
 %%RELENG_6%%lib/valgrind/libc_r.so.6
 %%RELENG_6%%lib/valgrind/libpthread.so.2
 %%RELENG_6%%lib/valgrind/libthr.so.2
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@ -31,16 +31,10 @@ USE_GCC=	3.4
 .if ${OSVERSION} >= 800000
 IGNORE=	FreeBSD 8.x is unsupported
 .elif ${OSVERSION} >= 700000
-PLIST_SUB+=	RELENG_5="@comment "
 PLIST_SUB+=	RELENG_6="@comment "
 PLIST_SUB+=	RELENG_7=""
-.elif ${OSVERSION} >= 600000
-PLIST_SUB+=	RELENG_5="@comment "
-PLIST_SUB+=	RELENG_6=""
-PLIST_SUB+=	RELENG_7="@comment "
 .else
-PLIST_SUB+=	RELENG_5=""
-PLIST_SUB+=	RELENG_6="@comment "
+PLIST_SUB+=	RELENG_6=""
 PLIST_SUB+=	RELENG_7="@comment "
 .endif

--- a/devel/valgrind/pkg-plist
+++ b/devel/valgrind/pkg-plist
@ -12,10 +12,6 @@ lib/valgrind/default.supp
 lib/valgrind/glibc-2.1.supp
 lib/valgrind/glibc-2.2.supp
 lib/valgrind/glibc-2.3.supp
-%%RELENG_5%%lib/valgrind/libc_r.so.5
-%%RELENG_5%%lib/valgrind/libkse.so.1
-%%RELENG_5%%lib/valgrind/libpthread.so.1
-%%RELENG_5%%lib/valgrind/libthr.so.1
 %%RELENG_6%%lib/valgrind/libc_r.so.6
 %%RELENG_6%%lib/valgrind/libpthread.so.2
 %%RELENG_6%%lib/valgrind/libthr.so.2
--- a/dns/dhisd/Makefile
+++ b/dns/dhisd/Makefile
@ -14,14 +14,11 @@ MASTER_SITES=	ftp://ftp.dhis.org/pub/dhis/
 MAINTAINER=	marius@FreeBSD.org
 COMMENT=	DHIS server for dynamic updates on the server using specific engines

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 500023
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
+
 CFLAGS+=	-I${PREFIX}/include
 LDFLAGS+=	-L${PREFIX}/lib
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
-.endif
+MAKE_ENV=	LDFLAGS="${LDFLAGS}"

 DOCFILES=	CONTRIBUTORS COPYRIGHT INSTALL MODULES README

@ -77,4 +74,4 @@ post-install:
 .endif
 	@${ECHO} "--------------------------------------------------------------------------"

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/dns/fourcdns/Makefile
+++ b/dns/fourcdns/Makefile
@ -24,9 +24,6 @@ PORTDOCS=	fourcdns.pdf
 # distfile contains i386 binary
 ONLY_FOR_ARCHS=	i386

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION}>=600000
 EXEFILE=	fourcdns6
 MGRGUI=	fourcdnsmgr6
 LIBWXBASE=	wxversion6/libwx_base-2.6.so.0
@ -38,19 +35,6 @@ LIBWXX11UNIVHTML=	wxversion6/libwx_x11univ_html-2.6.so.0
 LIBWXX11UNIVQA=		wxversion6/libwx_x11univ_qa-2.6.so.0
 LIBWXX11UNIVXRC=	wxversion6/libwx_x11univ_xrc-2.6.so.0
 LIBWXX11UNIVMED=	wxversion6/libwx_x11univ_media-2.6.so.0
-.else
-EXEFILE=	fourcdns6
-MGRGUI=	fourcdnsmgr5
-LIBWXBASE=	wxversion5/libwx_base-2.6.so.5
-LIBWXBASENET=	wxversion5/libwx_base_net-2.6.so.5
-LIBWXBASEXML=	wxversion5/libwx_base_xml-2.6.so.5
-LIBWXX11UNIVADV=	wxversion5/libwx_x11univ_adv-2.6.so.5
-LIBWXX11UNIVCORE=	wxversion5/libwx_x11univ_core-2.6.so.5
-LIBWXX11UNIVHTML=	wxversion5/libwx_x11univ_html-2.6.so.5
-LIBWXX11UNIVQA=		wxversion5/libwx_x11univ_qa-2.6.so.5
-LIBWXX11UNIVXRC=	wxversion5/libwx_x11univ_xrc-2.6.so.5
-LIBWXX11UNIVMED=	wxversion5/libwx_x11univ_media-2.6.so.5
-.endif

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${EXEFILE} ${PREFIX}/bin/fourcdns
@ -75,4 +59,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/license.txt ${PREFIX}/zerocaloriedns/license.txt
 	${INSTALL_DATA} ${WRKSRC}/wxWidgetsNotes.txt ${PREFIX}/zerocaloriedns/wxWidgetsNotes.txt
 	${INSTALL_DATA} ${WRKSRC}/wxWidgetsLicense.txt ${PREFIX}/zerocaloriedns/wxWidgetsLicense.txt
-.include <bsd.port.post.mk>
+
+.include <bsd.port.mk>
--- a/dns/maradns/Makefile
+++ b/dns/maradns/Makefile
@ -28,12 +28,6 @@ MAN5=	mararc.5 csv1.5 csv2.5 csv2_txt.5
 MAN8=	maradns.8 zoneserver.8 duende.8
 #MANLANG=	"" fr.ISO8859-1

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 600000
-IGNORE=		does not compile on FreeBSD 5.X, needs pidfile functions in libutil
-.endif
-
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/etc/mara|${PREFIX}/etc/mara|g'
@ -90,4 +84,4 @@ do-install:
 	${CP} -R ${WRKSRC}/doc/en/text ${DOCSDIR}/en
 .endif

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/dns/nss_mdns/Makefile
+++ b/dns/nss_mdns/Makefile
@ -60,10 +60,6 @@ PORTDOCS=	README README.html

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} < 600000
-IGNORE=		name-service switch support in libc.so.6 or later is required
-.endif
-
 .if defined(WITH_SEARCH_DOMAINS)
 CONFIGURE_ARGS+=	--enable-search-domains
 .endif
--- a/dns/nss_resinit/Makefile
+++ b/dns/nss_resinit/Makefile
@ -21,10 +21,6 @@ MANCOMPRESSED=	yes

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} < 500112
-IGNORE=		name-service switch support in libc is required
-.endif
-
 .if defined(WITH_COMPAT5X)
 .if ${OSVERSION} > 700017
 BROKEN=		7.X and later do not have compat syms for the old resolver
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@ -45,36 +45,10 @@ USE_RUBY=	yes
 USE_PGSQL=	yes

 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>

 CONFIGURE_ARGS+=--with-pgsqlincdir=${LOCALBASE}/include \
 		--with-pgsqllibdir=${LOCALBASE}/lib \
 		--with-pqxx-includes=${LOCALBASE}/include \
 		--with-pqxx-libraries=${LOCALBASE}/lib

-.if ${OSVERSION} < 500035
-EXTRA_PATCHES=	${PATCHDIR}/extrapatch-kexi-main-keximainwindowimpl.cpp
-CONFIGURE_ARGS+=--disable-final
-.endif
-
-post-configure:
-.if ${OSVERSION} < 500035
-	${REINPLACE_CMD} -e 's|\(^CPPFLAGS =.*\)|\1 -I${LOCALBASE}/include/stlport|g' \
-	-e 's|\(^LDFLAGS =.*\)|\1 -L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS}|g' \
-		${WRKSRC}/filters/krita/tiff/Makefile \
-		${WRKSRC}/filters/kspread/excel/sidewinder/Makefile \
-		${WRKSRC}/kchart/Makefile \
-		${WRKSRC}/kchart/kdchart/Makefile \
-		${WRKSRC}/kexi/kexidb/drivers/pqxx/Makefile \
-		${WRKSRC}/kexi/migration/pqxx/Makefile
-	${REINPLACE_CMD} -e 's|round(|rint(|g' \
-		${WRKSRC}/krita/plugins/filters/levelfilter/kgradientslider.cc
-	${REINPLACE_CMD} -e 's|-O[s23]||g' -e 's|-O|-O0|g' \
-		${WRKSRC}/krita/plugins/filters/cimg/Makefile
-	${REINPLACE_CMD} -e 's|xor|^|g' \
-		${WRKSRC}/kspread/kspread_style.cc
-	${REINPLACE_CMD} -e 's|trunc(|rint(|g' \
-		${WRKSRC}/kchart/kdchart/KDChartAxesPainter.cpp
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/editors/calligra/files/extrapatch-kexi-main-keximainwindowimpl.cpp
+++ b/editors/calligra/files/extrapatch-kexi-main-keximainwindowimpl.cpp
@ -1,13 +0,0 @@
--- kexi/main/keximainwindowimpl.cpp.orig	Thu Jun 30 17:28:58 2005
-+++ kexi/main/keximainwindowimpl.cpp	Thu Jun 30 17:29:14 2005
-@@ -106,8 +106,8 @@
- //#define PROPEDITOR_VISIBILITY_CHANGES
- 
- //temporary fix to manage layout
-#include "ksplitter.h"
-#define KDOCKWIDGET_P 1
-+// #include "ksplitter.h"
-+// #define KDOCKWIDGET_P 1
- 
- //#ifndef KEXI_NO_MIGRATION
- //#include "migration/importwizard.h"
--- a/editors/glimmer/Makefile
+++ b/editors/glimmer/Makefile
@ -26,26 +26,17 @@ USE_GNOME=	gnomeprefix gnomehack gnomelibs gnomeprint gnomevfs \
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-regex
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I/usr/include/gnu" \
+		LIBS="-L${LOCALBASE}/lib -lgnuregex"
+
 .if exists(/usr/lib/libcrypto.a)
 PYTHON_LIBS=	-lssl -lcrypto
 .endif
 PYTHON_LIBS+=	-lutil -lreadline -lcrypt -lpython

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502104
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I/usr/include/gnu" \
-		LIBS="-L${LOCALBASE}/lib -lgnuregex"
-.else
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D_REGEX_H_ -D_REGEX_H" \
-		LIBS="-L${LOCALBASE}/lib -lgnuregex"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpython|${PYTHON_LIBS}|g' ${WRKSRC}/configure
-.if ${OSVERSION} >= 502104
 	@${REINPLACE_CMD} -e 's|gnuregex\.h|regex.h|' \
 		${WRKSRC}/src/gtkextext/gtkextext.h
-.endif

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@ -45,36 +45,10 @@ USE_RUBY=	yes
 USE_PGSQL=	yes

 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>

 CONFIGURE_ARGS+=--with-pgsqlincdir=${LOCALBASE}/include \
 		--with-pgsqllibdir=${LOCALBASE}/lib \
 		--with-pqxx-includes=${LOCALBASE}/include \
 		--with-pqxx-libraries=${LOCALBASE}/lib

-.if ${OSVERSION} < 500035
-EXTRA_PATCHES=	${PATCHDIR}/extrapatch-kexi-main-keximainwindowimpl.cpp
-CONFIGURE_ARGS+=--disable-final
-.endif
-
-post-configure:
-.if ${OSVERSION} < 500035
-	${REINPLACE_CMD} -e 's|\(^CPPFLAGS =.*\)|\1 -I${LOCALBASE}/include/stlport|g' \
-	-e 's|\(^LDFLAGS =.*\)|\1 -L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS}|g' \
-		${WRKSRC}/filters/krita/tiff/Makefile \
-		${WRKSRC}/filters/kspread/excel/sidewinder/Makefile \
-		${WRKSRC}/kchart/Makefile \
-		${WRKSRC}/kchart/kdchart/Makefile \
-		${WRKSRC}/kexi/kexidb/drivers/pqxx/Makefile \
-		${WRKSRC}/kexi/migration/pqxx/Makefile
-	${REINPLACE_CMD} -e 's|round(|rint(|g' \
-		${WRKSRC}/krita/plugins/filters/levelfilter/kgradientslider.cc
-	${REINPLACE_CMD} -e 's|-O[s23]||g' -e 's|-O|-O0|g' \
-		${WRKSRC}/krita/plugins/filters/cimg/Makefile
-	${REINPLACE_CMD} -e 's|xor|^|g' \
-		${WRKSRC}/kspread/kspread_style.cc
-	${REINPLACE_CMD} -e 's|trunc(|rint(|g' \
-		${WRKSRC}/kchart/kdchart/KDChartAxesPainter.cpp
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/editors/koffice-kde3/files/extrapatch-kexi-main-keximainwindowimpl.cpp
+++ b/editors/koffice-kde3/files/extrapatch-kexi-main-keximainwindowimpl.cpp
@ -1,13 +0,0 @@
--- kexi/main/keximainwindowimpl.cpp.orig	Thu Jun 30 17:28:58 2005
-+++ kexi/main/keximainwindowimpl.cpp	Thu Jun 30 17:29:14 2005
-@@ -106,8 +106,8 @@
- //#define PROPEDITOR_VISIBILITY_CHANGES
- 
- //temporary fix to manage layout
-#include "ksplitter.h"
-#define KDOCKWIDGET_P 1
-+// #include "ksplitter.h"
-+// #define KDOCKWIDGET_P 1
- 
- //#ifndef KEXI_NO_MIGRATION
- //#include "migration/importwizard.h"
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@ -45,36 +45,10 @@ USE_RUBY=	yes
 USE_PGSQL=	yes

 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>

 CONFIGURE_ARGS+=--with-pgsqlincdir=${LOCALBASE}/include \
 		--with-pgsqllibdir=${LOCALBASE}/lib \
 		--with-pqxx-includes=${LOCALBASE}/include \
 		--with-pqxx-libraries=${LOCALBASE}/lib

-.if ${OSVERSION} < 500035
-EXTRA_PATCHES=	${PATCHDIR}/extrapatch-kexi-main-keximainwindowimpl.cpp
-CONFIGURE_ARGS+=--disable-final
-.endif
-
-post-configure:
-.if ${OSVERSION} < 500035
-	${REINPLACE_CMD} -e 's|\(^CPPFLAGS =.*\)|\1 -I${LOCALBASE}/include/stlport|g' \
-	-e 's|\(^LDFLAGS =.*\)|\1 -L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS}|g' \
-		${WRKSRC}/filters/krita/tiff/Makefile \
-		${WRKSRC}/filters/kspread/excel/sidewinder/Makefile \
-		${WRKSRC}/kchart/Makefile \
-		${WRKSRC}/kchart/kdchart/Makefile \
-		${WRKSRC}/kexi/kexidb/drivers/pqxx/Makefile \
-		${WRKSRC}/kexi/migration/pqxx/Makefile
-	${REINPLACE_CMD} -e 's|round(|rint(|g' \
-		${WRKSRC}/krita/plugins/filters/levelfilter/kgradientslider.cc
-	${REINPLACE_CMD} -e 's|-O[s23]||g' -e 's|-O|-O0|g' \
-		${WRKSRC}/krita/plugins/filters/cimg/Makefile
-	${REINPLACE_CMD} -e 's|xor|^|g' \
-		${WRKSRC}/kspread/kspread_style.cc
-	${REINPLACE_CMD} -e 's|trunc(|rint(|g' \
-		${WRKSRC}/kchart/kdchart/KDChartAxesPainter.cpp
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/editors/koffice-kde4/files/extrapatch-kexi-main-keximainwindowimpl.cpp
+++ b/editors/koffice-kde4/files/extrapatch-kexi-main-keximainwindowimpl.cpp
@ -1,13 +0,0 @@
--- kexi/main/keximainwindowimpl.cpp.orig	Thu Jun 30 17:28:58 2005
-+++ kexi/main/keximainwindowimpl.cpp	Thu Jun 30 17:29:14 2005
-@@ -106,8 +106,8 @@
- //#define PROPEDITOR_VISIBILITY_CHANGES
- 
- //temporary fix to manage layout
-#include "ksplitter.h"
-#define KDOCKWIDGET_P 1
-+// #include "ksplitter.h"
-+// #define KDOCKWIDGET_P 1
- 
- //#ifndef KEXI_NO_MIGRATION
- //#include "migration/importwizard.h"
--- a/editors/le/Makefile
+++ b/editors/le/Makefile
@ -27,19 +27,11 @@ MISC_DATA=	colors-black colors-blue colors-defbg colors-green \
 		colors-white keymap-emacs mainmenu mainmenu-ru syntax
 SRC_DATA=	le.hlp

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 502010
-GNU_REGEX_H=	gnu/regex.h
-.else
-GNU_REGEX_H=	gnuregex.h
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|@LIBOBJS@||g ; \
 		 s|@ALLOCA@||g' ${WRKSRC}/lib/Makefile.in
 .for file in configure src/search.cc src/highli.h
-	@${REINPLACE_CMD} -e 's|<regex.h>|<${GNU_REGEX_H}>|g' ${WRKSRC}/${file}
+	@${REINPLACE_CMD} -e 's|<regex.h>|<gnu/regex.h>|g' ${WRKSRC}/${file}
 .endfor

 do-install:
@ -61,4 +53,4 @@ do-install:
 .endfor
 .endif

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/editors/openoffice-3-devel/files/Makefile.knobs
+++ b/editors/openoffice-3-devel/files/Makefile.knobs
@ -62,21 +62,6 @@ CONFIGURE_ARGS+=	--with-system-icu=no
 .endif

 pre-fetch:
-.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
-	@${ECHO}
-	@${ECHO} "WARNING"
-	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "[1] if you use 4-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "[2] if you use 5-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "AT YOUR OWN RISK!"
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/files/Makefile.knobs
@ -58,21 +58,6 @@ CONFIGURE_ARGS+=	--with-system-icu=no
 .endif

 pre-fetch:
-.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
-	@${ECHO}
-	@${ECHO} "WARNING"
-	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "[1] if you use 4-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "[2] if you use 5-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "AT YOUR OWN RISK!"
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
--- a/editors/openoffice.org-2-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-2-RC/files/Makefile.knobs
@ -62,21 +62,6 @@ CONFIGURE_ARGS+=	--with-system-icu=no
 .endif

 pre-fetch:
-.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
-	@${ECHO}
-	@${ECHO} "WARNING"
-	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "[1] if you use 4-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "[2] if you use 5-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "AT YOUR OWN RISK!"
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
--- a/editors/openoffice.org-2-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-2-devel/files/Makefile.knobs
@ -62,21 +62,6 @@ CONFIGURE_ARGS+=	--with-system-icu=no
 .endif

 pre-fetch:
-.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
-	@${ECHO}
-	@${ECHO} "WARNING"
-	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "[1] if you use 4-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "[2] if you use 5-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "AT YOUR OWN RISK!"
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
--- a/editors/openoffice.org-2/files/Makefile.knobs
+++ b/editors/openoffice.org-2/files/Makefile.knobs
@ -62,21 +62,6 @@ CONFIGURE_ARGS+=	--with-system-icu=no
 .endif

 pre-fetch:
-.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
-	@${ECHO}
-	@${ECHO} "WARNING"
-	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "[1] if you use 4-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "[2] if you use 5-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "AT YOUR OWN RISK!"
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
--- a/editors/openoffice.org-3-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-3-RC/files/Makefile.knobs
@ -58,21 +58,6 @@ CONFIGURE_ARGS+=	--with-system-icu=no
 .endif

 pre-fetch:
-.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
-	@${ECHO}
-	@${ECHO} "WARNING"
-	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "[1] if you use 4-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "[2] if you use 5-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "AT YOUR OWN RISK!"
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
--- a/editors/openoffice.org-3-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-3-devel/files/Makefile.knobs
@ -62,21 +62,6 @@ CONFIGURE_ARGS+=	--with-system-icu=no
 .endif

 pre-fetch:
-.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
-	@${ECHO}
-	@${ECHO} "WARNING"
-	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "[1] if you use 4-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "[2] if you use 5-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "AT YOUR OWN RISK!"
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
--- a/editors/openoffice.org-3/files/Makefile.knobs
+++ b/editors/openoffice.org-3/files/Makefile.knobs
@ -58,21 +58,6 @@ CONFIGURE_ARGS+=	--with-system-icu=no
 .endif

 pre-fetch:
-.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
-	@${ECHO}
-	@${ECHO} "WARNING"
-	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "[1] if you use 4-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "[2] if you use 5-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "AT YOUR OWN RISK!"
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
--- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
@ -62,21 +62,6 @@ CONFIGURE_ARGS+=	--with-system-icu=no
 .endif

 pre-fetch:
-.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
-	@${ECHO}
-	@${ECHO} "WARNING"
-	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "[1] if you use 4-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "[2] if you use 5-series:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
-	@${ECHO} "# make ; make depend ; make install"
-	@${ECHO} "AT YOUR OWN RISK!"
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@ -44,12 +44,6 @@ USE_EFL=	imlib2
 CONFIGURE_ARGS+=	--with-imlib2
 .endif

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 600000
-CONFIGURE_ARGS+=--disable-fastalloc
-.endif
-
 post-patch:
 	@${GREP} -lR "#!/bin/bash" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		 's|#!/bin/bash|#!/bin/sh|g'
@ -60,4 +54,4 @@ post-install:
 	${CHOWN} -R ${LIBOWN}:${LIBGRP} ${PREFIX}/libexec/TeXmacs
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/TeXmacs

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/editors/xcoral/Makefile
+++ b/editors/xcoral/Makefile
@ -20,19 +20,11 @@ CONFIGURE_ARGS=	--libdir=${PREFIX}/share

 PLIST_SUB=	VERSION="${PORTVERSION}"

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 502010
-GNU_REGEX_H=	gnu/regex.h
-.else
-GNU_REGEX_H=	gnuregex.h
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's| regex\.c | |g ; \
 		 s| -g | |g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
-		's|"regex\.h"|<${GNU_REGEX_H}>|g' ${WRKSRC}/bm_search.c
+		's|"regex\.h"|<gnu/regex.h>|g' ${WRKSRC}/bm_search.c

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xcoral ${PREFIX}/bin
@ -43,4 +35,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/Doc/* ${DOCSDIR}
 .endif

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/editors/zile/Makefile
+++ b/editors/zile/Makefile
@ -24,21 +24,13 @@ PLIST_FILES=	bin/zile %%DATADIR%%/AUTODOC %%DATADIR%%/FAQ %%DATADIR%%/HELP \
 		%%DATADIR%%/TUTORIAL %%DATADIR%%/dotzile.sample
 PLIST_DIRS=	%%DATADIR%%

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 502010
-GNU_REGEX_H=	gnu/regex.h
-.else
-GNU_REGEX_H=	gnuregex.h
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|<regex\.h>|<${GNU_REGEX_H}>|g ; \
 		 s|-pedantic||g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
-		's|"regex\.h"|<${GNU_REGEX_H}>|g' ${WRKSRC}/src/search.c
+		's|"regex\.h"|<gnu/regex.h>|g' ${WRKSRC}/src/search.c
 	@${REINPLACE_CMD} -e \
 		's|: install-exec-local|:|g' ${WRKSRC}/lib/Makefile.in

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/emulators/fceu-server/Makefile
+++ b/emulators/fceu-server/Makefile
@ -19,12 +19,6 @@ CFLAGS+=	-DSOL_TCP=6
 USE_GMAKE=	yes
 USE_SDL=	sdl

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 600000
-IGNORE=	does not build on FreeBSD 5.X
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/fceu-standard.conf|${ETCDIR}/fceu-standard.conf|g' \
 		${WRKSRC}/server.cpp
@ -37,4 +31,4 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/fceu-server.conf \
 			${ETCDIR}/fceu-standard.conf

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@ -48,13 +48,8 @@ post-patch:
 .   endif
 .endif

-# Generator does not automatically determine the GCC version.
 .if !defined(WITHOUT_OPTIMIZED_CFLAGS)
-.   if ${OSVERSION} < 500035
-CONFIGURE_ARGS+=--with-gcc=2
-.   elif ${OSVERSION} >= 500035
 CONFIGURE_ARGS+=--with-gcc=3
-.   endif
 .else
 CONFIGURE_ARGS+=--without-gcc
 .endif
--- a/emulators/ines/Makefile
+++ b/emulators/ines/Makefile
@ -16,6 +16,8 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nintendo Entertainment System emlator for X

+LIB_DEPENDS=	c.5:${PORTSDIR}/misc/compat5x
+
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	is an i386 binary

@ -24,12 +26,6 @@ USE_XORG=	x11 xext
 NO_BUILD=	yes
 STRIP=

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 600000
-LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ines ${PREFIX}/bin
 	${MKDIR} ${DATADIR}
@ -37,4 +33,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/CART.NES ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.pal ${DATADIR}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/emulators/linux-vmware-toolbox2/Makefile
+++ b/emulators/linux-vmware-toolbox2/Makefile
@ -34,16 +34,10 @@ NO_LATEST_LINK=	yes
 LINUX_FLP?=	${DISTDIR}/linux.flp
 MOUNT_PT?=	${WRKDIR}/mnt
 .if exists(${LINUX_FLP})
-.if ${OSVERSION} >= 500018
 DEV_ATTACH=	/usr/sbin/mdconfig -a -t vnode -f ${LINUX_FLP} -u ${MOUNT_DEV}
 DEV_DETACH=	/usr/sbin/mdconfig -d -u ${MOUNT_DEV}
 MOUNT_DEV?=	md0
 .else
-DEV_ATTACH=	/usr/sbin/vnconfig -c ${MOUNT_DEV} ${LINUX_FLP}
-DEV_DETACH=	/usr/sbin/vnconfig -u ${MOUNT_DEV}
-MOUNT_DEV?=	vn0
-.endif
-.else
 MOUNT_DEV?=	fd0
 .endif

--- a/emulators/mame-devel/Makefile
+++ b/emulators/mame-devel/Makefile
@ -47,13 +47,6 @@ post-install:

 .include <bsd.port.pre.mk>

-# In FreeBSD 5.x fails to build due to an internal compiler error. Using the
-# version 3.4 from ports which probably fixes this error requires a hack to
-# get around bsd.gcc.mk handling, so use a higher version than in base system.
-.if ${OSVERSION} < 600000
-USE_GCC=	4.2+
-.endif
-
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@ -47,13 +47,6 @@ post-install:

 .include <bsd.port.pre.mk>

-# In FreeBSD 5.x fails to build due to an internal compiler error. Using the
-# version 3.4 from ports which probably fixes this error requires a hack to
-# get around bsd.gcc.mk handling, so use a higher version than in base system.
-.if ${OSVERSION} < 600000
-USE_GCC=	4.2+
-.endif
-
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif
--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@ -47,10 +47,6 @@ FLAG_NLS=	true
 BROKEN=		does not compile on ${ARCH} due to internal compiler error
 .endif

-.if ${OSVERSION} < 503000
-IGNORE=		needs round(3), which appears in 5.3 or later
-.endif
-
 pre-configure:
 	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' -e \
 		's|/usr/local|${LOCALBASE}|g' -e 's|/usr/X11R6|${LOCALBASE}|g' \
--- a/emulators/mess/Makefile
+++ b/emulators/mess/Makefile
@ -25,13 +25,6 @@ SUB_FILES=	${PORTNAME} pkg-message

 .include <bsd.port.pre.mk>

-# In FreeBSD 5.x fails to build due to an internal compiler error. Using the
-# version 3.4 from ports which probably fixes this error requires a hack to
-# get around bsd.gcc.mk handling, so use a higher version than in base system.
-.if ${OSVERSION} < 600000
-USE_GCC=	4.2+
-.endif
-
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@ -55,15 +55,9 @@ USE_RC_SUBR=		vmware-guestd.sh vmware-kmod.sh

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} >= 600000
-NOTON5=		""
-.else
-NOTON5=		"@comment "
-.endif
+PLIST_SUB+=	LIB32DIR=${LIB32DIR}

-PLIST_SUB+=	NOTON5=${NOTON5} LIB32DIR=${LIB32DIR}
-
-SUB_LIST+=	NOTON5=${NOTON5} LIB32DIR=${LIB32DIR}
+SUB_LIST+=	LIB32DIR=${LIB32DIR}

 post-patch:
 .if defined(WITHOUT_X11)
@ -78,10 +72,8 @@ post-install:
 	${MKDIR} ${PREFIX}/${LIB32DIR}/vmware-tools/modules/input
 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmmemctl.ko
 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmxnet.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmxnet.ko
-.if ${OSVERSION} >= 600000
 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmhgfs.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmhgfs.ko
 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmblock.ko
-.endif
 	@-kldxref ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers 2>/dev/null
 	@${CAT} ${PKGMESSAGE}

--- a/emulators/open-vm-tools/files/pkg-message.in
+++ b/emulators/open-vm-tools/files/pkg-message.in
@ -2,8 +2,8 @@
 To run the Open Virtual Machine tools at startup, add the following
 settings to your /etc/rc.conf

-%%NOTON5%%vmware_guest_vmblock_enable="YES"
-%%NOTON5%%vmware_guest_vmhgfs_enable="YES"
+vmware_guest_vmblock_enable="YES"
+vmware_guest_vmhgfs_enable="YES"
 vmware_guest_vmmemctl_enable="YES"
 vmware_guest_vmxnet_enable="YES"
 vmware_guestd_enable="YES"
--- a/Show More
+++ b/Show More