- Update to 1.0.0

PR:		166886
Submitted by:	Ports Fury

6 files changed, 72 insertions, 29 deletions

diff --git a/games/latrine/Makefile b/games/latrine/Makefile
index 75a87f8b2d76..49a22dabec34 100644
--- a/games/latrine/Makefile
+++ b/games/latrine/Makefile
@@ -6,28 +6,35 @@
 #
 
 PORTNAME=	latrine
-PORTVERSION=	0.10.0
-PORTREVISION=	2
+PORTVERSION=	1.0.0
 CATEGORIES=	games
-MASTER_SITES=	http://people.debian.org/~godisch/latrine/
+MASTER_SITES=	http://alioth.debian.org/frs/download.php/3085/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Curses-based LAnguage TRaINEr
 
+LICENSE=	GPLv3
+
+BUILD_DEPENDS=	p5-DBI>0:${PORTSDIR}/databases/p5-DBI
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
+
+USE_CSTD=	gnu89
+USE_SQLITE=	3
+USE_PERL5_BUILD=yes
+USE_NCURSES=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include -D_XOPEN_SOURCE_EXTENDED
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_CSTD=	gnu89
-USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USE_NCURSES=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-MAN1=		latrine.1
 
-.include <bsd.port.pre.mk>
+MAN1=		latrine.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,ncursesw/ncurses.h,ncurses.h,' \
-		${WRKSRC}/charset.h ${WRKSRC}/screen.c
+	@${FIND} ${WRKSRC} -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|<ncursesw/|<|'
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/latrine/distinfo b/games/latrine/distinfo
index 632106d7a7b6..79216ad788a4 100644
--- a/games/latrine/distinfo
+++ b/games/latrine/distinfo
@@ -1,2 +1,2 @@
-SHA256 (latrine-0.10.0.tar.gz) = aeac80c8d158d9c0a4a269df1de41c51a98013ba21aaab230340d844408edba4
-SIZE (latrine-0.10.0.tar.gz) = 109040
+SHA256 (latrine-1.0.0.tar.gz) = f2df58e9cf112dd0bfa96a4a46a4be47e65a665188e8b14f8bf707d1b0b45c71
+SIZE (latrine-1.0.0.tar.gz) = 128477
diff --git a/games/latrine/files/patch-data.c b/games/latrine/files/patch-data.c
new file mode 100644
index 000000000000..32af3d4cadcd
--- /dev/null
+++ b/games/latrine/files/patch-data.c
@@ -0,0 +1,43 @@
+--- data.c.orig	2009-07-16 03:10:29.000000000 +0900
++++ data.c	2012-04-10 22:49:26.000000000 +0900
+@@ -26,6 +26,17 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#include <sys/param.h>
++#if __FreeBSD_version < 800067
++#define NO_WCSCASECMP
++#endif
++
++#if defined(NO_WCSCASECMP)
++#include <wchar.h>
++#include <wctype.h>
++#define wcscasecmp __wcscasecmp
++#endif
++
+ #include "charset.h"
+ #include "latrine.h"
+ #include "memory.h"
+@@ -912,6 +923,22 @@
+ 	return 0;
+ }
+ 
++#if defined(NO_WCSCASECMP)
++int
++__wcscasecmp(const wchar_t *s1, const wchar_t *s2)
++{
++	wchar_t c1, c2;
++
++	for (; *s1; s1++, s2++) {
++		c1 = towlower(*s1);
++		c2 = towlower(*s2);
++		if (c1 != c2)
++			return ((int)c1 - c2);
++	}
++	return (-*s2);
++}
++#endif
++
+ int
+ wordcmp(struct word *w[2], const int ignore_case)
+ {
diff --git a/games/latrine/files/patch-screen.c b/games/latrine/files/patch-screen.c
deleted file mode 100644
index ec61e48c5f77..000000000000
--- a/games/latrine/files/patch-screen.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: screen.c
-@@ -23,7 +23,11 @@
- #include <options.h>
- #include <screen.h>
- #include <unistd.h>
-+#ifdef __FreeBSD__
-+#include <sys/wait.h>
-+#else
- #include <wait.h>
-+#endif
- 
- #define LEFT        10
- #define RIGHT       10
diff --git a/games/latrine/pkg-descr b/games/latrine/pkg-descr
index e4605487c1e5..6243977326bf 100644
--- a/games/latrine/pkg-descr
+++ b/games/latrine/pkg-descr
@@ -9,4 +9,4 @@ download one from the internet. The Free Dictionaries Project provides
 dictionaries for about 50 language combinations, which can be used with
 LaTrine.
 
-WWW: http://www.godisch.de/debian/latrine/
+WWW: http://alioth.debian.org/projects/latrine/
diff --git a/games/latrine/pkg-plist b/games/latrine/pkg-plist
index 8d2b88f578d0..2c189d72dafb 100644
--- a/games/latrine/pkg-plist
+++ b/games/latrine/pkg-plist
@@ -1,11 +1,17 @@
 bin/latrine
+share/locale/da/LC_MESSAGES/latrine.mo
 share/locale/de/LC_MESSAGES/latrine.mo
 share/locale/fr/LC_MESSAGES/latrine.mo
 share/locale/ga/LC_MESSAGES/latrine.mo
+share/locale/id/LC_MESSAGES/latrine.mo
 share/locale/it/LC_MESSAGES/latrine.mo
+share/locale/lv/LC_MESSAGES/latrine.mo
 share/locale/nl/LC_MESSAGES/latrine.mo
+share/locale/pl/LC_MESSAGES/latrine.mo
 share/locale/ro/LC_MESSAGES/latrine.mo
+share/locale/ru/LC_MESSAGES/latrine.mo
 share/locale/sv/LC_MESSAGES/latrine.mo
 share/locale/tr/LC_MESSAGES/latrine.mo
 share/locale/vi/LC_MESSAGES/latrine.mo
+share/locale/zh_CN/LC_MESSAGES/latrine.mo
 etc/latrine.conf.sample