4 files changed, 33 insertions, 34 deletions

diff --git a/textproc/qstardict/Makefile b/textproc/qstardict/Makefile
index 1273ccb76ce3..e13ce6d56923 100644
--- a/textproc/qstardict/Makefile
+++ b/textproc/qstardict/Makefile
@@ -6,23 +6,20 @@
 #
 
 PORTNAME=	qstardict
-PORTVERSION=	0.12.9
+PORTVERSION=	0.13.1
 CATEGORIES=	textproc
-MASTER_SITES=	http://qstardict.ylsoftware.com/files/ \
-		ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
+MASTER_SITES=	http://qstardict.ylsoftware.com/files/
 
-MAINTAINER=	makc@issp.ac.ru
+MAINTAINER=	makc@FreeBSD.org
 COMMENT=	A StarDict clone written with using Qt4
 
 USE_BZIP2=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	gui network xml qmake_build uic_build moc_build rcc_build
-QMAKE_ARGS+=	 -recursive SEPARATE_TRANSLATIONS=1
+QMAKE_ARGS+=	-recursive
 USE_DOS2UNIX=	qstardict.pri
 
-DICPATH=	${PREFIX}/share/stardict/dic
-
-PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL README THANKS
+DICPATH=	${LOCALBASE}/share/stardict/dic
 
 OPTIONS=	DBUS "Enable D-BUS support" on
 
@@ -44,8 +41,10 @@ LIB_DEPENDS+=	QtDBus.4:${PORTSDIR}/devel/dbus-qt4
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr|${PREFIX}|g" \
 		${WRKSRC}/qstardict.pri
+.if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e "/^INSTALLS/s|docs||g" \
 		${WRKSRC}/qstardict.pro
+.endif
 	@${REINPLACE_CMD} -e "s|/usr/share/stardict/dic|${DICPATH}|g" \
 		${WRKSRC}/plugins/stardict/stardict.cpp
 
@@ -57,12 +56,6 @@ post-configure:
 		's|^CC .*|CC=${CC}|; s|^CXX .*|CXX=${CXX}|; s|^LINK .*|LINK=${CXX}|'
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-.endfor
-.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/textproc/qstardict/distinfo b/textproc/qstardict/distinfo
index 8cab421353bd..0e0f91813f6e 100644
--- a/textproc/qstardict/distinfo
+++ b/textproc/qstardict/distinfo
@@ -1,3 +1,3 @@
-MD5 (qstardict-0.12.9.tar.bz2) = 229f29065fd3831b7b678e85cf3ef2c9
-SHA256 (qstardict-0.12.9.tar.bz2) = f903d6960dd18b54a7442b573bce1f441aff198930380f23ca75c24d09fb673b
-SIZE (qstardict-0.12.9.tar.bz2) = 311769
+MD5 (qstardict-0.13.1.tar.bz2) = 0828c3fa01c5237db8a67d356a9d1a8c
+SHA256 (qstardict-0.13.1.tar.bz2) = 52cb7b699159a804158045d2ae79bf80ce28e2febc2bb3e808784242d829c9ee
+SIZE (qstardict-0.13.1.tar.bz2) = 385053
diff --git a/textproc/qstardict/files/patch-qstardict.pri b/textproc/qstardict/files/patch-qstardict.pri
index 289ca40fe98a..fc0e21564fd1 100644
--- a/textproc/qstardict/files/patch-qstardict.pri
+++ b/textproc/qstardict/files/patch-qstardict.pri
@@ -1,10 +1,10 @@
---- ./qstardict.pri.orig	2008-06-12 12:55:49.000000000 +0400
-+++ ./qstardict.pri	2008-06-12 12:56:16.000000000 +0400
-@@ -36,7 +36,6 @@
- windows:LIBS += -lzdll
+--- ./qstardict.pri.orig	2009-02-03 21:36:16.000000000 +0300
++++ ./qstardict.pri	2009-02-05 10:24:18.000000000 +0300
+@@ -44,7 +44,6 @@
+ }
  
  unix:DEFINES += HAVE_MMAP
--unix:isEmpty(NO_DBUS):!contains(QT_CONFIG, qdbus): NO_DBUS = 1
+-unix:isEmpty(NO_DBUS):!contains(QT_CONFIG, dbus): NO_DBUS = 1
  unix:isEmpty(NO_DBUS):CONFIG += qdbus
  unix:isEmpty(NO_DBUS):DEFINES += QSTARDICT_WITH_DBUS
  isEmpty(NO_TRANSLATIONS):DEFINES += QSTARDICT_WITH_TRANSLATIONS
diff --git a/textproc/qstardict/pkg-plist b/textproc/qstardict/pkg-plist
index b2912a7579d6..ac039d51cdaf 100644
--- a/textproc/qstardict/pkg-plist
+++ b/textproc/qstardict/pkg-plist
@@ -2,19 +2,25 @@ bin/qstardict
 lib/qstardict/plugins/libstardict.so
 lib/qstardict/plugins/libweb.so
 share/applications/qstardict.desktop
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
 share/pixmaps/qstardict.png
-%%NLS%%share/qstardict/translations/qstardict-bg_BG.qm
-%%NLS%%share/qstardict/translations/qstardict-cs_CZ.qm
-%%NLS%%share/qstardict/translations/qstardict-de_DE.qm
-%%NLS%%share/qstardict/translations/qstardict-it_IT.qm
-%%NLS%%share/qstardict/translations/qstardict-pl_PL.qm
-%%NLS%%share/qstardict/translations/qstardict-pt_BR.qm
-%%NLS%%share/qstardict/translations/qstardict-ru_RU.qm
-%%NLS%%share/qstardict/translations/qstardict-ua_UA.qm
-%%NLS%%share/qstardict/translations/qstardict-zh_CN.qm
-%%NLS%%share/qstardict/translations/qstardict-zh_TW.qm
-%%NLS%%@dirrm share/qstardict/translations
-@dirrm share/qstardict
+%%NLS%%%%DATADIR%%/translations/qstardict-bg_BG.qm
+%%NLS%%%%DATADIR%%/translations/qstardict-cs_CZ.qm
+%%NLS%%%%DATADIR%%/translations/qstardict-de_DE.qm
+%%NLS%%%%DATADIR%%/translations/qstardict-es_ES.qm
+%%NLS%%%%DATADIR%%/translations/qstardict-fr_FR.qm
+%%NLS%%%%DATADIR%%/translations/qstardict-it_IT.qm
+%%NLS%%%%DATADIR%%/translations/qstardict-pl_PL.qm
+%%NLS%%%%DATADIR%%/translations/qstardict-pt_BR.qm
+%%NLS%%%%DATADIR%%/translations/qstardict-ru_RU.qm
+%%NLS%%%%DATADIR%%/translations/qstardict-ua_UA.qm
+%%NLS%%%%DATADIR%%/translations/qstardict-zh_CN.qm
+%%NLS%%%%DATADIR%%/translations/qstardict-zh_TW.qm
+%%NLS%%@dirrm %%DATADIR%%/translations
+%%NLS%%@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
 @dirrm lib/qstardict/plugins
 @dirrm lib/qstardict