4 files changed, 70 insertions, 35 deletions

diff --git a/games/eboard/Makefile b/games/eboard/Makefile
index a8bf6b2601eb..821ccd8d51ca 100644
--- a/games/eboard/Makefile
+++ b/games/eboard/Makefile
@@ -6,33 +6,31 @@
 #
 
 PORTNAME=	eboard
-PORTVERSION=	0.8.0
-PORTREVISION=	1
-EXTRASVERSION=	1pl2
+PORTVERSION=	0.9.5
+EXTRAS=		1pl2 2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} eboard-extras-${EXTRASVERSION}.tar.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} eboard-extras-1pl2.tar.gz eboard-extras-2.tar.gz
 
 MAINTAINER=	petef@FreeBSD.org
 COMMENT=	GTK+ chess board interface (mainly for FICS and chessd)
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext
-
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 USE_GNOME=	imlib
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 
+CONFIGURE_ARGS=	--prefix=${PREFIX} --extra-inc=${LOCALBASE}/include:${X11BASE}/include --extra-ld=${LOCALBASE}/lib:${X11BASE}/lib
+
 INSTALL_TARGET=	install install-man
 
 MAN1=	eboard-config.1 eboard-addtheme.1
 MAN6=	eboard.6
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,-O6,,' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's,po intl,po,' -e 's,CXXFLAGS =,CXXFLAGS +=,' \
-		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's,g++,${CXX},' -e 's,-O6,${CXXFLAGS},' \
+		${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -43,11 +41,9 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Documentation/${file} ${DOCSDIR}
 .endfor
 .endif
-	${INSTALL_DATA} ${WRKDIR}/eboard-extras-${EXTRASVERSION}/*.png \
-		${PREFIX}/share/eboard
-	${INSTALL_DATA} ${WRKDIR}/eboard-extras-${EXTRASVERSION}/*.wav \
-		${PREFIX}/share/eboard
-	@${CAT} ${WRKDIR}/eboard-extras-${EXTRASVERSION}/extras1.conf >> \
-		${PREFIX}/share/eboard/eboard_themes.conf
+.for extra in ${EXTRAS}
+	@cd ${WRKDIR}/eboard-extras-${extra} && ./${CONFIGURE_SCRIPT} --prefix=${PREFIX}
+	@cd ${WRKDIR}/eboard-extras-${extra} && ${SETENV} ${MAKE_ENV} ${MAKE} install
+.endfor
 
 .include <bsd.port.mk>
diff --git a/games/eboard/distinfo b/games/eboard/distinfo
index 9bca8b119f26..17b5715f5b4f 100644
--- a/games/eboard/distinfo
+++ b/games/eboard/distinfo
@@ -1,2 +1,3 @@
-MD5 (eboard-0.8.0.tar.gz) = 4833405d70b86af52c56ebc0ecb306eb
+MD5 (eboard-0.9.5.tar.gz) = 2c22384e0a75c6037eb795df41e3c63b
 MD5 (eboard-extras-1pl2.tar.gz) = d5fb7a541d9ef5f6d1d565d877b1ab9a
+MD5 (eboard-extras-2.tar.gz) = e0994803fdd2b3c6b2367efeaa841a34
diff --git a/games/eboard/files/patch-configure b/games/eboard/files/patch-configure
new file mode 100644
index 000000000000..0ba8b9be0cfe
--- /dev/null
+++ b/games/eboard/files/patch-configure
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- configure.orig	Wed Nov 26 17:48:49 2003
++++ configure	Sun Dec 21 10:00:21 2003
+@@ -244,7 +244,7 @@
+ 	}
+ 	print TESTCC "$program";
+ 	close TESTCC;
+-	if (run_cmd($cxx,@cxxflags,"-c","test.cc","-o","xxtest.o") != 0) {
++	if (0) {
+ 	    print ": no\n";
+ 	    $y = header_def($x);
+ 	    print CONFIGH "#undef $y\n";
diff --git a/games/eboard/pkg-plist b/games/eboard/pkg-plist
index 70efe310e9aa..ca78101e8aa3 100644
--- a/games/eboard/pkg-plist
+++ b/games/eboard/pkg-plist
@@ -1,49 +1,74 @@
 bin/eboard
 bin/eboard-addtheme
 bin/eboard-config
-%%PORTDOCS%%share/doc/eboard/Crafty.txt
-%%PORTDOCS%%share/doc/eboard/FICS-Timeseal.txt
-%%PORTDOCS%%share/doc/eboard/GNUChess4.txt
-%%PORTDOCS%%share/doc/eboard/GNUChess5.txt
-%%PORTDOCS%%share/doc/eboard/README
-%%PORTDOCS%%share/doc/eboard/Scripts.txt
-%%PORTDOCS%%share/doc/eboard/Sjeng.txt
-%%PORTDOCS%%share/doc/eboard/Themes.txt
+%%PORTDOCS%%%%DOCSDIR%%/Crafty.txt
+%%PORTDOCS%%%%DOCSDIR%%/FICS-Timeseal.txt
+%%PORTDOCS%%%%DOCSDIR%%/GNUChess4.txt
+%%PORTDOCS%%%%DOCSDIR%%/GNUChess5.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/Scripts.txt
+%%PORTDOCS%%%%DOCSDIR%%/Sjeng.txt
+%%PORTDOCS%%%%DOCSDIR%%/Themes.txt
+share/eboard/Adventurer.png
 share/eboard/Alpha.png
+share/eboard/Altinov.png
+share/eboard/Beat1.wav
+share/eboard/Beat2.wav
+share/eboard/Berlin.png
+share/eboard/Boing1.wav
 share/eboard/Book.png
+share/eboard/Challenge1.wav
 share/eboard/Chap.png
 share/eboard/ChessBase.png
+share/eboard/Cling1.wav
 share/eboard/Cmf.png
 share/eboard/Diagram.png
+share/eboard/Dominical72.png
 share/eboard/Draw1.wav
 share/eboard/Dyche1.png
 share/eboard/Dyche2.png
+share/eboard/Ebony.png
 share/eboard/Enquil.png
+share/eboard/GameOver1.wav
+share/eboard/Harlequin.png
 share/eboard/Jumbo.png
 share/eboard/Kingdom.png
+share/eboard/Lcd.png
 share/eboard/Leipzig.png
 share/eboard/Mayan.png
 share/eboard/Move1.wav
 share/eboard/NAG.en.txt
+share/eboard/NutBolt.png
 share/eboard/OldClassicDark.png
+share/eboard/Primepov.png
 share/eboard/Rastapov.png
+share/eboard/SadGreen.png
+share/eboard/ShallWePlay.wav
 share/eboard/Slics.png
 share/eboard/Staunton.png
 share/eboard/Tell1.wav
+share/eboard/Tick1.wav
 share/eboard/Traveler.png
 share/eboard/Usual.png
+share/eboard/Utretch.png
+share/eboard/Victory1.wav
 share/eboard/Vision.png
+share/eboard/Voosh.wav
 share/eboard/WCN.png
+share/eboard/Whitney.png
 share/eboard/Yahoo.png
-share/eboard/basic_g.png
-share/eboard/basic_w.png
-share/eboard/basic_y.png
-share/eboard/rock.png
+share/eboard/classic.png
+share/eboard/eboard.cs.dict
+share/eboard/eboard.de.dict
+share/eboard/eboard.es.dict
+share/eboard/eboard.it.dict
+share/eboard/eboard.pt_BR.dict
 share/eboard/eboard_themes.conf
-share/locale/de/LC_MESSAGES/eboard.mo
-share/locale/es/LC_MESSAGES/eboard.mo
-share/locale/it/LC_MESSAGES/eboard.mo
-share/locale/it_IT/LC_MESSAGES/eboard.mo
-share/locale/pt_BR/LC_MESSAGES/eboard.mo
+share/eboard/extras1.prevconf
+share/eboard/extras2.prevconf
+share/eboard/ghouls.png
+share/eboard/plastic.png
+share/eboard/themeconf.extras1
+share/eboard/themeconf.extras2
 @dirrm share/eboard
-%%PORTDOCS%%@dirrm share/doc/eboard
+%%PORTDOCS%%@dirrm %%DOCSDIR%%