13 files changed, 27 insertions, 108 deletions

diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index 70eeeeb5edc8..c33582b726a6 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -75,7 +75,6 @@ PORTDOCS=	${PORTVERSION}
 .endif
 
 # nl_langinfo(CODESET) drops the support of ja_JP.EUC after 5.1-RELEASE
-.if ${OSVERSION} > 501100
 LOCALE_CMD?=	/usr/bin/locale
 .if exists(${LOCALE_CMD})
 CHARMAP!=	${LOCALE_CMD} charmap
@@ -85,7 +84,6 @@ pre-build:
 	@${ECHO_CMD} "Warning: Your current locale setting is not supported by the system."
 .endif
 .endif
-.endif
 
 .if defined(WITHOUT_INFO)
 PLIST_SUB+=	INFO="@comment "
diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile
index e12727944529..86d75515746a 100644
--- a/japanese/iiimf-le-canna/Makefile
+++ b/japanese/iiimf-le-canna/Makefile
@@ -31,12 +31,6 @@ USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:15:env
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 503000
-IGNORE=	is supported on FreeBSD 5.3 and later only
-.endif
-
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -53,4 +47,4 @@ do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/iiimf-le-freewnn/Makefile b/japanese/iiimf-le-freewnn/Makefile
index 6a55b06dfdec..e18d9c2a5c1a 100644
--- a/japanese/iiimf-le-freewnn/Makefile
+++ b/japanese/iiimf-le-freewnn/Makefile
@@ -31,12 +31,6 @@ USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:15:env
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 503000
-IGNORE=	is supported on FreeBSD 5.3 and later only
-.endif
-
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/wnn \
 		${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}
@@ -55,4 +49,4 @@ do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index d3f6e92dd1f1..d4311b57953d 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -27,16 +27,9 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500035
-IGNORE=		does not build on FreeBSD < 5.x
-.else
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
@@ -44,4 +37,4 @@ post-install:
 	@${ECHO} To display this message again, type \`pkg_info -D ${PKGNAME}\'
 	@${ECHO}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/scim-honoka-plugin-romkan/Makefile b/japanese/scim-honoka-plugin-romkan/Makefile
index 8143085fabc3..5930cbea038f 100644
--- a/japanese/scim-honoka-plugin-romkan/Makefile
+++ b/japanese/scim-honoka-plugin-romkan/Makefile
@@ -26,15 +26,8 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500035
-IGNORE=		does not build in FreeBSD < 5.x
-.else
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/scim-honoka-plugin-wnn/Makefile b/japanese/scim-honoka-plugin-wnn/Makefile
index af1306a3b9db..9dc773533184 100644
--- a/japanese/scim-honoka-plugin-wnn/Makefile
+++ b/japanese/scim-honoka-plugin-wnn/Makefile
@@ -29,15 +29,8 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500035
-IGNORE=		does not build in FreeBSD < 5.x
-.else
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/scim-honoka/Makefile b/japanese/scim-honoka/Makefile
index e2a671eeba1b..315ddf4e5457 100644
--- a/japanese/scim-honoka/Makefile
+++ b/japanese/scim-honoka/Makefile
@@ -26,20 +26,13 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500035
-IGNORE=		does not build in FreeBSD < 5.x
-.else
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-.endif
 
 post-install:
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/scim-prime/Makefile b/japanese/scim-prime/Makefile
index 71bff9e3599c..2088b592da85 100644
--- a/japanese/scim-prime/Makefile
+++ b/japanese/scim-prime/Makefile
@@ -24,17 +24,8 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500035
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-RUN_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/stlport" \
-		LDFLAGS="-L${LOCALBASE}/lib -lstlport_gcc"
-.else
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
@@ -42,4 +33,4 @@ post-install:
 	@${ECHO} To display this message again, type \`pkg_info -D ${PKGNAME}\'
 	@${ECHO}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index 69adbf6354a6..689c8d7fba49 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -24,19 +24,9 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500035
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-RUN_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/stlport" \
-		LDFLAGS="-L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS}"
-.else
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} "s|LOCALBASE|${LOCALBASE}|" ${WRKSRC}/src/scim_skk_prefs.h
@@ -47,4 +37,4 @@ post-install:
 	@${ECHO} To display this message again, type \`pkg_info -D ${PKGNAME}\'
 	@${ECHO}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index 1380eb8a3051..b7e777ead817 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -26,7 +26,9 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 PLIST_FILES=	bin/scim-tomoe \
 		lib/scim-1.0/1.4.0/Helper/tomoe.a \
@@ -35,22 +37,10 @@ PLIST_FILES=	bin/scim-tomoe \
 		share/locale/ja/LC_MESSAGES/scim-tomoe.mo \
 		share/scim/icons/scim-tomoe.png
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500035
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-RUN_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/stlport" \
-		LDFLAGS="-L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS}"
-.else
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-.endif
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO}
 	@${ECHO} To display this message again, type \`pkg_info -D ${PKGNAME}\'
 	@${ECHO}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index a2c7d5ad2385..f62ed4b8f7dc 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -26,16 +26,9 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500035
-IGNORE=		does not build on FreeBSD < 5.x
-.else
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
@@ -43,4 +36,4 @@ post-install:
 	@${ECHO} To display this message again, type \`pkg_info -D ${PKGNAME}\'
 	@${ECHO}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/tcl76/Makefile b/japanese/tcl76/Makefile
index 4b5ab1d4d05a..51c6c298a505 100644
--- a/japanese/tcl76/Makefile
+++ b/japanese/tcl76/Makefile
@@ -50,7 +50,7 @@ post-configure:
 
 pre-build:
 	cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} \
-	   VERSION=${VERSION} OSVERSION=${OSVERSION} && ${RM} *.o
+	   VERSION=${VERSION} && ${RM} *.o
 
 pre-install:
 	${MKDIR} ${PREFIX}/lib/tcl${VERSION}
diff --git a/japanese/tcl76/files/Makefile.lib b/japanese/tcl76/files/Makefile.lib
index 52921a346a55..d98bae2bad25 100644
--- a/japanese/tcl76/files/Makefile.lib
+++ b/japanese/tcl76/files/Makefile.lib
@@ -8,9 +8,6 @@ CFLAGS+=	-I. -I./../generic \
 		-DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1  -DKANJI \
 		-DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
 		-DTCL_PACKAGE_PATH="\"/usr/local/lib\""
-.if ${OSVERSION} < 600011
-CFLAGS+=	-DNEED_MATHERR=1
-.endif
 GENERIC_DIR=	../generic
 UNIX_DIR=	.