- Update to 0.15

PR:		119557
Submitted by:	Pietro Cerutti <gahr@gahr.ch> (maintainer)

10 files changed, 309 insertions, 269 deletions

diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile
index f7e4424ddfaa..394cb0249c37 100644
--- a/games/gnubg/Makefile
+++ b/games/gnubg/Makefile
@@ -6,70 +6,69 @@
 #
 
 PORTNAME=	gnubg
-PORTVERSION=	0.14.3
-PORTREVISION=	1
+PORTVERSION=	0.15
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${DISTNAME}.tar.gz	\
-		gnubg.weights-${GNUBG_WEIGHTS_VERSION}.gz	\
-		gnubg_os0.bd.gz	gnubg_ts0.bd.gz
-DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${DISTNAME}.tar.gz
+MASTER_SITES=	http://www.gnubg.org/media/sources/:src \
+					${MASTER_SITE_GNU_ALPHA}:ts
+MASTER_SITE_SUBDIR=	${PORTNAME}/:ts
+DISTFILES=	gnubg-source-MAIN-20070601.tar.gz:src \
+				gnubg_ts0.bd.gz:ts
+EXTRACT_ONLY=	gnubg-source-MAIN-20070601.tar.gz
 
 MAINTAINER=	gahr@gahr.ch
 COMMENT=	GNU Backgammon
 
-LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
-		gmp.7:${PORTSDIR}/math/libgmp4 \
-		gtkextra-x11-2.0.1:${PORTSDIR}/x11-toolkits/gtkextra2
+BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison
+LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
+					gdbm.3:${PORTSDIR}/databases/gdbm \
+					gtkextra-x11-2.0.1:${PORTSDIR}/x11-toolkits/gtkextra2
+
+WRKSRC=	${WRKDIR}/gnubg
+
+OPTIONS=	ESOUND	"Enable sound support" ON	\
+			NLS		"Enable gettext support" ON
 
-USE_GNOME=	gnomehack gnometarget gtk20 libxml2
-USE_GETOPT_LONG=	yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		ac_cv_path_ARTSC_CONFIG=no ac_cv_path_LIBART_CONFIG=no
 CONFIGURE_ARGS=	--with-x --with-gtk2 --enable-nls --with-timecontrol \
-		--without-board3d
+						--without-board3d
 
-MAN6=		gnubg.6
-INFO=		gnubg
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+		ac_cv_path_ARTSC_CONFIG=no ac_cv_path_LIBART_CONFIG=no
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+USE_GNOME=	gnomehack gnometarget libxml2
+USE_GETOPT_LONG=	yes
+USE_GMAKE=	yes
+USE_PYTHON=	2.0+
+USE_AUTOTOOLS=	libtool:15 automake:19
+GNU_CONFIGURE=	yes
 
-GNUBG_WEIGHTS_VERSION=	0.14
+.include <bsd.port.pre.mk>
 
-.if defined(WITH_ESOUND)
+.if !defined(WITHOUT_ESOUND)
 USE_GNOME+=	esound
 .else
 CONFIGURE_ENV+=	ac_cv_path_AUDIOFILE_CONFIG=no ac_cv_path_ESD_CONFIG=no
 .endif
 
-.if defined(WITH_NAS)
-CONFIGURE_ARGS+=	--enable-nas
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+CONFIGURE_ARGS+=	--enable-nls
 .else
-CONFIGURE_ARGS+=	--disable-nas
+PLIST_SUB+=	NLS="@comment "
+CONFIGURE_ARGS+=	--disable-nls
 .endif
 
-.if defined(WITH_GUILE)
-CONFIGURE_ARGS+=	--with-guile
-.else
-CONFIGURE_ARGS+=	--without-guile
+.if ${ARCH} == "sparc64"
+CONFIGURE_ARGS+=	--disable-sse
 .endif
 
-.if defined(WITH_PYTHON)
-USE_PYTHON=	2.0+
-CONFIGURE_ARGS+=	--with-python
-.else
-CONFIGURE_ARGS+=	--without-python
-.endif
+MAN6=	gnubg.6
+INFO=	gnubg
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 post-extract:
-	${GUNZIP_CMD} --stdout ${DISTDIR}/${DIST_SUBDIR}/gnubg.weights-${GNUBG_WEIGHTS_VERSION}.gz > ${WRKSRC}/gnubg.weights
-	${GUNZIP_CMD} --stdout ${DISTDIR}/${DIST_SUBDIR}/gnubg_os0.bd.gz > ${WRKSRC}/gnubg_os0.bd
 	${GUNZIP_CMD} --stdout ${DISTDIR}/${DIST_SUBDIR}/gnubg_ts0.bd.gz > ${WRKSRC}/gnubg_ts0.bd
 
 post-patch:
@@ -77,4 +76,7 @@ post-patch:
 	${REINPLACE_CMD} -e 's|"getopt\.h"|<getopt.h>|g' ${WRKSRC}/${file}
 .endfor
 
-.include <bsd.port.mk>
+pre-configure:
+	cd ${WRKSRC} && ./autogen.sh
+
+.include <bsd.port.post.mk>
diff --git a/games/gnubg/distinfo b/games/gnubg/distinfo
index b4018149ab25..d7fdc22cd86b 100644
--- a/games/gnubg/distinfo
+++ b/games/gnubg/distinfo
@@ -1,12 +1,6 @@
-MD5 (gnubg/gnubg-0.14.3.tar.gz) = b3ab1ace76fa4bea69db8e617ab587da
-SHA256 (gnubg/gnubg-0.14.3.tar.gz) = 76d18f1a7952a4ba2372e439b3c4ecf2fcd244d334c609bb22d3f501067d1d72
-SIZE (gnubg/gnubg-0.14.3.tar.gz) = 4241526
-MD5 (gnubg/gnubg.weights-0.14.gz) = 9f1154a9b327954a260726aa6aa6eea5
-SHA256 (gnubg/gnubg.weights-0.14.gz) = 6c134ded36d0875cb673a4f9fd84e2d30424935951baeffcd94852ccdb2daf70
-SIZE (gnubg/gnubg.weights-0.14.gz) = 460747
-MD5 (gnubg/gnubg_os0.bd.gz) = 4015327219322eacab5ddd58f6fa268d
-SHA256 (gnubg/gnubg_os0.bd.gz) = e84a36f133ee7ea9fa3686af6c111088b8b43906db1b6c6b3db0035c84cda809
-SIZE (gnubg/gnubg_os0.bd.gz) = 906720
-MD5 (gnubg/gnubg_ts0.bd.gz) = 01bd14c184bd701ae484618eb8acec6e
-SHA256 (gnubg/gnubg_ts0.bd.gz) = 0934e4f2d84f5cd50c2ff4592c93c49d43f7cb89da342600736849c7362626d5
-SIZE (gnubg/gnubg_ts0.bd.gz) = 5899380
+MD5 (gnubg-source-MAIN-20070601.tar.gz) = b896dc885f5db15ce63b190d16b6f6b9
+SHA256 (gnubg-source-MAIN-20070601.tar.gz) = 5565fe50de9c53d4d7ba73f3ff97e6e49fa50c4d5cec3be9a831431fbe5fdb98
+SIZE (gnubg-source-MAIN-20070601.tar.gz) = 8421846
+MD5 (gnubg_ts0.bd.gz) = 97783d786411349ec61b3c87de9751e6
+SHA256 (gnubg_ts0.bd.gz) = 6a1609de2c6c50ce190f03317e0d3592b772b07902222170cd2ba9e2fcd7557f
+SIZE (gnubg_ts0.bd.gz) = 5899380
diff --git a/games/gnubg/files/patch-Makefile.in b/games/gnubg/files/patch-Makefile.in
deleted file mode 100644
index 918d4d92a143..000000000000
--- a/games/gnubg/files/patch-Makefile.in
+++ /dev/null
@@ -1,103 +0,0 @@
---- Makefile.in.orig	Fri May  7 15:20:25 2004
-+++ Makefile.in	Sat Aug  5 02:38:28 2006
-@@ -289,14 +289,14 @@
- 
- makebearoff_SOURCES = makebearoff.c eval.h eval.c positionid.h positionid.c \
- 	pub_eval.c matchequity.c matchequity.h matchid.h matchid.c \
--	i18n.c i18n.h getopt.c getopt.h getopt1.c osr.c osr.h \
-+	i18n.c i18n.h osr.c osr.h \
-         bearoffgammon.c bearoffgammon.h bearoff.c bearoff.h path.c path.h \
- 	format.c format.h mec.h mec.c $(LIBGEN_SOURCES)  $(BR1_SOURCES)
- 
- makebearoff_LDADD = -Llib -levent $(COMMON_LIBS) @GTK_LIBS@
- makebearoff_DEPENDENCIES = lib/libevent.a
- 
--makebearoff1_SOURCES = makebearoff1.c getopt.c getopt.h getopt1.c \
-+makebearoff1_SOURCES = makebearoff1.c \
- 	$(LIBGEN_SOURCES)
- 
- makebearoff1_LDADD = @GTK_LIBS@ 
-@@ -308,7 +308,7 @@
- 
- makehyper_SOURCES = makehyper.c eval.h eval.c positionid.h positionid.c \
-         pub_eval.c matchequity.c matchequity.h matchid.h matchid.c \
--        i18n.c i18n.h getopt.c getopt.h getopt1.c osr.c osr.h \
-+        i18n.c i18n.h osr.c osr.h \
-         bearoffgammon.c bearoffgammon.h bearoff.c bearoff.h path.c path.h \
-         drawboard.c drawboard.h format.c format.h mec.h mec.c \
- 	$(LIBGEN_SOURCES) $(BR1_SOURCES)
-@@ -319,7 +319,7 @@
- 
- bearoffdump_SOURCES = bearoffdump.c eval.h eval.c positionid.h positionid.c \
- 	pub_eval.c matchequity.c matchequity.h matchid.h matchid.c \
--        i18n.c i18n.h getopt.c getopt.h getopt1.c osr.c osr.h \
-+        i18n.c i18n.h osr.c osr.h \
-         bearoffgammon.c bearoffgammon.h bearoff.c bearoff.h path.c path.h \
- 	format.c format.h mec.h mec.c $(LIBGEN_SOURCES)  $(BR1_SOURCES)
- 
-@@ -354,8 +354,8 @@
- @COMPILE_BR1_FALSE@am__objects_2 =
- am_bearoffdump_OBJECTS = bearoffdump.$(OBJEXT) eval.$(OBJEXT) \
- 	positionid.$(OBJEXT) pub_eval.$(OBJEXT) matchequity.$(OBJEXT) \
--	matchid.$(OBJEXT) i18n.$(OBJEXT) getopt.$(OBJEXT) \
--	getopt1.$(OBJEXT) osr.$(OBJEXT) bearoffgammon.$(OBJEXT) \
-+	matchid.$(OBJEXT) i18n.$(OBJEXT) \
-+	osr.$(OBJEXT) bearoffgammon.$(OBJEXT) \
- 	bearoff.$(OBJEXT) path.$(OBJEXT) format.$(OBJEXT) mec.$(OBJEXT) \
- 	$(am__objects_1) $(am__objects_2)
- bearoffdump_OBJECTS = $(am_bearoffdump_OBJECTS)
-@@ -365,7 +365,7 @@
- erftest_LDADD = $(LDADD)
- erftest_DEPENDENCIES =
- erftest_LDFLAGS =
--am__objects_3 = gnubg.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT) \
-+am__objects_3 = gnubg.$(OBJEXT) \
- 	eval.$(OBJEXT) play.$(OBJEXT) positionid.$(OBJEXT) \
- 	drawboard.$(OBJEXT) pub_eval.$(OBJEXT) set.$(OBJEXT) \
- 	show.$(OBJEXT) database.$(OBJEXT) dice.$(OBJEXT) \
-@@ -409,20 +409,20 @@
- gnubg_OBJECTS = $(am_gnubg_OBJECTS)
- am_makebearoff_OBJECTS = makebearoff.$(OBJEXT) eval.$(OBJEXT) \
- 	positionid.$(OBJEXT) pub_eval.$(OBJEXT) matchequity.$(OBJEXT) \
--	matchid.$(OBJEXT) i18n.$(OBJEXT) getopt.$(OBJEXT) \
--	getopt1.$(OBJEXT) osr.$(OBJEXT) bearoffgammon.$(OBJEXT) \
-+	matchid.$(OBJEXT) i18n.$(OBJEXT) \
-+	osr.$(OBJEXT) bearoffgammon.$(OBJEXT) \
- 	bearoff.$(OBJEXT) path.$(OBJEXT) format.$(OBJEXT) mec.$(OBJEXT) \
- 	$(am__objects_1) $(am__objects_2)
- makebearoff_OBJECTS = $(am_makebearoff_OBJECTS)
- makebearoff_LDFLAGS =
--am_makebearoff1_OBJECTS = makebearoff1.$(OBJEXT) getopt.$(OBJEXT) \
--	getopt1.$(OBJEXT) $(am__objects_1)
-+am_makebearoff1_OBJECTS = makebearoff1.$(OBJEXT) \
-+	$(am__objects_1)
- makebearoff1_OBJECTS = $(am_makebearoff1_OBJECTS)
- makebearoff1_LDFLAGS =
- am_makehyper_OBJECTS = makehyper.$(OBJEXT) eval.$(OBJEXT) \
- 	positionid.$(OBJEXT) pub_eval.$(OBJEXT) matchequity.$(OBJEXT) \
--	matchid.$(OBJEXT) i18n.$(OBJEXT) getopt.$(OBJEXT) \
--	getopt1.$(OBJEXT) osr.$(OBJEXT) bearoffgammon.$(OBJEXT) \
-+	matchid.$(OBJEXT) i18n.$(OBJEXT) \
-+	osr.$(OBJEXT) bearoffgammon.$(OBJEXT) \
- 	bearoff.$(OBJEXT) path.$(OBJEXT) drawboard.$(OBJEXT) \
- 	format.$(OBJEXT) mec.$(OBJEXT) $(am__objects_1) \
- 	$(am__objects_2)
-@@ -451,8 +451,7 @@
- @AMDEP_TRUE@	./$(DEPDIR)/eval.Po ./$(DEPDIR)/export.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/external.Po ./$(DEPDIR)/external_l.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/external_y.Po ./$(DEPDIR)/format.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/formatgs.Po ./$(DEPDIR)/getopt.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/gnubg.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/formatgs.Po ./$(DEPDIR)/gnubg.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/gnubgmodule.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/gtk-multiview.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/gtkbearoff.Po ./$(DEPDIR)/gtkboard.Po \
-@@ -635,8 +634,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/external_y.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/format.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/formatgs.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnubg.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnubgmodule.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-multiview.Po@am__quote@
diff --git a/games/gnubg/files/patch-dice.c b/games/gnubg/files/patch-dice.c
new file mode 100644
index 000000000000..3d4dbcd23010
--- /dev/null
+++ b/games/gnubg/files/patch-dice.c
@@ -0,0 +1,10 @@
+--- dice.c.orig	2008-01-11 07:30:32.000000000 +0100
++++ dice.c	2008-01-11 07:31:35.000000000 +0100
+@@ -34,6 +34,7 @@
+ #include <unistd.h>
+ #endif
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #if HAVE_SOCKETS
+ #ifndef WIN32
diff --git a/games/gnubg/files/patch-doc_Makefile.am b/games/gnubg/files/patch-doc_Makefile.am
new file mode 100644
index 000000000000..e665dd433721
--- /dev/null
+++ b/games/gnubg/files/patch-doc_Makefile.am
@@ -0,0 +1,21 @@
+--- doc/Makefile.am.orig	2008-01-11 08:12:03.000000000 +0100
++++ doc/Makefile.am	2008-01-11 08:13:00.000000000 +0100
+@@ -1,4 +1,5 @@
+ gnubg_helpdir = $(DESTDIR)$(pkgdatadir)/doc
++gnubg_infodir = ${prefix}/info
+ gnubg_help_DATA =  gnubg.html
+ 
+ man_MANS = gnubg.6
+@@ -35,10 +36,11 @@
+ 
+ install-data-local: gnubg.html allabout.html gnubg.info images/*.png
+ 	$(mkinstalldirs) $(gnubg_helpdir)/images
+-	-for file in gnubg.html allabout.html gnubgdb.xml allabout.xml gnubg.info; do \
++	-for file in gnubg.html allabout.html gnubgdb.xml allabout.xml; do \
+ 	basefile=`basename $$file`; \
+ 	$(INSTALL_DATA) $(srcdir)/$$file $(gnubg_helpdir)/$$basefile; \
+ 	done
++	$(INSTALL_DATA) $(srcdir)/gnubg.info $(gnubg_infodir)/
+ 
+ CLEANFILES=*.html
+ DISTCLEANFILES=gnubg.texi gnubg.info gnubg.6
diff --git a/games/gnubg/files/patch-eval.c b/games/gnubg/files/patch-eval.c
deleted file mode 100644
index 8c721d4b9fc6..000000000000
--- a/games/gnubg/files/patch-eval.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- eval.c.orig	2007-11-25 23:01:11.000000000 +0100
-+++ eval.c	2007-11-25 23:02:20.000000000 +0100
-@@ -798,7 +798,7 @@
- 	    if( !fstat( h, &st ) &&
- 		( p = mmap( NULL, st.st_size, PROT_READ | PROT_WRITE,
- 			    MAP_PRIVATE, h, 0 ) ) ) {
--		( (float *) p ) += 2; /* skip magic number and version */
-+		p += 2; /* skip magic number and version */
- 		fReadWeights =
- 		    ( p = NeuralNetCreateDirect( &nnContact, p ) ) &&
- 		    ( p = NeuralNetCreateDirect( &nnRace, p ) ) &&
diff --git a/games/gnubg/files/patch-htmlimages.c b/games/gnubg/files/patch-htmlimages.c
deleted file mode 100644
index e4a60ac29dd3..000000000000
--- a/games/gnubg/files/patch-htmlimages.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- htmlimages.c.orig	2007-11-25 23:07:11.000000000 +0100
-+++ htmlimages.c	2007-11-25 23:07:24.000000000 +0100
-@@ -30,6 +30,7 @@
- #endif
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- 
- #if HAVE_SYS_TYPES_H
diff --git a/games/gnubg/files/patch-lib_neuralnet.c b/games/gnubg/files/patch-lib_neuralnet.c
index 8ee6bab0bbd0..b87895ea9bc4 100644
--- a/games/gnubg/files/patch-lib_neuralnet.c
+++ b/games/gnubg/files/patch-lib_neuralnet.c
@@ -1,46 +1,40 @@
---- lib/neuralnet.c.orig	2007-11-25 22:55:20.000000000 +0100
-+++ lib/neuralnet.c	2007-11-25 23:00:22.000000000 +0100
-@@ -384,15 +384,17 @@
+--- lib/neuralnet.c.orig	2008-01-14 23:59:11.000000000 +0100
++++ lib/neuralnet.c	2008-01-15 00:05:27.000000000 +0100
+@@ -30,6 +30,10 @@
+ #include <time.h>
+ #include <stdlib.h>
  
-     return 0;
- }
--extern void *NeuralNetCreateDirect( neuralnet *pnn, void *p ) {
-+extern void *NeuralNetCreateDirect( neuralnet *pnn, void *v_p ) {
-+   int *p = v_p;
-+   float *fp = v_p;
-  
-    pnn->cInput = *( ( (int *) p )++ );
-    pnn->cHidden = *( ( (int *) p )++ );
-    pnn->cOutput = *( ( (int *) p )++ );
-    pnn->nTrained = *( ( (int *) p )++ );
-    pnn->fDirect = TRUE;
--   pnn->rBetaHidden = *( ( (float *) p )++ );
--   pnn->rBetaOutput = *( ( (float *) p )++ );
-+   pnn->rBetaHidden = *( ( fp )++ );
-+   pnn->rBetaOutput = *( ( fp )++ );
-  
-    if( pnn->cInput < 1 || pnn->cHidden < 1 || pnn->cOutput < 1 ||
-      pnn->nTrained < 0 || pnn->rBetaHidden <= 0.0 ||
-@@ -402,14 +404,14 @@
-      return NULL;
-    }
-  
--   pnn->arHiddenWeight = p;
--   ( (float *) p ) += pnn->cInput * pnn->cHidden;
--   pnn->arOutputWeight = p;
--   ( (float *) p ) += pnn->cHidden * pnn->cOutput;
--   pnn->arHiddenThreshold = p;
--   ( (float *) p ) += pnn->cHidden;
--   pnn->arOutputThreshold = p;
--   ( (float *) p ) += pnn->cOutput;
-+   pnn->arHiddenWeight = fp;
-+   fp += pnn->cInput * pnn->cHidden;
-+   pnn->arOutputWeight = fp;
-+   fp += pnn->cHidden * pnn->cOutput;
-+   pnn->arHiddenThreshold = fp;
-+   fp += pnn->cHidden;
-+   pnn->arOutputThreshold = fp;
-+   fp += pnn->cOutput;
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#endif
++
+ #include "neuralnet.h"
+ #include "sse.h"
  
-    pnn->savedBase = malloc( pnn->cHidden * sizeof( float ) ); 
-    pnn->savedIBase = malloc( pnn->cInput * sizeof( float ) ); 
+@@ -960,7 +964,17 @@
+     if ( 0 != error ) result = 0;
+     return result;
+ 
+-#else
++#endif
++
++#ifdef __FreeBSD__
++
++#include <sys/sysctl.h>
++    size_t length = sizeof( result );
++    int error = sysctlbyname("hw.instruction_sse", &result, &length, NULL, 0);
++    if ( 0 != error) result = 0;
++    return result;
++
++#endif
+ 
+ 	asm (
+ 		/* Check if cpuid is supported (can bit 21 of flags be changed) */
+@@ -1011,7 +1025,6 @@
+ "4:"
+ 
+ 			: "=b"(result) : : "%eax", "%ecx", "%edx");
+-#endif
+ 
+ 	switch (result)
+ 	{
diff --git a/games/gnubg/files/patch-rollout.h b/games/gnubg/files/patch-rollout.h
deleted file mode 100644
index e59630803224..000000000000
--- a/games/gnubg/files/patch-rollout.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- rollout.h.orig	2007-11-25 23:05:53.000000000 +0100
-+++ rollout.h	2007-11-25 23:06:00.000000000 +0100
-@@ -59,8 +59,6 @@
- 
- } rolloutstat;
- 
--extern int nSkip;
--
- typedef void
- (rolloutprogressfunc) ( float arOutput[][ NUM_ROLLOUT_OUTPUTS ],
-                         float arStdDev[][ NUM_ROLLOUT_OUTPUTS ],
diff --git a/games/gnubg/pkg-plist b/games/gnubg/pkg-plist
index e14bed3d92ff..ce96a1be11b4 100644
--- a/games/gnubg/pkg-plist
+++ b/games/gnubg/pkg-plist
@@ -2,39 +2,152 @@ bin/bearoffdump
 bin/gnubg
 bin/makebearoff
 bin/makehyper
-%%DATADIR%%/annealing.png
-%%DATADIR%%/boards.xml
-%%DATADIR%%/gnubg.gtkrc
-%%DATADIR%%/gnubg.sql
-%%DATADIR%%/gnubg.wd
-%%DATADIR%%/gnubg.xml
-%%DATADIR%%/gnubg_os0.bd
-%%DATADIR%%/gnubg_ts0.bd
-%%DATADIR%%/met/Kazaross-Shaw.xml
-%%DATADIR%%/met/README
-%%DATADIR%%/met/TODO
-%%DATADIR%%/met/catalog
+%%NLS%%share/locale/cs/LC_MESSAGES/gnubg.mo
+%%NLS%%share/locale/da/LC_MESSAGES/gnubg.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gnubg.mo
+%%NLS%%share/locale/en_US/LC_MESSAGES/gnubg.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gnubg.mo
+%%NLS%%share/locale/is/LC_MESSAGES/gnubg.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gnubg.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gnubg.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gnubg.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/gnubg.mo
+%%DATADIR%%/doc/images/1540d81e.png
+%%DATADIR%%/doc/images/16d7944c.png
+%%DATADIR%%/doc/images/1805dc7d.png
+%%DATADIR%%/doc/images/20bc52ca.png
+%%DATADIR%%/doc/images/20d56757.png
+%%DATADIR%%/doc/images/234924dc.png
+%%DATADIR%%/doc/images/26e34ea5.png
+%%DATADIR%%/doc/images/29c6aa57.png
+%%DATADIR%%/doc/images/2d9edbab.png
+%%DATADIR%%/doc/images/2dd86698.png
+%%DATADIR%%/doc/images/2e6307ae.png
+%%DATADIR%%/doc/images/3117171e.png
+%%DATADIR%%/doc/images/33d3487.png
+%%DATADIR%%/doc/images/34740886.png
+%%DATADIR%%/doc/images/3658e0e8.png
+%%DATADIR%%/doc/images/38371a4c.png
+%%DATADIR%%/doc/images/3b2e620f.png
+%%DATADIR%%/doc/images/3cb4011e.png
+%%DATADIR%%/doc/images/4332f3e4.png
+%%DATADIR%%/doc/images/48d8024f.png
+%%DATADIR%%/doc/images/4aad0142.png
+%%DATADIR%%/doc/images/4b13a0e7.png
+%%DATADIR%%/doc/images/4bd6c15f.png
+%%DATADIR%%/doc/images/4e43baf8.png
+%%DATADIR%%/doc/images/51394706.png
+%%DATADIR%%/doc/images/5308d35c.png
+%%DATADIR%%/doc/images/53ce0fa6.png
+%%DATADIR%%/doc/images/5412263e.png
+%%DATADIR%%/doc/images/58c77df2.png
+%%DATADIR%%/doc/images/5ada89e8.png
+%%DATADIR%%/doc/images/60df14d2.png
+%%DATADIR%%/doc/images/66ed48bd.png
+%%DATADIR%%/doc/images/6a6ae1b7.png
+%%DATADIR%%/doc/images/6e75aa33.png
+%%DATADIR%%/doc/images/723e49fc.png
+%%DATADIR%%/doc/images/74a66417.png
+%%DATADIR%%/doc/images/78be1dd5.png
+%%DATADIR%%/doc/images/analysepane.png
+%%DATADIR%%/doc/images/analysesettings.png
+%%DATADIR%%/doc/images/appearence.png
+%%DATADIR%%/doc/images/be5c848.png
+%%DATADIR%%/doc/images/clearboard.png
+%%DATADIR%%/doc/images/cubebuttons.png
+%%DATADIR%%/doc/images/cubeful-ex1.png
+%%DATADIR%%/doc/images/cubeful-ex2.png
+%%DATADIR%%/doc/images/cubefuleq-ex1.png
+%%DATADIR%%/doc/images/doubleline.png
+%%DATADIR%%/doc/images/e613071.png
+%%DATADIR%%/doc/images/evalsetting.png
+%%DATADIR%%/doc/images/ff1f1de.png
+%%DATADIR%%/doc/images/gamerecord.png
+%%DATADIR%%/doc/images/gtkinterface.png
+%%DATADIR%%/doc/images/hintcubewindow.png
+%%DATADIR%%/doc/images/hintwindow.png
+%%DATADIR%%/doc/images/initialboard.png
+%%DATADIR%%/doc/images/m1921b4.png
+%%DATADIR%%/doc/images/m19f9a2cc.png
+%%DATADIR%%/doc/images/m1bd07579.png
+%%DATADIR%%/doc/images/m1e2a8a3a.png
+%%DATADIR%%/doc/images/m20a4701e.png
+%%DATADIR%%/doc/images/m215edfe5.png
+%%DATADIR%%/doc/images/m22b92249.png
+%%DATADIR%%/doc/images/m23e0471c.png
+%%DATADIR%%/doc/images/m259fcca6.png
+%%DATADIR%%/doc/images/m2698978a.png
+%%DATADIR%%/doc/images/m2759b1ca.png
+%%DATADIR%%/doc/images/m2a94f4ab.png
+%%DATADIR%%/doc/images/m2b86c3ea.png
+%%DATADIR%%/doc/images/m2c28ffc2.png
+%%DATADIR%%/doc/images/m2c37a1e7.png
+%%DATADIR%%/doc/images/m30dc13f6.png
+%%DATADIR%%/doc/images/m3a7e4f1b.png
+%%DATADIR%%/doc/images/m3eb29fd9.png
+%%DATADIR%%/doc/images/m3fb550fb.png
+%%DATADIR%%/doc/images/m3fd7ee24.png
+%%DATADIR%%/doc/images/m4149eeab.png
+%%DATADIR%%/doc/images/m46788d89.png
+%%DATADIR%%/doc/images/m4796afa7.png
+%%DATADIR%%/doc/images/m4ed24f10.png
+%%DATADIR%%/doc/images/m518778bb.png
+%%DATADIR%%/doc/images/m57625db1.png
+%%DATADIR%%/doc/images/m5781f59d.png
+%%DATADIR%%/doc/images/m5878543.png
+%%DATADIR%%/doc/images/m60d5424b.png
+%%DATADIR%%/doc/images/m634daa5.png
+%%DATADIR%%/doc/images/m68ad25e2.png
+%%DATADIR%%/doc/images/m6e32590b.png
+%%DATADIR%%/doc/images/m6e43baca.png
+%%DATADIR%%/doc/images/m6fc19da0.png
+%%DATADIR%%/doc/images/m707a2772.png
+%%DATADIR%%/doc/images/m72075f4e.png
+%%DATADIR%%/doc/images/m76e2d010.png
+%%DATADIR%%/doc/images/m7bf4f29.png
+%%DATADIR%%/doc/images/m7cee1bfc.png
+%%DATADIR%%/doc/images/m93f2ca3.png
+%%DATADIR%%/doc/images/mb4b1284.png
+%%DATADIR%%/doc/images/md9b1995.png
+%%DATADIR%%/doc/images/mgcd.png
+%%DATADIR%%/doc/images/mgtp.png
+%%DATADIR%%/doc/images/movefilter1.png
+%%DATADIR%%/doc/images/movefilter2.png
+%%DATADIR%%/doc/images/movefilter3.png
+%%DATADIR%%/doc/images/movefilterex.png
+%%DATADIR%%/doc/images/mptp.png
+%%DATADIR%%/doc/images/newbox.png
+%%DATADIR%%/doc/images/rolldice.png
+%%DATADIR%%/doc/images/rulfig1.png
+%%DATADIR%%/doc/images/rulfig2.png
+%%DATADIR%%/doc/images/rulfig3.png
+%%DATADIR%%/doc/images/rulfig4.png
+%%DATADIR%%/doc/images/rulfig5.png
+%%DATADIR%%/doc/images/setdice.png
+%%DATADIR%%/doc/images/setturn.png
+%%DATADIR%%/doc/images/tutor.png
+%%DATADIR%%/doc/images/tutorwarning.png
+%%DATADIR%%/doc/gnubg.html
+%%DATADIR%%/doc/allabout.html
+%%DATADIR%%/doc/gnubgdb.xml
+%%DATADIR%%/doc/allabout.xml
+%%DATADIR%%/met/catalog.xml
 %%DATADIR%%/met/g11.xml
 %%DATADIR%%/met/jac050.xml
 %%DATADIR%%/met/jac100.xml
 %%DATADIR%%/met/jacobs.xml
-%%DATADIR%%/met/mec.xml
+%%DATADIR%%/met/Kazaross-Shaw.xml
 %%DATADIR%%/met/mec26.xml
+%%DATADIR%%/met/mec.xml
+%%DATADIR%%/met/catalog.dtd
 %%DATADIR%%/met/met.dtd
 %%DATADIR%%/met/met.xsl
 %%DATADIR%%/met/ortega.xml
+%%DATADIR%%/met/README
 %%DATADIR%%/met/snowie.xml
+%%DATADIR%%/met/TODO
 %%DATADIR%%/met/woolsey.xml
 %%DATADIR%%/met/zadeh.xml
-%%DATADIR%%/rulfig1.png
-%%DATADIR%%/rulfig2.png
-%%DATADIR%%/rulfig3.png
-%%DATADIR%%/rulfig4.png
-%%DATADIR%%/rulfig5.png
-%%DATADIR%%/scripts/batch.py
-%%DATADIR%%/scripts/batch_win.py
-%%DATADIR%%/scripts/database.py
-%%DATADIR%%/scripts/gnubg.py
 %%DATADIR%%/sounds/chequer.wav
 %%DATADIR%%/sounds/dance.wav
 %%DATADIR%%/sounds/double.wav
@@ -47,23 +160,64 @@ bin/makehyper
 %%DATADIR%%/sounds/resign.wav
 %%DATADIR%%/sounds/roll.wav
 %%DATADIR%%/sounds/take.wav
-%%DATADIR%%/texinfo.dtd
-share/locale/cs/LC_MESSAGES/gnubg.mo
-share/locale/da/LC_MESSAGES/gnubg.mo
-share/locale/de/LC_MESSAGES/gnubg.mo
-share/locale/en@quot/LC_MESSAGES/gnubg.mo
-share/locale/en_US/LC_MESSAGES/gnubg.mo
-share/locale/fr/LC_MESSAGES/gnubg.mo
-share/locale/is/LC_MESSAGES/gnubg.mo
-share/locale/it/LC_MESSAGES/gnubg.mo
-share/locale/ja/LC_MESSAGES/gnubg.mo
-share/locale/ru/LC_MESSAGES/gnubg.mo
-share/locale/tr/LC_MESSAGES/gnubg.mo
+%%DATADIR%%/textures/logo2.bmp
+%%DATADIR%%/textures/logo.bmp
+%%DATADIR%%/textures/total.bmp
+%%DATADIR%%/textures/alder.png
+%%DATADIR%%/textures/ash.png
+%%DATADIR%%/textures/berch.png
+%%DATADIR%%/textures/felt.png
+%%DATADIR%%/textures/hinge.png
+%%DATADIR%%/textures/hinge2.png
+%%DATADIR%%/textures/maple.png
+%%DATADIR%%/textures/marble.png
+%%DATADIR%%/textures/oak.png
+%%DATADIR%%/textures/pine.png
+%%DATADIR%%/textures/pine2.png
+%%DATADIR%%/textures/redwood.png
+%%DATADIR%%/textures/stain.png
+%%DATADIR%%/textures/suede.png
+%%DATADIR%%/textures/swirl.png
+%%DATADIR%%/textures/Grass01.png
+%%DATADIR%%/textures/wavesand01.png
+%%DATADIR%%/textures/Water01.png
+%%DATADIR%%/textures/EarthSand01.png
+%%DATADIR%%/textures/wood.png
+%%DATADIR%%/scripts/gnubg.py
+%%DATADIR%%/scripts/batch.py
+%%DATADIR%%/scripts/database.py
+%%DATADIR%%/scripts/batch_win.py
+%%DATADIR%%/scripts/matchseries.py
+%%DATADIR%%/scripts/db_import.py
+%%DATADIR%%/flags/czech.png
+%%DATADIR%%/flags/denmark.png
+%%DATADIR%%/flags/england.png
+%%DATADIR%%/flags/france.png
+%%DATADIR%%/flags/germany.png
+%%DATADIR%%/flags/iceland.png
+%%DATADIR%%/flags/italy.png
+%%DATADIR%%/flags/japan.png
+%%DATADIR%%/flags/russia.png
+%%DATADIR%%/flags/turkey.png
+%%DATADIR%%/flags/usa.png
+%%DATADIR%%/fonts/COPYRIGHT.TXT.gz
+%%DATADIR%%/fonts/VeraBd.ttf
+%%DATADIR%%/fonts/VeraSeBd.ttf
+%%DATADIR%%/fonts/Vera.ttf
+%%DATADIR%%/gnubg_ts0.bd
+%%DATADIR%%/gnubg.wd
+%%DATADIR%%/boards.xml
+%%DATADIR%%/gnubg_os0.bd
+%%DATADIR%%/gnubg.game.sql
+%%DATADIR%%/gnubg.gtkrc
 @dirrmtry share/locale/en_US/LC_MESSAGES
 @dirrmtry share/locale/en_US
-@dirrmtry share/locale/en@quot/LC_MESSAGES
-@dirrmtry share/locale/en@quot
+@dirrm %%DATADIR%%/textures
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/met
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%/flags
+@dirrm %%DATADIR%%/doc/images
+@dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%