- Update to 0.1.20

- Take maintainership

Removed file(s):
- files/lib-patch-src_verbiste_FrenchVerbDictionary.cpp
- files/lib-patch-Makefile.in

PR:		ports/115145
Submitted by:	tabthorpe@
Approved by:	clsung (mentor)

6 files changed, 24 insertions, 63 deletions

diff --git a/french/verbiste/Makefile b/french/verbiste/Makefile
index 53c117e88e74..545936475b00 100644
--- a/french/verbiste/Makefile
+++ b/french/verbiste/Makefile
@@ -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=	tabthorpe@FreeBSD.org
 COMMENT=	French verb conjugator/deconjugator
 
 USE_GETTEXT=	yes
@@ -24,17 +24,13 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .if !defined(PKGNAMEPREFIX)
 
-USE_GETOPT_LONG=yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
-USE_GCC=	3.4+
 
 MAN1=		french-conjugator.1 french-deconjugator.1
 MAN3=		verbiste.3
 MANLANG=	"" fr
 
-EXTRA_PATCHES=	${FILESDIR}/lib-patch-*
-
 post-install:
 	${MKDIR} ${EXAMPLESDIR}
 .for f in README *.java *.c
diff --git a/french/verbiste/distinfo b/french/verbiste/distinfo
index 3163b4c505a2..418e70923f8d 100644
--- a/french/verbiste/distinfo
+++ b/french/verbiste/distinfo
@@ -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 --git a/french/verbiste/files/lib-patch-Makefile.in b/french/verbiste/files/lib-patch-Makefile.in
deleted file mode 100644
index 06e07971ead0..000000000000
--- a/french/verbiste/files/lib-patch-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
- 
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(datadir)/doc/$(PACKAGE)
- doc_DATA = \
- 	AUTHORS \
--	COPYING \
--	INSTALL \
- 	NEWS \
- 	README \
- 	TODO \
diff --git a/french/verbiste/files/lib-patch-src_verbiste_FrenchVerbDictionary.cpp b/french/verbiste/files/lib-patch-src_verbiste_FrenchVerbDictionary.cpp
deleted file mode 100644
index 1b9d71d845c4..000000000000
--- a/french/verbiste/files/lib-patch-src_verbiste_FrenchVerbDictionary.cpp
+++ /dev/null
@@ -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 --git a/french/verbiste/files/patch-configure b/french/verbiste/files/patch-configure
index 9381d1315f6c..a4c7ff9d965e 100644
--- a/french/verbiste/files/patch-configure
+++ b/french/verbiste/files/patch-configure
@@ -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 --git a/french/verbiste/pkg-plist b/french/verbiste/pkg-plist
index a566c360ee62..1bd9d2f7b416 100644
--- a/french/verbiste/pkg-plist
+++ b/french/verbiste/pkg-plist
@@ -11,23 +11,23 @@ lib/libverbiste-0.1.la
 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%%