From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Mar 8 15:10:08 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 BA76416A479 for ; Thu, 8 Mar 2007 15:10:08 +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 95F1513C4AC for ; Thu, 8 Mar 2007 15:10:08 +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 l28FA8WY015139 for ; Thu, 8 Mar 2007 15:10:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l28FA8uv015134; Thu, 8 Mar 2007 15:10:08 GMT (envelope-from gnats) Resent-Date: Thu, 8 Mar 2007 15:10:08 GMT Resent-Message-Id: <200703081510.l28FA8uv015134@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 3B71016A420 for ; Thu, 8 Mar 2007 15:08:03 +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 933A113C4A5 for ; Thu, 8 Mar 2007 15:08:02 +0000 (UTC) (envelope-from rebum@mail.vx.sk) Received: from localhost (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id A4A953F454 for ; Thu, 8 Mar 2007 16:08:01 +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 QkoYiv+ySR-i for ; Thu, 8 Mar 2007 16:07:55 +0100 (CET) Received: by mail.vx.sk (Postfix, from userid 1001) id B7E493F453; Thu, 8 Mar 2007 16:07:55 +0100 (CET) Message-Id: <20070308150755.B7E493F453@mail.vx.sk> Date: Thu, 8 Mar 2007 16:07:55 +0100 (CET) From: Martin Matuska To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/110090: [MAINTAINER] 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: Thu, 08 Mar 2007 15:10:08 -0000 >Number: 110090 >Category: ports >Synopsis: [MAINTAINER] www/tclwebtest >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Mar 08 15:10:08 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: - as this is a scripty-only port, it depends on the new lang/tcl-tk-wrapper - reorganized file structure to be automatically loaded by tcl package require - fixed PORTDOCS in pkg-plist Tinderbox and portlint -A do not complain. >How-To-Repeat: >Fix: diff -Nbur www/tclwebtest.orig/Makefile www/tclwebtest/Makefile --- www/tclwebtest.orig/Makefile Thu Mar 8 16:05:24 2007 +++ www/tclwebtest/Makefile Thu Mar 8 16:05:47 2007 @@ -7,7 +7,7 @@ PORTNAME= tclwebtest PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www tcl84 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,65 +15,35 @@ MAINTAINER= martin@matuska.org COMMENT= Tool for issuing HTTP requests and dealing with the result -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 +RUN_DEPENDS= tclsh:${PORTSDIR}/lang/tcl-tk-wrapper NO_BUILD= YES -TWTBASE= ${PREFIX}/tclwebtest-${PORTVERSION} -TWTBASEL= ${PREFIX}/tclwebtest +LIBDIR= lib/tclwebtest${PORTVERSION} +PLIST_SUB+= LIBDIR="${LIBDIR}" .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} |g" ${WRKSRC}/tclwebtest + @${SED} -i "" -e "s| tclsh | ${LOCALBASE}/bin/tclsh |g" ${WRKSRC}/tclwebtest do-install: - @${TEST} -d ${TWTBASE} || ( ${MKDIR} ${TWTBASE} && \ - ${CP} -R ${WRKSRC}/lib ${TWTBASE} && \ - ${CP} -R ${WRKSRC}/selftest ${TWTBASE} && \ - ${CP} ${WRKSRC}/tclwebtest ${TWTBASE} ) + @${MKDIR} ${PREFIX}/${LIBDIR} +.for FILE in entities.tcl from_openacs.tcl pkgIndex.tcl tclwebtest.tcl + ${INSTALL_DATA} ${WRKSRC}/lib/${FILE} ${PREFIX}/${LIBDIR}/${FILE} +.endfor @${MKDIR} ${EXAMPLESDIR} - @${CP} -R ${WRKSRC}/openacs4tests ${EXAMPLESDIR} + ${CP} -R ${WRKSRC}/selftest ${EXAMPLESDIR} + ${CP} -R ${WRKSRC}/openacs4tests ${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/tclwebtest ${PREFIX}/bin/tclwebtest +post-install: .if !defined(NOPORTDOCS) @${ECHO} "Installing docs" @${MKDIR} ${DOCSDIR}/doc @${TAR} -C ${WRKSRC} -c -f - ChangeLog README TODO index.html generate_docs.test | ${TAR} -C ${DOCSDIR} -x -f - @${TAR} -C ${WRKSRC}/doc -c -f - . | ${TAR} -C ${DOCSDIR}/doc -x -f - .endif - -post-install: - @${TEST} -L ${TWTBASEL} || ${LN} -s ${TWTBASE} ${TWTBASEL} - @${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} "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" - @${ECHO_CMD} " You may need to set TCLLIBPATH in your environment. " - @${ECHO_CMD} " Set it to ${TWTBASEL} if tclwebtest barks at you. " - @${ECHO_CMD} "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" .include diff -Nbur www/tclwebtest.orig/pkg-plist www/tclwebtest/pkg-plist --- www/tclwebtest.orig/pkg-plist Thu Mar 8 16:05:24 2007 +++ www/tclwebtest/pkg-plist Thu Mar 8 15:49:50 2007 @@ -1,18 +1,21 @@ bin/tclwebtest -%%TCLLIB%%/tclwebtest -%%DOCSDIR%%/ChangeLog -%%DOCSDIR%%/README -%%DOCSDIR%%/TODO -%%DOCSDIR%%/doc/api_all.html -%%DOCSDIR%%/doc/api_public.html -%%DOCSDIR%%/doc/index.html -%%DOCSDIR%%/doc/matching.txt -%%DOCSDIR%%/doc/others.html -%%DOCSDIR%%/doc/others.txt -%%DOCSDIR%%/doc/output.html -%%DOCSDIR%%/doc/req.txt -%%DOCSDIR%%/generate_docs.test -%%DOCSDIR%%/index.html +%%LIBDIR%%/entities.tcl +%%LIBDIR%%/from_openacs.tcl +%%LIBDIR%%/pkgIndex.tcl +%%LIBDIR%%/tclwebtest.tcl +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/doc/api_all.html +%%PORTDOCS%%%%DOCSDIR%%/doc/api_public.html +%%PORTDOCS%%%%DOCSDIR%%/doc/index.html +%%PORTDOCS%%%%DOCSDIR%%/doc/matching.txt +%%PORTDOCS%%%%DOCSDIR%%/doc/others.html +%%PORTDOCS%%%%DOCSDIR%%/doc/others.txt +%%PORTDOCS%%%%DOCSDIR%%/doc/output.html +%%PORTDOCS%%%%DOCSDIR%%/doc/req.txt +%%PORTDOCS%%%%DOCSDIR%%/generate_docs.test +%%PORTDOCS%%%%DOCSDIR%%/index.html %%EXAMPLESDIR%%/openacs4tests/bboard_many_posts.test %%EXAMPLESDIR%%/openacs4tests/calendar/000_install_calendar.test %%EXAMPLESDIR%%/openacs4tests/calendar/001_mount_calendar.test @@ -38,62 +41,55 @@ %%EXAMPLESDIR%%/openacs4tests/templating.test %%EXAMPLESDIR%%/openacs4tests/wp-slim-delete-all.test %%EXAMPLESDIR%%/openacs4tests/wp-slim.test -tclwebtest -%%TWTDIR%%/lib/entities.tcl -%%TWTDIR%%/lib/from_openacs.tcl -%%TWTDIR%%/lib/pkgIndex.tcl -%%TWTDIR%%/lib/tclwebtest.tcl -%%TWTDIR%%/selftest/ad_proc.test -%%TWTDIR%%/selftest/asserts.test -%%TWTDIR%%/selftest/caption.html -%%TWTDIR%%/selftest/caption.test -%%TWTDIR%%/selftest/caption2.html -%%TWTDIR%%/selftest/caption3.html -%%TWTDIR%%/selftest/caption3.test -%%TWTDIR%%/selftest/checkboxes.html -%%TWTDIR%%/selftest/checkboxes.test -%%TWTDIR%%/selftest/directory_traversal.test -%%TWTDIR%%/selftest/entity.test -%%TWTDIR%%/selftest/field_order.test -%%TWTDIR%%/selftest/field_order2.html -%%TWTDIR%%/selftest/field_order2.test -%%TWTDIR%%/selftest/fields_iterate.test -%%TWTDIR%%/selftest/forms.html -%%TWTDIR%%/selftest/forms.test -%%TWTDIR%%/selftest/forms2.html -%%TWTDIR%%/selftest/forms2.test -%%TWTDIR%%/selftest/image_submit.gif -%%TWTDIR%%/selftest/image_submit.html -%%TWTDIR%%/selftest/image_submit.html~ -%%TWTDIR%%/selftest/image_submit.test -%%TWTDIR%%/selftest/image_submit.test~ -%%TWTDIR%%/selftest/link_fail.test -%%TWTDIR%%/selftest/links.html -%%TWTDIR%%/selftest/links.test -%%TWTDIR%%/selftest/links2.html -%%TWTDIR%%/selftest/links2.test -%%TWTDIR%%/selftest/links_empty.html -%%TWTDIR%%/selftest/namespace.test -%%TWTDIR%%/selftest/radio.html -%%TWTDIR%%/selftest/radio.test -%%TWTDIR%%/selftest/regsplit.test -%%TWTDIR%%/selftest/reset_session.test -%%TWTDIR%%/selftest/segfault -%%TWTDIR%%/selftest/select.html -%%TWTDIR%%/selftest/select.test -%%TWTDIR%%/selftest/select2.test -%%TWTDIR%%/selftest/select_many.html -%%TWTDIR%%/selftest/select_many.test -%%TWTDIR%%/selftest/simple_form.html -%%TWTDIR%%/selftest/simple_form.test -%%TWTDIR%%/selftest/strip_comments.test -%%TWTDIR%%/selftest/url_anchor.test -%%TWTDIR%%/tclwebtest -@dirrm %%TWTDIR%%/selftest -@dirrm %%TWTDIR%%/lib -@dirrm %%TWTDIR%% +%%EXAMPLESDIR%%/selftest/ad_proc.test +%%EXAMPLESDIR%%/selftest/asserts.test +%%EXAMPLESDIR%%/selftest/caption.html +%%EXAMPLESDIR%%/selftest/caption.test +%%EXAMPLESDIR%%/selftest/caption2.html +%%EXAMPLESDIR%%/selftest/caption3.html +%%EXAMPLESDIR%%/selftest/caption3.test +%%EXAMPLESDIR%%/selftest/checkboxes.html +%%EXAMPLESDIR%%/selftest/checkboxes.test +%%EXAMPLESDIR%%/selftest/directory_traversal.test +%%EXAMPLESDIR%%/selftest/entity.test +%%EXAMPLESDIR%%/selftest/field_order.test +%%EXAMPLESDIR%%/selftest/field_order2.html +%%EXAMPLESDIR%%/selftest/field_order2.test +%%EXAMPLESDIR%%/selftest/fields_iterate.test +%%EXAMPLESDIR%%/selftest/forms.html +%%EXAMPLESDIR%%/selftest/forms.test +%%EXAMPLESDIR%%/selftest/forms2.html +%%EXAMPLESDIR%%/selftest/forms2.test +%%EXAMPLESDIR%%/selftest/image_submit.gif +%%EXAMPLESDIR%%/selftest/image_submit.html +%%EXAMPLESDIR%%/selftest/image_submit.html~ +%%EXAMPLESDIR%%/selftest/image_submit.test +%%EXAMPLESDIR%%/selftest/image_submit.test~ +%%EXAMPLESDIR%%/selftest/link_fail.test +%%EXAMPLESDIR%%/selftest/links.html +%%EXAMPLESDIR%%/selftest/links.test +%%EXAMPLESDIR%%/selftest/links2.html +%%EXAMPLESDIR%%/selftest/links2.test +%%EXAMPLESDIR%%/selftest/links_empty.html +%%EXAMPLESDIR%%/selftest/namespace.test +%%EXAMPLESDIR%%/selftest/radio.html +%%EXAMPLESDIR%%/selftest/radio.test +%%EXAMPLESDIR%%/selftest/regsplit.test +%%EXAMPLESDIR%%/selftest/reset_session.test +%%EXAMPLESDIR%%/selftest/segfault +%%EXAMPLESDIR%%/selftest/select.html +%%EXAMPLESDIR%%/selftest/select.test +%%EXAMPLESDIR%%/selftest/select2.test +%%EXAMPLESDIR%%/selftest/select_many.html +%%EXAMPLESDIR%%/selftest/select_many.test +%%EXAMPLESDIR%%/selftest/simple_form.html +%%EXAMPLESDIR%%/selftest/simple_form.test +%%EXAMPLESDIR%%/selftest/strip_comments.test +%%EXAMPLESDIR%%/selftest/url_anchor.test +@dirrm %%EXAMPLESDIR%%/selftest @dirrm %%EXAMPLESDIR%%/openacs4tests/calendar @dirrm %%EXAMPLESDIR%%/openacs4tests @dirrm %%EXAMPLESDIR%% -@dirrm %%DOCSDIR%%/doc -@dirrm %%DOCSDIR%% +@dirrm %%LIBDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc +%%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted: