fix the build by updating to 3.3 (from Sourceforge svn)

Approved by:	portmgr

3 files changed, 19 insertions, 29 deletions

diff --git a/devel/tclxml/Makefile b/devel/tclxml/Makefile
index 9dd1f862f63b..ed6e34b35b2c 100644
--- a/devel/tclxml/Makefile
+++ b/devel/tclxml/Makefile
@@ -1,20 +1,15 @@
-# New ports collection makefile for:	tclxml
-# Date created:				2 May 2003
-# Whom:					David Yeske <dyeske@gmail.com>
-#
+# Created by: David Yeske <dyeske@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	tclxml
-PORTVERSION=	3.2
-PORTREVISION=	1
+PORTVERSION=	3.3
 CATEGORIES=	devel tcl
-MASTER_SITES=	SF/tclxml/TclXML/${PORTVERSION}
+MASTER_SITES=	LOCAL/bf SF/tclxml/TclXML/${PORTVERSION}
 
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	API for parsing XML documents using Tcl
 
-LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS=	xslt:${PORTSDIR}/textproc/libxslt
 RUN_DEPENDS?=	dtplite:${PORTSDIR}/devel/tcllib
 
 PORTDOCS=	README.xml html.xsl man.macros nroff.xsl tcldoc-1.0.dtd \
@@ -22,23 +17,29 @@ PORTDOCS=	README.xml html.xsl man.macros nroff.xsl tcldoc-1.0.dtd \
 		tclxslt.html tclxslt.xml transform.tcl txt.xsl
 
 USE_TCL=	83+
+USE_XZ=		yes
 XML_CONFIG?=	${LOCALBASE}/bin/xml2-config
 GNU_CONFIGURE=	yes
 USE_LDCONFIG?=	${PREFIX}/lib/Tclxml${PORTVERSION}
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
 		--with-tclinclude=${TCL_INCLUDEDIR} \
 		XML_CONFIG="${XML_CONFIG}"
-PLIST=		${PKGDIR}${PKGNAMESUFFIX}/pkg-plist
-PATCHDIR=	${PKGDIR}${PKGNAMESUFFIX}/files/
 PLIST_SUB=	VER=${PORTVERSION}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-pre-install:
+post-patch:
+	@${REINPLACE_CMD} -e '/^TCLSH_ENV[[:blank:]]*=/,/[^\]$$/d' \
+	${WRKSRC}/Makefile.in
 
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+post-install:
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} doc
+	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+check test: install
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} test
+
+.include <bsd.port.mk>
diff --git a/devel/tclxml/distinfo b/devel/tclxml/distinfo
index d9cdc85f0e59..93b32ae95e99 100644
--- a/devel/tclxml/distinfo
+++ b/devel/tclxml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tclxml-3.2.tar.gz) = f4116b6680b249ce74b856a121762361ca09e6256f0c8ad578d1c661b822cb39
-SIZE (tclxml-3.2.tar.gz) = 757594
+SHA256 (tclxml-3.3.tar.xz) = 10744fdf2c77ab21b07ba5a3b8652a9545f5e5dbfd5addaad4a26d9dd3e76f87
+SIZE (tclxml-3.3.tar.xz) = 498388
diff --git a/devel/tclxml/files/patch-configure b/devel/tclxml/files/patch-configure
deleted file mode 100644
index 51f450d8cc60..000000000000
--- a/devel/tclxml/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2008-12-02 08:55:06.000000000 -0200
-+++ configure	2009-10-09 19:10:25.000000000 -0300
-@@ -6770,6 +6770,8 @@
- 
-     TCL_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\"
- 
-+    TCL_SRC_DIR=${with_tclinclude}
-+
- 
- 
-