8 files changed, 61 insertions, 42 deletions

diff --git a/textproc/goldendict/Makefile b/textproc/goldendict/Makefile
index 7b7f59dcd64f..6bc1498c11a0 100644
--- a/textproc/goldendict/Makefile
+++ b/textproc/goldendict/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	goldendict
-PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTVERSION=	1.0.1
 CATEGORIES=	textproc
-MASTER_SITES=	BERLIOS
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src-x11
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:C|(.*)\.[0-9]*$|\1|}/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	A feature-rich dictionary lookup program (with QT lib)
 
 LIB_DEPENDS=	hunspell-1.2.0:${PORTSDIR}/hungarian/hunspell \
+		execinfo:${PORTSDIR}/devel/libexecinfo \
 		vorbis:${PORTSDIR}/audio/libvorbis
 
+LICENSE=	GPLv3
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 USE_GNOME=	pkgconfig
@@ -26,7 +27,7 @@ USE_QT4=	linguist
 QT_COMPONENTS=	corelib gui webkit \
 		qmake_build linguist_build moc_build rcc_build script_build uic_build
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
+WRKSRC=		${WRKDIR}
 
 post-patch:
 	@${SED} -I.bak -e "s:/usr:${PREFIX}:" ${WRKSRC}/redist/goldendict.desktop
@@ -38,7 +39,7 @@ do-configure:
 
 post-install:
 	@${MKDIR} ${DATADIR}/locale
-	@${INSTALL_DATA} ${WRKSRC}/locale/ru.qm ${DATADIR}/locale/
+	@${INSTALL_DATA} ${WRKSRC}/locale/*.qm ${DATADIR}/locale/
 
 .include <bsd.port.pre.mk>
 
diff --git a/textproc/goldendict/distinfo b/textproc/goldendict/distinfo
index 79e83858049a..04dd8d50db2e 100644
--- a/textproc/goldendict/distinfo
+++ b/textproc/goldendict/distinfo
@@ -1,3 +1,2 @@
-MD5 (goldendict-0.9.0-src-x11.tar.bz2) = 89303abcac6c86c4635b264414f02ccc
-SHA256 (goldendict-0.9.0-src-x11.tar.bz2) = 30bf5e4ac6abf56067ee8d8750c545726509bcea591825de88ba44071769c946
-SIZE (goldendict-0.9.0-src-x11.tar.bz2) = 450332
+SHA256 (goldendict-1.0.1-src.tar.bz2) = b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6
+SIZE (goldendict-1.0.1-src.tar.bz2) = 2705932
diff --git a/textproc/goldendict/files/patch-bgl_babylon.cc b/textproc/goldendict/files/patch-bgl_babylon.cc
index 0e68a6b935f9..b74ba732f90f 100644
--- a/textproc/goldendict/files/patch-bgl_babylon.cc
+++ b/textproc/goldendict/files/patch-bgl_babylon.cc
@@ -1,6 +1,6 @@
---- bgl_babylon.cc.orig	2009-05-07 14:59:58.000000000 +0400
-+++ bgl_babylon.cc	2009-11-08 23:52:53.000000000 +0300
-@@ -545,13 +545,8 @@
+--- ./bgl_babylon.cc.orig	2010-12-04 00:12:46.000000000 +0300
++++ ./bgl_babylon.cc	2010-12-28 11:46:37.203723541 +0300
+@@ -648,13 +648,8 @@
  
    inbufbytes = s.size();
    outbufbytes = s.size() * 6;
diff --git a/textproc/goldendict/files/patch-dictzip.c b/textproc/goldendict/files/patch-dictzip.c
index ca9c8f762a50..2aaab52bb626 100644
--- a/textproc/goldendict/files/patch-dictzip.c
+++ b/textproc/goldendict/files/patch-dictzip.c
@@ -1,5 +1,5 @@
---- dictzip.c.orig	2009-11-09 01:12:06.000000000 +0300
-+++ dictzip.c	2009-11-09 01:12:21.000000000 +0300
+--- ./dictzip.c.orig	2010-12-04 00:12:46.000000000 +0300
++++ ./dictzip.c	2010-12-28 11:46:37.205720708 +0300
 @@ -23,6 +23,7 @@
   */
  
diff --git a/textproc/goldendict/files/patch-goldendict.pro b/textproc/goldendict/files/patch-goldendict.pro
index 0a70ac9c6852..ee38f56b8674 100644
--- a/textproc/goldendict/files/patch-goldendict.pro
+++ b/textproc/goldendict/files/patch-goldendict.pro
@@ -1,44 +1,45 @@
---- goldendict.pro.orig	2009-05-24 23:28:51.000000000 +0400
-+++ goldendict.pro	2009-11-12 18:57:44.000000000 +0300
-@@ -35,24 +35,20 @@
-     LIBS += -lXtst
+--- ./goldendict.pro.orig	2010-12-04 00:12:46.000000000 +0300
++++ ./goldendict.pro	2010-12-28 11:46:37.207723741 +0300
+@@ -58,12 +58,12 @@
+ 	ogg \
+ 	hunspell
+     LIBS += -lX11 \
+-        -lXtst
++        -lXtst -lexecinfo
      PREFIX = $$(PREFIX)
      isEmpty( PREFIX ):PREFIX = /usr/local
 -    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\"
-+    isEmpty( DESKTOPDIR ):DESKTOPDIR = $$PREFIX/share/applications
-+    isEmpty( ICONDIR ):ICONDIR = $$PREFIX/share/pixmaps
 +    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\"
      target.path = $$PREFIX/bin/
 -    locale.path = $$PREFIX/share/apps/goldendict/locale/
-+    locale.path = $$PREFIX/share/goldendict
++    locale.path = $$PREFIX/share/goldendict/locale/
      locale.files = locale/*.qm
      INSTALLS += target \
          locale
--    icons.path = /usr/share/pixmaps
--    icons.files = redist/icons/*.*
-+    icons.path = $$ICONDIR
-+    icons.files = redist/icons/goldendict.png
+@@ -72,13 +72,15 @@
      INSTALLS += icons
--    icons2.path = /usr/share/app-install/icons
--    icons2.files = redist/icons/*.*
+     icons2.path = $$PREFIX/share/app-install/icons
+     icons2.files = redist/icons/*.*
 -    INSTALLS += icons2
--    desktops.path = /usr/share/applications
--    desktops.files = redist/*.desktop
-+    desktops.path = $$DESKTOPDIR
-+    desktops.files = redist/goldendict.desktop
++    # we don't use icons2 directory at FreeBSD
++    #INSTALLS += icons2
+     desktops.path = $$PREFIX/share/applications
+     desktops.files = redist/*.desktop
      INSTALLS += desktops
--    desktops2.path = /usr/share/app-install/desktop
--    desktops2.files = redist/*.desktop
+     desktops2.path = $$PREFIX/share/app-install/desktop
+     desktops2.files = redist/*.desktop
 -    INSTALLS += desktops2
++    # we don't use desktop2 directory at FreeBSD
++    #INSTALLS += desktops2
  }
  DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
  
-@@ -196,7 +192,7 @@
- TRANSLATIONS += locale/ru.ts
+@@ -267,8 +269,6 @@
+ }
  
  # This makes qmake generate translations
+-win32:# Windows doesn't seem to have *-qt4 symlinks
 -isEmpty(QMAKE_LRELEASE):QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
-+isEmpty(QMAKE_LRELEASE):QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease-qt4
- TS_OUT = $$TRANSLATIONS
- TS_OUT ~= s/.ts/.qm
- TSQM.name = lrelease \
+ isEmpty(QMAKE_LRELEASE):QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease-qt4
+ updateqm.input = TRANSLATIONS
+ updateqm.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.qm
diff --git a/textproc/goldendict/files/patch-greektranslit.cc b/textproc/goldendict/files/patch-greektranslit.cc
new file mode 100644
index 000000000000..a17422a8c6ee
--- /dev/null
+++ b/textproc/goldendict/files/patch-greektranslit.cc
@@ -0,0 +1,8 @@
+--- ./greektranslit.cc.orig	2010-12-28 11:54:33.498725323 +0300
++++ ./greektranslit.cc	2010-12-28 11:54:44.774724956 +0300
+@@ -1,4 +1,4 @@
+-/* This file is (c) 2010 Jennie Petoumenou <epetoumenou@gmail.com>
++/* This file is (c) 2010 Jennie Petoumenou <epetoumenou@gmail.com>
+  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
+ 
+ #include "greektranslit.hh"
diff --git a/textproc/goldendict/files/patch-iconv.cc b/textproc/goldendict/files/patch-iconv.cc
index e167ff53bfd2..d32904bee641 100644
--- a/textproc/goldendict/files/patch-iconv.cc
+++ b/textproc/goldendict/files/patch-iconv.cc
@@ -1,5 +1,5 @@
---- iconv.cc.orig	2009-04-18 21:20:12.000000000 +0400
-+++ iconv.cc	2009-11-09 01:15:24.000000000 +0300
+--- ./iconv.cc.orig	2010-12-04 00:12:46.000000000 +0300
++++ ./iconv.cc	2010-12-28 11:46:37.208721626 +0300
 @@ -44,11 +44,7 @@
    throw( exIncorrectSeq, exOther )
  {
diff --git a/textproc/goldendict/pkg-plist b/textproc/goldendict/pkg-plist
index fc300d91b974..16b4436c09cf 100644
--- a/textproc/goldendict/pkg-plist
+++ b/textproc/goldendict/pkg-plist
@@ -1,7 +1,17 @@
 bin/goldendict
 share/applications/goldendict.desktop
 share/pixmaps/goldendict.png
-%%DATADIR%%/locale/ru.qm
+%%DATADIR%%/locale/ar_SA.qm
+%%DATADIR%%/locale/bg_BG.qm
+%%DATADIR%%/locale/cs_CZ.qm
+%%DATADIR%%/locale/de_DE.qm
+%%DATADIR%%/locale/el_GR.qm
+%%DATADIR%%/locale/it_IT.qm
+%%DATADIR%%/locale/lt_LT.qm
+%%DATADIR%%/locale/ru_RU.qm
+%%DATADIR%%/locale/uk_UA.qm
+%%DATADIR%%/locale/vi_VN.qm
+%%DATADIR%%/locale/zh_CN.qm
 @dirrm %%DATADIR%%/locale
 @dirrm %%DATADIR%%
 @dirrmtry share/applications