From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 22 22:00:04 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F38B1065675 for ; Tue, 22 Apr 2008 22:00:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E588B8FC21 for ; Tue, 22 Apr 2008 22:00:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m3MM03eV078045 for ; Tue, 22 Apr 2008 22:00:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m3MM03TT078044; Tue, 22 Apr 2008 22:00:03 GMT (envelope-from gnats) Resent-Date: Tue, 22 Apr 2008 22:00:03 GMT Resent-Message-Id: <200804222200.m3MM03TT078044@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, Frank Fenor Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A0DC11065672 for ; Tue, 22 Apr 2008 21:51:43 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 9A23D8FC0C for ; Tue, 22 Apr 2008 21:51:43 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m3MLpKjJ026217 for ; Tue, 22 Apr 2008 21:51:20 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m3MLpJP8026216; Tue, 22 Apr 2008 21:51:19 GMT (envelope-from nobody) Message-Id: <200804222151.m3MLpJP8026216@www.freebsd.org> Date: Tue, 22 Apr 2008 21:51:19 GMT From: Frank Fenor To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/122998: Fix some paths in tclConfig.sh X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Apr 2008 22:00:04 -0000 >Number: 122998 >Category: ports >Synopsis: Fix some paths in tclConfig.sh >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: Tue Apr 22 22:00:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Frank Fenor >Release: FreeBSD 7.0-PRERELEASE >Organization: >Environment: FreeBSD konzentrisch.de 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #5: Tue Feb 5 00:33:58 CET 2008 >Description: tclConfig.sh reports $WRKSRC from the build process as location of some libraries and headers. This problem does currently not seem to interfere with building any ports as I'm sure somebody would have noticed that. I am planning to submit a PR to bring devel/tclxml up to date tho which does require Tcl's private headers. While fixing TCL_SRC_DIR, I also fixed the other occurances of $WRKSRC, even tho I was not able to verify if I put in the correct directories since I don't know of any Tcl package that uses these settings. I think it's safe to commit this second change aswell anyways, because chances the new locations are correct are fairly good and the old ones were definitely 100% wrong. I also noticed, tclConfig.sh does contain "${WRKDIRPREFIX}" but since its not breaking anything, I left it in place. One last cosmetic change: According to http://tcl.tk/ Tcl 8.5 is no development version anymore, so I took that out of the COMMENT. >How-To-Repeat: >Fix: Apply attached patch Patch attached with submission follows: diff -Nru tcl85.vanilla/Makefile tcl85/Makefile --- tcl85.vanilla/Makefile 2008-04-03 00:03:25.000000000 +0200 +++ tcl85/Makefile 2008-04-22 23:20:21.000000000 +0200 @@ -7,6 +7,7 @@ PORTNAME= tcl PORTVERSION= 8.5.2 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl @@ -14,7 +15,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= mm@FreeBSD.org -COMMENT= Tool Command Language (development version) +COMMENT= Tool Command Language PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP} WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}/unix @@ -735,6 +736,10 @@ # ==================================================== .endif +post-build: + ${REINPLACE_CMD} -e 's|TCL_SRC_DIR=.*|TCL_SRC_DIR=${PREFIX}/include/tcl${TCL_VER}|' \ + -e 's|${WRKSRC:S/-thread/-threads/}|${PREFIX}/lib|' ${WRKSRC}/tclConfig.sh + .if defined(BUILDING_TCL_THREADS) do-install: @cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries >Release-Note: >Audit-Trail: >Unformatted: