22 files changed, 21 insertions, 149 deletions

diff --git a/x11-clocks/wmbday/Makefile b/x11-clocks/wmbday/Makefile
index 3d19d76b0ad1..ca1f5b3fbb2e 100644
--- a/x11-clocks/wmbday/Makefile
+++ b/x11-clocks/wmbday/Makefile
@@ -24,10 +24,4 @@ MAKE_ENV+=	${CONFIGURE_ENV}
 MAN1=		wmbday.1
 MANCOMPRESSED=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile on 4.x
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fm/evidence/Makefile b/x11-fm/evidence/Makefile
index 78fb7498df36..74e214463304 100644
--- a/x11-fm/evidence/Makefile
+++ b/x11-fm/evidence/Makefile
@@ -105,12 +105,6 @@ CONFIGURE_ARGS+=--enable-thumbnailer-xine
 PLIST_SUB+=	XINE:=""
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=	"Broken dependencies."
-.endif
-
 pre-everything::
 	@${ECHO_MSG} "*****************************************************************************"
 .if !defined(WITH_DEBUG) || !defined(WITH_ECORE_MAINLOOP) || !defined(WITHOUT_EXTRACTOR) || !defined(WITHOUT_ID3) || !defined(WITHOUT_VORBIS) || !defined(WITHOUT_XINE)
@@ -145,4 +139,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|@ecore_cflags@|$$(ECORE_CFLAGS)|g ; \
 		s|@ecore_libs@|$$(ECORE_LIBS)|g' ${WRKSRC}/src/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fm/krusader/Makefile b/x11-fm/krusader/Makefile
index ac921c0e8dfc..133b9fc25a6e 100644
--- a/x11-fm/krusader/Makefile
+++ b/x11-fm/krusader/Makefile
@@ -44,10 +44,4 @@ pre-configure:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile on FreeBSD 4.x
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile
index ac921c0e8dfc..133b9fc25a6e 100644
--- a/x11-fm/krusader2/Makefile
+++ b/x11-fm/krusader2/Makefile
@@ -44,10 +44,4 @@ pre-configure:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile on FreeBSD 4.x
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fm/worker/Makefile b/x11-fm/worker/Makefile
index 23b4045e543b..2b59adfb380d 100644
--- a/x11-fm/worker/Makefile
+++ b/x11-fm/worker/Makefile
@@ -26,20 +26,14 @@ MAN1=		worker.1
 CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--disable-libxpkmaster
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile on FreeBSD 4.x
-.endif
-
 pre-configure:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/configure
 
 post-patch:
-.for file in aa.pattern_rename.sh cd2flac.sh cd2mp3.sh cd2ogg.sh cd2wav.sh xeditor
+.for f in aa.pattern_rename.sh cd2flac.sh cd2mp3.sh cd2ogg.sh cd2wav.sh xeditor
 	${REINPLACE_CMD} -e 's|/bin/bash|/usr/local/bin/bash|g' \
-		${WRKSRC}/scripts/${file}
+		${WRKSRC}/scripts/${f}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-themes/rezlooks/Makefile b/x11-themes/rezlooks/Makefile
index fcff092b88a0..cc150fcba3c9 100644
--- a/x11-themes/rezlooks/Makefile
+++ b/x11-themes/rezlooks/Makefile
@@ -22,14 +22,8 @@ USE_GNOME=	gtk20
 
 OPTIONS+=	ANIMATION "Animation support" On
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		does not build on 4.x
-.endif
-
 .if !defined(WITHOUT_ANIMATION)
 CONFIGURE_ARGS+=	--enable-animation
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index 190482998051..f6417e3143fe 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -85,10 +85,6 @@ ADDITIONAL_LDFLAGS+=	-L${TARGLIB}
 MAKE_FLAGS+=		messages=yes
 PLIST_SUB+=		BACKVERSION=${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1}
 
-.if ${OSVERSION} < 500000
-ADDITIONAL_LDFLAGS+=	-L/usr/lib -lcipher
-.endif
-
 .if defined(WITH_GNUSTEP_XDPS)
 .if ${X_WINDOW_SYSTEM:L} == "xfree86-4"
 BUILD_DEPENDS+=		pswrap:${PORTSDIR}/devel/imake-4
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index 817e2c5b6c19..8b082f6e2423 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -77,12 +77,4 @@ post-install:
 		${PREFIX}/share/aclocal
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 500000
-PLIST_SUB+=	FREEBSD5=""
-.else
-PLIST_SUB+=	FREEBSD5="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile
index 85cfff1449b4..92af142277b0 100644
--- a/x11-toolkits/libgnomeuimm/Makefile
+++ b/x11-toolkits/libgnomeuimm/Makefile
@@ -29,10 +29,4 @@ USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-EXTRA_PATCHES=  ${PATCHDIR}/extra-patch-old_gcc_bugs
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/py-wax/Makefile b/x11-toolkits/py-wax/Makefile
index 11406b765764..9e47c8cb2863 100644
--- a/x11-toolkits/py-wax/Makefile
+++ b/x11-toolkits/py-wax/Makefile
@@ -43,12 +43,10 @@ do-install:
 	${MV} ${DATADIR}/${PORTNAME}/examples ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_UNICODE) && (${OSVERSION} > 500000)
+.if defined(WITH_UNICODE)
 WX_PYTHON_DIR=	wx-2.6-gtk2-unicode
 .else
 WX_PYTHON_DIR=	wx-2.6-gtk2-ansi
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index 4f9cf5ff50fe..6bb94353f176 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -78,13 +78,6 @@ post-build:
 
 .include <bsd.port.pre.mk>
 
-# are we ready for unicode?
-.if defined(WITH_WXPYTHON_UNICODE)
-. if ${OSVERSION} < 500000
-IGNORE=	systems prior to FreeBSD 5.0 do not support Unicode
-. endif
-.endif
-
 # wx version
 .if exists(${WX_CONFIG})
 WX_VERSION!=	${WX_CONFIG} --release
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 712f54e095c5..355b1230bc43 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -69,13 +69,6 @@ post-build:
 
 .include <bsd.port.pre.mk>
 
-# are we ready for unicode?
-.if defined(WITH_WXPYTHON_UNICODE)
-. if ${OSVERSION} < 500000
-IGNORE=	systems prior to FreeBSD 5.0 do not support Unicode
-. endif
-.endif
-
 # wx version
 .if exists(${WX_CONFIG})
 WX_VERSION!=	${WX_CONFIG} --release
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index ecdf782b01d1..79a4ee4ca8f6 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -96,10 +96,4 @@ post-patch:
 		s|pkg_config_args --libs|pkg_config_args pangox --libs|g' \
 			${WRKSRC}/configure
 
-.include <bsd.port.pre.mk>
-
-.if ${WXGTK_FLAVOR} == "gtk2-unicode" && ${OSVERSION} < 500000
-IGNORE=		requires wchar_t
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index ba040a67e1a1..f390f71cbc4e 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -94,10 +94,4 @@ post-patch:
 		s|pkg_config_args --libs|pkg_config_args pangox --libs|g' \
 			${WRKSRC}/configure
 
-.include <bsd.port.pre.mk>
-
-.if ${WXGTK_FLAVOR} == "gtk2-unicode" && ${OSVERSION} < 500000
-IGNORE=		requires wchar_t
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index ba040a67e1a1..f390f71cbc4e 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -94,10 +94,4 @@ post-patch:
 		s|pkg_config_args --libs|pkg_config_args pangox --libs|g' \
 			${WRKSRC}/configure
 
-.include <bsd.port.pre.mk>
-
-.if ${WXGTK_FLAVOR} == "gtk2-unicode" && ${OSVERSION} < 500000
-IGNORE=		requires wchar_t
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index bfbe8bdd47ca..9e3cc9362d22 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -25,13 +25,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS}"
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		"does not build on 4.x (sound system)"
-.endif
-
 pre-configure:
 	@cd ${WRKSRC}; ${ACLOCAL}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index 4f1fc0300d1e..da29380273bc 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -26,10 +26,4 @@ USE_LDCONFIG=	yes
 NO_LATEST_LINK=	yes
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-IGNORE=	does not build on 4.X
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/fireflies/Makefile b/x11/fireflies/Makefile
index dfb0c56b559d..f463be5d531e 100644
--- a/x11/fireflies/Makefile
+++ b/x11/fireflies/Makefile
@@ -29,13 +29,7 @@ MAKE_ARGS=	CONFIGURE_ENV=${CONFIGURE_ENV:Q} \
 		CONFIGURE_SCRIPT=${CONFIGURE_SCRIPT:Q} \
 		CONFIGURE_ARGS=${CONFIGURE_ARGS:Q}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		does not compile
-.endif
-
 post-extract:
 	(cd ${WRKSRC};  ${TAR} zxvpf libgfx-1.0.1.tar.gz)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/gcb/Makefile b/x11/gcb/Makefile
index 0d756182581b..82d216a0c383 100644
--- a/x11/gcb/Makefile
+++ b/x11/gcb/Makefile
@@ -19,12 +19,6 @@ HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile on FreeBSD 4.x
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!${SH}|' \
 		${WRKSRC}/configure
@@ -41,4 +35,4 @@ do-install:
 	${MKDIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${PREFIX}/share/pixmaps
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/ipager/Makefile b/x11/ipager/Makefile
index a129829d9561..fdf803226311 100644
--- a/x11/ipager/Makefile
+++ b/x11/ipager/Makefile
@@ -36,12 +36,6 @@ THEMES=		atlantis.conf \
 		light_gray.conf \
 		light_orange.conf
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-IGNORE=	fails to build on FreeBSD 4.x (due to problems with threading support)
-.endif
-
 post-patch:
 		@${REINPLACE_CMD} -e '35,36d;89d;92,94d' \
 			${WRKSRC}/SConstruct
@@ -75,4 +69,4 @@ post-install:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile
index 068a15003df9..4856604c8d9e 100644
--- a/x11/mrxvt-devel/Makefile
+++ b/x11/mrxvt-devel/Makefile
@@ -38,10 +38,6 @@ OPTIONS=	XFT "Enable Xft support for fonts" Off \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		does not compile
-.endif
-
 .if defined(WITH_JAPANESE)
 CONFIGURE_ARGS+=	--enable-xim --enable-cjk --with-encoding=eucj
 .endif
diff --git a/x11/terminal.app/Makefile b/x11/terminal.app/Makefile
index 86eb4d514f27..0297cbb09baa 100644
--- a/x11/terminal.app/Makefile
+++ b/x11/terminal.app/Makefile
@@ -25,10 +25,4 @@ USE_GNUSTEP_INSTALL=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME:C/\.app//}-${DISTVERSION}${DISTVERSIONSUFFIX:C/\.orig//}
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		does not compile on 4.x
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>