diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-07-09 21:49:00 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-07-09 21:49:00 +0000 |
| commit | 2c80774ea9e44f876b9af2e57eb6518e34b048e6 (patch) | |
| tree | 21ade7adf550e362a177b17677167207e23451a5 /russian | |
| parent | c9f576c5338b08f896d070b9bdc5e754af345373 (diff) | |
| download | ports-2c80774ea9e44f876b9af2e57eb6518e34b048e6.tar.gz ports-2c80774ea9e44f876b9af2e57eb6518e34b048e6.zip | |
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]
Notes
Notes:
svn path=/head/; revision=322586
Diffstat (limited to 'russian')
| -rw-r--r-- | russian/kde4-l10n/Makefile | 3 | ||||
| -rw-r--r-- | russian/kde4-l10n/pkg-plist | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/russian/kde4-l10n/Makefile b/russian/kde4-l10n/Makefile index 462dac484c34..fee9ab89c683 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 f3df71ac63ef..b4678389b323 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 |