diff --git a/MOVED b/MOVED index ab12ca2ad8be..255f4d72109d 100644 --- a/MOVED +++ b/MOVED @@ -4216,3 +4216,7 @@ mail/p5-Email-MIME-Creator||2009-11-24|Folded into p5-Email-MIME package mail/p5-Email-MIME-Modifier||2009-11-24|Folded into p5-Email-MIME package mail/p5-Email-Simple-Creator||2009-11-24|Folded into p5-Email-Simple package www/gecko-sharp10|www/gecko-sharp20|2009-11-26|Superseded by later version +devel/tclxml-libxml2|devel/tclxml|2009-11-26|port now do part of devel/tclxml +devel/tclxml-expat|devel/tclxml|2009-11-26|port now do part of devel/tclxml +www/tcldom|devel/tclxml|2009-11-26|port now do part of devel/tclxml +www/tcldom-libxml2|devel/tclxml|2009-11-26|port now do part of devel/tclxml diff --git a/devel/Makefile b/devel/Makefile index cce91765c207..3d0269a01464 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -2920,8 +2920,6 @@ SUBDIR += tclthread SUBDIR += tcltls SUBDIR += tclxml - SUBDIR += tclxml-expat - SUBDIR += tclxml-libxml2 SUBDIR += tdl SUBDIR += templ SUBDIR += terminality diff --git a/devel/tclxml-expat/Makefile b/devel/tclxml-expat/Makefile deleted file mode 100644 index fe58235b1f6b..000000000000 --- a/devel/tclxml-expat/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# New ports collection makefile for: tclxml-expat -# Date created: 28 April 2008 -# Whom: Frank Fenor -# -# $FreeBSD$ -# - -PKGNAMESUFFIX= -expat - -MAINTAINER= frank@fenor.de - -BUILD_DEPENDS= ${LOCALBASE}/lib/TclxmlConfig.sh:${PORTSDIR}/devel/tclxml - -USE_LDCONFIG= ${LOCALBASE}/lib/Tclexpat${PORTVERSION} -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/expat -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" - -MASTERDIR= ${.CURDIR}/../tclxml - -BUILDING_EXPAT= yes -NOPORTDOCS= yes - -.include "${MASTERDIR}/Makefile" diff --git a/devel/tclxml-expat/pkg-descr b/devel/tclxml-expat/pkg-descr deleted file mode 100644 index d87e45fbabfc..000000000000 --- a/devel/tclxml-expat/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -tclxml-expat -TclXML is an API for parsing XML documents using the Tcl scripting -language. It is also a package with several parser implementations. -The goal of the TclXML package is to provide an API for Tcl scripts -that allows "Plug-and-Play" parser implementations; ie. an application -will be able to use different parser implementations without change -to the application code. - -WWW: http://tclxml.sourceforge.net/ diff --git a/devel/tclxml-expat/pkg-plist b/devel/tclxml-expat/pkg-plist deleted file mode 100644 index 28147b65b358..000000000000 --- a/devel/tclxml-expat/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -include/xmlparse.h -include/xmlrole.h -include/xmltok.h -lib/Tclexpat%%VER%%/libTclexpat%%VER%%.so -lib/Tclexpat%%VER%%/pkgIndex.tcl -@dirrm lib/Tclexpat3.1 diff --git a/devel/tclxml-libxml2/Makefile b/devel/tclxml-libxml2/Makefile deleted file mode 100644 index 29747a0fbacd..000000000000 --- a/devel/tclxml-libxml2/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# New ports collection makefile for: tclxml-libxml2 -# Date created: 28 April 2008 -# Whom: Frank Fenor -# -# $FreeBSD$ -# - -PORTREVISION= 1 -PKGNAMESUFFIX= -libxml2 - -MAINTAINER= frank@fenor.de - -LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 -BUILD_DEPENDS= ${LOCALBASE}/lib/TclxmlConfig.sh:${PORTSDIR}/devel/tclxml - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/libxml2 -USE_LDCONFIG= ${LOCALBASE}/lib/TclXML_libxml2${PORTVERSION} -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} - -MASTERDIR= ${.CURDIR}/../tclxml - -NOPORTDOCS= yes - -post-build: - ${REINPLACE_CMD} -e 's|@tcldomxml_LIB_FILE@|libTclXML_libxml2${PORTVERSION}.so|' \ - -e 's|@tclxml_libxml2_LIB_SPEC@|${LOCALBASE}/lib/TclXML_libxml2${PORTVERSION}/libTclXML_libxml2${PORTVERSION}.so|' \ - -e 's|@tclxml_libxml2_stub_LIB_FILE@|libTclxmlstub${PORTVERSION}.a|' \ - -e 's|@tclxml_libxml2_STUB_LIB_SPEC@|${LOCALBASE}/lib/Tclxml${PORTVERSION}/libTclxmlstub${PORTVERSION}.a|' \ - -e 's|@tclxml_libxml2_STUB_LIB_PATH@|${LOCALBASE}/lib/TclXML_libxml2${PORTVERSION}|' \ - ${WRKSRC}/tcllibxml2Config.sh - -post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/tcllibxml2Config.sh ${LOCALBASE}/lib - -.include "${MASTERDIR}/Makefile" diff --git a/devel/tclxml-libxml2/files/patch-libxml2-configure b/devel/tclxml-libxml2/files/patch-libxml2-configure deleted file mode 100644 index 665a80866b09..000000000000 --- a/devel/tclxml-libxml2/files/patch-libxml2-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2008-04-28 16:02:30.000000000 +0200 -+++ configure 2008-04-28 16:02:51.000000000 +0200 -@@ -3316,7 +3316,7 @@ - - TCL_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" - -- -+ TCL_SRC_DIR=${with_tclinclude} - - - echo $ac_n "checking for Tcl private include files""... $ac_c" 1>&6 \ No newline at end of file diff --git a/devel/tclxml-libxml2/pkg-descr b/devel/tclxml-libxml2/pkg-descr deleted file mode 100644 index b6812a6ae74d..000000000000 --- a/devel/tclxml-libxml2/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -tclxml-libxml2 -TclXML is an API for parsing XML documents using the Tcl scripting -language. It is also a package with several parser implementations. -The goal of the TclXML package is to provide an API for Tcl scripts -that allows "Plug-and-Play" parser implementations; ie. an application -will be able to use different parser implementations without change -to the application code. - -WWW: http://tclxml.sourceforge.net/ diff --git a/devel/tclxml-libxml2/pkg-plist b/devel/tclxml-libxml2/pkg-plist deleted file mode 100644 index 0799cb18a857..000000000000 --- a/devel/tclxml-libxml2/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -include/tclxml-libxml2/docObj.h -include/tclxml-libxml2/tclxml-libxml2.h -include/tclxml-libxml2/tclxml-libxml2Decls.h -lib/TclXML_libxml2%%VER%%/libTclXML_libxml2%%VER%%.so -lib/TclXML_libxml2%%VER%%/pkgIndex.tcl -lib/tcllibxml2Config.sh -@dirrm lib/TclXML_libxml2%%VER%% -@dirrm include/tclxml-libxml2 diff --git a/www/Makefile b/www/Makefile index d1f9b3969ff7..eff4c6780abc 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1500,8 +1500,6 @@ SUBDIR += swish++ SUBDIR += swish-e SUBDIR += syndigator - SUBDIR += tcldom - SUBDIR += tcldom-libxml2 SUBDIR += tclhttpd SUBDIR += tclwebtest SUBDIR += tdiary diff --git a/www/tcldom-libxml2/Makefile b/www/tcldom-libxml2/Makefile deleted file mode 100644 index 7eb591927084..000000000000 --- a/www/tcldom-libxml2/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# New ports collection makefile for: TclDOM-libxml2 -# Date created: 28 April 2008 -# Whom: Frank Fenor -# -# $FreeBSD$ -# - -PKGNAMESUFFIX= -libxml2 - -MAINTAINER= frank@fenor.de -COMMENT= DOM API for Tcl using libxml2 - -BUILD_DEPENDS= ${LOCALBASE}/lib/TclxmlConfig.sh:${PORTSDIR}/devel/tclxml \ - ${LOCALBASE}/include/tclxml-libxml2/tclxml-libxml2Decls.h:${PORTSDIR}/devel/tclxml-libxml2 -RUN_DEPENDS= ${LOCALBASE}/lib/Tclxml${PORTVERSION}/libTclxml${PORTVERSION}.so:${PORTSDIR}/devel/tclxml \ - ${LOCALBASE}/lib/TclXML_libxml2${PORTVERSION}/libTclXML_libxml2${PORTVERSION}.so:${PORTSDIR}/devel/tclxml-libxml2 - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src-libxml2 -PATCHDIR= ${.CURDIR}/files -USE_LDCONFIG= yes -NOPORTDOCS= yes -PLIST_SUB= VER=${PORTVERSION} - -MASTERDIR= ${.CURDIR}/../tcldom - -post-build: - ${REINPLACE_CMD} -e 's|@tcldomxml_LIB_FILE@|libtcldom_libxml2${PORTVERSION}.so|' \ - -e 's|@tcldomxml_LIB_SPEC@|${LOCALBASE}/lib/tcldom_libxml2${PORTVERSION}/libtcldom_libxml2${PORTVERSION}.so|' \ - -e 's|@tcldomxmlstub_LIB_FILE@|libtcldom_libxml2stub${PORTVERSION}.a|' \ - -e 's|@tcldomxml_STUB_LIB_SPEC@|${LOCALBASE}/lib/tcldom_libxml2${PORTVERSION}/libtcldom_libxml2stub${PORTVERSION}.a|' \ - -e 's|@tcldomxml_STUB_LIB_PATH@|${LOCALBASE}/lib/tcldom_libxml2${PORTVERSION}|' \ - ${WRKSRC}/tcldomlibxml2Config.sh - -.include "${MASTERDIR}/Makefile" diff --git a/www/tcldom-libxml2/files/patch-docs-tcldom.n b/www/tcldom-libxml2/files/patch-docs-tcldom.n deleted file mode 100644 index 454109d59eb9..000000000000 --- a/www/tcldom-libxml2/files/patch-docs-tcldom.n +++ /dev/null @@ -1,26 +0,0 @@ ---- ../docs/tcldom.n.orig 2005-11-04 07:36:33.000000000 +0100 -+++ ../docs/tcldom.n 2008-04-29 00:14:09.000000000 +0200 -@@ -1,15 +1,15 @@ - '\" - '\" Copyright (c) 2004 Zveno Pty Ltd - '\" --Zveno makes this software and all associated data and documentation --('Software') available free of charge for any purpose. This software may --be copied, and distributed, with or without modifications; but this notice --must be included on any copy. -+'\" Zveno makes this software and all associated data and documentation -+'\" ('Software') available free of charge for any purpose. This software may -+'\" be copied, and distributed, with or without modifications; but this notice -+'\" must be included on any copy. - '\" --The Software was developed for research purposes and Zveno does not --warrant that it is error free or fit for any purpose. Zveno disclaims any --liability for all claims, expenses, losses, damages and costs any user may --incur as a result of using, copying or modifying the Software. -+'\" The Software was developed for research purposes and Zveno does not -+'\" warrant that it is error free or fit for any purpose. Zveno disclaims any -+'\" liability for all claims, expenses, losses, damages and costs any user may -+'\" incur as a result of using, copying or modifying the Software. - '\" - '\" - '\" RCS: @(#) $Id: nroff.xsl,v 1.4 2004/01/15 08:18:34 balls Exp $ diff --git a/www/tcldom-libxml2/files/patch-src-libxml2-configure b/www/tcldom-libxml2/files/patch-src-libxml2-configure deleted file mode 100644 index ae2a197b84b9..000000000000 --- a/www/tcldom-libxml2/files/patch-src-libxml2-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2008-04-28 10:45:06.000000000 +0200 -+++ configure 2008-04-28 10:45:36.000000000 +0200 -@@ -3192,7 +3192,7 @@ - - TCL_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" - -- -+ TCL_SRC_DIR=${with_tclinclude} - - - echo $ac_n "checking for Tcl private include files""... $ac_c" 1>&6 diff --git a/www/tcldom-libxml2/pkg-descr b/www/tcldom-libxml2/pkg-descr deleted file mode 100644 index 13c7d139a18e..000000000000 --- a/www/tcldom-libxml2/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -TclDOM is a Tcl language binding for the W3C's DOM standard. DOM -provides a tree view of an XML document. - -TclDOM is a package with several implementations, including one -written in pure Tcl, one written in C based on TclDOMPro and -another that wraps the Gnome libxml2 library. -This port installs the libxml2 part. - -WWW: http://tclxml.sourceforge.net/tcldom.html diff --git a/www/tcldom-libxml2/pkg-plist b/www/tcldom-libxml2/pkg-plist deleted file mode 100644 index 28410ab2ed7c..000000000000 --- a/www/tcldom-libxml2/pkg-plist +++ /dev/null @@ -1,10 +0,0 @@ -include/tcldom-libxml2/tcldom.h -include/tcldom-libxml2/tcldomlibxml2.h -include/tcldom-libxml2/tcldomlibxml2Decls.h -lib/tcldom_libxml2%%VER%%/impl.tcl -lib/tcldom_libxml2%%VER%%/libtcldom_libxml2%%VER%%.so -lib/tcldom_libxml2%%VER%%/libtcldom_libxml2stub%%VER%%.a -lib/tcldom_libxml2%%VER%%/pkgIndex.tcl -lib/tcldomlibxml2Config.sh -@dirrm lib/tcldom_libxml2%%VER%% -@dirrm include/tcldom-libxml2 diff --git a/www/tcldom/Makefile b/www/tcldom/Makefile deleted file mode 100644 index ae40da819f54..000000000000 --- a/www/tcldom/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# New ports collection makefile for: TclDOM -# Date created: 28 April 2008 -# Whom: Frank Fenor -# -# $FreeBSD$ -# - -PORTNAME= tcldom -PORTVERSION= 3.1 -PORTREVISION= 1 -CATEGORIES= www tcl -MASTER_SITES= SF/tclxml/TclDOM/${PORTVERSION} - -MAINTAINER= frank@fenor.de -COMMENT= DOM API for Tcl based on TclDOMPro - -BUILD_DEPENDS?= ${LOCALBASE}/include/expat.h:${PORTSDIR}/textproc/expat2 - -PLIST= ${PKGDIR}${PKGNAMESUFFIX}/pkg-plist -PATCHDIR= ${PKGDIR}${PKGNAMESUFFIX}/files/ -WRKSRC?= ${WRKDIR}/${PORTNAME}-${DISTVERSION}/src -USE_TCL= 82+ -INVALID_TCL_VER= 85 86 -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ - --with-tclinclude=${TCL_INCLUDEDIR} -CONFIGURE_ENV= CFLAGS="${CFLAGS} -I\"${PREFIX}/include\"" - -.include diff --git a/www/tcldom/distinfo b/www/tcldom/distinfo deleted file mode 100644 index 6ad0b354fdbe..000000000000 --- a/www/tcldom/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (tcldom-3.1.tar.gz) = b5af0e29e5cf2109d1f1a9b1a6ec2d81 -SHA256 (tcldom-3.1.tar.gz) = 1eabfe884a072f18bd18b1ec9c495145057442e072fe5288d9742058d93278ed -SIZE (tcldom-3.1.tar.gz) = 395572 diff --git a/www/tcldom/pkg-descr b/www/tcldom/pkg-descr deleted file mode 100644 index 3784f96b32e9..000000000000 --- a/www/tcldom/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -TclDOM is a Tcl language binding for the W3C's DOM standard. DOM -provides a tree view of an XML document. - -TclDOM is a package with several implementations, including one -written in pure Tcl, one written in C based on TclDOMPro and -another that wraps the Gnome libxml2 library. -This port installs the TclDOMPro part. - -WWW: http://tclxml.sourceforge.net/tcldom.html diff --git a/www/tcldom/pkg-plist b/www/tcldom/pkg-plist deleted file mode 100644 index d6fbcea45cdb..000000000000 --- a/www/tcldom/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -lib/tcldom2.0/tcldom84.so.1 -lib/tcldom2.0/pkgIndex.tcl -@dirrm lib/tcldom2.0