ports/110405: [MAINTAINER] www/tdom

[Martin Matuska]

>Number:         110405
>Category:       ports
>Synopsis:       [MAINTAINER] www/tdom
>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:   Fri Mar 16 16:50:07 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:
Added support for the new tcl threads structure.
>How-To-Repeat:
>Fix:
diff -Nbur www/tdom.orig/Makefile www/tdom/Makefile
--- www/tdom.orig/Makefile	Thu Mar  1 14:15:59 2007
+++ www/tdom/Makefile	Fri Mar 16 17:24:33 2007
@@ -7,10 +7,9 @@
 
 PORTNAME=	tDOM
 PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.tdom.org/files/
-PKGNAMESUFFIX?=	-threads
 
 MAINTAINER=	martin at matuska.org
 COMMENT=	High performance XML data processing with Tcl (ARGS for OpenACS)
@@ -25,8 +24,7 @@
 .endif
 
 # by default we want a threaded build
-USE_TCL=	${USE_TCL_VER}-thread
-USE_TCL_BUILD=	${USE_TCL_VER}-thread
+LIB_DEPENDS=	tcl${USE_TCL_VER}-threads:${PORTSDIR}/lang/tcl${USE_TCL_VER}-thread
 
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
@@ -46,29 +44,9 @@
 
 .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}
+CONFIGURE_ARGS+=	--enable-threads --disable-tdomalloc \
+		--with-tcl=${LOCALBASE}/lib/tcl${USE_TCL_VER:S/8/8./}-threads \
+		--with-tclinclude=${LOCALBASE}/include/tcl${USE_TCL_VER:S/8/8./} --prefix=${PREFIX}
 
 post-install:
 .if !defined(NOPORTDOCS)
>Release-Note:
>Audit-Trail:
>Unformatted: