Index: head/Mk/Uses/tcl.mk =================================================================== --- head/Mk/Uses/tcl.mk (revision 413645) +++ head/Mk/Uses/tcl.mk (revision 413646) @@ -1,205 +1,221 @@ # $FreeBSD$ # # vim: ts=8 noexpandtab # # Provide support to use Tcl/Tk # # Variables set by this file: # # TCL_VER - Major.Minor version of Tcl # # TCLSH - Set to full path of the Tcl interpreter # # TCL_LIBDIR - Path where the Tcl libraries can be found # # TCL_INCLUDEDIR - Path where the Tcl C headers can be found # # # TK_VER - Major.Minor version of Tk # # WISH - Set to full path of the Tk interpreter # # TK_LIBDIR - Path where the Tk libraries can be found # # TK_INCLUDEDIR - Path where the Tk C headers can be found # # # # Usage: # -# USES+= PORT[:(VERSION|wrapper),build,run] +# USES+= PORT[:(VERSION|wrapper),build,run,tea] # # where PORT is one of: # # - tcl - Depend on Tcl # - tk - Depend on both Tk and Tcl (Tk itself depends on Tcl) # # and VERSION is in one of the following formats: # # - (empty) - Depend on any installed version of PORT. If none # is installed, bring in the default version. See # ${_TCLTK_DEFAULT_VERSION} below. # # - 84, 85, 86 - Depend on a specific version series of PORT. Multiple # values are OK. The highest version available is # picked. # # - 84+, 85+, 86+ - Depend on any installed version greater or equal to # the specified version. # # If wrapper is specified, an additional dependency on tcl-wrapper or # tk-wrapper is added. It is NOT possible to select a specific version of # Tcl/Tk when using the wrapper. # # Build-time / Run-time only dependencies can be specified with build or run. # +# Tea can be used for Tcl/Tk extensions that use the Tcl Extension Architecture +# [http://www.tcl.tk/doc/tea] and allows to set common autoconf parameters. +# # MAINTAINER: tcltk@FreeBSD.org .if ${USES:Mtk} || ${USES:Mtk\:*} .if !defined(_TCLTK_PORT) _TCLTK_IGNORE= yes .endif .endif .if !defined(_INCLUDE_USES_TCL_MK) && !defined(_TCLTK_IGNORE) _INCLUDE_USES_TCL_MK= yes # # List the currently available versions. # # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. _TCLTK_VALID_VERSIONS= 84 85 86 # # Bring in the default and check that the specified version is in the list of # valid versions. # .include "${PORTSDIR}/Mk/bsd.default-versions.mk" _TCLTK_DEFAULT_VERSION= ${TCLTK_DEFAULT:S/.//} .if ! ${_TCLTK_VALID_VERSIONS:M${_TCLTK_DEFAULT_VERSION}} IGNORE= Invalid tcltk version ${TCLTK_DEFAULT} .endif # # _TCLTK_PORT tells us whether we're depending on Tcl or Tk. When using # USES+=tk, the included file tk.mk sets this before including this file. # _TCLTK_PORT?= tcl # # Parse a ver+ argument. # .if ${tcl_ARGS:M*+} _TCLTK_MIN_VERSION:= ${tcl_ARGS:M*+:S/+//} _TCLTK_WANTED_VERSIONS:=${_TCLTK_DEFAULT_VERSION} .endif # # Parse one or more ver arguments. # .if ${tcl_ARGS:M8[4-6]} _TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[4-6]} .endif # # It makes little sense to specify both the wrapper and a specific version. # .if ${tcl_ARGS:Mwrapper} && defined(_TCLTK_WANTED_VERSIONS) IGNORE= USES=${_TCLTK_PORT}: it is not possible to specify both a version and the wrapper: ${tcl_ARGS} .endif # # If no version was specified with any of the ver or ver+ arguments, set the # default version. # .if !defined(_TCLTK_WANTED_VERSIONS) _TCLTK_WANTED_VERSIONS= ${_TCLTK_DEFAULT_VERSION} .endif # # Resolve minimum versions (ver+). Append anything greater or equal than the # specified minimum version to the list of wanted versions. # .if defined(_TCLTK_MIN_VERSION) . for _v in ${_TCLTK_VALID_VERSIONS} . if ${_TCLTK_MIN_VERSION} <= ${_v} _TCLTK_WANTED_VERSIONS+=${_v} . endif . endfor .endif # # Right now we have built a list of potential versions that we may depend on. # Let's sort them and remove any duplicates. We then locate the highest one # already installed, if any. # .for _v in ${_TCLTK_WANTED_VERSIONS:O:u} _TCLTK_HIGHEST_VERSION:=${_v} . if exists(${LOCALBASE}/lib/lib${_TCLTK_PORT}${_v}.so) _TCLTK_WANTED_VERSION:= ${_v} . endif .endfor # # If we couldn't find any wanted version installed, depend on the highest one. .if !defined(_TCLTK_WANTED_VERSION) _TCLTK_WANTED_VERSION:= ${_TCLTK_HIGHEST_VERSION} .endif # # Exported variables # TCL_VER:= ${_TCLTK_WANTED_VERSION:S/8/8./} TCL_SHLIB_VER:= ${_TCLTK_WANTED_VERSION} TCLSH:= ${LOCALBASE}/bin/tclsh${TCL_VER} TCL_LIBDIR:= ${LOCALBASE}/lib/tcl${TCL_VER} TCL_INCLUDEDIR:=${LOCALBASE}/include/tcl${TCL_VER} .if ${_TCLTK_PORT} == "tk" TK_VER:= ${_TCLTK_WANTED_VERSION:S/8/8./} TK_SHLIB_VER:= ${_TCLTK_WANTED_VERSION} WISH:= ${LOCALBASE}/bin/wish${TCL_VER} TK_LIBDIR:= ${LOCALBASE}/lib/tk${TK_VER} TK_INCLUDEDIR:= ${LOCALBASE}/include/tk${TK_VER} .endif # # Dependencies # _TCLTK_BUILD_DEPENDS= _TCLTK_RUN_DEPENDS= _TCLTK_LIB_DEPENDS= # Construct the correct dependency lines (wrapper) .if ${tcl_ARGS:Mwrapper} . if ${_TCLTK_PORT} == "tcl" _TCLTK_WRAPPER_PORT= tclsh:lang/tcl-wrapper . elif ${_TCLTK_PORT} == "tk" _TCLTK_WRAPPER_PORT= wish:x11-toolkits/tk-wrapper . endif .endif # Construct the correct dependency lines (Tcl/Tk) . if ${_TCLTK_PORT} == "tcl" _TCLTK_EXE_LINE= tclsh${TCL_VER}:lang/tcl${_TCLTK_WANTED_VERSION} _TCLTK_LIB_LINE= libtcl${TCL_SHLIB_VER}.so:lang/tcl${_TCLTK_WANTED_VERSION} . elif ${_TCLTK_PORT} == "tk" _TCLTK_EXE_LINE= wish${TK_VER}:x11-toolkits/tk${_TCLTK_WANTED_VERSION} _TCLTK_LIB_LINE= libtk${TK_SHLIB_VER}.so:x11-toolkits/tk${_TCLTK_WANTED_VERSION} .endif .if ${tcl_ARGS:Mbuild} BUILD_DEPENDS+= ${_TCLTK_WRAPPER_PORT} \ ${_TCLTK_EXE_LINE} .elif ${tcl_ARGS:Mrun} RUN_DEPENDS+= ${_TCLTK_WRAPPER_PORT} \ ${_TCLTK_EXE_LINE} .else RUN_DEPENDS+= ${_TCLTK_WRAPPER_PORT} LIB_DEPENDS+= ${_TCLTK_LIB_LINE} +.endif + +# Setup TEA stuff +.if ${tcl_ARGS:Mtea} +GNU_CONFIGURE= yes +TCL_PKG?= ${PORTNAME:C/^tcl(-?)//:C/(-?)tcl\$//}${PORTVERSION} +PLIST_SUB+= TCL_PKG=${TCL_PKG} +CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \ + --with-tcl=${TCL_LIBDIR} \ + --with-tcl-includes=${TCL_INCLUDEDIR} +. if ${_TCLTK_PORT} == "tk" +CONFIGURE_ARGS+=--with-tk=${TK_LIBDIR} +. endif .endif .endif # defined(_INCLUDE_USES_TCL_MK) .undef _TCLTK_IGNORE Index: head/devel/dbus-tcl/Makefile =================================================================== --- head/devel/dbus-tcl/Makefile (revision 413645) +++ head/devel/dbus-tcl/Makefile (revision 413646) @@ -1,45 +1,42 @@ # Created by: gahr # $FreeBSD$ PORTNAME= dbus-tcl PORTVERSION= 2.1 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/dbus/${PORTVERSION}/ DISTNAME= dbus-${PORTVERSION} MAINTAINER= tcltk@FreeBSD.org COMMENT= Tcl interface to the D-Bus messaging system LICENSE= ISCL LIB_DEPENDS= libdbus-1.so:devel/dbus BUILD_DEPENDS= dtplite:devel/tcllib OPTIONS_DEFINE= DOCS DOCSDIR= ${PREFIX}/share/doc/dbus PORTDOCS= * TEST_TARGET= do-test -USES= pkgconfig tcl:85+ -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \ - --exec-prefix=${PREFIX} +USES= pkgconfig tcl:85+,tea PLIST_FILES= lib/dbus/libdbus21.so.1 \ lib/dbus/pkgIndex.tcl \ man/mann/dbus.n.gz post-patch: ${REINPLACE_CMD} -e '/^INSTALL_PROGRAM/s|$$| -s|' \ ${WRKSRC}/Makefile.in do-test: DBUS=$$(${LOCALBASE}/bin/dbus-daemon --session --print-address --fork --print-pid); \ - DBUS_ADDR=$$(echo $$DBUS | awk '{print $$1}'); \ - DBUS_PID=$$(echo $$DBUS | awk '{print $$2}'); \ + DBUS_ADDR=$$(echo $$DBUS | ${AWK} '{print $$1}'); \ + DBUS_PID=$$(echo $$DBUS | ${AWK} '{print $$2}'); \ DBUS_ENV=DBUS_SESSION_BUS_ADDRESS=$$DBUS_ADDR; \ ${SETENV} ${MAKE_ENV} $$DBUS_ENV ${MAKE} -C ${WRKSRC} test; \ kill $$DBUS_PID .include Index: head/devel/tcl-memchan/Makefile =================================================================== --- head/devel/tcl-memchan/Makefile (revision 413645) +++ head/devel/tcl-memchan/Makefile (revision 413646) @@ -1,31 +1,24 @@ # Created by: Mikhail Teterin # $FreeBSD$ PORTNAME= memchan PORTVERSION= 2.3 CATEGORIES= devel tcl MASTER_SITES= SF PKGNAMEPREFIX= tcl- DISTNAME= Memchan${PORTVERSION} MAINTAINER= mi@aldan.algebra.com COMMENT= Two new channel types for in-memory channels in TCL8 BUILD_DEPENDS= ${LOCALBASE}/lib/tcllib/doctools/pkgIndex.tcl:devel/tcllib WRKSRC= ${WRKDIR}/${DISTNAME} ALL_TARGET= binaries libraries doc-old +TEST_TARGET= test -USES+= tcl -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ - --exec-prefix=${PREFIX} - -# Too bad, n is no longer an acceptable section for bsd.man.mk -PLIST_SUB+= PORTVERSION=${PORTVERSION} - -regression-test test: - ${MAKE} -C ${WRKSRC} test +USES+= tcl:tea +TCL_PKG= Memchan${PORTVERSION} .include Index: head/devel/tcl-memchan/files/patch-Makefile.in =================================================================== --- head/devel/tcl-memchan/files/patch-Makefile.in (revision 413645) +++ head/devel/tcl-memchan/files/patch-Makefile.in (revision 413646) @@ -1,19 +1,19 @@ ---- Makefile.in.orig 2010-12-10 22:24:41.000000000 +0100 -+++ Makefile.in 2014-02-17 15:55:10.000000000 +0100 -@@ -237,7 +237,7 @@ +--- Makefile.in.orig 2010-12-10 21:24:41 UTC ++++ Makefile.in +@@ -237,7 +237,7 @@ install-doc: doc @for i in $(DOC_NROFF); do \ echo "Installing $$i"; \ rm -f $(DESTDIR)$(mandir)/mann/`basename $$i`; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \ + $(INSTALL_DATA) doc/$$i $(DESTDIR)$(mandir)/mann ; \ done test: binaries libraries -@@ -419,6 +419,7 @@ +@@ -419,6 +419,7 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + chmod 755 $(DESTDIR)$(pkglibdir)/$$p; \ stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ if test "x$$stub" = "xstub"; then \ echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ Index: head/devel/tcl-memchan/pkg-plist =================================================================== --- head/devel/tcl-memchan/pkg-plist (revision 413645) +++ head/devel/tcl-memchan/pkg-plist (revision 413646) @@ -1,15 +1,15 @@ -lib/Memchan%%PORTVERSION%%/libMemchan.so.1 -lib/Memchan%%PORTVERSION%%/libMemchanstub.a -lib/Memchan%%PORTVERSION%%/pkgIndex.tcl +lib/%%TCL_PKG%%/libMemchan.so.1 +lib/%%TCL_PKG%%/libMemchanstub.a +lib/%%TCL_PKG%%/pkgIndex.tcl include/memchan.h include/memchanDecls.h include/buf.h include/bufDecls.h include/bufIntDecls.h man/mann/fifo.n.gz man/mann/fifo2.n.gz man/mann/memchan.n.gz man/mann/memchanapi.n.gz man/mann/null.n.gz man/mann/random.n.gz man/mann/zero.n.gz Index: head/devel/tcl-mmap/Makefile =================================================================== --- head/devel/tcl-mmap/Makefile (revision 413645) +++ head/devel/tcl-mmap/Makefile (revision 413646) @@ -1,31 +1,28 @@ # Created by: Mikhail Teterin # $FreeBSD$ PORTNAME= tcl-mmap PORTVERSION= 1.1 CATEGORIES= devel MASTER_SITES= SF MAINTAINER= tcltk@FreeBSD.org COMMENT= New TCL channel type using mmap-ed files LICENSE= GPLv3 -USES+= tcl -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \ - --prefix=${PREFIX} \ - --exec-prefix=${PREFIX} +USES+= tcl:tea -PLIST_FILES= lib/mmap${PORTVERSION}/pkgIndex.tcl \ - lib/mmap${PORTVERSION}/libmmap${PORTVERSION}.so \ - man/mann/tcl-mmap.n.gz +PLIST_FILES= lib/${TCL_PKG}/pkgIndex.tcl \ + lib/${TCL_PKG}/lib${TCL_PKG}.so \ + man/mann/${PORTNAME}.n.gz +TEST_TARGET= do-test -regression-test: build +do-test: cd ${WRKSRC}/tests; \ for t in *.tcl; \ do \ echo "load ../libmmap${PORTVERSION}.so; source $$t" | ${TCLSH}; \ done; .include Index: head/devel/tcl-signal/Makefile =================================================================== --- head/devel/tcl-signal/Makefile (revision 413645) +++ head/devel/tcl-signal/Makefile (revision 413646) @@ -1,31 +1,30 @@ # Created by: gahr # $FreeBSD$ PORTNAME= tcl-signal PORTVERSION= 1.4.0.1 CATEGORIES= devel MASTER_SITES= http://www.nyx.net/~mschwart/ DISTNAME= signal_ext${PORTVERSION:R:R} MAINTAINER= tcltk@FreeBSD.org COMMENT= Dynamically loadable signal handling for Tcl/Tk scripts -USES+= tcl -GNU_CONFIGURE= yes +USES+= tcl:tea ALL_TARGET= signal.so -CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} + CONFIGURE_ENV+= TCL_INC_DIR=${TCL_INCLUDEDIR} PLIST_FILES= lib/signal/signal.so \ lib/signal/pkgIndex.tcl post-patch: ${REINPLACE_CMD} -e 's|\.\./lib||' ${WRKSRC}/${CONFIGURE_SCRIPT} ${REINPLACE_CMD} -e 's|mkdir|${MKDIR}|; s|@TCL_PACKAGE_PATH@|@TCL_PREFIX@/lib|g' ${WRKSRC}/Makefile.in do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/signal ${INSTALL_DATA} ${WRKSRC}/signal.so ${STAGEDIR}${PREFIX}/lib/signal ${INSTALL_DATA} ${WRKSRC}/pkgIndex.tcl ${STAGEDIR}${PREFIX}/lib/signal .include Index: head/devel/tcl-trf/Makefile =================================================================== --- head/devel/tcl-trf/Makefile (revision 413645) +++ head/devel/tcl-trf/Makefile (revision 413646) @@ -1,77 +1,75 @@ # Created by: Mikhail Teterin # $FreeBSD$ PORTNAME= Trf PORTVERSION= 2.1.4 PORTREVISION= 1 CATEGORIES= devel tcl MASTER_SITES= SF/tcltrf/tcltrf/${PORTVERSION} PKGNAMEPREFIX= tcl- DISTNAME= trf${PORTVERSION} MAINTAINER= mi@aldan.algebra.com COMMENT= Data conversion, digests, compression, error-correction for Tcl ALL_TARGET= all -USES+= tcl tar:bzip2 +USES+= tcl:tea tar:bzip2 USE_LDCONFIG= ${PREFIX}/lib/Trf DDIR= ${PREFIX}/lib/tcl${TCL_VER}/Trf CFLAGS+= -Wall -Werror -MAKE_ENV+= TCL_VER=${TCL_VER} MKDIR="${MKDIR}" \ - INSTALL_DATA="${INSTALL_DATA}" +MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" +TEST_TARGET= do-test + REINPLACE_ARGS= -i "" -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl${TCL_VER} \ - --with-tclinclude=${LOCALBASE}/include/tcl${TCL_VER} \ - --enable-static-zlib --enable-static-bzlib \ +CONFIGURE_ARGS+=--enable-static-zlib --enable-static-bzlib \ --enable-static-md5 .include post-patch: .if defined(TRF_USE_MD) # # Using FreeBSD's own -lmd instead of OpenSSL's -lcrypto # ${REINPLACE_CMD} -E -e 's,openssl/,,' \ -e 's,(MD[5])_([A-Z][a-z]),\1\2,g' \ ${WRKSRC}/generic/*.[ch] ${REINPLACE_CMD} 's,-lcrypto,-lmd,' ${WRKSRC}/Makefile.in .else # # Using OpenSSL's implementations of message digests (-lcrypto) # To use FreeBSD's own -lmd, stop now and restart make with: # # -DTRF_USE_MD # USE_OPENSSL= yes .endif do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/Trf ${INSTALL_DATA} ${WRKSRC}/libTrf${PORTVERSION}.so \ ${WRKSRC}/pkgIndex.tcl ${STAGEDIR}${PREFIX}/lib/Trf/ for m in ${WRKSRC}/doc/man/*.n ; \ do \ ${INSTALL_MAN} $$m ${STAGEDIR}${MANNPREFIX}/man/mann/ ;\ done -check regression-test test: +do-test: @if ! ${PKG_BIN} info --quiet tcl-memchan; then \ ${PRINTF} "*****************\n%s\n*****************\n" \ "devel/tcl-memchan must be installed for the tests to work"; \ exit 1; \ fi cd ${WRKSRC}/tests && ${SETENV} TCLLIBPATH="${WRKSRC}" ${TCLSH} all .include PLIST_SUB+= TCL_DVER=${TCL_VER:C/\.//} VER=${PORTVERSION} .if defined(OPENSSLBASE) && ${OPENSSLBASE} != "/usr" MAKE_ENV+= SSLINC=-I${OPENSSLINC} SSLLIB=-L${OPENSSLLIB} .endif .include Index: head/devel/tclbsd/Makefile =================================================================== --- head/devel/tclbsd/Makefile (revision 413645) +++ head/devel/tclbsd/Makefile (revision 413646) @@ -1,35 +1,32 @@ # Created by: gahr # $FreeBSD$ PORTNAME= tclbsd PORTVERSION= 1.6 DISTVERSIONPREFIX= v CATEGORIES= devel MAINTAINER= tcltk@FreeBSD.org COMMENT= Tcl interface to various system calls and library routines LICENSE= MIT OPTIONS_DEFINE= DOCS PORTDOCS= bsd.pdf -USES= tcl -USE_AUTOTOOLS= autoconf +USES= autoreconf tcl:tea +TCL_PKG= BSD${PORTVERSION} USE_GITHUB= yes GH_ACCOUNT= flightaware -CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \ - --with-tcl=${TCL_LIBDIR} - -PLIST_FILES= lib/BSD${PORTVERSION}/bsd_procs.tcl \ - lib/BSD${PORTVERSION}/libBSD${PORTVERSION}.so \ - lib/BSD${PORTVERSION}/pkgIndex.tcl \ +PLIST_FILES= lib/${TCL_PKG}/bsd_procs.tcl \ + lib/${TCL_PKG}/lib${TCL_PKG}.so \ + lib/${TCL_PKG}/pkgIndex.tcl \ man/mann/bsd.n.gz post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/bsd.pdf ${STAGEDIR}${DOCSDIR} .include Index: head/devel/tcllauncher/Makefile =================================================================== --- head/devel/tcllauncher/Makefile (revision 413645) +++ head/devel/tcllauncher/Makefile (revision 413646) @@ -1,33 +1,28 @@ # Created by: gahr # $FreeBSD$ PORTNAME= tcllauncher PORTVERSION= 1.6 DISTVERSIONPREFIX= v CATEGORIES= devel MAINTAINER= tcltk@FreeBSD.org COMMENT= Launcher program for Tcl applications LICENSE= MIT LIB_DEPENDS= libtclx8.4.so:lang/tclX USE_GITHUB= yes GH_ACCOUNT= flightaware -USES+= tcl autoreconf -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \ - --prefix=${PREFIX} \ - --exec-prefix=${PREFIX} +USES+= tcl:tea autoreconf +TCL_PKG= Tcllauncher${PORTVERSION} -LIBDIR= lib/Tcllauncher${PORTVERSION} - PLIST_FILES= bin/${PORTNAME} \ - ${LIBDIR}/tcllauncher.tcl \ - ${LIBDIR}/tcllauncher-support.tcl \ - ${LIBDIR}/pkgIndex.tcl \ + lib/${TCL_PKG}/tcllauncher.tcl \ + lib/${TCL_PKG}/tcllauncher-support.tcl \ + lib/${TCL_PKG}/pkgIndex.tcl \ man/mann/${PORTNAME}.n.gz .include Index: head/devel/tclmore/Makefile =================================================================== --- head/devel/tclmore/Makefile (revision 413645) +++ head/devel/tclmore/Makefile (revision 413646) @@ -1,25 +1,22 @@ # Created by: Denis Shaposhnikov # $FreeBSD$ PORTNAME= tclmore PORTVERSION= 0.7b1 PORTREVISION= 1 CATEGORIES= devel tcl MASTER_SITES= http://download.gna.org/tclmore/0.7/ DISTNAME= ${PORTNAME}_${PORTVERSION}_src MAINTAINER= dsh@vlink.ru COMMENT= More TCL commands -USES= gmake makeinfo tcl -GNU_CONFIGURE= yes +USES= gmake makeinfo tcl:tea USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/_src$//} INFO= ${PORTNAME} -CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \ - --enable-threads MAKE_ENV+= STAGEDIR=${STAGEDIR} .include Index: head/devel/tcloo/Makefile =================================================================== --- head/devel/tcloo/Makefile (revision 413645) +++ head/devel/tcloo/Makefile (revision 413646) @@ -1,25 +1,26 @@ # Created by: gahr # $FreeBSD$ PORTNAME= tcloo PORTVERSION= 1.0.4 CATEGORIES= devel MASTER_SITES= http://core.tcl.tk/tcloo/tarball/ DISTNAME= TclOO+Package-${FOSSIL_CHECKIN} MAINTAINER= tcltk@FreeBSD.org COMMENT= Implementation of TclOO for Tcl 8.5 +LICENSE= TclTk +LICENSE_NAME= Tcl/Tk License +LICENSE_FILE= ${WRKSRC}/license.terms +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + FOSSIL_CHECKIN= 0a6e9f1ea3 WRKSRC= ${WRKDIR}/${DISTNAME:S/+/_/} -USES+= tcl:85 USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \ - --exec-prefix=${PREFIX} - -PLIST_SUB+= PORTVERSION=${PORTVERSION} +USES+= tcl:85,tea +TCL_PKG= TclOO${PORTVERSION} TEST_TARGET= test .include Index: head/devel/tcloo/pkg-plist =================================================================== --- head/devel/tcloo/pkg-plist (revision 413645) +++ head/devel/tcloo/pkg-plist (revision 413646) @@ -1,17 +1,17 @@ -lib/TclOO%%PORTVERSION%%/libTclOO.so.1 -lib/TclOO%%PORTVERSION%%/pkgIndex.tcl -lib/TclOO%%PORTVERSION%%/tclooConfig.sh -lib/TclOO%%PORTVERSION%%/libTclOOstub.a +lib/%%TCL_PKG%%/libTclOO.so.1 +lib/%%TCL_PKG%%/pkgIndex.tcl +lib/%%TCL_PKG%%/tclooConfig.sh +lib/%%TCL_PKG%%/libTclOOstub.a include/tclOO.h include/tclOODecls.h man/mann/class.n.gz man/mann/copy.n.gz man/mann/define.n.gz man/mann/my.n.gz man/mann/next.n.gz man/mann/object.n.gz man/mann/ooInfo.n.gz man/mann/self.n.gz man/man3/Class.3.gz man/man3/Method.3.gz man/man3/OOInitStubs.3.gz Index: head/devel/tclreadline/Makefile =================================================================== --- head/devel/tclreadline/Makefile (revision 413645) +++ head/devel/tclreadline/Makefile (revision 413646) @@ -1,32 +1,28 @@ # Created by: darius@dons.net.au # $FreeBSD$ PORTNAME= tclreadline PORTVERSION= 2.1.0 PORTREVISION= 4 CATEGORIES= devel tcl MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= tcltk@FreeBSD.org COMMENT= GNU readline for TCL -USES= libtool tcl readline -GNU_CONFIGURE= yes +USES= libtool tcl:tea readline USE_LDCONFIG= yes - -PLIST_SUB+= VERSION="${PORTVERSION}" - -CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \ - --with-tcl-includes=${TCL_INCLUDEDIR} +TCL_PKG= ${PORTNAME}${PORTVERSION} +PLIST_SUB+= PORTVERSION=${PORTVERSION} post-patch: ${REINPLACE_CMD} \ -e '/^#define MALLOC/d; /^#define FREE/d; s|MALLOC|malloc|g; s|FREE|free|g' \ ${WRKSRC}/tclreadline.c ${REINPLACE_CMD} -e 's|/usr/locanl|/usr/local|' ${WRKSRC}/tclreadlineSetup.tcl.in ${REINPLACE_CMD} -e 's|/usr/local/bin/tclsh|${TCLSH}|g' \ ${WRKSRC}/tclreadlineSetup.tcl.in \ ${WRKSRC}/tclreadlineInit.tcl.in \ ${WRKSRC}/pkgIndex.tcl.in .include Index: head/devel/tclreadline/pkg-plist =================================================================== --- head/devel/tclreadline/pkg-plist (revision 413645) +++ head/devel/tclreadline/pkg-plist (revision 413646) @@ -1,9 +1,9 @@ include/tclreadline.h -lib/libtclreadline-%%VERSION%%.so +lib/libtclreadline-%%PORTVERSION%%.so lib/libtclreadline.a lib/libtclreadline.so -lib/tclreadline%%VERSION%%/pkgIndex.tcl -lib/tclreadline%%VERSION%%/tclreadlineCompleter.tcl -lib/tclreadline%%VERSION%%/tclreadlineInit.tcl -lib/tclreadline%%VERSION%%/tclreadlineSetup.tcl +lib/%%TCL_PKG%%/pkgIndex.tcl +lib/%%TCL_PKG%%/tclreadlineCompleter.tcl +lib/%%TCL_PKG%%/tclreadlineInit.tcl +lib/%%TCL_PKG%%/tclreadlineSetup.tcl man/mann/tclreadline.n.gz Index: head/devel/tclthread/Makefile =================================================================== --- head/devel/tclthread/Makefile (revision 413645) +++ head/devel/tclthread/Makefile (revision 413646) @@ -1,52 +1,48 @@ # Created by: Martin Matuska # $FreeBSD$ PORTNAME= thread PORTVERSION= 2.7.3 CATEGORIES= devel MASTER_SITES= SF/tcl/Thread%20Extension/${PORTVERSION} PKGNAMEPREFIX= tcl DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= tcltk@FreeBSD.org COMMENT= Scripting level thread extension for Tcl LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/license.terms -USES= autoreconf tcl +USES= autoreconf tcl:tea -DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \ - --prefix=${PREFIX} \ - --exec-prefix=${PREFIX} -USE_LDCONFIG= ${PREFIX}/lib/thread${PORTVERSION} +DOCSDIR= ${PREFIX}/share/doc/${TCL_PKG} +USE_LDCONFIG= ${PREFIX}/lib/${TCL_PKG} PLIST_SUB+= VERSION="${PORTVERSION}" INSTALL_TARGET= install-binaries install-libraries install-doc TEST_TARGET= test OPTIONS_DEFINE= GDBM DOCS OPTIONS_DEFAULT=GDBM GDBM_DESC= Persistent shared variables using GDBM GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_WITH= gdbm PORTDOCS= * post-patch: @${REINPLACE_CMD} "/INSTALL_LIBRARY=/s|'\$$| -s'|" \ ${WRKSRC}/tclconfig/tcl.m4 post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR}/html .for FILE in ChangeLog README ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} .endfor .for FILE in thread.html tpool.html tsv.html ttrace.html ${INSTALL_DATA} ${WRKSRC}/doc/html/${FILE} ${STAGEDIR}${DOCSDIR}/html .endfor .include Index: head/devel/tclthread/pkg-plist =================================================================== --- head/devel/tclthread/pkg-plist (revision 413645) +++ head/devel/tclthread/pkg-plist (revision 413646) @@ -1,8 +1,8 @@ -lib/thread%%VERSION%%/libthread%%VERSION%%.so -lib/thread%%VERSION%%/ttrace.tcl -lib/thread%%VERSION%%/pkgIndex.tcl +lib/%%TCL_PKG%%/lib%%TCL_PKG%%.so +lib/%%TCL_PKG%%/ttrace.tcl +lib/%%TCL_PKG%%/pkgIndex.tcl man/mann/thread.n.gz man/mann/tpool.n.gz man/mann/tsv.n.gz man/mann/ttrace.n.gz include/tclThread.h Index: head/devel/tcltls/Makefile =================================================================== --- head/devel/tcltls/Makefile (revision 413645) +++ head/devel/tcltls/Makefile (revision 413646) @@ -1,53 +1,48 @@ # Created by: mi@aldan.algebra.com # $FreeBSD$ PORTNAME= tcltls PORTVERSION= 1.6.7 PORTREVISION= 1 CATEGORIES= devel tcl MASTER_SITES= SF/tls/tls/${PORTVERSION} DISTNAME= tls${PORTVERSION}-src MAINTAINER= mi@aldan.algebra.com COMMENT= SSL extensions for TCL; dynamicly loadable LICENSE= TclTk LICENSE_NAME= Tcl/Tk License LICENSE_FILE= ${WRKSRC}/license.terms LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept OPTIONS_DEFINE= DOCS -USES+= tcl +USES+= tcl:tea USE_OPENSSL= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \ - --with-tcl=${TCL_LIBDIR} \ - --with-ssl-dir=${OPENSSLBASE} +CONFIGURE_ARGS+=--with-ssl-dir=${OPENSSLBASE} -TCLPKG= tls${PORTVERSION} -WRKSRC= ${WRKDIR}/${TCLPKG} -PLIST_FILES= \ - lib/${TCLPKG}/libtls.so.1 \ - lib/${TCLPKG}/pkgIndex.tcl \ - lib/${TCLPKG}/tls.tcl +WRKSRC= ${WRKDIR}/${TCL_PKG} +PLIST_FILES= lib/${TCL_PKG}/libtls.so.1 \ + lib/${TCL_PKG}/pkgIndex.tcl \ + lib/${TCL_PKG}/tls.tcl PORTDOCS= * INSTALL_TARGET= install-binaries install-doc post-patch: ${REINPLACE_CMD} -e \ 's,package require tls.*,load ${WRKSRC}/libtls.so.1;\ source ${WRKSRC}/tls.tcl,' \ ${WRKSRC}/tests/*.test # The tests in ciphers.test are meaningless so far: ${MV} ${WRKSRC}/tests/ciphers.test ${WRKSRC}/tests/ciphers.test.broken post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/tls.htm ${STAGEDIR}${DOCSDIR} xregression-test test check: build cd ${WRKSRC}/tests && ${SETENV} TCL_LIBRARY="${WRKSRC}" \ tclsh${TCL_VER} all.tcl .include Index: head/devel/tclvfs/Makefile =================================================================== --- head/devel/tclvfs/Makefile (revision 413645) +++ head/devel/tclvfs/Makefile (revision 413646) @@ -1,20 +1,17 @@ # Created by: gahr@FreeBSD.org # $FreeBSD$ PORTNAME= tclvfs PORTVERSION= 20080503 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ MAINTAINER= tcltk@FreeBSD.org COMMENT= Tcl VirtualFileSystem layer LIB_DEPENDS= libTrf2.1.4.so:devel/tcl-trf -USES+= gmake tcl -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \ - --prefix=${PREFIX} \ - -exec-prefix=${PREFIX} +USES+= gmake tcl:tea +TCL_PKG= vfs1.3 .include Index: head/devel/tclvfs/pkg-plist =================================================================== --- head/devel/tclvfs/pkg-plist (revision 413645) +++ head/devel/tclvfs/pkg-plist (revision 413646) @@ -1,28 +1,28 @@ -lib/vfs1.3/ftpvfs.tcl -lib/vfs1.3/httpvfs.tcl -lib/vfs1.3/libvfs1.3.so -lib/vfs1.3/mk4vfs.tcl -lib/vfs1.3/mk4vfscompat.tcl -lib/vfs1.3/pkgIndex.tcl -lib/vfs1.3/starkit.tcl -lib/vfs1.3/tarvfs.tcl -lib/vfs1.3/tclIndex -lib/vfs1.3/tclprocvfs.tcl -lib/vfs1.3/template/collatevfs.tcl -lib/vfs1.3/template/deltavfs.tcl -lib/vfs1.3/template/fishvfs.tcl -lib/vfs1.3/template/globfind.tcl -lib/vfs1.3/template/quotavfs.tcl -lib/vfs1.3/template/tdelta.tcl -lib/vfs1.3/template/templatevfs.tcl -lib/vfs1.3/template/versionvfs.tcl -lib/vfs1.3/testvfs.tcl -lib/vfs1.3/tkvfs.tcl -lib/vfs1.3/vfsUrl.tcl -lib/vfs1.3/vfsUtils.tcl -lib/vfs1.3/vfslib.tcl -lib/vfs1.3/webdavvfs.tcl -lib/vfs1.3/zipvfs.tcl -lib/vfs1.3/zipvfscompat.tcl +lib/%%TCL_PKG%%/ftpvfs.tcl +lib/%%TCL_PKG%%/httpvfs.tcl +lib/%%TCL_PKG%%/lib%%TCL_PKG%%.so +lib/%%TCL_PKG%%/mk4vfs.tcl +lib/%%TCL_PKG%%/mk4vfscompat.tcl +lib/%%TCL_PKG%%/pkgIndex.tcl +lib/%%TCL_PKG%%/starkit.tcl +lib/%%TCL_PKG%%/tarvfs.tcl +lib/%%TCL_PKG%%/tclIndex +lib/%%TCL_PKG%%/tclprocvfs.tcl +lib/%%TCL_PKG%%/template/collatevfs.tcl +lib/%%TCL_PKG%%/template/deltavfs.tcl +lib/%%TCL_PKG%%/template/fishvfs.tcl +lib/%%TCL_PKG%%/template/globfind.tcl +lib/%%TCL_PKG%%/template/quotavfs.tcl +lib/%%TCL_PKG%%/template/tdelta.tcl +lib/%%TCL_PKG%%/template/templatevfs.tcl +lib/%%TCL_PKG%%/template/versionvfs.tcl +lib/%%TCL_PKG%%/testvfs.tcl +lib/%%TCL_PKG%%/tkvfs.tcl +lib/%%TCL_PKG%%/vfsUrl.tcl +lib/%%TCL_PKG%%/vfsUtils.tcl +lib/%%TCL_PKG%%/vfslib.tcl +lib/%%TCL_PKG%%/webdavvfs.tcl +lib/%%TCL_PKG%%/zipvfs.tcl +lib/%%TCL_PKG%%/zipvfscompat.tcl man/mann/vfs.n.gz man/mann/vfslib.n.gz Index: head/devel/tclxml/Makefile =================================================================== --- head/devel/tclxml/Makefile (revision 413645) +++ head/devel/tclxml/Makefile (revision 413646) @@ -1,51 +1,45 @@ # Created by: David Yeske # $FreeBSD$ PORTNAME= tclxml PORTVERSION= 3.3 CATEGORIES= devel tcl MASTER_SITES= LOCAL/bf SF/tclxml/TclXML/${PORTVERSION} MAINTAINER= tcltk@FreeBSD.org COMMENT= API for parsing XML documents using Tcl LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libxslt.so:textproc/libxslt RUN_DEPENDS?= dtplite:devel/tcllib PORTDOCS= README.xml html.xsl man.macros nroff.xsl tcldoc-1.0.dtd \ tcldom.html tcldom.xml tclxml.css tclxml.html tclxml.xml \ tclxslt.html tclxslt.xml transform.tcl txt.xsl -USES= tcl tar:xz +USES= tcl:tea tar:xz +TCL_PKG= Tclxml${PORTVERSION} +PLIST_SUB= PORTVERSION=${PORTVERSION} XML_CONFIG?= ${LOCALBASE}/bin/xml2-config -GNU_CONFIGURE= yes -USE_LDCONFIG?= ${PREFIX}/lib/Tclxml${PORTVERSION} -CONFIGURE_ARGS= --exec-prefix=${PREFIX} \ - --with-tcl=${TCL_LIBDIR} \ - XML_CONFIG="${XML_CONFIG}" -PLIST_SUB= VER=${PORTVERSION} +USE_LDCONFIG= ${PREFIX}/lib/${TCL_PKG} +CONFIGURE_ARGS+=XML_CONFIG="${XML_CONFIG}" OPTIONS_DEFINE= DOCS MAKE_ENV+= TCLLIBPATH=${STAGEDIR}/${PREFIX}/lib TEST_TARGET= test post-patch: @${REINPLACE_CMD} -e '/^TCLSH_ENV[[:blank:]]*=/,/[^\]$$/d' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's/FreeBSD-\*/FreeBSD-*|DragonFly-*/g' \ ${WRKSRC}/configure -.include - -.if ${PORT_OPTIONS:MDOCS} post-install: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} doc) - @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) -.endif .include Index: head/devel/tclxml/pkg-plist =================================================================== --- head/devel/tclxml/pkg-plist (revision 413645) +++ head/devel/tclxml/pkg-plist (revision 413646) @@ -1,26 +1,26 @@ include/tclxml/docObj.h include/tclxml/tcldom-libxml2.h include/tclxml/tcldom.h include/tclxml/tclxml-libxml2.h include/tclxml/tclxslt.h -lib/Tclxml%%VER%%/libTclxml%%VER%%.so -lib/Tclxml%%VER%%/libTclxmlstub%%VER%%.a -lib/Tclxml%%VER%%/pkgIndex.tcl -lib/Tclxml%%VER%%/process.tcl -lib/Tclxml%%VER%%/resources.tcl -lib/Tclxml%%VER%%/sgml-8.0.tcl -lib/Tclxml%%VER%%/sgml-8.1.tcl -lib/Tclxml%%VER%%/sgmlparser.tcl -lib/Tclxml%%VER%%/tcldom-libxml2.tcl -lib/Tclxml%%VER%%/tclparser-8.0.tcl -lib/Tclxml%%VER%%/tclparser-8.1.tcl -lib/Tclxml%%VER%%/tclxslt-libxslt.tcl -lib/Tclxml%%VER%%/utilities.tcl -lib/Tclxml%%VER%%/xml-8.0.tcl -lib/Tclxml%%VER%%/xml-8.1.tcl -lib/Tclxml%%VER%%/xml__tcl.tcl -lib/Tclxml%%VER%%/xmldep.tcl -lib/Tclxml%%VER%%/xmlswitch.tcl -lib/Tclxml%%VER%%/xpath.tcl -lib/Tclxml%%VER%%/xsltcache.tcl +lib/%%TCL_PKG%%/lib%%TCL_PKG%%.so +lib/%%TCL_PKG%%/libTclxmlstub%%PORTVERSION%%.a +lib/%%TCL_PKG%%/pkgIndex.tcl +lib/%%TCL_PKG%%/process.tcl +lib/%%TCL_PKG%%/resources.tcl +lib/%%TCL_PKG%%/sgml-8.0.tcl +lib/%%TCL_PKG%%/sgml-8.1.tcl +lib/%%TCL_PKG%%/sgmlparser.tcl +lib/%%TCL_PKG%%/tcldom-libxml2.tcl +lib/%%TCL_PKG%%/tclparser-8.0.tcl +lib/%%TCL_PKG%%/tclparser-8.1.tcl +lib/%%TCL_PKG%%/tclxslt-libxslt.tcl +lib/%%TCL_PKG%%/utilities.tcl +lib/%%TCL_PKG%%/xml-8.0.tcl +lib/%%TCL_PKG%%/xml-8.1.tcl +lib/%%TCL_PKG%%/xml__tcl.tcl +lib/%%TCL_PKG%%/xmldep.tcl +lib/%%TCL_PKG%%/xmlswitch.tcl +lib/%%TCL_PKG%%/xpath.tcl +lib/%%TCL_PKG%%/xsltcache.tcl lib/TclxmlConfig.sh Index: head/lang/tclX/Makefile =================================================================== --- head/lang/tclX/Makefile (revision 413645) +++ head/lang/tclX/Makefile (revision 413646) @@ -1,64 +1,61 @@ # Created by: jkh # $FreeBSD$ PORTNAME= tclX PORTVERSION= 8.4.1 CATEGORIES= lang tcl devel MASTER_SITES= SF/${PORTNAME:tl}/TclX/${PORTVERSION} DISTNAME= tclx${PORTVERSION} MAINTAINER= mi@aldan.algebra.com COMMENT= Extended TCL LICENSE= TclTk LICENSE_NAME= Tcl/Tk License LICENSE_FILE= ${WRKSRC}/license.terms LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept WRKSRC= ${WRKDIR}/${PORTNAME:tl}${PORTVERSION:R} -USES= alias tcl tar:bzip2 +USES= autoreconf alias tcl:tea tar:bzip2 USE_LDCONFIG= ${PREFIX}/lib/tclx${PORTVERSION:R} -USE_AUTOTOOLS= autoconf -CONFIGURE_ARGS= --exec-prefix=${PREFIX} \ - --enable-shared \ - --with-help=Help \ - --with-tcl="${TCL_LIBDIR}" +CONFIGURE_ARGS+=--enable-shared \ + --with-help=Help PLIST_SUB= TCLX_VER=${PORTVERSION:R} ALL_TARGET= binaries libraries INSTALL_TARGET= install-binaries install-libraries .include .if ${TCL_VER} > 8.4 EXTRA_PATCHES+= ${FILESDIR}/tcl85-test-patch .endif .if ${TCL_VER} > 8.5 EXTRA_PATCHES+= ${FILESDIR}/tcl86-test-patch .endif post-configure: # Disabling the failing help.test ${MV} ${WRKSRC}/tests/help.test ${WRKSRC}/tests/help.test.dis post-install: ${INSTALL_DATA} ${WRKSRC}/doc/TclX.n ${STAGEDIR}${PREFIX}/man/mann .for l in CmdWrite Handles Keylist ObjCmdWrite TclXInit ${INSTALL_DATA} ${WRKSRC}/doc/${l}.3 ${STAGEDIR}${PREFIX}/man/man3 .endfor ${LN} -s CmdWrite.3.gz ${STAGEDIR}${PREFIX}/man/man3/TclCommandWriting.3.gz ${LN} -s KeyList.3.gz ${STAGEDIR}${PREFIX}/man/man3/TclX_NewKeyedListObj.3.gz .for l in Delete Get GetKeys Set TclX_Main TclX_NewKeyedListObj ${LN} -s KeyList.3.gz ${STAGEDIR}${PREFIX}/man/man3/TclX_KeyedList${l}.3.gz .endfor .for l in Alloc Free TblInit TblRelease TblUseCount Walk Xlate ${LN} -s Handles.3.gz ${STAGEDIR}${PREFIX}/man/man3/TclX_Handle${l}.3.gz .endfor .for l in Tclxcmd_Init TclX_Main Tkx_Init TkX_Main ${LN} -s TclXInit.3.gz ${STAGEDIR}${PREFIX}/man/man3/${l}.3.gz .endfor regression-test test: build ${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC} test .include