- Remove conditional checks for FreeBSD 5.x and older

20 files changed, 14 insertions, 305 deletions

diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 651b1caa2d26..e9a8740625c4 100644
--- 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>
diff --git a/editors/calligra/files/extrapatch-kexi-main-keximainwindowimpl.cpp b/editors/calligra/files/extrapatch-kexi-main-keximainwindowimpl.cpp
deleted file mode 100644
index 68068710b7c0..000000000000
--- a/editors/calligra/files/extrapatch-kexi-main-keximainwindowimpl.cpp
+++ /dev/null
@@ -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"
diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile
index 877b738c8812..e8cafa47a282 100644
--- 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>
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index 651b1caa2d26..e9a8740625c4 100644
--- 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>
diff --git a/editors/koffice-kde3/files/extrapatch-kexi-main-keximainwindowimpl.cpp b/editors/koffice-kde3/files/extrapatch-kexi-main-keximainwindowimpl.cpp
deleted file mode 100644
index 68068710b7c0..000000000000
--- a/editors/koffice-kde3/files/extrapatch-kexi-main-keximainwindowimpl.cpp
+++ /dev/null
@@ -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"
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index 651b1caa2d26..e9a8740625c4 100644
--- 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>
diff --git a/editors/koffice-kde4/files/extrapatch-kexi-main-keximainwindowimpl.cpp b/editors/koffice-kde4/files/extrapatch-kexi-main-keximainwindowimpl.cpp
deleted file mode 100644
index 68068710b7c0..000000000000
--- a/editors/koffice-kde4/files/extrapatch-kexi-main-keximainwindowimpl.cpp
+++ /dev/null
@@ -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"
diff --git a/editors/le/Makefile b/editors/le/Makefile
index 4c1aae293fa9..0c6d1afe094d 100644
--- 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>
diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs
index 6c4a374c58f0..abefb30bb0d1 100644
--- 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}
diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index fde58d2ff5c6..c1a56b9ed2a3 100644
--- 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}
diff --git a/editors/openoffice.org-2-RC/files/Makefile.knobs b/editors/openoffice.org-2-RC/files/Makefile.knobs
index 686099bd3274..3f9d19ba5f93 100644
--- 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}
diff --git a/editors/openoffice.org-2-devel/files/Makefile.knobs b/editors/openoffice.org-2-devel/files/Makefile.knobs
index 686099bd3274..3f9d19ba5f93 100644
--- 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}
diff --git a/editors/openoffice.org-2/files/Makefile.knobs b/editors/openoffice.org-2/files/Makefile.knobs
index 686099bd3274..3f9d19ba5f93 100644
--- 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}
diff --git a/editors/openoffice.org-3-RC/files/Makefile.knobs b/editors/openoffice.org-3-RC/files/Makefile.knobs
index fde58d2ff5c6..c1a56b9ed2a3 100644
--- 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}
diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs
index 6c4a374c58f0..abefb30bb0d1 100644
--- 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}
diff --git a/editors/openoffice.org-3/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs
index fde58d2ff5c6..c1a56b9ed2a3 100644
--- 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}
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
index 686099bd3274..3f9d19ba5f93 100644
--- 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}
diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile
index 1b997541cbac..bb3b2eca8f60 100644
--- 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>
diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile
index 6969b1840e7f..5057783453bf 100644
--- 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>
diff --git a/editors/zile/Makefile b/editors/zile/Makefile
index 18cd1edbedfe..1f19cd065577 100644
--- 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>