summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorehaupt <ehaupt@FreeBSD.org>2011-10-18 13:05:36 +0000
committerehaupt <ehaupt@FreeBSD.org>2011-10-18 13:05:36 +0000
commite56af4078451f0b9675553ec087856bb366a62ad (patch)
treeb5abf8f97f55d665fb3954f1bdc627ae00ce951f
parent21a53dcec9d3712e5e49a3950abeda6190e1ce60 (diff)
downloadFreeBSD-ports-e56af4078451f0b9675553ec087856bb366a62ad.zip
FreeBSD-ports-e56af4078451f0b9675553ec087856bb366a62ad.tar.gz
- Fix MASTER_SITES
- Remove hardcoded Tcl/Tk version - Support ECHO_MSG PR: 161640 Submitted by: KATO Tsuguru <tkato432@yahoo.com>
-rw-r--r--games/awele/Makefile34
-rw-r--r--games/awele/files/patch-aa4
2 files changed, 23 insertions, 15 deletions
diff --git a/games/awele/Makefile b/games/awele/Makefile
index 7f27c41..0e580dd 100644
--- a/games/awele/Makefile
+++ b/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>
diff --git a/games/awele/files/patch-aa b/games/awele/files/patch-aa
index 6547b71..cf14711 100644
--- a/games/awele/files/patch-aa
+++ b/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
OpenPOWER on IntegriCloud