* Update to 0.1.32.

* Add (optional) support for GTK+ app.
* Clean up a lot of cruft, e.g., the GNOME option didn't work at all,

Approved by:	maintainer

5 files changed, 48 insertions, 43 deletions

diff --git a/french/verbiste/Makefile b/french/verbiste/Makefile
index 3bfa59201b3d..9ad2c0af83b3 100644
--- a/french/verbiste/Makefile
+++ b/french/verbiste/Makefile
@@ -6,41 +6,55 @@
 #
 
 PORTNAME=	verbiste
-PORTVERSION=	0.1.31
+PORTVERSION=	0.1.32
 CATEGORIES=	french textproc
 MASTER_SITES=	http://perso.b2b2c.ca/sarrazip/dev/
 
 MAINTAINER=	dereckson@gmail.com
 COMMENT=	French verb conjugator/deconjugator
-LICENSE=	GPLv2
 
-OPTIONS=	GNOMEGUI	"With gnome gui"		no
+OPTIONS=	GTK	"With GTK+ application"		no	\
+		GNOME	"With GNOME application"	no
+
+LICENSE=	GPLv2
 
-USE_GETTEXT=	yes
-USE_GNOME=	gnomehack ltverhack libxml2
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
+USE_GNOME=	gnomehack ltverhack libxml2
+USE_ICONV=	yes
+USE_LDCONFIG=	yes
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-.if defined(WITH_GNOMEGUI)
-CONFIGURE_ARGS=	--with-gnome-app
-USE_GNOME+=	gnomeprefix libgnomeui
-PLIST_SUB=	HASGUI=""
+MAN1=		french-conjugator.1 french-deconjugator.1
+MAN3=		verbiste.3
+MANLANG=	"" fr
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_GTK)
+CONFIGURE_ARGS+=--with-gtk-app
+USE_GNOME+=	gtk20
+PLIST_SUB+=	HASGTK=""
 .else
-PLIST_SUB=	HASGUI="@comment "
+PLIST_SUB+=	HASGTK="@comment "
 .endif
 
-.if !defined(PKGNAMEPREFIX)
-
-USE_ICONV=	yes
-USE_LDCONFIG=	yes
+.if defined(WITH_GNOME)
+CONFIGURE_ARGS+=--with-gnome-app
+USE_GNOME+=	gnomeprefix libgnomeui
+PLIST_SUB+=	HASGNOME=""
+.else
+PLIST_SUB+=	HASGNOME="@comment "
+.endif
 
-MAN1=		french-conjugator.1 french-deconjugator.1
-MAN3=		verbiste.3
-MANLANG=	"" fr
+.if defined(WITH_GTK) || defined(WITH_GNOME)
+USE_GETTEXT=	yes
+PLIST_SUB+=	HASGUI=""
+.else
+PLIST_SUB+=	HASGUI="@comment "
+.endif
 
 post-install:
 	${MKDIR} ${EXAMPLESDIR}
@@ -49,6 +63,4 @@ post-install:
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/examples/*.pl ${EXAMPLESDIR}
 
-.endif
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/french/verbiste/distinfo b/french/verbiste/distinfo
index 222953239960..96731f394152 100644
--- a/french/verbiste/distinfo
+++ b/french/verbiste/distinfo
@@ -1,3 +1,2 @@
-MD5 (verbiste-0.1.31.tar.gz) = 4697b3b28a3725fd91543a5305ac1c66
-SHA256 (verbiste-0.1.31.tar.gz) = d1983cc7acf329e624105a203f4415487ef3ce1fa7368c6adae143757aabfd9f
-SIZE (verbiste-0.1.31.tar.gz) = 672971
+SHA256 (verbiste-0.1.32.tar.gz) = b9a064573eca01c6facf5d4fbf9d1a12fe523a19abee8c6d886e85f4c45fd12b
+SIZE (verbiste-0.1.32.tar.gz) = 678049
diff --git a/french/verbiste/files/patch-configure b/french/verbiste/files/patch-configure
deleted file mode 100644
index a4c7ff9d965e..000000000000
--- a/french/verbiste/files/patch-configure
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.orig	Thu Aug  2 09:13:16 2007
-+++ configure	Thu Aug  2 09:14:19 2007
-@@ -26629,12 +26629,11 @@
- #ifdef __cplusplus
- "C"
- #endif
--const char *_nl_expand_alias (const char *);
- int
- main ()
- {
- bindtextdomain ("", "");
--return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-+return * gettext ("") + _nl_msg_cat_cntr
-   ;
-   return 0;
- }
diff --git a/french/verbiste/pkg-descr b/french/verbiste/pkg-descr
index 380e8fd5f61c..616321d90dc6 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 6800 verbs.
+knowledge base is represented in XML and contains over 7000 verbs.
 
 WWW: http://sarrazip.com/dev/verbiste.html
diff --git a/french/verbiste/pkg-plist b/french/verbiste/pkg-plist
index 1e6f040e7023..99762e1fb872 100644
--- a/french/verbiste/pkg-plist
+++ b/french/verbiste/pkg-plist
@@ -1,6 +1,7 @@
 bin/french-conjugator
 bin/french-deconjugator
-%%HASGUI%%bin/verbiste
+%%HASGNOME%%bin/verbiste
+%%HASGTK%%bin/verbiste-gtk
 include/verbiste-0.1/verbiste/FrenchVerbDictionary.h
 include/verbiste-0.1/verbiste/Trie.cpp
 include/verbiste-0.1/verbiste/Trie.h
@@ -11,8 +12,11 @@ lib/libverbiste-0.1.la
 lib/libverbiste-0.1.so
 lib/libverbiste-0.1.so.0
 libdata/pkgconfig/verbiste-0.1.pc
-%%HASGUI%%share/applications/verbiste.desktop
+%%HASGNOME%%share/applications/verbiste.desktop
+%%HASGUI%%share/locale/da/LC_MESSAGES/verbiste.mo
+%%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
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/COPYING
@@ -35,6 +39,12 @@ libdata/pkgconfig/verbiste-0.1.pc
 %%DATADIR%%-0.1/verbs-fr.xml
 %%DATADIR%%-0.1/conjugation-it.xml
 %%DATADIR%%-0.1/verbs-it.xml
+%%HASGTK%%share/texmf/tex/latex/verbiste/verbiste.cls
+%%HASGTK%%share/texmf/tex/latex/verbiste/verbiste.cfg
+%%HASGTK%%@dirrm share/texmf/tex/latex/verbiste
+%%HASGTK%%@dirrmtry share/texmf/tex/latex
+%%HASGTK%%@dirrmtry share/texmf/tex
+%%HASGTK%%@dirrmtry share/texmf
 @dirrm %%DATADIR%%-0.1
 @dirrm %%EXAMPLESDIR%%
 @dirrm %%DOCSDIR%%