From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Mar 15 08:00:12 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 856B116A411 for ; Thu, 15 Mar 2007 08:00:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 5E36213C46E for ; Thu, 15 Mar 2007 08:00:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l2F80CTp000978 for ; Thu, 15 Mar 2007 08:00:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l2F80CW9000977; Thu, 15 Mar 2007 08:00:12 GMT (envelope-from gnats) Resent-Date: Thu, 15 Mar 2007 08:00:12 GMT Resent-Message-Id: <200703150800.l2F80CW9000977@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Martin Tournoij Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 84A6016A401 for ; Thu, 15 Mar 2007 07:53:19 +0000 (UTC) (envelope-from carpetsmoker@glitch.carpetsmoker.net) Received: from glitch.carpetsmoker.net (carpetsmoker.xs4all.nl [82.93.23.199]) by mx1.freebsd.org (Postfix) with ESMTP id E593413C44C for ; Thu, 15 Mar 2007 07:53:18 +0000 (UTC) (envelope-from carpetsmoker@glitch.carpetsmoker.net) Received: by glitch.carpetsmoker.net (Postfix, from userid 1001) id D46CDB82B; Thu, 15 Mar 2007 08:53:13 +0100 (CET) Message-Id: <20070315075313.D46CDB82B@glitch.carpetsmoker.net> Date: Thu, 15 Mar 2007 08:53:13 +0100 (CET) From: Martin Tournoij To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/110323: Use TCL/TK 8.4: games/awele X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Martin Tournoij List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2007 08:00:12 -0000 >Number: 110323 >Category: ports >Synopsis: Use TCL/TK 8.4: games/awele >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Mar 15 08:00:11 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Martin Tournoij >Release: FreeBSD 6.2-RELEASE-p1 i386 >Organization: >Environment: FreeBSD glitch.carpetsmoker.net 6.2-RELEASE-p1 FreeBSD 6.2-RELEASE-p1 #0: Thu Feb 15 20:56:16 CET 2007 carpetsmoker@glitch.carpetsmoker.net:/usr/obj/nfs/tinderbox/jails/6.2/src/sys/GENERICri386 >Description: - Use TCL/TK 8.4 And while I'm here: - Use PLIST_FILES - Tell the user to use xawele to launch awele >How-To-Repeat: >Fix: --- patch-awele begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/games/awele/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 21 Mar 2006 11:39:45 -0000 1.13 +++ Makefile 15 Mar 2007 07:49:47 -0000 @@ -7,7 +7,8 @@ PORTNAME= awele PORTVERSION= 1.0 -CATEGORIES= games tk82 +PORTREVISION= 1 +CATEGORIES= games tk84 MASTER_SITES= http://www-air.inria.fr/ftp/Jean-Paul/ \ ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= games @@ -16,14 +17,19 @@ MAINTAINER= tg@FreeBSD.org COMMENT= An african board game -LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 - +USE_TK= yes WRKSRC= ${WRKDIR}/awele USE_IMAKE= yes USE_PERL5_BUILD=yes MAN6= xawele.6 +PLIST_FILES= bin/awelewish bin/xawele post-patch: ${PERL} -pi -e "s|\@\@LOCALBASE\@\@|${LOCALBASE}|g;" ${WRKSRC}/Imakefile + +post-install: + @${ECHO_CMD} "" + @${ECHO_CMD} "Use xawele to start awele" + @${ECHO_CMD} "" .include Index: files/patch-aa =================================================================== RCS file: /home/ncvs/ports/games/awele/files/patch-aa,v retrieving revision 1.3 diff -u -r1.3 patch-aa --- files/patch-aa 13 Dec 2000 12:03:22 -0000 1.3 +++ files/patch-aa 15 Mar 2007 07:49:47 -0000 @@ -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 -ltk82 -ltcl82 ++ TK_LIB = -L@@LOCALBASE@@/lib -ltk84 -ltcl84 XCOMM TK_LIB = -L/usr/local/lib -ltk4.0 -ltcl7.4 - TK_INCLUDE = -I/usr/local/include -+ TK_INCLUDE = -I@@LOCALBASE@@/include/tcl8.2 -I@@LOCALBASE@@/include/tk8.2 ++ TK_INCLUDE = -I@@LOCALBASE@@/include/tcl8.4 -I@@LOCALBASE@@/include/tk8.4 DEFINES = $(TK_INCLUDE) LOCAL_LIBRARIES = $(TK_LIB) -lX11 -lm XCOMM ANSI-C compiler Index: files/patch-ab =================================================================== RCS file: /home/ncvs/ports/games/awele/files/patch-ab,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-ab --- files/patch-ab 5 May 1998 08:00:27 -0000 1.1.1.1 +++ files/patch-ab 15 Mar 2007 07:49:48 -0000 @@ -1,5 +1,5 @@ --- tkAppInit.c.orig Fri Dec 8 16:35:38 1995 -+++ tkAppInit.c Fri May 1 09:36:18 1998 ++++ tkAppInit.c Thu Mar 15 08:44:13 2007 @@ -9,12 +9,10 @@ * * See the file "license.terms" for information on usage and redistribution @@ -15,15 +15,18 @@ #include "tk.h" extern void create_commands(Tcl_Interp *,Tk_Window); -@@ -27,6 +25,7 @@ +@@ -25,9 +23,7 @@ + * Sun shared libraries to be used for Tcl. + */ - extern int matherr(); - int *tclDummyMathPtr = (int *) matherr; +-extern int matherr(); +-int *tclDummyMathPtr = (int *) matherr; +- + - /* *---------------------------------------------------------------------- -@@ -77,14 +76,13 @@ + * +@@ -77,14 +73,13 @@ Tcl_AppInit(interp) Tcl_Interp *interp; /* Interpreter for application. */ { @@ -39,15 +42,7 @@ /* * Call the init procedures for included packages. Each call should -@@ -103,17 +101,14 @@ - */ - create_commands(interp, main); - link_global_variables(interp, main); -- -+ - /* - * Specify a user-specific startup file to invoke if the application - * is run interactively. Typically the startup file is "~/.apprc" +@@ -110,10 +105,7 @@ * where "app" is the name of the application. If this line is deleted * then no user-specific startup file will be run under any conditions. */ --- patch-awele ends here --- >Release-Note: >Audit-Trail: >Unformatted: