- Update to 0.10.0

6 files changed, 40 insertions, 25 deletions

diff --git a/games/latrine/Makefile b/games/latrine/Makefile
index cfd34c9ab8d0..b6441c181436 100644
--- a/games/latrine/Makefile
+++ b/games/latrine/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	latrine
-PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTVERSION=	0.10.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.godisch.de/debian/latrine/
 
diff --git a/games/latrine/distinfo b/games/latrine/distinfo
index 3aca762249b5..2e50b349eeb3 100644
--- a/games/latrine/distinfo
+++ b/games/latrine/distinfo
@@ -1,3 +1,3 @@
-MD5 (latrine-0.9.0.tar.gz) = 348dee815cf34ddb1335de97e47f9a83
-SHA256 (latrine-0.9.0.tar.gz) = 4c63010daf8ea00d44e7004b052f859a946ce0f90cce4e91427eca8cb44f4b06
-SIZE (latrine-0.9.0.tar.gz) = 106957
+MD5 (latrine-0.10.0.tar.gz) = 94e4cb0597654238d591f3c20fd297b2
+SHA256 (latrine-0.10.0.tar.gz) = aeac80c8d158d9c0a4a269df1de41c51a98013ba21aaab230340d844408edba4
+SIZE (latrine-0.10.0.tar.gz) = 109040
diff --git a/games/latrine/files/patch-Makefile.in b/games/latrine/files/patch-Makefile.in
index 83cdcd7adc3e..8001407ec2a4 100644
--- a/games/latrine/files/patch-Makefile.in
+++ b/games/latrine/files/patch-Makefile.in
@@ -1,22 +1,22 @@
 Index: Makefile.in
-@@ -12,7 +12,7 @@
+@@ -13,7 +13,7 @@
  CPPFLAGS        = -I. -DSYSCONFFILE=\"${sysconfdir}/latrine.conf\" -DDICTDIR=\"${dictdir}\" -DLOCALEDIR=\"${localedir}\" @CPPFLAGS@
- CFLAGS          = -Wall -funroll-loops @CFLAGS@ @GLIB_CFLAGS@
+ CFLAGS          = -Wall -funroll-loops -D_GNU_SOURCE @CFLAGS@
  LDFLAGS         = -Wall @LDFLAGS@
--LDLIBS          = @LIBS@ @GLIB_LIBS@
-+LDLIBS          = @LIBS@ @GLIB_LIBS@ -lintl
+-LDLIBS          = @LIBS@
++LDLIBS          = @LIBS@ -lintl
  INSTALL         = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA    = @INSTALL_DATA@
-@@ -41,10 +41,10 @@
- 		${INSTALL} -d ${DESTDIR}${localedir}/`basename $$i .mo`/LC_MESSAGES; \
- 		${INSTALL_DATA} $$i ${DESTDIR}${localedir}/`basename $$i .mo`/LC_MESSAGES/latrine.mo; \
+@@ -46,11 +46,7 @@
  	done
--	${INSTALL} -d ${DESTDIR}${dictdir}
-+#	${INSTALL} -d ${DESTDIR}${dictdir}
+ #	${INSTALL} -d ${DESTDIR}${dictdir}
  #	${INSTALL_DATA} ${KEYMAPS} ${DESTDIR}${dictdir}
- 	${INSTALL} -d ${DESTDIR}${sysconfdir}
--	test -e ${DESTDIR}${sysconfdir}/latrine.conf || ${INSTALL_DATA} latrine.conf ${DESTDIR}${sysconfdir}
+-	if test -e ${DESTDIR}${sysconfdir}/latrine.conf; then \
+-		${INSTALL_DATA} -D latrine.conf ${DESTDIR}${sysconfdir}/latrine.conf.sample; \
+-	else \
+-		${INSTALL_DATA} -D latrine.conf ${DESTDIR}${sysconfdir}/latrine.conf; \
+-	fi
 +	${INSTALL_DATA} latrine.conf ${DESTDIR}${sysconfdir}/latrine.conf.sample
  
  clean:
diff --git a/games/latrine/files/patch-configure b/games/latrine/files/patch-configure
new file mode 100644
index 000000000000..61064c369677
--- /dev/null
+++ b/games/latrine/files/patch-configure
@@ -0,0 +1,12 @@
+Index: configure
+@@ -5461,8 +5461,8 @@
+ # ----------------------------------------------------------------------------
+ { echo "$as_me:$LINENO: checking for release date" >&5
+ echo $ECHO_N "checking for release date... $ECHO_C" >&6; }
+-RELEASE_MONTH=`date -f released +%B`
+-RELEASE_YEAR=`date -f released +%Y`
++RELEASE_MONTH=$(date -j -f  '%a, %e %b %Y %T %z' "$(cat released)" +%B)
++RELEASE_YEAR=$(date -j -f  '%a, %e %b %Y %T %z' "$(cat released)" +%Y)
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define RELEASE_MONTH $RELEASE_MONTH
diff --git a/games/latrine/files/patch-data.h b/games/latrine/files/patch-data.h
deleted file mode 100644
index 9f1625d36d14..000000000000
--- a/games/latrine/files/patch-data.h
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: data.h
-@@ -19,6 +19,7 @@
- #define _DATA_H
- 
- #include <stdlib.h>
-+#include <time.h>
- 
- #define DEFAULT_RANDCOUNT   10
- #define DEFAULT_WORDLIMIT 1000
diff --git a/games/latrine/files/patch-screen.c b/games/latrine/files/patch-screen.c
new file mode 100644
index 000000000000..ec61e48c5f77
--- /dev/null
+++ b/games/latrine/files/patch-screen.c
@@ -0,0 +1,13 @@
+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