From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 28 17:30:05 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 565F716A401 for ; Wed, 28 Feb 2007 17:30:05 +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 335E813C46B for ; Wed, 28 Feb 2007 17:30:05 +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 l1SHU4kI032363 for ; Wed, 28 Feb 2007 17:30:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l1SHU473032362; Wed, 28 Feb 2007 17:30:04 GMT (envelope-from gnats) Resent-Date: Wed, 28 Feb 2007 17:30:04 GMT Resent-Message-Id: <200702281730.l1SHU473032362@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 Matuska Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7D24E16A400 for ; Wed, 28 Feb 2007 17:23:25 +0000 (UTC) (envelope-from rebum@mail.vx.sk) Received: from mail.vx.sk (neo.vx.sk [88.198.35.14]) by mx1.freebsd.org (Postfix) with ESMTP id 101A413C4A3 for ; Wed, 28 Feb 2007 17:23:24 +0000 (UTC) (envelope-from rebum@mail.vx.sk) Received: from localhost (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id 8D3293F4F4 for ; Wed, 28 Feb 2007 18:23:23 +0100 (CET) Received: from mail.vx.sk ([127.0.0.1]) by localhost (mail.vx.sk [127.0.0.1]) (amavisd-new, port 10024) with LMTP id fSx1ST4ZworI for ; Wed, 28 Feb 2007 18:23:17 +0100 (CET) Received: by mail.vx.sk (Postfix, from userid 1001) id B4C6D3F4F1; Wed, 28 Feb 2007 18:23:17 +0100 (CET) Message-Id: <20070228172317.B4C6D3F4F1@mail.vx.sk> Date: Wed, 28 Feb 2007 18:23:17 +0100 (CET) From: Martin Matuska To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/109691: [UPDATE] www/tclwebtest X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Martin Matuska List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Feb 2007 17:30:05 -0000 >Number: 109691 >Category: ports >Synopsis: [UPDATE] www/tclwebtest >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Feb 28 17:30:04 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 6.2-RELEASE i386 >Organization: >Environment: System: FreeBSD 6.2-RELEASE i386 amd64 >Description: Update of tclwebtest-1.0: - added support for non-threaded tcl (if installed) - added support for tcl85 via USE_TCL_VER=85 - added tcl84 to CATEGORIES list - fixed some Makefile and pkg-plist issues Tested with tinderbox: http://tinderbox.vx.sk/logs/6.2-FreeBSD-amd64/tclwebtest-1.0_1.log I would like to takeover maintainership for this port. >How-To-Repeat: >Fix: diff -Nbur www/tclwebtest.orig/Makefile www/tclwebtest/Makefile --- www/tclwebtest.orig/Makefile Wed Jul 27 13:32:50 2005 +++ www/tclwebtest/Makefile Wed Feb 28 18:14:38 2007 @@ -7,26 +7,49 @@ PORTNAME= tclwebtest PORTVERSION= 1.0 -CATEGORIES= www +PORTREVISION= 1 +CATEGORIES= www tcl84 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= aldert@nooitgedagt.net COMMENT= Tool for issuing HTTP requests and dealing with the result -LIB_DEPENDS+= tcl84.1:${PORTSDIR}/lang/tcl84-thread +USE_TCL_VER?= 84 + +.if ${USE_TCL_VER} != 84 && ${USE_TCL_VER} != 85 +IGNORE= supported values for USE_TCL_VER are only 84 and 85 +.endif + +# by default we want tcl with threads as dependency (www/openacs) +USE_TCL= ${USE_TCL_VER}-thread NO_BUILD= YES -TCLVERSION= 8.4 TWTBASE= ${PREFIX}/tclwebtest-${PORTVERSION} TWTBASEL= ${PREFIX}/tclwebtest -PLIST_SUB+= TWTDIR=tclwebtest-${PORTVERSION} TCLLIB=lib/tcl${TCLVERSION} +.include + +.if exists(${TCLSH}) +_TCL_IS_THREADED!= ${ECHO_CMD} 'puts [array names tcl_platform -exact threaded]' | ${TCLSH} || return 0 +. if empty(_TCL_IS_THREADED) +# Check if a threaded build is forced +. if defined(TCL_WITH_THREADS) || defined(WITH_THREADS) +IGNORE= tcl with threads is required. Please install tcl with WITH_THREADS defined or from lang/tcl${USE_TCL} port and try again +. else +# Installed tcl is not threaded, so set correct dependencies +USE_TCL=${USE_TCL_VER} +.include "${PORTSDIR}/Mk/bsd.tcl.mk" +. endif +. endif +.endif + +PLIST_SUB+= TWTDIR=tclwebtest-${PORTVERSION} TCLLIB=${TCL_LIBDIR:S/${LOCALBASE}\///g} post-extract: @${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -rf - @${SED} -i "" -e "s| tclsh | tclsh${TCLVERSION} |g" ${WRKSRC}/tclwebtest + @${SED} -i "" -e "s| tclsh | ${TCLSH} |g" ${WRKSRC}/tclwebtest do-install: @${TEST} -d ${TWTBASE} || ( ${MKDIR} ${TWTBASE} && \ @@ -45,7 +68,7 @@ post-install: @${TEST} -L ${TWTBASEL} || ${LN} -s ${TWTBASE} ${TWTBASEL} - @${TEST} -L ${LOCALBASE}/lib/tcl${TCLVERSION}/tclwebtest || ${LN} -s ${TWTBASEL}/lib ${LOCALBASE}/lib/tcl${TCLVERSION}/tclwebtest + @${TEST} -L ${TCL_LIBDIR}/tclwebtest || ${LN} -s ${TWTBASEL}/lib ${TCL_LIBDIR}/tclwebtest @${TEST} -L ${PREFIX}/bin/tclwebtest || ${LN} -s ${TWTBASEL}/tclwebtest ${PREFIX}/bin @${ECHO_CMD} "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" @@ -53,4 +76,4 @@ @${ECHO_CMD} " Set it to ${TWTBASEL} if tclwebtest barks at you. " @${ECHO_CMD} "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" -.include +.include diff -Nbur www/tclwebtest.orig/pkg-plist www/tclwebtest/pkg-plist --- www/tclwebtest.orig/pkg-plist Wed Jul 27 13:32:50 2005 +++ www/tclwebtest/pkg-plist Wed Feb 28 18:13:58 2007 @@ -1,4 +1,5 @@ bin/tclwebtest +%%TCLLIB%%/tclwebtest %%DOCSDIR%%/ChangeLog %%DOCSDIR%%/README %%DOCSDIR%%/TODO @@ -96,5 +97,3 @@ @dirrm %%EXAMPLESDIR%% @dirrm %%DOCSDIR%%/doc @dirrm %%DOCSDIR%% -@cwd %%LOCALBASE%% -%%TCLLIB%%/tclwebtest >Release-Note: >Audit-Trail: >Unformatted: