- Fix MASTER_SITES

- Remove hardcoded Tcl/Tk version
- Support ECHO_MSG

PR:		161640
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

games/awele/Makefile

@@ -7,30 +7,38 @@
 
 PORTNAME=	awele
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games tk
-MASTER_SITES=	http://www-air.inria.fr/ftp/Jean-Paul/ \
-		${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	games
-DISTFILES=	${PORTNAME}1.0.tgz
+MASTER_SITES=	XCONTRIB/games
+DISTNAME=	${PORTNAME}${PORTVERSION}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An african board game
 
-USE_TCL_BUILD=	84
-USE_TK_BUILD=	${USE_TCL_BUILD}
-WRKSRC=		${WRKDIR}/awele
-USE_IMAKE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 USE_XORG=	x11
+USE_IMAKE=	yes
+USE_TCL_BUILD=	yes
+USE_TK_BUILD=	yes
+USE_TCL=	yes
+USE_TK=		yes
+
 MAN6=		xawele.6
 PLIST_FILES=	bin/awelewish bin/xawele
 
 post-patch:
-	${REINPLACE_CMD} -e "s|\@\@LOCALBASE\@\@|${LOCALBASE}|g;" ${WRKSRC}/Imakefile
+	@${REINPLACE_CMD} -e \
+		's|%%LOCALBASE%%|${LOCALBASE}|; \
+		 s|%%TK_VER%%|${TK_VER:S/.//}|; \
+		 s|%%TCL_VER%%|${TCL_VER:S/.//}|; \
+		 s|%%TK_INCLUDEDIR%%|${TK_INCLUDEDIR}|; \
+		 s|%%TCL_INCLUDEDIR%%|${TCL_INCLUDEDIR}|' ${WRKSRC}/Imakefile
 
 post-install:
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "Use xawele to start awele"
-	@${ECHO_CMD} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Use xawele to start awele"
+	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>

games/awele/files/patch-aa

@@ -11,10 +11,10 @@
  XCOMM libs, includes
  XCOMM TK_LIB AND TK_INCLUDE stand for tk and tcl
 -    TK_LIB		= -L/usr/local/lib -ltk -ltcl
-+    TK_LIB		= -L@@LOCALBASE@@/lib -ltk84 -ltcl84
++    TK_LIB		= -L%%LOCALBASE%%/lib -ltk%%TK_VER%% -ltcl%%TCL_VER%%
  XCOMM    TK_LIB		= -L/usr/local/lib -ltk4.0 -ltcl7.4
 -    TK_INCLUDE 		= -I/usr/local/include
-+    TK_INCLUDE 		= -I@@LOCALBASE@@/include/tcl8.4 -I@@LOCALBASE@@/include/tk8.4
++    TK_INCLUDE 		= -I%%TK_INCLUDEDIR%% -I%%TCL_INCLUDEDIR%%
      DEFINES = $(TK_INCLUDE) 
      LOCAL_LIBRARIES = $(TK_LIB) -lX11 -lm
  XCOMM ANSI-C compiler