5 files changed, 197 insertions, 91 deletions

diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile
index af8af67ecc92..9f15a9ad4940 100644
--- a/games/gnubg/Makefile
+++ b/games/gnubg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnubg
-PORTVERSION=	0.14.1
-PORTREVISION=	4
+PORTVERSION=	0.14.3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,48 +19,61 @@ EXTRACT_ONLY=	${DISTNAME}.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU Backgammon
 
-MAN6=	gnubg.6
+LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
+		gmp.7:${PORTSDIR}/math/libgmp4 \
+		gtkextra-x11-2.0.1:${PORTSDIR}/x11-toolkits/gtkextra2
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_GNOME=	gnomehack gnometarget gtk20 libxml2
+USE_GETOPT_LONG=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	libxml2 gtk20
-WANT_ESOUND=	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
+
+MAN6=		gnubg.6
+INFO=		gnubg
 
-CONFIGURE_ARGS+=	--with-x --with-gtk2 --enable-nls --with-timecontrol --without-board3d
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
-.if defined(HAVE_ESOUND)
-CONFIGURE_ARGS += --with-esound
+GNUBG_WEIGHTS_VERSION=	0.14
+
+.if defined(WITH_ESOUND)
+USE_GNOME+=	esound
 .else
-CONFIGURE_ARGS += --without-esound
+CONFIGURE_ENV+=	ac_cv_path_AUDIOFILE_CONFIG=no ac_cv_path_ESD_CONFIG=no
 .endif
 
 .if defined(WITH_NAS)
-CONFIGURE_ARGS += --enable-nas
+CONFIGURE_ARGS+=	--enable-nas
 .else
-CONFIGURE_ARGS += --disable-nas
+CONFIGURE_ARGS+=	--disable-nas
 .endif
 
 .if defined(WITH_GUILE)
-CONFIGURE_ARGS += --with-guile
+CONFIGURE_ARGS+=	--with-guile
 .else
-CONFIGURE_ARGS += --without-guile
+CONFIGURE_ARGS+=	--without-guile
 .endif
 
 .if defined(WITH_PYTHON)
 USE_PYTHON=	2.0+
-CONFIGURE_ARGS += --with-python
+CONFIGURE_ARGS+=	--with-python
 .else
-CONFIGURE_ARGS += --without-python
+CONFIGURE_ARGS+=	--without-python
 .endif
 
-INFO=	gnubg
-
-GNUBG_WEIGHTS_VERSION=0.14
-
 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:
+.for file in gnubg.c makebearoff.c makebearoff1.c makehyper.c
+	${REINPLACE_CMD} -e 's|"getopt\.h"|<getopt.h>|g' ${WRKSRC}/${file}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/games/gnubg/distinfo b/games/gnubg/distinfo
index 51cae61cff00..b4018149ab25 100644
--- a/games/gnubg/distinfo
+++ b/games/gnubg/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnubg/gnubg-0.14.1.tar.gz) = fb5b6283daf6da99146a3df785c4f446
-SHA256 (gnubg/gnubg-0.14.1.tar.gz) = 9b1b369640cf7a80402da5e58738d74aa546631d8a3d91e5f0b9ac09a74b2080
-SIZE (gnubg/gnubg-0.14.1.tar.gz) = 3773258
+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
diff --git a/games/gnubg/files/patch-Makefile.in b/games/gnubg/files/patch-Makefile.in
new file mode 100644
index 000000000000..918d4d92a143
--- /dev/null
+++ b/games/gnubg/files/patch-Makefile.in
@@ -0,0 +1,103 @@
+--- 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-htmlimages.c b/games/gnubg/files/patch-htmlimages.c
deleted file mode 100644
index f1adf2b38475..000000000000
--- a/games/gnubg/files/patch-htmlimages.c
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: htmlimages.c
-===================================================================
-RCS file: /cvsroot/gnubg/gnubg/htmlimages.c,v
-retrieving revision 1.20
-retrieving revision 1.21
-diff -u -r1.20 -r1.21
---- htmlimages.c	6 Jan 2004 12:30:36 -0000	1.20
-+++ htmlimages.c	26 Jan 2004 07:36:02 -0000	1.21
-@@ -777,7 +777,7 @@
- 		free(asRefract[i]);
- }
- 
--extern void CommandExportHTMLImages(char *sz)
-+extern void CommandExportHTMLImages( char *sz )
- {
- 	szFile = GetFilenameBase(sz);
- 	if (!szFile)
-@@ -791,10 +791,10 @@
- 	TidyObjects();
- }
- 
--#else
--extern void CommandExportHTMLImages( char * )
-+#else /* not HAVE_LIBPNG */
-+extern void CommandExportHTMLImages( char *sz )
- {
- 	outputl( _("This installation of GNU Backgammon was compiled without\n"
- 		"support for writing HTML images.") );
- }
--#endif
-+#endif /* not HAVE_LIBPNG */
diff --git a/games/gnubg/pkg-plist b/games/gnubg/pkg-plist
index 1b053f0cd4bb..1ac7df9f8ead 100644
--- a/games/gnubg/pkg-plist
+++ b/games/gnubg/pkg-plist
@@ -1,49 +1,71 @@
+bin/bearoffdump
 bin/gnubg
 bin/makebearoff
 bin/makehyper
-share/gnubg/annealing.png
-share/gnubg/boards.xml
-share/gnubg/gnubg.gtkrc
-share/gnubg/gnubg.wd
-share/gnubg/gnubg.xml
-share/gnubg/gnubg_os0.bd
-share/gnubg/gnubg_ts0.bd
-share/gnubg/rulfig1.png
-share/gnubg/rulfig2.png
-share/gnubg/rulfig3.png
-share/gnubg/rulfig4.png
-share/gnubg/rulfig5.png
-share/gnubg/texinfo.dtd
-share/gnubg/met/catalog
-share/gnubg/met/jacobs.xml
-share/gnubg/met/met.dtd
-share/gnubg/met/met.xsl
-share/gnubg/met/snowie.xml
-share/gnubg/met/woolsey.xml
-share/gnubg/met/zadeh.xml
-share/gnubg/sounds/chequer.wav
-share/gnubg/sounds/dance.wav
-share/gnubg/sounds/double.wav
-share/gnubg/sounds/drop.wav
-share/gnubg/sounds/fanfare.wav
-share/gnubg/sounds/gameover.wav
-share/gnubg/sounds/haere-ra.wav
-share/gnubg/sounds/matchover.wav
-share/gnubg/sounds/move.wav
-share/gnubg/sounds/resign.wav
-share/gnubg/sounds/roll.wav
-share/gnubg/sounds/take.wav
-@dirrm share/gnubg/met
-@dirrm share/gnubg/sounds
-@dirrm share/gnubg
+%%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
+%%DATADIR%%/met/g11.xml
+%%DATADIR%%/met/jac050.xml
+%%DATADIR%%/met/jac100.xml
+%%DATADIR%%/met/jacobs.xml
+%%DATADIR%%/met/mec.xml
+%%DATADIR%%/met/mec26.xml
+%%DATADIR%%/met/met.dtd
+%%DATADIR%%/met/met.xsl
+%%DATADIR%%/met/ortega.xml
+%%DATADIR%%/met/snowie.xml
+%%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
+%%DATADIR%%/sounds/drop.wav
+%%DATADIR%%/sounds/fanfare.wav
+%%DATADIR%%/sounds/gameover.wav
+%%DATADIR%%/sounds/haere-ra.wav
+%%DATADIR%%/sounds/matchover.wav
+%%DATADIR%%/sounds/move.wav
+%%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_US/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
 @dirrmtry share/locale/en_US/LC_MESSAGES
 @dirrmtry share/locale/en_US
+@dirrmtry share/locale/en@quot/LC_MESSAGES
+@dirrmtry share/locale/en@quot
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/met
+@dirrm %%DATADIR%%