diff -ruN --exclude=CVS /usr/ports/french/verbiste/Makefile /home/ports/french/verbiste/Makefile
--- /usr/ports/french/verbiste/Makefile	Fri Dec 29 18:48:18 2006
+++ /home/ports/french/verbiste/Makefile	Thu Aug  2 10:05:09 2007
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	verbiste
-PORTVERSION=	0.1.15
+PORTVERSION=	0.1.20
 CATEGORIES=	french textproc
-MASTER_SITES=	http://www3.sympatico.ca/sarrazip/dev/
+MASTER_SITES=	http://perso.b2b2c.ca/sarrazip/dev/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	thomas@goodking.ca
 COMMENT=	French verb conjugator/deconjugator
 
 USE_GETTEXT=	yes
@@ -27,7 +27,6 @@
 USE_GETOPT_LONG=yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
-USE_GCC=	3.4+
 
 MAN1=		french-conjugator.1 french-deconjugator.1
 MAN3=		verbiste.3
diff -ruN --exclude=CVS /usr/ports/french/verbiste/distinfo /home/ports/french/verbiste/distinfo
--- /usr/ports/french/verbiste/distinfo	Fri Dec 29 18:48:18 2006
+++ /home/ports/french/verbiste/distinfo	Thu Aug  2 08:50:47 2007
@@ -1,3 +1,3 @@
-MD5 (verbiste-0.1.15.tar.gz) = cb695836b49fc24ae445ba47d117fb35
-SHA256 (verbiste-0.1.15.tar.gz) = 003ab33bdab306f206d0eed60eafa16f3bb1109cb523c0cb8208e19b6bfcdfbd
-SIZE (verbiste-0.1.15.tar.gz) = 564868
+MD5 (verbiste-0.1.20.tar.gz) = f3d46647505d8d02bf513691a2d7cc29
+SHA256 (verbiste-0.1.20.tar.gz) = 4e4fb705c9a14da388085cefa32bc4081627280dc09dd71be1f5f9d6423eaa73
+SIZE (verbiste-0.1.20.tar.gz) = 628613
diff -ruN --exclude=CVS /usr/ports/french/verbiste/files/lib-patch-Makefile.in /home/ports/french/verbiste/files/lib-patch-Makefile.in
--- /usr/ports/french/verbiste/files/lib-patch-Makefile.in	Tue Nov 29 13:40:51 2005
+++ /home/ports/french/verbiste/files/lib-patch-Makefile.in	Thu Aug  2 08:54:36 2007
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Tue Nov 29 16:23:13 2005
-+++ Makefile.in	Tue Nov 29 16:23:33 2005
-@@ -277,11 +277,9 @@
- 	data/conjugation-fr.xml \
- 	data/verbs-fr.xml
+--- Makefile.in.orig	Thu Aug  2 08:50:55 2007
++++ Makefile.in	Thu Aug  2 08:53:57 2007
+@@ -308,11 +308,9 @@
+ 	COPYING
  
+ # COPYING contains the license; main-window.cpp expects it there.
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(datadir)/doc/$(PACKAGE)
  doc_DATA = \
diff -ruN --exclude=CVS /usr/ports/french/verbiste/files/lib-patch-src_verbiste_FrenchVerbDictionary.cpp /home/ports/french/verbiste/files/lib-patch-src_verbiste_FrenchVerbDictionary.cpp
--- /usr/ports/french/verbiste/files/lib-patch-src_verbiste_FrenchVerbDictionary.cpp	Tue Nov 29 13:40:51 2005
+++ /home/ports/french/verbiste/files/lib-patch-src_verbiste_FrenchVerbDictionary.cpp	Wed Dec 31 19:00:00 1969
@@ -1,20 +0,0 @@
---- src/verbiste/FrenchVerbDictionary.cpp.orig	Sun Mar 13 14:03:26 2005
-+++ src/verbiste/FrenchVerbDictionary.cpp	Sat Nov  5 21:32:23 2005
-@@ -655,7 +655,7 @@
-     char *inbuf = strcpy(new char[inbytesleft], latin1String.c_str());
-     char *outbuf = new char[outbytesleft];
- 
--    char *in = inbuf;
-+    const char *in = inbuf;
-     char *out = outbuf;
-     if (iconv(toUTF8, &in, &inbytesleft, &out, &outbytesleft) == (size_t) -1)
-     {
-@@ -681,7 +681,7 @@
-     char *inbuf = strcpy(new char[inbytesleft], utf8String.c_str());
-     char *outbuf = new char[outbytesleft];
- 
--    char *in = inbuf;
-+    const char *in = inbuf;
-     char *out = outbuf;
-     if (iconv(toLatin1, &in, &inbytesleft, &out, &outbytesleft) == (size_t) -1)
-     {
diff -ruN --exclude=CVS /usr/ports/french/verbiste/files/patch-configure /home/ports/french/verbiste/files/patch-configure
--- /usr/ports/french/verbiste/files/patch-configure	Tue Nov 29 13:40:51 2005
+++ /home/ports/french/verbiste/files/patch-configure	Thu Aug  2 09:14:51 2007
@@ -1,16 +1,16 @@
---- configure.orig	Wed Nov 23 13:10:32 2005
-+++ configure	Wed Nov 23 13:10:55 2005
-@@ -23960,12 +23960,11 @@
+--- 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 *_nl_expand_alias (const char *);
  int
  main ()
  {
  bindtextdomain ("", "");
--return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
-+return (int) gettext ("") + _nl_msg_cat_cntr
+-return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
++return * gettext ("") + _nl_msg_cat_cntr
    ;
    return 0;
  }
diff -ruN --exclude=CVS /usr/ports/french/verbiste/pkg-plist /home/ports/french/verbiste/pkg-plist
--- /usr/ports/french/verbiste/pkg-plist	Thu Feb 23 05:36:31 2006
+++ /home/ports/french/verbiste/pkg-plist	Thu Aug  2 09:25:18 2007
@@ -11,23 +11,23 @@
 lib/libverbiste-0.1.so
 lib/libverbiste-0.1.so.0
 libdata/pkgconfig/verbiste-0.1.pc
-share/locale/fr/LC_MESSAGES/verbiste.mo
-share/verbiste-0.1/conjugation-fr.xml
-share/verbiste-0.1/verbs-fr.xml
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/HACKING
-%%DOCSDIR%%/LISEZMOI
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%PORTDOCS%%%%DOCSDIR%%/LISEZMOI
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%EXAMPLESDIR%%/FrenchDeconjugatorTester.java
 %%EXAMPLESDIR%%/README
 %%EXAMPLESDIR%%/conjugator.c
 %%EXAMPLESDIR%%/deconjugator.c
 %%EXAMPLESDIR%%/test-french-deconjugator.pl
 %%EXAMPLESDIR%%/trans-tenses.pl
+%%DATADIR%%-0.1/COPYING
+%%DATADIR%%-0.1/conjugation-fr.xml
+%%DATADIR%%-0.1/verbs-fr.xml
+@dirrm %%DATADIR%%-0.1
+@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/verbiste-0.1/verbiste
 @dirrm include/verbiste-0.1
-@dirrm share/verbiste-0.1
-@dirrm %%DOCSDIR%%
-@dirrm %%EXAMPLESDIR%%