3 files changed, 61 insertions, 25 deletions

diff --git a/games/awale/Makefile b/games/awale/Makefile
index 154981799ec9..186256098c65 100644
--- a/games/awale/Makefile
+++ b/games/awale/Makefile
@@ -6,29 +6,53 @@
 #
 
 PORTNAME=	awale
-PORTVERSION=	1.3
-PORTREVISION=	1
+PORTVERSION=	1.4
 CATEGORIES=	games
-MASTER_SITES=	SAVANNAH CENKES
+MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	African board game
 
-USE_TK_RUN=	yes
-GNU_CONFIGURE=	yes
-PORTDOCS=	AUTHORS ChangeLog NEWS README THANKS
-MAN1=	${PORTNAME}.1 x${PORTNAME}.1
-PATCH_TK_SCRIPTS=	src/xawale.tcl
-
-pre-patch:
-	@${REINPLACE_CMD} -e '/^#define.*VERSION/d' ${WRKSRC}/src/awale.c
-	@${REINPLACE_CMD} -e '/^pkgdatadir =/s|=.*|=${DATADIR}|'\
-		${WRKSRC}/src/Makefile.in
-
-post-install:
-.ifndef NOPORTDOCS
-	@${INSTALL} -d ${DOCSDIR}
-	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
+OPTIONS=	GUI "Installs Tcl/Tk GUI" on
+
+MAN1=		${PORTNAME}.1
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_GUI)
+PLIST_SUB+=	GUI="@comment "
+.else
+USE_TK_WRAPPER=	yes
+.include "${PORTSDIR}/Mk/bsd.tcl.mk"
+MAN1+=		x${PORTNAME}.1
+PLIST_SUB+=	GUI=""
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e '/bin\/bash/d' ${WRKSRC}/src/xawale.tcl
+	@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/src/x${PORTNAME}
+	@${ECHO_CMD} "${DATADIR}/xawale.tcl" >> ${WRKSRC}/src/x${PORTNAME}
+
+do-build:
+	(cd ${WRKSRC}/src && ${CC} ${CFLAGS} -o ${PORTNAME} ${PORTNAME}.c)
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${MANPREFIX}/man/man1
+	@${MKDIR} ${DATADIR}
+.for f in README *.bmp *.gif *.ico *.png
+	${INSTALL_DATA} ${WRKSRC}/src/${f} ${DATADIR}
+.endfor
+.if !defined(WITHOUT_X11)
+	${INSTALL_SCRIPT} ${WRKSRC}/src/x${PORTNAME} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/x${PORTNAME}.1 ${MANPREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/src/xawale.tcl ${DATADIR}
+.endif
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for f in AUTHORS ChangeLog NEWS README THANKS
+	cd ${WRKSRC} && ${INSTALL_DATA} ${f} ${DOCSDIR}
+.endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/awale/distinfo b/games/awale/distinfo
index 948467042437..0cbacaacc0b3 100644
--- a/games/awale/distinfo
+++ b/games/awale/distinfo
@@ -1,3 +1,3 @@
-MD5 (awale-1.3.tar.gz) = 0c9eedec2086b5dcb1248a91262f59cc
-SHA256 (awale-1.3.tar.gz) = 9c565f2b1eb8968bf0b5ccfc763cfc0961d67e186da2bf8beedb3b1e555ea194
-SIZE (awale-1.3.tar.gz) = 444752
+MD5 (awale-1.4.tar.gz) = d585597c4a85a21a9ceb2baba5f20d0e
+SHA256 (awale-1.4.tar.gz) = 3429620880df22b76cbf0530a8c23d79124f0ff35077febabea8f26a925871b8
+SIZE (awale-1.4.tar.gz) = 485792
diff --git a/games/awale/pkg-plist b/games/awale/pkg-plist
index 35996765c15c..0ba0d6ac9d43 100644
--- a/games/awale/pkg-plist
+++ b/games/awale/pkg-plist
@@ -1,5 +1,5 @@
 bin/awale
-bin/xawale
+%%GUI%%bin/xawale
 %%DATADIR%%/Awale.gif
 %%DATADIR%%/AwaleBanner.bmp
 %%DATADIR%%/README
@@ -13,11 +13,23 @@ bin/xawale
 %%DATADIR%%/Trou07.gif
 %%DATADIR%%/Trou08.gif
 %%DATADIR%%/Trou09.gif
-%%DATADIR%%/awale.png
+%%DATADIR%%/Trou10.gif
+%%DATADIR%%/Trou11.gif
+%%DATADIR%%/Trou12.gif
+%%DATADIR%%/Trou13.gif
+%%DATADIR%%/Trou14.gif
+%%DATADIR%%/Trou15.gif
 %%DATADIR%%/awale.ico
+%%DATADIR%%/awale.png
 %%DATADIR%%/copyright.gif
 %%DATADIR%%/fr.gif
 %%DATADIR%%/sp.gif
 %%DATADIR%%/uk.gif
-%%DATADIR%%/xawale.tcl
+%%GUI%%%%DATADIR%%/xawale.tcl
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%