3 files changed, 100 insertions, 111 deletions

diff --git a/misc/qt4-l10n/Makefile b/misc/qt4-l10n/Makefile
index a82904352075..b9adce593c37 100644
--- a/misc/qt4-l10n/Makefile
+++ b/misc/qt4-l10n/Makefile
@@ -2,23 +2,24 @@
 
 PORTNAME=	l10n
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	misc
+CATEGORIES=	misc
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt translations messages
+COMMENT=	Qt localized messages
 
 USE_QT4=	linguist_build
 QT_DIST=	yes
-QT_NONSTANDARD=	yes
 
 EXTRACT_AFTER_ARGS+=	--include '${DISTNAME}/translations'
 
+EXTRA_PATCHES=	# empty
+
 do-build:
-	${LOCALBASE}/bin/lrelease-qt4 ${WRKSRC}/translations/*.ts
+	${QT_BINDIR}/lrelease${_QT_BINSUFX} ${WRKSRC}/translations/*.ts
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/qt4/translations
-	${INSTALL_DATA} ${WRKSRC}/translations/*.qm ${STAGEDIR}${PREFIX}/share/qt4/translations
+	${MKDIR} ${STAGEDIR}${PREFIX}/${QT_L10NDIR_REL}
+	${INSTALL_DATA} ${WRKSRC}/translations/*.qm ${STAGEDIR}${PREFIX}/${QT_L10NDIR_REL}
 
 .include <bsd.port.mk>
diff --git a/misc/qt4-l10n/pkg-descr b/misc/qt4-l10n/pkg-descr
deleted file mode 100644
index 36bc69717e98..000000000000
--- a/misc/qt4-l10n/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Qt is a C++ toolkit for application development.  It lets application
-developers target all major operating systems with a single application
-source code.
-
-Qt provides a platform-independent API to all central platform functionality:
-GUI, database access, networking, file handling, etc.  The Qt library
-encapsulates the different APIs of different operating systems, providing
-the application programmer with a single, common API for all operating systems.
-The native C APIs are encapsulated in a set of well-designed, fully
-object-oriented C++ classes. 
-
-WWW: http://qt.nokia.com/products/qt/index.html
diff --git a/misc/qt4-l10n/pkg-plist b/misc/qt4-l10n/pkg-plist
index c64869066557..09b0ecfda907 100644
--- a/misc/qt4-l10n/pkg-plist
+++ b/misc/qt4-l10n/pkg-plist
@@ -1,93 +1,93 @@
-share/qt4/translations/assistant_cs.qm
-share/qt4/translations/assistant_da.qm
-share/qt4/translations/assistant_de.qm
-share/qt4/translations/assistant_fr.qm
-share/qt4/translations/assistant_hu.qm
-share/qt4/translations/assistant_ja.qm
-share/qt4/translations/assistant_ko.qm
-share/qt4/translations/assistant_pl.qm
-share/qt4/translations/assistant_ru.qm
-share/qt4/translations/assistant_sl.qm
-share/qt4/translations/assistant_uk.qm
-share/qt4/translations/assistant_zh_CN.qm
-share/qt4/translations/assistant_zh_TW.qm
-share/qt4/translations/designer_cs.qm
-share/qt4/translations/designer_de.qm
-share/qt4/translations/designer_fr.qm
-share/qt4/translations/designer_hu.qm
-share/qt4/translations/designer_ja.qm
-share/qt4/translations/designer_ko.qm
-share/qt4/translations/designer_pl.qm
-share/qt4/translations/designer_ru.qm
-share/qt4/translations/designer_sl.qm
-share/qt4/translations/designer_uk.qm
-share/qt4/translations/designer_zh_CN.qm
-share/qt4/translations/designer_zh_TW.qm
-share/qt4/translations/linguist_cs.qm
-share/qt4/translations/linguist_de.qm
-share/qt4/translations/linguist_fr.qm
-share/qt4/translations/linguist_hu.qm
-share/qt4/translations/linguist_ja.qm
-share/qt4/translations/linguist_ko.qm
-share/qt4/translations/linguist_pl.qm
-share/qt4/translations/linguist_ru.qm
-share/qt4/translations/linguist_sl.qm
-share/qt4/translations/linguist_uk.qm
-share/qt4/translations/linguist_zh_CN.qm
-share/qt4/translations/linguist_zh_TW.qm
-share/qt4/translations/qt_ar.qm
-share/qt4/translations/qt_cs.qm
-share/qt4/translations/qt_da.qm
-share/qt4/translations/qt_de.qm
-share/qt4/translations/qt_es.qm
-share/qt4/translations/qt_fa.qm
-share/qt4/translations/qt_fr.qm
-share/qt4/translations/qt_gl.qm
-share/qt4/translations/qt_he.qm
-share/qt4/translations/qt_help_cs.qm
-share/qt4/translations/qt_help_da.qm
-share/qt4/translations/qt_help_de.qm
-share/qt4/translations/qt_help_fr.qm
-share/qt4/translations/qt_help_gl.qm
-share/qt4/translations/qt_help_hu.qm
-share/qt4/translations/qt_help_ja.qm
-share/qt4/translations/qt_help_ko.qm
-share/qt4/translations/qt_help_pl.qm
-share/qt4/translations/qt_help_ru.qm
-share/qt4/translations/qt_help_sl.qm
-share/qt4/translations/qt_help_uk.qm
-share/qt4/translations/qt_help_zh_CN.qm
-share/qt4/translations/qt_help_zh_TW.qm
-share/qt4/translations/qt_hu.qm
-share/qt4/translations/qt_ja.qm
-share/qt4/translations/qt_ko.qm
-share/qt4/translations/qt_lt.qm
-share/qt4/translations/qt_pl.qm
-share/qt4/translations/qt_pt.qm
-share/qt4/translations/qt_ru.qm
-share/qt4/translations/qt_sk.qm
-share/qt4/translations/qt_sl.qm
-share/qt4/translations/qt_sv.qm
-share/qt4/translations/qt_uk.qm
-share/qt4/translations/qt_zh_CN.qm
-share/qt4/translations/qt_zh_TW.qm
-share/qt4/translations/qtconfig_hu.qm
-share/qt4/translations/qtconfig_ja.qm
-share/qt4/translations/qtconfig_ko.qm
-share/qt4/translations/qtconfig_pl.qm
-share/qt4/translations/qtconfig_ru.qm
-share/qt4/translations/qtconfig_sl.qm
-share/qt4/translations/qtconfig_uk.qm
-share/qt4/translations/qtconfig_zh_CN.qm
-share/qt4/translations/qtconfig_zh_TW.qm
-share/qt4/translations/qvfb_hu.qm
-share/qt4/translations/qvfb_ja.qm
-share/qt4/translations/qvfb_ko.qm
-share/qt4/translations/qvfb_pl.qm
-share/qt4/translations/qvfb_ru.qm
-share/qt4/translations/qvfb_sl.qm
-share/qt4/translations/qvfb_uk.qm
-share/qt4/translations/qvfb_zh_CN.qm
-share/qt4/translations/qvfb_zh_TW.qm
-@dirrm share/qt4/translations
-@dirrmtry share/qt4
+%%QT_L10NDIR%%/assistant_cs.qm
+%%QT_L10NDIR%%/assistant_da.qm
+%%QT_L10NDIR%%/assistant_de.qm
+%%QT_L10NDIR%%/assistant_fr.qm
+%%QT_L10NDIR%%/assistant_hu.qm
+%%QT_L10NDIR%%/assistant_ja.qm
+%%QT_L10NDIR%%/assistant_ko.qm
+%%QT_L10NDIR%%/assistant_pl.qm
+%%QT_L10NDIR%%/assistant_ru.qm
+%%QT_L10NDIR%%/assistant_sl.qm
+%%QT_L10NDIR%%/assistant_uk.qm
+%%QT_L10NDIR%%/assistant_zh_CN.qm
+%%QT_L10NDIR%%/assistant_zh_TW.qm
+%%QT_L10NDIR%%/designer_cs.qm
+%%QT_L10NDIR%%/designer_de.qm
+%%QT_L10NDIR%%/designer_fr.qm
+%%QT_L10NDIR%%/designer_hu.qm
+%%QT_L10NDIR%%/designer_ja.qm
+%%QT_L10NDIR%%/designer_ko.qm
+%%QT_L10NDIR%%/designer_pl.qm
+%%QT_L10NDIR%%/designer_ru.qm
+%%QT_L10NDIR%%/designer_sl.qm
+%%QT_L10NDIR%%/designer_uk.qm
+%%QT_L10NDIR%%/designer_zh_CN.qm
+%%QT_L10NDIR%%/designer_zh_TW.qm
+%%QT_L10NDIR%%/linguist_cs.qm
+%%QT_L10NDIR%%/linguist_de.qm
+%%QT_L10NDIR%%/linguist_fr.qm
+%%QT_L10NDIR%%/linguist_hu.qm
+%%QT_L10NDIR%%/linguist_ja.qm
+%%QT_L10NDIR%%/linguist_ko.qm
+%%QT_L10NDIR%%/linguist_pl.qm
+%%QT_L10NDIR%%/linguist_ru.qm
+%%QT_L10NDIR%%/linguist_sl.qm
+%%QT_L10NDIR%%/linguist_uk.qm
+%%QT_L10NDIR%%/linguist_zh_CN.qm
+%%QT_L10NDIR%%/linguist_zh_TW.qm
+%%QT_L10NDIR%%/qt_ar.qm
+%%QT_L10NDIR%%/qt_cs.qm
+%%QT_L10NDIR%%/qt_da.qm
+%%QT_L10NDIR%%/qt_de.qm
+%%QT_L10NDIR%%/qt_es.qm
+%%QT_L10NDIR%%/qt_fa.qm
+%%QT_L10NDIR%%/qt_fr.qm
+%%QT_L10NDIR%%/qt_gl.qm
+%%QT_L10NDIR%%/qt_he.qm
+%%QT_L10NDIR%%/qt_help_cs.qm
+%%QT_L10NDIR%%/qt_help_da.qm
+%%QT_L10NDIR%%/qt_help_de.qm
+%%QT_L10NDIR%%/qt_help_fr.qm
+%%QT_L10NDIR%%/qt_help_gl.qm
+%%QT_L10NDIR%%/qt_help_hu.qm
+%%QT_L10NDIR%%/qt_help_ja.qm
+%%QT_L10NDIR%%/qt_help_ko.qm
+%%QT_L10NDIR%%/qt_help_pl.qm
+%%QT_L10NDIR%%/qt_help_ru.qm
+%%QT_L10NDIR%%/qt_help_sl.qm
+%%QT_L10NDIR%%/qt_help_uk.qm
+%%QT_L10NDIR%%/qt_help_zh_CN.qm
+%%QT_L10NDIR%%/qt_help_zh_TW.qm
+%%QT_L10NDIR%%/qt_hu.qm
+%%QT_L10NDIR%%/qt_ja.qm
+%%QT_L10NDIR%%/qt_ko.qm
+%%QT_L10NDIR%%/qt_lt.qm
+%%QT_L10NDIR%%/qt_pl.qm
+%%QT_L10NDIR%%/qt_pt.qm
+%%QT_L10NDIR%%/qt_ru.qm
+%%QT_L10NDIR%%/qt_sk.qm
+%%QT_L10NDIR%%/qt_sl.qm
+%%QT_L10NDIR%%/qt_sv.qm
+%%QT_L10NDIR%%/qt_uk.qm
+%%QT_L10NDIR%%/qt_zh_CN.qm
+%%QT_L10NDIR%%/qt_zh_TW.qm
+%%QT_L10NDIR%%/qtconfig_hu.qm
+%%QT_L10NDIR%%/qtconfig_ja.qm
+%%QT_L10NDIR%%/qtconfig_ko.qm
+%%QT_L10NDIR%%/qtconfig_pl.qm
+%%QT_L10NDIR%%/qtconfig_ru.qm
+%%QT_L10NDIR%%/qtconfig_sl.qm
+%%QT_L10NDIR%%/qtconfig_uk.qm
+%%QT_L10NDIR%%/qtconfig_zh_CN.qm
+%%QT_L10NDIR%%/qtconfig_zh_TW.qm
+%%QT_L10NDIR%%/qvfb_hu.qm
+%%QT_L10NDIR%%/qvfb_ja.qm
+%%QT_L10NDIR%%/qvfb_ko.qm
+%%QT_L10NDIR%%/qvfb_pl.qm
+%%QT_L10NDIR%%/qvfb_ru.qm
+%%QT_L10NDIR%%/qvfb_sl.qm
+%%QT_L10NDIR%%/qvfb_uk.qm
+%%QT_L10NDIR%%/qvfb_zh_CN.qm
+%%QT_L10NDIR%%/qvfb_zh_TW.qm
+@dirrm %%QT_L10NDIR%%
+@dirrmtry %%QT_DATADIR%%