5 files changed, 32 insertions, 17 deletions

diff --git a/french/verbiste/Makefile b/french/verbiste/Makefile
index ddc2bc5a0b77..505f1c651239 100644
--- a/french/verbiste/Makefile
+++ b/french/verbiste/Makefile
@@ -2,19 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	verbiste
-PORTVERSION=	0.1.33
-PORTREVISION=	2
+PORTVERSION=	0.1.41
 CATEGORIES=	french textproc
 MASTER_SITES=	http://perso.b2b2c.ca/sarrazip/dev/
 
 MAINTAINER=	dereckson@gmail.com
 COMMENT=	French verb conjugator/deconjugator
 
-OPTIONS_DEFINE=	GTK2 GNOME DOCS EXAMPLES
-
 LICENSE=	GPLv2
 
-USES=		pathfix pkgconfig iconv libtool shebangfix
+OPTIONS_DEFINE=	GTK2 GNOME DOCS EXAMPLES
+
+USES=		pathfix pkgconfig iconv:wchar_t libtool shebangfix
 SHEBANG_FILES=	${WRKSRC}/examples/*.pl
 GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2
@@ -27,18 +26,18 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTK2}
-CONFIGURE_ARGS+=--with-gtk-app
 USE_GNOME+=	gtk20
 PLIST_SUB+=	HASGTK=""
 .else
+CONFIGURE_ARGS+=--without-gtk-app
 PLIST_SUB+=	HASGTK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGNOME}
-CONFIGURE_ARGS+=--with-gnome-app
 USE_GNOME+=	gnomeprefix libgnomeui
 PLIST_SUB+=	HASGNOME=""
 .else
+CONFIGURE_ARGS+=--without-gnome-app --without-gnome-applet
 PLIST_SUB+=	HASGNOME="@comment "
 .endif
 
diff --git a/french/verbiste/distinfo b/french/verbiste/distinfo
index 697daa973d49..7d555854ad85 100644
--- a/french/verbiste/distinfo
+++ b/french/verbiste/distinfo
@@ -1,2 +1,2 @@
-SHA256 (verbiste-0.1.33.tar.gz) = 3fa7c86e452543e4262b581522a33bc1b222e872924239a8724ee9d7e4bc9e3d
-SIZE (verbiste-0.1.33.tar.gz) = 684999
+SHA256 (verbiste-0.1.41.tar.gz) = b4490d99dc768c8947536c01a5fbbecf71d067f472c0bd4d79b828df45d79f9f
+SIZE (verbiste-0.1.41.tar.gz) = 751059
diff --git a/french/verbiste/files/patch-src_verbiste_Makefile.in b/french/verbiste/files/patch-src_verbiste_Makefile.in
new file mode 100644
index 000000000000..fc7d5592b95f
--- /dev/null
+++ b/french/verbiste/files/patch-src_verbiste_Makefile.in
@@ -0,0 +1,12 @@
+--- src/verbiste/Makefile.in.orig	2014-04-06 23:50:04 UTC
++++ src/verbiste/Makefile.in
+@@ -347,7 +347,8 @@ libverbiste_0_1_la_CXXFLAGS = \
+ 	$(LIBXML2_CFLAGS)
+ 
+ libverbiste_0_1_la_LIBADD = \
+-	$(LIBXML2_LIBS)
++	$(LIBXML2_LIBS) \
++	$(LTLIBICONV)
+ 
+ pkginclude_HEADERS = \
+ 	misc-types.h \
diff --git a/french/verbiste/pkg-descr b/french/verbiste/pkg-descr
index 616321d90dc6..7878785c1a89 100644
--- a/french/verbiste/pkg-descr
+++ b/french/verbiste/pkg-descr
@@ -1,5 +1,5 @@
-Verbiste is a French conjugation system. It contains a C++ library, and two
-programs that can be run from the command line or from another program. The
-knowledge base is represented in XML and contains over 7000 verbs.
+Verbiste is a conjugation system, with comprehensive French verb tables, and
+some capabilities for extra languages. It provides a library, a CLI and a GUI
+interface.
 
 WWW: http://sarrazip.com/dev/verbiste.html
diff --git a/french/verbiste/pkg-plist b/french/verbiste/pkg-plist
index a9c2d8c96970..59fc7ed9a49a 100644
--- a/french/verbiste/pkg-plist
+++ b/french/verbiste/pkg-plist
@@ -22,23 +22,27 @@ man/man3/verbiste.3.gz
 %%HASGUI%%share/locale/de/LC_MESSAGES/verbiste.mo
 %%HASGUI%%share/locale/fr/LC_MESSAGES/verbiste.mo
 %%HASGUI%%share/locale/el/LC_MESSAGES/verbiste.mo
-%%HASGUI%%share/pixmaps/verbiste.png
+%%HASGUI%%share/icons/hicolor/16x16/apps/verbiste.png
+%%HASGUI%%share/icons/hicolor/32x32/apps/verbiste.png
+%%HASGUI%%share/icons/hicolor/48x48/apps/verbiste.png
+%%HASGUI%%share/icons/hicolor/64x64/apps/verbiste.png
+%%HASGUI%%share/icons/hicolor/128x128/apps/verbiste.png
+%%HASGUI%%share/icons/hicolor/256x256/apps/verbiste.png
+%%HASGUI%%share/icons/hicolor/512x512/apps/verbiste.png
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/HACKING
 %%PORTDOCS%%%%DOCSDIR%%/LISEZMOI
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/FrenchDeconjugatorTester.java
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/conjugator.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deconjugator.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generate-all-forms.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-french-deconjugator.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/trans-tenses.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generate-all-forms.pl
 %%DATADIR%%-0.1/COPYING
 %%DATADIR%%-0.1/conjugation-el.xml
 %%DATADIR%%-0.1/conjugation-fr.xml