Index: head/games/awele/Makefile
===================================================================
--- head/games/awele/Makefile	(revision 283785)
+++ head/games/awele/Makefile	(revision 283786)
@@ -1,36 +1,44 @@
 # New ports collection makefile for:	awele
 # Date created:		01 May 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 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>

Property changes on: head/games/awele/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.20
\ No newline at end of property
+1.21
\ No newline at end of property
Index: head/games/awele/files/patch-aa
===================================================================
--- head/games/awele/files/patch-aa	(revision 283785)
+++ head/games/awele/files/patch-aa	(revision 283786)
@@ -1,43 +1,43 @@
 --- Imakefile.orig	Sat Dec  9 00:35:38 1995
 +++ Imakefile	Wed Nov  1 06:58:15 2000
 @@ -2,31 +2,31 @@
  
  
  XCOMM install directory
 -    AWELE_DIR		= /user/berroir/src/awele/install
 +    AWELE_DIR		= $(BINDIR)
  XCOMM tcl/tk script
      AWELE_SCRIPT	= xawele
  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
 -    CC = gcc
 +XCOMM    CC = gcc
  
  XCOMM Please don't change anything below this point 
  
      DEPLIBS = $(DEPXLIB)
  
 -    SRCS1 = 	tkAppInit.c awelewish.c alphabeta.c move.c util.c
 -    OBJS1 = 	tkAppInit.o awelewish.o alphabeta.o move.o util.o
 +    SRCS = 	tkAppInit.c awelewish.c alphabeta.c move.c util.c
 +    OBJS = 	tkAppInit.o awelewish.o alphabeta.o move.o util.o
  
      PROGRAMS = awelewish
 +    MANSUFFIX = 6
  
 -all::	$(PROGRAMS)
 -
 -ComplexProgramTarget_1($(PROGRAMS), $(LOCAL_LIBRARIES), )
 +ComplexProgramTargetNoMan($(PROGRAMS))
 +InstallManPage(xawele,$(MANDIR))
  
  install:: $(PROGRAMS) $(AWELE_SCRIPT)
  	@echo "AWELE directory is " $(AWELE_DIR) 

Property changes on: head/games/awele/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property