From 2c80774ea9e44f876b9af2e57eb6518e34b048e6 Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Tue, 9 Jul 2013 21:49:00 +0000 Subject: 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 ... .include ... .include First the right order in that case should be: ... .include ... .include ... .include 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] --- french/kde4-l10n/Makefile | 3 +-- french/kde4-l10n/pkg-plist | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'french/kde4-l10n') diff --git a/french/kde4-l10n/Makefile b/french/kde4-l10n/Makefile index ec899e0bf55a..5841717b66fe 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 +.include diff --git a/french/kde4-l10n/pkg-plist b/french/kde4-l10n/pkg-plist index 1070943d6cfd..16b5c6e99deb 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 -- cgit v1.2.3