KDE4 l10n fixes.

 - Remove an entry from all plists that slipped under radar and made
   packaging fail.

 - Properly save the OPTIONS defined by the user in the l10n ports. [1]

   Quoting bapt, master of all things ports:

   That is because misc/kde4-l10n/files/bsd.l10n.mk is totally wrong it does

   ...
   .include <bsd.port.pre.mk>
   ...
   .include <bsd.port.options.mk>
   ...
   .include <bsd.port.post.mk>

   First the right order in that case should be:

   ...
   .include <bsd.port.options.mk>
   ...
   .include <bsd.port.pre.mk>
   ...
   .include <bsd.port.post.mk>

   Second in that case (kde) the pre.mk/post.mk can be removed just keeping
   the options.mk and given that we now have the helpers options.mk can also
   be removed.

   The check for variables in OPTIONS_DEFINE is also useless (already done
   by the framework) defining OPTIONS_DEFINE and OPTIONS_DEFAULT to some
   empty values is also useless.

No PORTREVISION bump because the generated packages do not change regardless
of the changes/fixes in behavior here.

Reported by:	avg [1]
Submitted by:	bapt [1]

121 files changed, 67 insertions, 199 deletions

diff --git a/arabic/kde4-l10n/Makefile b/arabic/kde4-l10n/Makefile
index e729047..8f7edd8 100644
--- a/arabic/kde4-l10n/Makefile
+++ b/arabic/kde4-l10n/Makefile
@@ -9,5 +9,4 @@ COMMENT=	Arabic messages and documentation for KDE SC 4
 
 KDE4_L10N=	ar
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/arabic/kde4-l10n/pkg-plist b/arabic/kde4-l10n/pkg-plist
index 3ec0a6c..3db742e 100644
--- a/arabic/kde4-l10n/pkg-plist
+++ b/arabic/kde4-l10n/pkg-plist
@@ -211,7 +211,6 @@ share/locale/ar/LC_MESSAGES/kfile_kig.mo
 share/locale/ar/LC_MESSAGES/kfile_pnm.mo
 share/locale/ar/LC_MESSAGES/kfile_raw.mo
 share/locale/ar/LC_MESSAGES/kfile_rgb.mo
-share/locale/ar/LC_MESSAGES/kfile_rpm.mo
 share/locale/ar/LC_MESSAGES/kfile_tiff.mo
 share/locale/ar/LC_MESSAGES/kfile_xps.mo
 share/locale/ar/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/chinese/kde4-l10n-zh_CN/Makefile b/chinese/kde4-l10n-zh_CN/Makefile
index 284cb85..13530d1 100644
--- a/chinese/kde4-l10n-zh_CN/Makefile
+++ b/chinese/kde4-l10n-zh_CN/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Simplified Chinese messages and documentation for KDE SC 4
 
 KDE4_L10N=	zh_CN
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/kde4-l10n-zh_CN/pkg-plist b/chinese/kde4-l10n-zh_CN/pkg-plist
index ec31f58..dbb4985 100644
--- a/chinese/kde4-l10n-zh_CN/pkg-plist
+++ b/chinese/kde4-l10n-zh_CN/pkg-plist
@@ -292,7 +292,6 @@ share/locale/zh_CN/LC_MESSAGES/kfile_mail.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_pnm.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_raw.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_rgb.mo
-share/locale/zh_CN/LC_MESSAGES/kfile_rpm.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_tiff.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_xps.mo
 share/locale/zh_CN/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/chinese/kde4-l10n-zh_TW/Makefile b/chinese/kde4-l10n-zh_TW/Makefile
index 9286d64..70ceef1 100644
--- a/chinese/kde4-l10n-zh_TW/Makefile
+++ b/chinese/kde4-l10n-zh_TW/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Traditional Chinese messages and documentation for KDE SC 4
 
 KDE4_L10N=	zh_TW
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/kde4-l10n-zh_TW/pkg-plist b/chinese/kde4-l10n-zh_TW/pkg-plist
index a22919e..ceb0909 100644
--- a/chinese/kde4-l10n-zh_TW/pkg-plist
+++ b/chinese/kde4-l10n-zh_TW/pkg-plist
@@ -257,7 +257,6 @@ share/locale/zh_TW/LC_MESSAGES/kfile_mail.mo
 share/locale/zh_TW/LC_MESSAGES/kfile_pnm.mo
 share/locale/zh_TW/LC_MESSAGES/kfile_raw.mo
 share/locale/zh_TW/LC_MESSAGES/kfile_rgb.mo
-share/locale/zh_TW/LC_MESSAGES/kfile_rpm.mo
 share/locale/zh_TW/LC_MESSAGES/kfile_tiff.mo
 share/locale/zh_TW/LC_MESSAGES/kfile_xps.mo
 share/locale/zh_TW/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/french/kde4-l10n/Makefile b/french/kde4-l10n/Makefile
index ec899e0..5841717 100644
--- a/french/kde4-l10n/Makefile
+++ b/french/kde4-l10n/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	fr
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/french/kde4-l10n/pkg-plist b/french/kde4-l10n/pkg-plist
index 1070943..16b5c6e 100644
--- a/french/kde4-l10n/pkg-plist
+++ b/french/kde4-l10n/pkg-plist
@@ -1765,7 +1765,6 @@ share/locale/fr/LC_MESSAGES/kfile_mail.mo
 share/locale/fr/LC_MESSAGES/kfile_pnm.mo
 share/locale/fr/LC_MESSAGES/kfile_raw.mo
 share/locale/fr/LC_MESSAGES/kfile_rgb.mo
-share/locale/fr/LC_MESSAGES/kfile_rpm.mo
 share/locale/fr/LC_MESSAGES/kfile_tiff.mo
 share/locale/fr/LC_MESSAGES/kfile_xps.mo
 share/locale/fr/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/german/kde4-l10n/Makefile b/german/kde4-l10n/Makefile
index ccda205..1416e23 100644
--- a/german/kde4-l10n/Makefile
+++ b/german/kde4-l10n/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	de
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/german/kde4-l10n/pkg-plist b/german/kde4-l10n/pkg-plist
index 6b984e8..8094852 100644
--- a/german/kde4-l10n/pkg-plist
+++ b/german/kde4-l10n/pkg-plist
@@ -2132,7 +2132,6 @@ share/locale/de/LC_MESSAGES/kfile_mail.mo
 share/locale/de/LC_MESSAGES/kfile_pnm.mo
 share/locale/de/LC_MESSAGES/kfile_raw.mo
 share/locale/de/LC_MESSAGES/kfile_rgb.mo
-share/locale/de/LC_MESSAGES/kfile_rpm.mo
 share/locale/de/LC_MESSAGES/kfile_tiff.mo
 share/locale/de/LC_MESSAGES/kfile_xps.mo
 share/locale/de/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/hebrew/kde4-l10n/Makefile b/hebrew/kde4-l10n/Makefile
index e1eb53a..6d27821 100644
--- a/hebrew/kde4-l10n/Makefile
+++ b/hebrew/kde4-l10n/Makefile
@@ -9,5 +9,4 @@ COMMENT=	Hebrew messages and documentation for KDE SC 4
 
 KDE4_L10N=	he
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/hebrew/kde4-l10n/pkg-plist b/hebrew/kde4-l10n/pkg-plist
index a639804..76ec2bb 100644
--- a/hebrew/kde4-l10n/pkg-plist
+++ b/hebrew/kde4-l10n/pkg-plist
@@ -206,7 +206,6 @@ share/locale/he/LC_MESSAGES/kfile_kig.mo
 share/locale/he/LC_MESSAGES/kfile_pnm.mo
 share/locale/he/LC_MESSAGES/kfile_raw.mo
 share/locale/he/LC_MESSAGES/kfile_rgb.mo
-share/locale/he/LC_MESSAGES/kfile_rpm.mo
 share/locale/he/LC_MESSAGES/kfile_tiff.mo
 share/locale/he/LC_MESSAGES/kfile_xps.mo
 share/locale/he/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/hungarian/kde4-l10n/Makefile b/hungarian/kde4-l10n/Makefile
index 122dd38..866d1d6 100644
--- a/hungarian/kde4-l10n/Makefile
+++ b/hungarian/kde4-l10n/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Hungarian messages and documentation for KDE SC 4
 
 KDE4_L10N=	hu
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/hungarian/kde4-l10n/pkg-plist b/hungarian/kde4-l10n/pkg-plist
index e3b9861..a66daac 100644
--- a/hungarian/kde4-l10n/pkg-plist
+++ b/hungarian/kde4-l10n/pkg-plist
@@ -390,7 +390,6 @@ share/locale/hu/LC_MESSAGES/kfile_mail.mo
 share/locale/hu/LC_MESSAGES/kfile_pnm.mo
 share/locale/hu/LC_MESSAGES/kfile_raw.mo
 share/locale/hu/LC_MESSAGES/kfile_rgb.mo
-share/locale/hu/LC_MESSAGES/kfile_rpm.mo
 share/locale/hu/LC_MESSAGES/kfile_tiff.mo
 share/locale/hu/LC_MESSAGES/kfile_xps.mo
 share/locale/hu/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/japanese/kde4-l10n/Makefile b/japanese/kde4-l10n/Makefile
index 4baff0a..e174238 100644
--- a/japanese/kde4-l10n/Makefile
+++ b/japanese/kde4-l10n/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Japanese messages and documentation for KDE SC 4
 
 KDE4_L10N=	ja
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/kde4-l10n/pkg-plist b/japanese/kde4-l10n/pkg-plist
index 1023ef4..28ba4f7 100644
--- a/japanese/kde4-l10n/pkg-plist
+++ b/japanese/kde4-l10n/pkg-plist
@@ -265,7 +265,6 @@ share/locale/ja/LC_MESSAGES/kfile_mail.mo
 share/locale/ja/LC_MESSAGES/kfile_pnm.mo
 share/locale/ja/LC_MESSAGES/kfile_raw.mo
 share/locale/ja/LC_MESSAGES/kfile_rgb.mo
-share/locale/ja/LC_MESSAGES/kfile_rpm.mo
 share/locale/ja/LC_MESSAGES/kfile_tiff.mo
 share/locale/ja/LC_MESSAGES/kfile_xps.mo
 share/locale/ja/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/korean/kde4-l10n/Makefile b/korean/kde4-l10n/Makefile
index 2a1dc4d..1a216eb 100644
--- a/korean/kde4-l10n/Makefile
+++ b/korean/kde4-l10n/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Korean messages and documentation for KDE SC 4
 
 KDE4_L10N=	ko
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/korean/kde4-l10n/pkg-plist b/korean/kde4-l10n/pkg-plist
index a1053d1..aa0b8f2 100644
--- a/korean/kde4-l10n/pkg-plist
+++ b/korean/kde4-l10n/pkg-plist
@@ -236,7 +236,6 @@ share/locale/ko/LC_MESSAGES/kfile_mail.mo
 share/locale/ko/LC_MESSAGES/kfile_pnm.mo
 share/locale/ko/LC_MESSAGES/kfile_raw.mo
 share/locale/ko/LC_MESSAGES/kfile_rgb.mo
-share/locale/ko/LC_MESSAGES/kfile_rpm.mo
 share/locale/ko/LC_MESSAGES/kfile_tiff.mo
 share/locale/ko/LC_MESSAGES/kfile_xps.mo
 share/locale/ko/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-bg/Makefile b/misc/kde4-l10n-bg/Makefile
index feae4f3..a4872ef 100644
--- a/misc/kde4-l10n-bg/Makefile
+++ b/misc/kde4-l10n-bg/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Bulgarian messages and documentation for KDE SC 4
 
 KDE4_L10N=	bg
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-bg/pkg-plist b/misc/kde4-l10n-bg/pkg-plist
index ed013af..b9c6749 100644
--- a/misc/kde4-l10n-bg/pkg-plist
+++ b/misc/kde4-l10n-bg/pkg-plist
@@ -168,7 +168,6 @@ share/locale/bg/LC_MESSAGES/kfile_kig.mo
 share/locale/bg/LC_MESSAGES/kfile_pnm.mo
 share/locale/bg/LC_MESSAGES/kfile_raw.mo
 share/locale/bg/LC_MESSAGES/kfile_rgb.mo
-share/locale/bg/LC_MESSAGES/kfile_rpm.mo
 share/locale/bg/LC_MESSAGES/kfile_tiff.mo
 share/locale/bg/LC_MESSAGES/kfile_xps.mo
 share/locale/bg/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-bs/Makefile b/misc/kde4-l10n-bs/Makefile
index 768dc9a..f96a355 100644
--- a/misc/kde4-l10n-bs/Makefile
+++ b/misc/kde4-l10n-bs/Makefile
@@ -9,5 +9,4 @@ COMMENT=	Bosnian messages and documentation for KDE SC 4
 
 KDE4_L10N=	bs
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-bs/pkg-plist b/misc/kde4-l10n-bs/pkg-plist
index f343b48..9563816 100644
--- a/misc/kde4-l10n-bs/pkg-plist
+++ b/misc/kde4-l10n-bs/pkg-plist
@@ -253,7 +253,6 @@ share/locale/bs/LC_MESSAGES/kfile_mail.mo
 share/locale/bs/LC_MESSAGES/kfile_pnm.mo
 share/locale/bs/LC_MESSAGES/kfile_raw.mo
 share/locale/bs/LC_MESSAGES/kfile_rgb.mo
-share/locale/bs/LC_MESSAGES/kfile_rpm.mo
 share/locale/bs/LC_MESSAGES/kfile_tiff.mo
 share/locale/bs/LC_MESSAGES/kfile_xps.mo
 share/locale/bs/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-ca/Makefile b/misc/kde4-l10n-ca/Makefile
index 9bd5984..a759ead 100644
--- a/misc/kde4-l10n-ca/Makefile
+++ b/misc/kde4-l10n-ca/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	ca
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-ca/pkg-plist b/misc/kde4-l10n-ca/pkg-plist
index 8a97a88..5b50eb6 100644
--- a/misc/kde4-l10n-ca/pkg-plist
+++ b/misc/kde4-l10n-ca/pkg-plist
@@ -1614,7 +1614,6 @@ share/locale/ca/LC_MESSAGES/kfile_mail.mo
 share/locale/ca/LC_MESSAGES/kfile_pnm.mo
 share/locale/ca/LC_MESSAGES/kfile_raw.mo
 share/locale/ca/LC_MESSAGES/kfile_rgb.mo
-share/locale/ca/LC_MESSAGES/kfile_rpm.mo
 share/locale/ca/LC_MESSAGES/kfile_tiff.mo
 share/locale/ca/LC_MESSAGES/kfile_xps.mo
 share/locale/ca/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-ca_valencia/Makefile b/misc/kde4-l10n-ca_valencia/Makefile
index 4654cb2..1cd9aa2 100644
--- a/misc/kde4-l10n-ca_valencia/Makefile
+++ b/misc/kde4-l10n-ca_valencia/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Valencian (southern Catalan) messages and documentation for KDE SC 4
 
 KDE4_L10N=	ca@valencia
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-ca_valencia/pkg-plist b/misc/kde4-l10n-ca_valencia/pkg-plist
index 662580d..99c94b8 100644
--- a/misc/kde4-l10n-ca_valencia/pkg-plist
+++ b/misc/kde4-l10n-ca_valencia/pkg-plist
@@ -233,7 +233,6 @@ share/locale/ca@valencia/LC_MESSAGES/kfile_mail.mo
 share/locale/ca@valencia/LC_MESSAGES/kfile_pnm.mo
 share/locale/ca@valencia/LC_MESSAGES/kfile_raw.mo
 share/locale/ca@valencia/LC_MESSAGES/kfile_rgb.mo
-share/locale/ca@valencia/LC_MESSAGES/kfile_rpm.mo
 share/locale/ca@valencia/LC_MESSAGES/kfile_tiff.mo
 share/locale/ca@valencia/LC_MESSAGES/kfile_xps.mo
 share/locale/ca@valencia/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-cs/Makefile b/misc/kde4-l10n-cs/Makefile
index 444d176..ee872bd 100644
--- a/misc/kde4-l10n-cs/Makefile
+++ b/misc/kde4-l10n-cs/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Czech messages and documentation for KDE SC 4
 
 KDE4_L10N=	cs
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-cs/pkg-plist b/misc/kde4-l10n-cs/pkg-plist
index 8ef5ccc..edfd611 100644
--- a/misc/kde4-l10n-cs/pkg-plist
+++ b/misc/kde4-l10n-cs/pkg-plist
@@ -365,7 +365,6 @@ share/locale/cs/LC_MESSAGES/kfile_mail.mo
 share/locale/cs/LC_MESSAGES/kfile_pnm.mo
 share/locale/cs/LC_MESSAGES/kfile_raw.mo
 share/locale/cs/LC_MESSAGES/kfile_rgb.mo
-share/locale/cs/LC_MESSAGES/kfile_rpm.mo
 share/locale/cs/LC_MESSAGES/kfile_tiff.mo
 share/locale/cs/LC_MESSAGES/kfile_xps.mo
 share/locale/cs/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-csb/Makefile b/misc/kde4-l10n-csb/Makefile
index e0ae92a..d09e6cb 100644
--- a/misc/kde4-l10n-csb/Makefile
+++ b/misc/kde4-l10n-csb/Makefile
@@ -12,5 +12,4 @@ KDE4_L10N=	csb
 
 IGNORE=		is not included in KDE SC ${KDE4_VERSION}
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-da/Makefile b/misc/kde4-l10n-da/Makefile
index 418545e..ecf339e 100644
--- a/misc/kde4-l10n-da/Makefile
+++ b/misc/kde4-l10n-da/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	da
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-da/pkg-plist b/misc/kde4-l10n-da/pkg-plist
index 56b8394..e05b022 100644
--- a/misc/kde4-l10n-da/pkg-plist
+++ b/misc/kde4-l10n-da/pkg-plist
@@ -646,7 +646,6 @@ share/locale/da/LC_MESSAGES/kfile_mail.mo
 share/locale/da/LC_MESSAGES/kfile_pnm.mo
 share/locale/da/LC_MESSAGES/kfile_raw.mo
 share/locale/da/LC_MESSAGES/kfile_rgb.mo
-share/locale/da/LC_MESSAGES/kfile_rpm.mo
 share/locale/da/LC_MESSAGES/kfile_tiff.mo
 share/locale/da/LC_MESSAGES/kfile_xps.mo
 share/locale/da/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-el/Makefile b/misc/kde4-l10n-el/Makefile
index 00d0128..fef88cf 100644
--- a/misc/kde4-l10n-el/Makefile
+++ b/misc/kde4-l10n-el/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	el
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-el/pkg-plist b/misc/kde4-l10n-el/pkg-plist
index 1adb561..de61342 100644
--- a/misc/kde4-l10n-el/pkg-plist
+++ b/misc/kde4-l10n-el/pkg-plist
@@ -405,7 +405,6 @@ share/locale/el/LC_MESSAGES/kfile_mail.mo
 share/locale/el/LC_MESSAGES/kfile_pnm.mo
 share/locale/el/LC_MESSAGES/kfile_raw.mo
 share/locale/el/LC_MESSAGES/kfile_rgb.mo
-share/locale/el/LC_MESSAGES/kfile_rpm.mo
 share/locale/el/LC_MESSAGES/kfile_tiff.mo
 share/locale/el/LC_MESSAGES/kfile_xps.mo
 share/locale/el/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-en_GB/Makefile b/misc/kde4-l10n-en_GB/Makefile
index 294cd2e..8e702c6 100644
--- a/misc/kde4-l10n-en_GB/Makefile
+++ b/misc/kde4-l10n-en_GB/Makefile
@@ -10,5 +10,4 @@ COMMENT=	British messages and documentation for KDE SC 4
 
 KDE4_L10N=	en_GB
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-en_GB/pkg-plist b/misc/kde4-l10n-en_GB/pkg-plist
index 80f2e28..1d3c3e2 100644
--- a/misc/kde4-l10n-en_GB/pkg-plist
+++ b/misc/kde4-l10n-en_GB/pkg-plist
@@ -384,7 +384,6 @@ share/locale/en_GB/LC_MESSAGES/kfile_mail.mo
 share/locale/en_GB/LC_MESSAGES/kfile_pnm.mo
 share/locale/en_GB/LC_MESSAGES/kfile_raw.mo
 share/locale/en_GB/LC_MESSAGES/kfile_rgb.mo
-share/locale/en_GB/LC_MESSAGES/kfile_rpm.mo
 share/locale/en_GB/LC_MESSAGES/kfile_tiff.mo
 share/locale/en_GB/LC_MESSAGES/kfile_xps.mo
 share/locale/en_GB/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-eo/Makefile b/misc/kde4-l10n-eo/Makefile
index 97c8989..97ecd9a 100644
--- a/misc/kde4-l10n-eo/Makefile
+++ b/misc/kde4-l10n-eo/Makefile
@@ -12,5 +12,4 @@ KDE4_L10N=	eo
 
 IGNORE=		is not included in KDE SC ${KDE4_VERSION}
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-eo/pkg-plist b/misc/kde4-l10n-eo/pkg-plist
index cf2e407..17bbd1f 100644
--- a/misc/kde4-l10n-eo/pkg-plist
+++ b/misc/kde4-l10n-eo/pkg-plist
@@ -175,7 +175,6 @@ share/locale/eo/LC_MESSAGES/kfile_kig.mo
 share/locale/eo/LC_MESSAGES/kfile_pnm.mo
 share/locale/eo/LC_MESSAGES/kfile_raw.mo
 share/locale/eo/LC_MESSAGES/kfile_rgb.mo
-share/locale/eo/LC_MESSAGES/kfile_rpm.mo
 share/locale/eo/LC_MESSAGES/kfile_tiff.mo
 share/locale/eo/LC_MESSAGES/kfile_xps.mo
 share/locale/eo/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-es/Makefile b/misc/kde4-l10n-es/Makefile
index 4866356..ce79ebf 100644
--- a/misc/kde4-l10n-es/Makefile
+++ b/misc/kde4-l10n-es/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	es
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-es/pkg-plist b/misc/kde4-l10n-es/pkg-plist
index b874563..adb0c71 100644
--- a/misc/kde4-l10n-es/pkg-plist
+++ b/misc/kde4-l10n-es/pkg-plist
@@ -1673,7 +1673,6 @@ share/locale/es/LC_MESSAGES/kfile_mail.mo
 share/locale/es/LC_MESSAGES/kfile_pnm.mo
 share/locale/es/LC_MESSAGES/kfile_raw.mo
 share/locale/es/LC_MESSAGES/kfile_rgb.mo
-share/locale/es/LC_MESSAGES/kfile_rpm.mo
 share/locale/es/LC_MESSAGES/kfile_tiff.mo
 share/locale/es/LC_MESSAGES/kfile_xps.mo
 share/locale/es/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-et/Makefile b/misc/kde4-l10n-et/Makefile
index 69b79f8..51bf227 100644
--- a/misc/kde4-l10n-et/Makefile
+++ b/misc/kde4-l10n-et/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	et
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-et/pkg-plist b/misc/kde4-l10n-et/pkg-plist
index 9ce60c8..302483a 100644
--- a/misc/kde4-l10n-et/pkg-plist
+++ b/misc/kde4-l10n-et/pkg-plist
@@ -1236,7 +1236,6 @@ share/locale/et/LC_MESSAGES/kfile_mail.mo
 share/locale/et/LC_MESSAGES/kfile_pnm.mo
 share/locale/et/LC_MESSAGES/kfile_raw.mo
 share/locale/et/LC_MESSAGES/kfile_rgb.mo
-share/locale/et/LC_MESSAGES/kfile_rpm.mo
 share/locale/et/LC_MESSAGES/kfile_tiff.mo
 share/locale/et/LC_MESSAGES/kfile_xps.mo
 share/locale/et/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-eu/Makefile b/misc/kde4-l10n-eu/Makefile
index 53f6997..4681ad1 100644
--- a/misc/kde4-l10n-eu/Makefile
+++ b/misc/kde4-l10n-eu/Makefile
@@ -9,5 +9,4 @@ COMMENT=	Basque messages and documentation for KDE SC 4
 
 KDE4_L10N=	eu
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-eu/pkg-plist b/misc/kde4-l10n-eu/pkg-plist
index 4e1025c..ba505e2 100644
--- a/misc/kde4-l10n-eu/pkg-plist
+++ b/misc/kde4-l10n-eu/pkg-plist
@@ -181,7 +181,6 @@ share/locale/eu/LC_MESSAGES/kfile_kig.mo
 share/locale/eu/LC_MESSAGES/kfile_pnm.mo
 share/locale/eu/LC_MESSAGES/kfile_raw.mo
 share/locale/eu/LC_MESSAGES/kfile_rgb.mo
-share/locale/eu/LC_MESSAGES/kfile_rpm.mo
 share/locale/eu/LC_MESSAGES/kfile_tiff.mo
 share/locale/eu/LC_MESSAGES/kfile_xps.mo
 share/locale/eu/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-fa/Makefile b/misc/kde4-l10n-fa/Makefile
index 0704517..d384b43 100644
--- a/misc/kde4-l10n-fa/Makefile
+++ b/misc/kde4-l10n-fa/Makefile
@@ -9,5 +9,4 @@ COMMENT=	Farsi (Persian) messages and documentation for KDE SC 4
 
 KDE4_L10N=	fa
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-fa/pkg-plist b/misc/kde4-l10n-fa/pkg-plist
index e00dfa21b..5fb43d0 100644
--- a/misc/kde4-l10n-fa/pkg-plist
+++ b/misc/kde4-l10n-fa/pkg-plist
@@ -141,7 +141,6 @@ share/locale/fa/LC_MESSAGES/kfile_exr.mo
 share/locale/fa/LC_MESSAGES/kfile_kig.mo
 share/locale/fa/LC_MESSAGES/kfile_pnm.mo
 share/locale/fa/LC_MESSAGES/kfile_rgb.mo
-share/locale/fa/LC_MESSAGES/kfile_rpm.mo
 share/locale/fa/LC_MESSAGES/kfile_tiff.mo
 share/locale/fa/LC_MESSAGES/kfileaudiopreview4.mo
 share/locale/fa/LC_MESSAGES/kfilereplace.mo
diff --git a/misc/kde4-l10n-fi/Makefile b/misc/kde4-l10n-fi/Makefile
index b4a7461..fba65d8 100644
--- a/misc/kde4-l10n-fi/Makefile
+++ b/misc/kde4-l10n-fi/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Finnish messages and documentation for KDE SC 4
 
 KDE4_L10N=	fi
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-fi/pkg-plist b/misc/kde4-l10n-fi/pkg-plist
index d795205..b0a6ca0 100644
--- a/misc/kde4-l10n-fi/pkg-plist
+++ b/misc/kde4-l10n-fi/pkg-plist
@@ -270,7 +270,6 @@ share/locale/fi/LC_MESSAGES/kfile_mail.mo
 share/locale/fi/LC_MESSAGES/kfile_pnm.mo
 share/locale/fi/LC_MESSAGES/kfile_raw.mo
 share/locale/fi/LC_MESSAGES/kfile_rgb.mo
-share/locale/fi/LC_MESSAGES/kfile_rpm.mo
 share/locale/fi/LC_MESSAGES/kfile_tiff.mo
 share/locale/fi/LC_MESSAGES/kfile_xps.mo
 share/locale/fi/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-fy/Makefile b/misc/kde4-l10n-fy/Makefile
index df86455..65beea4 100644
--- a/misc/kde4-l10n-fy/Makefile
+++ b/misc/kde4-l10n-fy/Makefile
@@ -12,5 +12,4 @@ KDE4_L10N=	fy
 
 IGNORE=		is not included in KDE SC ${KDE4_VERSION}
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-ga/Makefile b/misc/kde4-l10n-ga/Makefile
index 1bc985d..6e569ec 100644
--- a/misc/kde4-l10n-ga/Makefile
+++ b/misc/kde4-l10n-ga/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Irish messages and documentation for KDE SC 4
 
 KDE4_L10N=	ga
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-ga/pkg-plist b/misc/kde4-l10n-ga/pkg-plist
index e3b86b9..46be0fb 100644
--- a/misc/kde4-l10n-ga/pkg-plist
+++ b/misc/kde4-l10n-ga/pkg-plist
@@ -286,7 +286,6 @@ share/locale/ga/LC_MESSAGES/kfile_mail.mo
 share/locale/ga/LC_MESSAGES/kfile_pnm.mo
 share/locale/ga/LC_MESSAGES/kfile_raw.mo
 share/locale/ga/LC_MESSAGES/kfile_rgb.mo
-share/locale/ga/LC_MESSAGES/kfile_rpm.mo
 share/locale/ga/LC_MESSAGES/kfile_tiff.mo
 share/locale/ga/LC_MESSAGES/kfile_xps.mo
 share/locale/ga/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-gl/Makefile b/misc/kde4-l10n-gl/Makefile
index 76497dc..be75ea1 100644
--- a/misc/kde4-l10n-gl/Makefile
+++ b/misc/kde4-l10n-gl/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	gl
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-gl/pkg-plist b/misc/kde4-l10n-gl/pkg-plist
index 1555116..fb1804a 100644
--- a/misc/kde4-l10n-gl/pkg-plist
+++ b/misc/kde4-l10n-gl/pkg-plist
@@ -686,7 +686,6 @@ share/locale/gl/LC_MESSAGES/kfile_mail.mo
 share/locale/gl/LC_MESSAGES/kfile_pnm.mo
 share/locale/gl/LC_MESSAGES/kfile_raw.mo
 share/locale/gl/LC_MESSAGES/kfile_rgb.mo
-share/locale/gl/LC_MESSAGES/kfile_rpm.mo
 share/locale/gl/LC_MESSAGES/kfile_tiff.mo
 share/locale/gl/LC_MESSAGES/kfile_xps.mo
 share/locale/gl/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-gu/Makefile b/misc/kde4-l10n-gu/Makefile
index 948cb69..f666a93 100644
--- a/misc/kde4-l10n-gu/Makefile
+++ b/misc/kde4-l10n-gu/Makefile
@@ -11,5 +11,4 @@ KDE4_L10N=	gu
 
 IGNORE=		is not included in KDE SC ${KDE4_VERSION}
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-hi/Makefile b/misc/kde4-l10n-hi/Makefile
index f3856bb..88b1667 100644
--- a/misc/kde4-l10n-hi/Makefile
+++ b/misc/kde4-l10n-hi/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Hindi messages and documentation for KDE SC 4
 
 KDE4_L10N=	hi
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-hi/pkg-plist b/misc/kde4-l10n-hi/pkg-plist
index 81463fb..83edd06 100644
--- a/misc/kde4-l10n-hi/pkg-plist
+++ b/misc/kde4-l10n-hi/pkg-plist
@@ -153,7 +153,6 @@ share/locale/hi/LC_MESSAGES/kfile_kig.mo
 share/locale/hi/LC_MESSAGES/kfile_pnm.mo
 share/locale/hi/LC_MESSAGES/kfile_raw.mo
 share/locale/hi/LC_MESSAGES/kfile_rgb.mo
-share/locale/hi/LC_MESSAGES/kfile_rpm.mo
 share/locale/hi/LC_MESSAGES/kfile_tiff.mo
 share/locale/hi/LC_MESSAGES/kfile_xps.mo
 share/locale/hi/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-hr/Makefile b/misc/kde4-l10n-hr/Makefile
index 406bd4d..e447dae 100644
--- a/misc/kde4-l10n-hr/Makefile
+++ b/misc/kde4-l10n-hr/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Croation messages and documentation for KDE SC 4
 
 KDE4_L10N=	hr
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-hr/pkg-plist b/misc/kde4-l10n-hr/pkg-plist
index 2e3f892..ab5df6ce 100644
--- a/misc/kde4-l10n-hr/pkg-plist
+++ b/misc/kde4-l10n-hr/pkg-plist
@@ -167,7 +167,6 @@ share/locale/hr/LC_MESSAGES/kfile_kig.mo
 share/locale/hr/LC_MESSAGES/kfile_pnm.mo
 share/locale/hr/LC_MESSAGES/kfile_raw.mo
 share/locale/hr/LC_MESSAGES/kfile_rgb.mo
-share/locale/hr/LC_MESSAGES/kfile_rpm.mo
 share/locale/hr/LC_MESSAGES/kfile_tiff.mo
 share/locale/hr/LC_MESSAGES/kfile_xps.mo
 share/locale/hr/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-ia/Makefile b/misc/kde4-l10n-ia/Makefile
index 2998ad5..4234b62 100644
--- a/misc/kde4-l10n-ia/Makefile
+++ b/misc/kde4-l10n-ia/Makefile
@@ -9,5 +9,4 @@ COMMENT=	Interlingua messages and documentation for KDE SC 4
 
 KDE4_L10N=	ia
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-ia/pkg-plist b/misc/kde4-l10n-ia/pkg-plist
index 54a4c78..0288e34 100644
--- a/misc/kde4-l10n-ia/pkg-plist
+++ b/misc/kde4-l10n-ia/pkg-plist
@@ -217,7 +217,6 @@ share/locale/ia/LC_MESSAGES/kfile_mail.mo
 share/locale/ia/LC_MESSAGES/kfile_pnm.mo
 share/locale/ia/LC_MESSAGES/kfile_raw.mo
 share/locale/ia/LC_MESSAGES/kfile_rgb.mo
-share/locale/ia/LC_MESSAGES/kfile_rpm.mo
 share/locale/ia/LC_MESSAGES/kfile_tiff.mo
 share/locale/ia/LC_MESSAGES/kfile_xps.mo
 share/locale/ia/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-id/Makefile b/misc/kde4-l10n-id/Makefile
index 64f154e..4a1abd0 100644
--- a/misc/kde4-l10n-id/Makefile
+++ b/misc/kde4-l10n-id/Makefile
@@ -12,5 +12,4 @@ KDE4_L10N=	id
 
 IGNORE=		is not included in KDE SC ${KDE4_VERSION}
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-is/Makefile b/misc/kde4-l10n-is/Makefile
index 27371c9..09a96e4 100644
--- a/misc/kde4-l10n-is/Makefile
+++ b/misc/kde4-l10n-is/Makefile
@@ -9,5 +9,4 @@ COMMENT=	Icelandic messages and documentation for KDE SC 4
 
 KDE4_L10N=	is
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-is/pkg-plist b/misc/kde4-l10n-is/pkg-plist
index df0b129..74ad12c 100644
--- a/misc/kde4-l10n-is/pkg-plist
+++ b/misc/kde4-l10n-is/pkg-plist
@@ -162,7 +162,6 @@ share/locale/is/LC_MESSAGES/kfile_kig.mo
 share/locale/is/LC_MESSAGES/kfile_pnm.mo
 share/locale/is/LC_MESSAGES/kfile_raw.mo
 share/locale/is/LC_MESSAGES/kfile_rgb.mo
-share/locale/is/LC_MESSAGES/kfile_rpm.mo
 share/locale/is/LC_MESSAGES/kfile_tiff.mo
 share/locale/is/LC_MESSAGES/kfile_xps.mo
 share/locale/is/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-it/Makefile b/misc/kde4-l10n-it/Makefile
index d06c644..e753e47 100644
--- a/misc/kde4-l10n-it/Makefile
+++ b/misc/kde4-l10n-it/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	it
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-it/pkg-plist b/misc/kde4-l10n-it/pkg-plist
index f71f520..629d870 100644
--- a/misc/kde4-l10n-it/pkg-plist
+++ b/misc/kde4-l10n-it/pkg-plist
@@ -1399,7 +1399,6 @@ share/locale/it/LC_MESSAGES/kfile_mail.mo
 share/locale/it/LC_MESSAGES/kfile_pnm.mo
 share/locale/it/LC_MESSAGES/kfile_raw.mo
 share/locale/it/LC_MESSAGES/kfile_rgb.mo
-share/locale/it/LC_MESSAGES/kfile_rpm.mo
 share/locale/it/LC_MESSAGES/kfile_tiff.mo
 share/locale/it/LC_MESSAGES/kfile_xps.mo
 share/locale/it/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-kk/Makefile b/misc/kde4-l10n-kk/Makefile
index d6f8b86..a4b94cb 100644
--- a/misc/kde4-l10n-kk/Makefile
+++ b/misc/kde4-l10n-kk/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Kazakh messages and documentation for KDE SC 4
 
 KDE4_L10N=	kk
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-kk/pkg-plist b/misc/kde4-l10n-kk/pkg-plist
index f4a13cd..b8c0078 100644
--- a/misc/kde4-l10n-kk/pkg-plist
+++ b/misc/kde4-l10n-kk/pkg-plist
@@ -253,7 +253,6 @@ share/locale/kk/LC_MESSAGES/kfile_mail.mo
 share/locale/kk/LC_MESSAGES/kfile_pnm.mo
 share/locale/kk/LC_MESSAGES/kfile_raw.mo
 share/locale/kk/LC_MESSAGES/kfile_rgb.mo
-share/locale/kk/LC_MESSAGES/kfile_rpm.mo
 share/locale/kk/LC_MESSAGES/kfile_tiff.mo
 share/locale/kk/LC_MESSAGES/kfile_xps.mo
 share/locale/kk/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-km/Makefile b/misc/kde4-l10n-km/Makefile
index f55e126..eda3ac7 100644
--- a/misc/kde4-l10n-km/Makefile
+++ b/misc/kde4-l10n-km/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Khmer messages and documentation for KDE SC 4
 
 KDE4_L10N=	km
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-km/pkg-plist b/misc/kde4-l10n-km/pkg-plist
index 5cea041..cb0ddcc 100644
--- a/misc/kde4-l10n-km/pkg-plist
+++ b/misc/kde4-l10n-km/pkg-plist
@@ -233,7 +233,6 @@ share/locale/km/LC_MESSAGES/kfile_mail.mo
 share/locale/km/LC_MESSAGES/kfile_pnm.mo
 share/locale/km/LC_MESSAGES/kfile_raw.mo
 share/locale/km/LC_MESSAGES/kfile_rgb.mo
-share/locale/km/LC_MESSAGES/kfile_rpm.mo
 share/locale/km/LC_MESSAGES/kfile_tiff.mo
 share/locale/km/LC_MESSAGES/kfile_xps.mo
 share/locale/km/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-kn/Makefile b/misc/kde4-l10n-kn/Makefile
index fb51a8a..3b5cea7 100644
--- a/misc/kde4-l10n-kn/Makefile
+++ b/misc/kde4-l10n-kn/Makefile
@@ -11,5 +11,4 @@ KDE4_L10N=	kn
 
 IGNORE=		is not included in KDE SC ${KDE4_VERSION}
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-lt/Makefile b/misc/kde4-l10n-lt/Makefile
index 76035d0..1448223 100644
--- a/misc/kde4-l10n-lt/Makefile
+++ b/misc/kde4-l10n-lt/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	lt
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-lt/pkg-plist b/misc/kde4-l10n-lt/pkg-plist
index 6569c24..ec5db91 100644
--- a/misc/kde4-l10n-lt/pkg-plist
+++ b/misc/kde4-l10n-lt/pkg-plist
@@ -631,7 +631,6 @@ share/locale/lt/LC_MESSAGES/kfile_mail.mo
 share/locale/lt/LC_MESSAGES/kfile_pnm.mo
 share/locale/lt/LC_MESSAGES/kfile_raw.mo
 share/locale/lt/LC_MESSAGES/kfile_rgb.mo
-share/locale/lt/LC_MESSAGES/kfile_rpm.mo
 share/locale/lt/LC_MESSAGES/kfile_tiff.mo
 share/locale/lt/LC_MESSAGES/kfile_xps.mo
 share/locale/lt/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-lv/Makefile b/misc/kde4-l10n-lv/Makefile
index da6dda4..225a58d 100644
--- a/misc/kde4-l10n-lv/Makefile
+++ b/misc/kde4-l10n-lv/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Latvian messages and documentation for KDE SC 4
 
 KDE4_L10N=	lv
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-lv/pkg-plist b/misc/kde4-l10n-lv/pkg-plist
index 0b5fd2b..f1d5462 100644
--- a/misc/kde4-l10n-lv/pkg-plist
+++ b/misc/kde4-l10n-lv/pkg-plist
@@ -228,7 +228,6 @@ share/locale/lv/LC_MESSAGES/kfile_kig.mo
 share/locale/lv/LC_MESSAGES/kfile_pnm.mo
 share/locale/lv/LC_MESSAGES/kfile_raw.mo
 share/locale/lv/LC_MESSAGES/kfile_rgb.mo
-share/locale/lv/LC_MESSAGES/kfile_rpm.mo
 share/locale/lv/LC_MESSAGES/kfile_tiff.mo
 share/locale/lv/LC_MESSAGES/kfile_xps.mo
 share/locale/lv/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-mai/Makefile b/misc/kde4-l10n-mai/Makefile
index c11e5a8..70e2428 100644
--- a/misc/kde4-l10n-mai/Makefile
+++ b/misc/kde4-l10n-mai/Makefile
@@ -11,5 +11,4 @@ KDE4_L10N=	mai
 
 IGNORE=		is not included in KDE SC ${KDE4_VERSION}
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-mk/Makefile b/misc/kde4-l10n-mk/Makefile
index ef44cfd..280adb8 100644
--- a/misc/kde4-l10n-mk/Makefile
+++ b/misc/kde4-l10n-mk/Makefile
@@ -12,5 +12,4 @@ KDE4_L10N=	mk
 
 IGNORE=		is not included in KDE SC ${KDE4_VERSION}
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-mk/pkg-plist b/misc/kde4-l10n-mk/pkg-plist
index b88c528..6d18ec2 100644
--- a/misc/kde4-l10n-mk/pkg-plist
+++ b/misc/kde4-l10n-mk/pkg-plist
@@ -137,7 +137,6 @@ share/locale/mk/LC_MESSAGES/kfile_kig.mo
 share/locale/mk/LC_MESSAGES/kfile_pnm.mo
 share/locale/mk/LC_MESSAGES/kfile_raw.mo
 share/locale/mk/LC_MESSAGES/kfile_rgb.mo
-share/locale/mk/LC_MESSAGES/kfile_rpm.mo
 share/locale/mk/LC_MESSAGES/kfile_tiff.mo
 share/locale/mk/LC_MESSAGES/kfile_xps.mo
 share/locale/mk/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-ml/Makefile b/misc/kde4-l10n-ml/Makefile
index d3a2b46..dbd7849 100644
--- a/misc/kde4-l10n-ml/Makefile
+++ b/misc/kde4-l10n-ml/Makefile
@@ -12,5 +12,4 @@ KDE4_L10N=	ml
 
 IGNORE=		is not included in KDE SC ${KDE4_VERSION}
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-mr/Makefile b/misc/kde4-l10n-mr/Makefile
index c1bba9b..c2998e7 100644
--- a/misc/kde4-l10n-mr/Makefile
+++ b/misc/kde4-l10n-mr/Makefile
@@ -9,5 +9,4 @@ COMMENT=	Marathi messages and documentation for KDE SC 4
 
 KDE4_L10N=	mr
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-mr/pkg-plist b/misc/kde4-l10n-mr/pkg-plist
index 3374d33..243edd8 100644
--- a/misc/kde4-l10n-mr/pkg-plist
+++ b/misc/kde4-l10n-mr/pkg-plist
@@ -253,7 +253,6 @@ share/locale/mr/LC_MESSAGES/kfile_mail.mo
 share/locale/mr/LC_MESSAGES/kfile_pnm.mo
 share/locale/mr/LC_MESSAGES/kfile_raw.mo
 share/locale/mr/LC_MESSAGES/kfile_rgb.mo
-share/locale/mr/LC_MESSAGES/kfile_rpm.mo
 share/locale/mr/LC_MESSAGES/kfile_tiff.mo
 share/locale/mr/LC_MESSAGES/kfile_xps.mo
 share/locale/mr/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-nb/Makefile b/misc/kde4-l10n-nb/Makefile
index 277469d..5148e5b 100644
--- a/misc/kde4-l10n-nb/Makefile
+++ b/misc/kde4-l10n-nb/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	nb
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-nb/pkg-plist b/misc/kde4-l10n-nb/pkg-plist
index bd2e7fc..63797f7 100644
--- a/misc/kde4-l10n-nb/pkg-plist
+++ b/misc/kde4-l10n-nb/pkg-plist
@@ -384,7 +384,6 @@ share/locale/nb/LC_MESSAGES/kfile_mail.mo
 share/locale/nb/LC_MESSAGES/kfile_pnm.mo
 share/locale/nb/LC_MESSAGES/kfile_raw.mo
 share/locale/nb/LC_MESSAGES/kfile_rgb.mo
-share/locale/nb/LC_MESSAGES/kfile_rpm.mo
 share/locale/nb/LC_MESSAGES/kfile_tiff.mo
 share/locale/nb/LC_MESSAGES/kfile_xps.mo
 share/locale/nb/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-nds/Makefile b/misc/kde4-l10n-nds/Makefile
index 9146fc2..1ec0872 100644
--- a/misc/kde4-l10n-nds/Makefile
+++ b/misc/kde4-l10n-nds/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Low German localized messages and documentation for KDE SC 4
 
 KDE4_L10N=	nds
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-nds/pkg-plist b/misc/kde4-l10n-nds/pkg-plist
index e9203b4..f6cb3f1 100644
--- a/misc/kde4-l10n-nds/pkg-plist
+++ b/misc/kde4-l10n-nds/pkg-plist
@@ -376,7 +376,6 @@ share/locale/nds/LC_MESSAGES/kfile_mail.mo
 share/locale/nds/LC_MESSAGES/kfile_pnm.mo
 share/locale/nds/LC_MESSAGES/kfile_raw.mo
 share/locale/nds/LC_MESSAGES/kfile_rgb.mo
-share/locale/nds/LC_MESSAGES/kfile_rpm.mo
 share/locale/nds/LC_MESSAGES/kfile_tiff.mo
 share/locale/nds/LC_MESSAGES/kfile_xps.mo
 share/locale/nds/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-nl/Makefile b/misc/kde4-l10n-nl/Makefile
index 470a919..54432c0 100644
--- a/misc/kde4-l10n-nl/Makefile
+++ b/misc/kde4-l10n-nl/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	nl
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-nl/pkg-plist b/misc/kde4-l10n-nl/pkg-plist
index e53ae03..c5196a7 100644
--- a/misc/kde4-l10n-nl/pkg-plist
+++ b/misc/kde4-l10n-nl/pkg-plist
@@ -1473,7 +1473,6 @@ share/locale/nl/LC_MESSAGES/kfile_mail.mo
 share/locale/nl/LC_MESSAGES/kfile_pnm.mo
 share/locale/nl/LC_MESSAGES/kfile_raw.mo
 share/locale/nl/LC_MESSAGES/kfile_rgb.mo
-share/locale/nl/LC_MESSAGES/kfile_rpm.mo
 share/locale/nl/LC_MESSAGES/kfile_tiff.mo
 share/locale/nl/LC_MESSAGES/kfile_xps.mo
 share/locale/nl/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-nn/Makefile b/misc/kde4-l10n-nn/Makefile
index 202967e..becf0a7 100644
--- a/misc/kde4-l10n-nn/Makefile
+++ b/misc/kde4-l10n-nn/Makefile
@@ -12,5 +12,4 @@ KDE4_L10N=	nn
 
 MANLANG=	${KDE4_L10N}
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-nn/pkg-plist b/misc/kde4-l10n-nn/pkg-plist
index 2de3b40..46fd0bc 100644
--- a/misc/kde4-l10n-nn/pkg-plist
+++ b/misc/kde4-l10n-nn/pkg-plist
@@ -234,7 +234,6 @@ share/locale/nn/LC_MESSAGES/kfile_kig.mo
 share/locale/nn/LC_MESSAGES/kfile_pnm.mo
 share/locale/nn/LC_MESSAGES/kfile_raw.mo
 share/locale/nn/LC_MESSAGES/kfile_rgb.mo
-share/locale/nn/LC_MESSAGES/kfile_rpm.mo
 share/locale/nn/LC_MESSAGES/kfile_tiff.mo
 share/locale/nn/LC_MESSAGES/kfile_xps.mo
 share/locale/nn/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-pa/Makefile b/misc/kde4-l10n-pa/Makefile
index 6de3c86..73a0e38 100644
--- a/misc/kde4-l10n-pa/Makefile
+++ b/misc/kde4-l10n-pa/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Panjabi messages and documentation for KDE SC 4
 
 KDE4_L10N=	pa
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-pa/pkg-plist b/misc/kde4-l10n-pa/pkg-plist
index 18331f6..4927a66 100644
--- a/misc/kde4-l10n-pa/pkg-plist
+++ b/misc/kde4-l10n-pa/pkg-plist
@@ -246,7 +246,6 @@ share/locale/pa/LC_MESSAGES/kfile_mail.mo
 share/locale/pa/LC_MESSAGES/kfile_pnm.mo
 share/locale/pa/LC_MESSAGES/kfile_raw.mo
 share/locale/pa/LC_MESSAGES/kfile_rgb.mo
-share/locale/pa/LC_MESSAGES/kfile_rpm.mo
 share/locale/pa/LC_MESSAGES/kfile_tiff.mo
 share/locale/pa/LC_MESSAGES/kfile_xps.mo
 share/locale/pa/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-ro/Makefile b/misc/kde4-l10n-ro/Makefile
index b80f159..e6cb76c 100644
--- a/misc/kde4-l10n-ro/Makefile
+++ b/misc/kde4-l10n-ro/Makefile
@@ -9,5 +9,4 @@ COMMENT=	Romanian messages and documentation for KDE SC 4
 
 KDE4_L10N=	ro
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-ro/pkg-plist b/misc/kde4-l10n-ro/pkg-plist
index a1199a0..f2389b9 100644
--- a/misc/kde4-l10n-ro/pkg-plist
+++ b/misc/kde4-l10n-ro/pkg-plist
@@ -302,7 +302,6 @@ share/locale/ro/LC_MESSAGES/kfile_mail.mo
 share/locale/ro/LC_MESSAGES/kfile_pnm.mo
 share/locale/ro/LC_MESSAGES/kfile_raw.mo
 share/locale/ro/LC_MESSAGES/kfile_rgb.mo
-share/locale/ro/LC_MESSAGES/kfile_rpm.mo
 share/locale/ro/LC_MESSAGES/kfile_tiff.mo
 share/locale/ro/LC_MESSAGES/kfile_xps.mo
 share/locale/ro/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-si/Makefile b/misc/kde4-l10n-si/Makefile
index 93d9b96..97174f39 100644
--- a/misc/kde4-l10n-si/Makefile
+++ b/misc/kde4-l10n-si/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Sinhalese messages and documentation for KDE SC 4
 
 KDE4_L10N=	si
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-sk/Makefile b/misc/kde4-l10n-sk/Makefile
index 9116499..f3ab00411 100644
--- a/misc/kde4-l10n-sk/Makefile
+++ b/misc/kde4-l10n-sk/Makefile
@@ -9,5 +9,4 @@ COMMENT=	Slovak messages and documentation for KDE SC 4
 
 KDE4_L10N=	sk
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-sk/pkg-plist b/misc/kde4-l10n-sk/pkg-plist
index 087cb0c..80180c9 100644
--- a/misc/kde4-l10n-sk/pkg-plist
+++ b/misc/kde4-l10n-sk/pkg-plist
@@ -253,7 +253,6 @@ share/locale/sk/LC_MESSAGES/kfile_mail.mo
 share/locale/sk/LC_MESSAGES/kfile_pnm.mo
 share/locale/sk/LC_MESSAGES/kfile_raw.mo
 share/locale/sk/LC_MESSAGES/kfile_rgb.mo
-share/locale/sk/LC_MESSAGES/kfile_rpm.mo
 share/locale/sk/LC_MESSAGES/kfile_tiff.mo
 share/locale/sk/LC_MESSAGES/kfile_xps.mo
 share/locale/sk/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-sl/Makefile b/misc/kde4-l10n-sl/Makefile
index 3a331af..6f56de7 100644
--- a/misc/kde4-l10n-sl/Makefile
+++ b/misc/kde4-l10n-sl/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Slovenian messages and documentation for KDE SC 4
 
 KDE4_L10N=	sl
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-sl/pkg-plist b/misc/kde4-l10n-sl/pkg-plist
index fed2fcf..a176b16 100644
--- a/misc/kde4-l10n-sl/pkg-plist
+++ b/misc/kde4-l10n-sl/pkg-plist
@@ -254,7 +254,6 @@ share/locale/sl/LC_MESSAGES/kfile_mail.mo
 share/locale/sl/LC_MESSAGES/kfile_pnm.mo
 share/locale/sl/LC_MESSAGES/kfile_raw.mo
 share/locale/sl/LC_MESSAGES/kfile_rgb.mo
-share/locale/sl/LC_MESSAGES/kfile_rpm.mo
 share/locale/sl/LC_MESSAGES/kfile_tiff.mo
 share/locale/sl/LC_MESSAGES/kfile_xps.mo
 share/locale/sl/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-sr/Makefile b/misc/kde4-l10n-sr/Makefile
index ebe5693..2901466 100644
--- a/misc/kde4-l10n-sr/Makefile
+++ b/misc/kde4-l10n-sr/Makefile
@@ -12,5 +12,4 @@ KDE4_L10N=	sr
 MANLANG=	${KDE4_L10N} sr@latin
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-sv/Makefile b/misc/kde4-l10n-sv/Makefile
index d915b28..cb7d550 100644
--- a/misc/kde4-l10n-sv/Makefile
+++ b/misc/kde4-l10n-sv/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	sv
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-sv/pkg-plist b/misc/kde4-l10n-sv/pkg-plist
index 84f217a..c86a67a 100644
--- a/misc/kde4-l10n-sv/pkg-plist
+++ b/misc/kde4-l10n-sv/pkg-plist
@@ -1672,7 +1672,6 @@ share/locale/sv/LC_MESSAGES/kfile_mail.mo
 share/locale/sv/LC_MESSAGES/kfile_pnm.mo
 share/locale/sv/LC_MESSAGES/kfile_raw.mo
 share/locale/sv/LC_MESSAGES/kfile_rgb.mo
-share/locale/sv/LC_MESSAGES/kfile_rpm.mo
 share/locale/sv/LC_MESSAGES/kfile_tiff.mo
 share/locale/sv/LC_MESSAGES/kfile_xps.mo
 share/locale/sv/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-tg/Makefile b/misc/kde4-l10n-tg/Makefile
index fa22a7c..c564300 100644
--- a/misc/kde4-l10n-tg/Makefile
+++ b/misc/kde4-l10n-tg/Makefile
@@ -9,5 +9,4 @@ COMMENT=	Tajik messages and documentation for KDE SC 4
 
 KDE4_L10N=	tg
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-tg/pkg-plist b/misc/kde4-l10n-tg/pkg-plist
index 12f964c..f7f48fd 100644
--- a/misc/kde4-l10n-tg/pkg-plist
+++ b/misc/kde4-l10n-tg/pkg-plist
@@ -142,7 +142,6 @@ share/locale/tg/LC_MESSAGES/kfile_exr.mo
 share/locale/tg/LC_MESSAGES/kfile_kig.mo
 share/locale/tg/LC_MESSAGES/kfile_pnm.mo
 share/locale/tg/LC_MESSAGES/kfile_rgb.mo
-share/locale/tg/LC_MESSAGES/kfile_rpm.mo
 share/locale/tg/LC_MESSAGES/kfile_tiff.mo
 share/locale/tg/LC_MESSAGES/kfileaudiopreview4.mo
 share/locale/tg/LC_MESSAGES/kfilereplace.mo
diff --git a/misc/kde4-l10n-th/Makefile b/misc/kde4-l10n-th/Makefile
index ba20079..6ad27c1 100644
--- a/misc/kde4-l10n-th/Makefile
+++ b/misc/kde4-l10n-th/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Thai messages and documentation for KDE SC 4
 
 KDE4_L10N=	th
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-th/pkg-plist b/misc/kde4-l10n-th/pkg-plist
index 9768758..2f77c9e 100644
--- a/misc/kde4-l10n-th/pkg-plist
+++ b/misc/kde4-l10n-th/pkg-plist
@@ -161,7 +161,6 @@ share/locale/th/LC_MESSAGES/kfile_kig.mo
 share/locale/th/LC_MESSAGES/kfile_pnm.mo
 share/locale/th/LC_MESSAGES/kfile_raw.mo
 share/locale/th/LC_MESSAGES/kfile_rgb.mo
-share/locale/th/LC_MESSAGES/kfile_rpm.mo
 share/locale/th/LC_MESSAGES/kfile_tiff.mo
 share/locale/th/LC_MESSAGES/kfile_xps.mo
 share/locale/th/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-tr/Makefile b/misc/kde4-l10n-tr/Makefile
index a99a1c5..957e755 100644
--- a/misc/kde4-l10n-tr/Makefile
+++ b/misc/kde4-l10n-tr/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	tr
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-tr/pkg-plist b/misc/kde4-l10n-tr/pkg-plist
index 001785f..cb39e2b 100644
--- a/misc/kde4-l10n-tr/pkg-plist
+++ b/misc/kde4-l10n-tr/pkg-plist
@@ -351,7 +351,6 @@ share/locale/tr/LC_MESSAGES/kfile_mail.mo
 share/locale/tr/LC_MESSAGES/kfile_pnm.mo
 share/locale/tr/LC_MESSAGES/kfile_raw.mo
 share/locale/tr/LC_MESSAGES/kfile_rgb.mo
-share/locale/tr/LC_MESSAGES/kfile_rpm.mo
 share/locale/tr/LC_MESSAGES/kfile_tiff.mo
 share/locale/tr/LC_MESSAGES/kfile_xps.mo
 share/locale/tr/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-ug/Makefile b/misc/kde4-l10n-ug/Makefile
index 2a6d844..f18ed79 100644
--- a/misc/kde4-l10n-ug/Makefile
+++ b/misc/kde4-l10n-ug/Makefile
@@ -9,5 +9,4 @@ COMMENT=	Uighur messages and documentation for KDE SC 4
 
 KDE4_L10N=	ug
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-ug/pkg-plist b/misc/kde4-l10n-ug/pkg-plist
index d383d46..4f75fe1 100644
--- a/misc/kde4-l10n-ug/pkg-plist
+++ b/misc/kde4-l10n-ug/pkg-plist
@@ -234,7 +234,6 @@ share/locale/ug/LC_MESSAGES/kfile_mail.mo
 share/locale/ug/LC_MESSAGES/kfile_pnm.mo
 share/locale/ug/LC_MESSAGES/kfile_raw.mo
 share/locale/ug/LC_MESSAGES/kfile_rgb.mo
-share/locale/ug/LC_MESSAGES/kfile_rpm.mo
 share/locale/ug/LC_MESSAGES/kfile_tiff.mo
 share/locale/ug/LC_MESSAGES/kfile_xps.mo
 share/locale/ug/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/misc/kde4-l10n-wa/Makefile b/misc/kde4-l10n-wa/Makefile
index 0ac9e86..0123620 100644
--- a/misc/kde4-l10n-wa/Makefile
+++ b/misc/kde4-l10n-wa/Makefile
@@ -10,5 +10,4 @@ COMMENT=	Walloon messages and documentation for KDE SC 4
 
 KDE4_L10N=	wa
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kde4-l10n-wa/pkg-plist b/misc/kde4-l10n-wa/pkg-plist
index 6f7739e..46b5801 100644
--- a/misc/kde4-l10n-wa/pkg-plist
+++ b/misc/kde4-l10n-wa/pkg-plist
@@ -189,7 +189,6 @@ share/locale/wa/LC_MESSAGES/kfile.mo
 share/locale/wa/LC_MESSAGES/kfile_pnm.mo
 share/locale/wa/LC_MESSAGES/kfile_raw.mo
 share/locale/wa/LC_MESSAGES/kfile_rgb.mo
-share/locale/wa/LC_MESSAGES/kfile_rpm.mo
 share/locale/wa/LC_MESSAGES/kfileaudiopreview4.mo
 share/locale/wa/LC_MESSAGES/kfindpart.mo
 share/locale/wa/LC_MESSAGES/kfloppy.mo
diff --git a/misc/kde4-l10n/files/bsd.l10n.mk b/misc/kde4-l10n/files/bsd.l10n.mk
index 6bbcbdd..95ece11 100644
--- a/misc/kde4-l10n/files/bsd.l10n.mk
+++ b/misc/kde4-l10n/files/bsd.l10n.mk
@@ -51,11 +51,6 @@ ${KDE4_L10N}_${i}_PORT_SUFFIX?=	#
 ${KDE4_L10N}_${i}_PORT?=	${${KDE4_L10N}_CATEGORY}/${${KDE4_L10N}_${i}_PORT_PREFIX}${i}${${KDE4_L10N}_${i}_PORT_SUFFIX}
 .endfor
 
-.include <bsd.port.pre.mk>
-
-OPTIONS_DEFINE=		#
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
-
 .if exists(${PORTSDIR}/${${KDE4_L10N}_aspell_PORT}/Makefile)
 OPTIONS_DEFINE+=	ASPELL
 ASPELL_DESC=		Install aspell dictionary
@@ -66,12 +61,5 @@ OPTIONS_DEFINE+=	HUNSPELL
 HUNSPELL_DESC=		Install hunspell dictionary
 .endif
 
-.include <bsd.port.options.mk>
-
-.if ${OPTIONS_DEFINE:MASPELL} && ${PORT_OPTIONS:MASPELL}
-RUN_DEPENDS+=	${${KDE4_L10N}_aspell_DETECT}:${PORTSDIR}/${${KDE4_L10N}_aspell_PORT}
-.endif
-
-.if ${OPTIONS_DEFINE:MHUNSPELL} && ${PORT_OPTIONS:MHUNSPELL}
-RUN_DEPENDS+=	${${KDE4_L10N}_hunspell_DETECT}:${PORTSDIR}/${${KDE4_L10N}_hunspell_PORT}
-.endif
+ASPELL_RUN_DEPENDS+=	${${KDE4_L10N}_aspell_DETECT}:${PORTSDIR}/${${KDE4_L10N}_aspell_PORT}
+HUNSPELL_RUN_DEPENDS+=	${${KDE4_L10N}_hunspell_DETECT}:${PORTSDIR}/${${KDE4_L10N}_hunspell_PORT}
diff --git a/polish/kde4-l10n/Makefile b/polish/kde4-l10n/Makefile
index 5395c08..01b28ef 100644
--- a/polish/kde4-l10n/Makefile
+++ b/polish/kde4-l10n/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	pl
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/polish/kde4-l10n/pkg-plist b/polish/kde4-l10n/pkg-plist
index 3d543cd..7abd359 100644
--- a/polish/kde4-l10n/pkg-plist
+++ b/polish/kde4-l10n/pkg-plist
@@ -1072,7 +1072,6 @@ share/locale/pl/LC_MESSAGES/kfile_mail.mo
 share/locale/pl/LC_MESSAGES/kfile_pnm.mo
 share/locale/pl/LC_MESSAGES/kfile_raw.mo
 share/locale/pl/LC_MESSAGES/kfile_rgb.mo
-share/locale/pl/LC_MESSAGES/kfile_rpm.mo
 share/locale/pl/LC_MESSAGES/kfile_tiff.mo
 share/locale/pl/LC_MESSAGES/kfile_xps.mo
 share/locale/pl/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/portuguese/kde4-l10n-pt_BR/Makefile b/portuguese/kde4-l10n-pt_BR/Makefile
index c1c7914..4532db4 100644
--- a/portuguese/kde4-l10n-pt_BR/Makefile
+++ b/portuguese/kde4-l10n-pt_BR/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	pt_BR
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/portuguese/kde4-l10n-pt_BR/pkg-plist b/portuguese/kde4-l10n-pt_BR/pkg-plist
index f7905d7..50fd67c 100644
--- a/portuguese/kde4-l10n-pt_BR/pkg-plist
+++ b/portuguese/kde4-l10n-pt_BR/pkg-plist
@@ -1735,7 +1735,6 @@ share/locale/pt_BR/LC_MESSAGES/kfile_mail.mo
 share/locale/pt_BR/LC_MESSAGES/kfile_pnm.mo
 share/locale/pt_BR/LC_MESSAGES/kfile_raw.mo
 share/locale/pt_BR/LC_MESSAGES/kfile_rgb.mo
-share/locale/pt_BR/LC_MESSAGES/kfile_rpm.mo
 share/locale/pt_BR/LC_MESSAGES/kfile_tiff.mo
 share/locale/pt_BR/LC_MESSAGES/kfile_xps.mo
 share/locale/pt_BR/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/portuguese/kde4-l10n/Makefile b/portuguese/kde4-l10n/Makefile
index 65de15b..7388b16 100644
--- a/portuguese/kde4-l10n/Makefile
+++ b/portuguese/kde4-l10n/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	pt
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/portuguese/kde4-l10n/pkg-plist b/portuguese/kde4-l10n/pkg-plist
index 0ddc70b..1ba53c7 100644
--- a/portuguese/kde4-l10n/pkg-plist
+++ b/portuguese/kde4-l10n/pkg-plist
@@ -1221,7 +1221,6 @@ share/locale/pt/LC_MESSAGES/kfile_mail.mo
 share/locale/pt/LC_MESSAGES/kfile_pnm.mo
 share/locale/pt/LC_MESSAGES/kfile_raw.mo
 share/locale/pt/LC_MESSAGES/kfile_rgb.mo
-share/locale/pt/LC_MESSAGES/kfile_rpm.mo
 share/locale/pt/LC_MESSAGES/kfile_tiff.mo
 share/locale/pt/LC_MESSAGES/kfile_xps.mo
 share/locale/pt/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/russian/kde4-l10n/Makefile b/russian/kde4-l10n/Makefile
index 462dac4..fee9ab8 100644
--- a/russian/kde4-l10n/Makefile
+++ b/russian/kde4-l10n/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	ru
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/russian/kde4-l10n/pkg-plist b/russian/kde4-l10n/pkg-plist
index f3df71a..b467838 100644
--- a/russian/kde4-l10n/pkg-plist
+++ b/russian/kde4-l10n/pkg-plist
@@ -1222,7 +1222,6 @@ share/locale/ru/LC_MESSAGES/kfile_mail.mo
 share/locale/ru/LC_MESSAGES/kfile_pnm.mo
 share/locale/ru/LC_MESSAGES/kfile_raw.mo
 share/locale/ru/LC_MESSAGES/kfile_rgb.mo
-share/locale/ru/LC_MESSAGES/kfile_rpm.mo
 share/locale/ru/LC_MESSAGES/kfile_tiff.mo
 share/locale/ru/LC_MESSAGES/kfile_xps.mo
 share/locale/ru/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/ukrainian/kde4-l10n/Makefile b/ukrainian/kde4-l10n/Makefile
index 8bd8f9c..5947796 100644
--- a/ukrainian/kde4-l10n/Makefile
+++ b/ukrainian/kde4-l10n/Makefile
@@ -13,5 +13,4 @@ KDE4_L10N=	uk
 MANLANG=	${KDE4_L10N}
 .include <${.CURDIR}/Makefile.man>
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/ukrainian/kde4-l10n/pkg-plist b/ukrainian/kde4-l10n/pkg-plist
index b11e90d..693cbdf 100644
--- a/ukrainian/kde4-l10n/pkg-plist
+++ b/ukrainian/kde4-l10n/pkg-plist
@@ -2108,7 +2108,6 @@ share/locale/uk/LC_MESSAGES/kfile_mail.mo
 share/locale/uk/LC_MESSAGES/kfile_pnm.mo
 share/locale/uk/LC_MESSAGES/kfile_raw.mo
 share/locale/uk/LC_MESSAGES/kfile_rgb.mo
-share/locale/uk/LC_MESSAGES/kfile_rpm.mo
 share/locale/uk/LC_MESSAGES/kfile_tiff.mo
 share/locale/uk/LC_MESSAGES/kfile_xps.mo
 share/locale/uk/LC_MESSAGES/kfileaudiopreview4.mo
diff --git a/vietnamese/kde4-l10n/Makefile b/vietnamese/kde4-l10n/Makefile
index abd8a33..41c294a 100644
--- a/vietnamese/kde4-l10n/Makefile
+++ b/vietnamese/kde4-l10n/Makefile
@@ -9,5 +9,4 @@ COMMENT=	Vietnamese messages and documentation for KDE SC 4
 
 KDE4_L10N=	vi
 
-.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>