Date: Sun, 20 Dec 1998 11:50:49 +0000 From: dmlb@ragnet.demon.co.uk To: FreeBSD-gnats-submit@FreeBSD.ORG Cc: dmlb@ragnet.demon.co.uk Subject: ports/9142: Update to tkdesk port. Message-ID: <E0zrhNo-0005sH-00@ragnet.demon.co.uk>
next in thread | raw e-mail | index | archive | help
>Number: 9142
>Category: ports
>Synopsis: Re-work patches to configure script to be Tcl version tolerant
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 20 04:40:00 PST 1998
>Last-Modified:
>Originator: Duncan Barclay
>Organization:
Hah!
>Release: FreeBSD 2.2.6-RELEASE i386
>Environment:
Any ports system
>Description:
A small change to the Makefile and patches so that configuring
tkdesk is better handled. This is a side effect of working on a
pre-release of TkDesk-1.2 which will be able to use Tcl 8.0.
>How-To-Repeat:
Not applicable
>Fix:
Diffs against ports CVSupd on 19/12/98
Index: Makefile
===================================================================
RCS file: /ide0.e/ncvs/ports/x11-fm/tkdesk/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile 1998/10/10 03:22:20 1.11
+++ Makefile 1998/12/20 11:02:47
@@ -16,6 +16,8 @@
USE_GMAKE= YES
GNU_CONFIGURE= YES
+CONFIGURE_ENV+= TCLCONF_PATH=/usr/local/lib/tcl7.6
+CONFIGURE_ENV+= TKCONF_PATH=/usr/local/lib/tk4.2
MAN1= tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1
Index: patches/patch-aa
===================================================================
RCS file: /ide0.e/ncvs/ports/x11-fm/tkdesk/patches/patch-aa,v
retrieving revision 1.8
diff -u -r1.8 patch-aa
--- patch-aa 1998/10/10 03:22:42 1.8
+++ patch-aa 1998/12/20 10:58:06
@@ -1,21 +1,13 @@
-*** configure~ Sun Sep 20 20:41:40 1998
---- configure Mon Sep 21 20:00:18 1998
-***************
-*** 2109,2116 ****
- s%@TCL_LD_SEARCH_FLAGS@%$TCL_LD_SEARCH_FLAGS%g
- s%@TCL_EXEC_PREFIX@%$TCL_EXEC_PREFIX%g
- s%@TK_EXEC_PREFIX@%$TK_EXEC_PREFIX%g
-! s%@TCL_INCLUDE_PATH@%$TCL_INCLUDE_PATH%g
-! s%@TK_INCLUDE_PATH@%$TK_INCLUDE_PATH%g
- s%@TK_XINCLUDES@%$TK_XINCLUDES%g
- s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
- s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g
---- 2109,2116 ----
- s%@TCL_LD_SEARCH_FLAGS@%$TCL_LD_SEARCH_FLAGS%g
- s%@TCL_EXEC_PREFIX@%$TCL_EXEC_PREFIX%g
- s%@TK_EXEC_PREFIX@%$TK_EXEC_PREFIX%g
-! s%@TCL_INCLUDE_PATH@%$TCL_INCLUDE_PATH/tcl7.6%g
-! s%@TK_INCLUDE_PATH@%$TK_INCLUDE_PATH/tk4.2%g
- s%@TK_XINCLUDES@%$TK_XINCLUDES%g
- s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
- s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g
+--- configure~ Sun Sep 20 20:41:40 1998
++++ configure Sun Dec 20 10:57:19 1998
+@@ -647,8 +647,8 @@
+ # ITCL_LIB_SPEC already set in itclConfig.sh
+ ITCL_LIB_STATIC=${TCLCONF_PATH}/libitcl${ITCL_VERSION}.a
+ else
+- TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include
+- TK_INCLUDE_PATH=$TK_EXEC_PREFIX/include
++ TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include/tcl${TCL_VERSION}
++ TK_INCLUDE_PATH=$TK_EXEC_PREFIX/include/tk${TK_VERSION}
+ NEED_ITCL_LIB=lib_itcl
+ ITCL_LIB_SPEC=itcl/libitcl.a
+ ITCL_LIB_STATIC=itcl/libitcl.a
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E0zrhNo-0005sH-00>