From rebum@mail.vx.sk  Wed Feb 28 16:29:42 2007
Return-Path: <rebum@mail.vx.sk>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DA69116A403
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 Feb 2007 16:29:41 +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 6C8B613C461
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 Feb 2007 16:29:41 +0000 (UTC)
	(envelope-from rebum@mail.vx.sk)
Received: from localhost (localhost [127.0.0.1])
	by mail.vx.sk (Postfix) with ESMTP id 79CF63F4F3
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 Feb 2007 17:29:40 +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 oiW0LDSYMmmr for <FreeBSD-gnats-submit@freebsd.org>;
	Wed, 28 Feb 2007 17:29:36 +0100 (CET)
Received: by mail.vx.sk (Postfix, from userid 1001)
	id B6FAC3F4CC; Wed, 28 Feb 2007 17:29:36 +0100 (CET)
Message-Id: <20070228162936.B6FAC3F4CC@mail.vx.sk>
Date: Wed, 28 Feb 2007 17:29:36 +0100 (CET)
From: Martin Matuska <martin@matuska.org>
Reply-To: Martin Matuska <martin@matuska.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [UPDATE] www/tdom
X-Send-Pr-Version: 3.113
X-GNATS-Notify: aldert@nooitgedagt.net

>Number:         109690
>Category:       ports
>Synopsis:       [UPDATE] www/tdom
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 28 16:30:11 GMT 2007
>Closed-Date:    Thu Mar 01 11:55:09 GMT 2007
>Last-Modified:  Thu Mar  1 12:00:12 GMT 2007
>Originator:     Martin Matuska
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD 6.2-RELEASE i386 amd64
>Description:
Update of tdom-0.8.0:
- added support for non-threaded tcl (if installed)
- added support for tcl85 via USE_TCL_VER=85
- added tcl84 to CATEGORIES list
- added readme and html documentation

Tested with tinderbox:
http://tinderbox.vx.sk/logs/6.2-FreeBSD-amd64/tDOM-threads-0.8.0_1.log

I would like to takeover maintainership for this port.

>How-To-Repeat:
>Fix:
diff -Nbur www/tdom.orig/Makefile www/tdom/Makefile
--- www/tdom.orig/Makefile	Wed Jul 27 13:44:45 2005
+++ www/tdom/Makefile	Wed Feb 28 17:22:22 2007
@@ -7,8 +7,10 @@
 
 PORTNAME=	tDOM
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.tdom.org/files/
+PKGNAMESUFFIX?=	-threads
 
 MAINTAINER=	aldert@nooitgedagt.net
 COMMENT=	High performance XML data processing with Tcl (ARGS for OpenACS)
@@ -16,39 +18,67 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/unix
 TDOMBASE=	${PREFIX}/lib/tdom${PORTVERSION}
 
-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 a threaded build
+USE_TCL=	${USE_TCL_VER}-thread
+USE_TCL_BUILD=	${USE_TCL_VER}-thread
 
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	../configure
-CONFIGURE_ARGS=	--enable-threads --disable-tdomalloc --with-tcl=${LOCALBASE}/lib/tcl8.4 \
-		--with-tclinclude=${LOCALBASE}/include/tcl8.4  --prefix=${PREFIX}
 
-INSTALLS_SHLIB=	YES
-LDCONFIG_DIRS+=	${TDOMBASE}
+USE_LDCONFIG=	${TDOMBASE}
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-pre-configure:
-	@${ECHO_CMD}
-	@${ECHO_CMD} "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-	@${ECHO_CMD} " Please make sure that you either have lang/tcl84-thread or "
-	@${ECHO_CMD} " no tcl84 installed before you add this port "
-	@${ECHO_CMD} "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-	@${ECHO_CMD}
-
-post-configure:
-	@if ${GREP} -qs 'enable-threads requested, but attempting building against' ${WRKSRC}/config.log ; then \
-		${ECHO_CMD} "" && \
-		${ECHO_CMD} " =====================================================" && \
-		${ECHO_CMD} " You need ${PORTSDIR}/lang/tcl84-thread but you appear " && \
-		${ECHO_CMD} " to have the non-threaded TCL version installed." && \
-		${ECHO_CMD} " =====================================================" && \
-		${ECHO_CMD} "" && \
-		${FALSE}; \
-	fi
-
 MANN=		dom.n domDoc.n domNode.n expat.n expatapi.n tdomcmd.n tnc.n
 MANCOMPRESSED=	no
 
-.include <bsd.port.mk>
+DOCS=		CHANGES LICENSE README README.AOL
+HTMLDOCS=	category-index.html dom.html domDoc.html domNode.html \
+		expat.html expatapi.html index.html keyword-index.html \
+		tdomcmd.html tnc.html
+
+.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
+CONFIGURE_ARGS+=	--disable-threads
+PKGNAMESUFFIX=
+USE_TCL=${USE_TCL_VER}
+USE_TCL_BUILD=${USE_TCL_VER}
+.include "${PORTSDIR}/Mk/bsd.tcl.mk"
+.  endif
+. else
+CONFIGURE_ARGS+=	--enable-threads
+. endif
+.else
+CONFIGURE_ARGS+=	--enable-threads
+.endif
+
+CONFIGURE_ARGS+=	-disable-tdomalloc --with-tcl=${TCL_LIBDIR} \
+		--with-tclinclude=${TCL_INCLUDEDIR}  --prefix=${PREFIX}
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}/html
+. for FILE in ${DOCS}
+	@${INSTALL_DATA} ${WRKSRC}/../${FILE} ${DOCSDIR}/${FILE}
+. endfor
+. for FILE in ${HTMLDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/../doc/${FILE} ${DOCSDIR}/html/${FILE}
+. endfor
+.endif
+
+.include <bsd.port.post.mk>
diff -Nbur www/tdom.orig/pkg-plist www/tdom/pkg-plist
--- www/tdom.orig/pkg-plist	Wed Jul 27 13:44:45 2005
+++ www/tdom/pkg-plist	Wed Feb 28 16:37:19 2007
@@ -3,4 +3,20 @@
 lib/tdom%%PORTVERSION%%/pkgIndex.tcl
 lib/tdom%%PORTVERSION%%/tdom.tcl
 lib/tdomConfig.sh
+%%PORTDOCS%%%%DOCSDIR%%/html/category-index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dom.html
+%%PORTDOCS%%%%DOCSDIR%%/html/domDoc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/domNode.html
+%%PORTDOCS%%%%DOCSDIR%%/html/expat.html
+%%PORTDOCS%%%%DOCSDIR%%/html/expatapi.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/keyword-index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tdomcmd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tnc.html
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.AOL
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/tdom%%PORTVERSION%%
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Feb 28 16:31:30 UTC 2007 
Responsible-Changed-Why:  
miwi@ wants this PRs 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109690 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Feb 28 16:31:45 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109690 

From: "A. Nooitgedagt" <a.nooit@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/109690: [UPDATE] www/tdom
Date: Wed, 28 Feb 2007 21:33:48 +0100

 I approve.
 Please change maintainership to Martin Matuska..
State-Changed-From-To: feedback->open 
State-Changed-By: miwi 
State-Changed-When: Wed Feb 28 21:23:26 UTC 2007 
State-Changed-Why:  
maintainer approved 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109690 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Thu Mar 1 11:55:07 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109690 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/109690: commit references a PR
Date: Thu,  1 Mar 2007 11:55:11 +0000 (UTC)

 miwi        2007-03-01 11:55:02 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/tdom             Makefile pkg-plist 
   Log:
   - Added support for non-threaded tcl (if installed)
   - Added support for tcl85 via USE_TCL_VER=85
   - Added tcl84 to CATEGORIES list
   - Added readme and html documentation
   - Bump PORTREVISION
   - Pass maintainership to submitter
   
   PR:             109690
   Submitted by:   Martin Matuska <martin@matuska.org>
   Approved by:    A. Nooitgedagt <a.nooit@gmail.com> (old maintainer)
   
   Revision  Changes    Path
   1.2       +55 -25    ports/www/tdom/Makefile
   1.2       +16 -0     ports/www/tdom/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
