- 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

PR:             110090
Submitted by:   Martin Matuska <martin@matuska.org> (maintainer)

2 files changed, 79 insertions, 113 deletions

diff --git a/www/tclwebtest/Makefile b/www/tclwebtest/Makefile
index 054cd8b3749d..6d0ee264c4df 100644
--- a/www/tclwebtest/Makefile
+++ b/www/tclwebtest/Makefile
@@ -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,50 +15,30 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 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 <bsd.port.pre.mk>
 
-.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
@@ -66,14 +46,4 @@ do-install:
 	@${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 <bsd.port.post.mk>
diff --git a/www/tclwebtest/pkg-plist b/www/tclwebtest/pkg-plist
index b0ec2eaabf12..f6c5894b6302 100644
--- a/www/tclwebtest/pkg-plist
+++ b/www/tclwebtest/pkg-plist
@@ -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 @@ bin/tclwebtest
 %%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%%