Update to 1.4.

5 files changed, 81 insertions, 4 deletions

diff --git a/games/gnomoku/Makefile b/games/gnomoku/Makefile
index c79a3432a431..193ece64553f 100644
--- a/games/gnomoku/Makefile
+++ b/games/gnomoku/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomoku
-PORTVERSION=	1.2
+PORTVERSION=	1.4
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/${PORTNAME}
diff --git a/games/gnomoku/distinfo b/games/gnomoku/distinfo
index e6dfb2648fca..d8b089b36dcf 100644
--- a/games/gnomoku/distinfo
+++ b/games/gnomoku/distinfo
@@ -1 +1 @@
-MD5 (gnomoku-1.2.tar.gz) = 05375da587ae497b4c260648037cddd1
+MD5 (gnomoku-1.4.tar.gz) = 5d4336f3aed7b68ee0997dbaeb57f83a
diff --git a/games/gnomoku/files/patch-fdstream.cc b/games/gnomoku/files/patch-fdstream.cc
new file mode 100644
index 000000000000..9157b5bdbcd7
--- /dev/null
+++ b/games/gnomoku/files/patch-fdstream.cc
@@ -0,0 +1,60 @@
+
+$FreeBSD$
+
+--- fdstream.cc	2002/02/05 13:27:38	1.1
++++ fdstream.cc	2002/02/05 13:35:40
+@@ -19,6 +19,8 @@
+ #include "fdstream.h"
+ 
+ #include <sys/types.h>
++#include <errno.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ namespace {
+@@ -96,7 +98,7 @@
+     return (num_written == count) ? 0 : -1;
+ }
+ 
+-fdstreambuf::int_type fdstreambuf::underflow()
++int fdstreambuf::underflow()
+ {
+     // Is the buffer already empty yet?
+     char *tmp_gptr = gptr();
+@@ -104,7 +106,8 @@
+ 
+         char *tmp_eback = eback();
+         const std::size_t num_putback =
+-            std::min <std::size_t> (tmp_gptr - tmp_eback, pback_end_ - buf);
++            (tmp_gptr - tmp_eback >  pback_end_ - buf) ? pback_end_ - buf :
++	    tmp_gptr - tmp_eback;
+ 
+         // Fill putback area.
+         tmp_eback = pback_end_ - num_putback;
+@@ -132,7 +135,7 @@
+ 
+     // First, empty the current buffer.
+     const std::size_t buf_avail = tmp_egptr - tmp_gptr;
+-    std::streamsize   idx       = std::min <std::size_t> (buf_avail, count);
++    std::streamsize   idx       = (buf_avail > count) ? count : buf_avail;
+ 
+     std::memcpy (dest, tmp_gptr, idx);
+ 
+@@ -149,7 +152,7 @@
+     if (tmp_gptr >= pback_end_) {
+ 
+         const std::size_t num_putback =
+-	    std::min <std::size_t> (idx, pback_end_ - buf);
++	    (idx > pback_end_ - buf) ? pback_end_ - buf : idx;
+ 
+         tmp_eback = pback_end_ - num_putback;
+         std::memcpy (tmp_eback, dest + idx - num_putback, num_putback);
+@@ -185,7 +188,7 @@
+     return (fd >= 0) ? flush() : -1;
+ }
+ 
+-fdstreambuf::int_type fdstreambuf::overflow (fdstreambuf::int_type c)
++int fdstreambuf::overflow (int c)
+ {
+     if (c != EOF) {
+         *pptr() = int_to_char (c);
diff --git a/games/gnomoku/files/patch-fdstream.h b/games/gnomoku/files/patch-fdstream.h
new file mode 100644
index 000000000000..612a0018dc4f
--- /dev/null
+++ b/games/gnomoku/files/patch-fdstream.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- fdstream.h	2002/02/05 13:25:12	1.1
++++ fdstream.h	2002/02/05 13:36:05
+@@ -26,6 +26,8 @@
+ 
+ namespace Gnomoku
+ {
++    typedef char char_type;
++
+     class fdstreambuf : public std::streambuf
+     {
+ 	int   buf_size;
diff --git a/games/gnomoku/pkg-plist b/games/gnomoku/pkg-plist
index 62f0fb3e135c..145461799d49 100644
--- a/games/gnomoku/pkg-plist
+++ b/games/gnomoku/pkg-plist
@@ -2,13 +2,16 @@ bin/gnomoku
 share/gnome/apps/Games/gnomoku.desktop
 share/gnome/pixmaps/gnomoku.png
 share/locale/de/LC_MESSAGES/gnomoku.mo
-share/locale/es/LC_MESSAGES/gnomoku.mo
 share/locale/fi/LC_MESSAGES/gnomoku.mo
 share/locale/fr/LC_MESSAGES/gnomoku.mo
 share/locale/hu/LC_MESSAGES/gnomoku.mo
 share/locale/it/LC_MESSAGES/gnomoku.mo
 share/locale/ja/LC_MESSAGES/gnomoku.mo
+share/locale/nn/LC_MESSAGES/gnomoku.mo
 share/locale/no/LC_MESSAGES/gnomoku.mo
+share/locale/pt/LC_MESSAGES/gnomoku.mo
 share/locale/ru/LC_MESSAGES/gnomoku.mo
+share/locale/sk/LC_MESSAGES/gnomoku.mo
+share/locale/sv/LC_MESSAGES/gnomoku.mo
 share/locale/uk/LC_MESSAGES/gnomoku.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gnomoku.mo
+share/locale/zh_TW/LC_MESSAGES/gnomoku.mo