From owner-svn-ports-head@freebsd.org Thu Apr 21 16:48:53 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BC2EBB176B9; Thu, 21 Apr 2016 16:48:53 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8B087177D; Thu, 21 Apr 2016 16:48:53 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3LGmqoa058889; Thu, 21 Apr 2016 16:48:52 GMT (envelope-from gahr@FreeBSD.org) Received: (from gahr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3LGmoxh058867; Thu, 21 Apr 2016 16:48:50 GMT (envelope-from gahr@FreeBSD.org) Message-Id: <201604211648.u3LGmoxh058867@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gahr set sender to gahr@FreeBSD.org using -f From: Pietro Cerutti Date: Thu, 21 Apr 2016 16:48:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413747 - in head: graphics/libimg graphics/tkpng graphics/togl net/tcludp security/tclgpg security/tclsasl x11-toolkits/blt x11-toolkits/iwidgets x11-toolkits/tile x11-toolkits/tix x11... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2016 16:48:53 -0000 Author: gahr Date: Thu Apr 21 16:48:50 2016 New Revision: 413747 URL: https://svnweb.freebsd.org/changeset/ports/413747 Log: Convert more ports to USES=(tcl|tk):tea Modified: head/graphics/libimg/Makefile head/graphics/tkpng/Makefile head/graphics/togl/Makefile head/net/tcludp/Makefile head/security/tclgpg/Makefile head/security/tclsasl/Makefile head/x11-toolkits/blt/Makefile head/x11-toolkits/iwidgets/Makefile head/x11-toolkits/tile/Makefile head/x11-toolkits/tile/pkg-plist head/x11-toolkits/tix/Makefile head/x11-toolkits/tk84/Makefile head/x11-toolkits/tk85/Makefile head/x11-toolkits/tk86/Makefile head/x11-toolkits/tkdnd/Makefile head/x11-toolkits/tkdnd/pkg-plist head/x11-toolkits/tktable/Makefile head/x11-toolkits/tktable/pkg-plist head/x11-toolkits/tktray/Makefile head/x11-toolkits/tktreectrl/Makefile head/x11-toolkits/tktreectrl/pkg-plist head/x11/tkXwin/Makefile Modified: head/graphics/libimg/Makefile ============================================================================== --- head/graphics/libimg/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/graphics/libimg/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -19,7 +19,7 @@ PLIST_SUB+= SHLIB_NAME="${SHLIB_NAME}" \ SHLIB_LINK="${SHLIB_LINK}" WRKSRC= ${WRKDIR}/tkimg${PORTVERSION:R} -USES= jpeg tk tar:bzip2 +USES= autoreconf jpeg tk:tea tar:bzip2 # We don't need the bundled libraries: EXTRACT_AFTER_ARGS= --exclude '*/libz/*' --exclude zlib \ @@ -27,8 +27,6 @@ EXTRACT_AFTER_ARGS= --exclude '*/libz/*' --exclude '*/compat/*' --exclude '*/libtiff/*' \ --exclude '*/libjpeg/*' --exclude '*/libpng/*' MAKE_ARGS+= INSTALL_ROOT="${STAGEDIR}" -USE_AUTOTOOLS= autoconf -CONFIGURE_ARGS= --with-tcl="${TCL_LIBDIR}" --with-tk="${TK_LIBDIR}" CONFIGURE_ENV= WRKDIR="${WRKDIR}" post-patch: Modified: head/graphics/tkpng/Makefile ============================================================================== --- head/graphics/tkpng/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/graphics/tkpng/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -16,15 +16,7 @@ LICENSE_NAME= Tcl/Tk License LICENSE_FILE= ${WRKSRC}/license.terms LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES+= tk tar:tgz -GNU_CONFIGURE= yes - -CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ - --with-tk=${TK_LIBDIR} \ - --with-tclinclude=${TCL_INCLUDEDIR} \ - --with-tkinclude=${TK_INCLUDEDIR} \ - --exec-prefix=${PREFIX} \ - --enable-shared +USES= tk:tea tar:tgz TKPKG= ${PORTNAME}${PORTVERSION} PLIST_SUB= VER=${PORTVERSION} TKPKG=${TKPKG} TKLIBVER=${TKLIBVER} Modified: head/graphics/togl/Makefile ============================================================================== --- head/graphics/togl/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/graphics/togl/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -14,22 +14,13 @@ COMMENT= Tk OpenGL widget LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= gmake tk +USES= gmake tk:tea USE_XORG= x11 xt xmu USE_GL= gl -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tk=${TK_LIBDIR} \ - --with-tcl=${TCL_LIBDIR} \ - --with-tclinclude=${TCL_INCLUDEDIR} USE_LDCONFIG= yes TOGL_INSTDIR= ${PREFIX}/lib/${DISTNAME} -CPPFLAGS+= -I${TK_INCLUDEDIR} -LDFLAGS+= -L${TK_LIBDIR} - -PLIST_SUB= TK_VER=${TK_VER} - OPTIONS_DEFINE= DOCS EXAMPLES post-patch: Modified: head/net/tcludp/Makefile ============================================================================== --- head/net/tcludp/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/net/tcludp/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -9,15 +9,19 @@ MASTER_SITES= SF MAINTAINER= frank@fenor.de COMMENT= UDP extension for TCL -USES= tcl -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \ - --exec-prefix=${PREFIX} -USE_LDCONFIG= ${PREFIX}/lib/udp${PORTVERSION} +LICENSE= TclTk +LICENSE_NAME= Tcl/Tk License +LICENSE_FILE= ${WRKSRC}/license.terms +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + +USES= tcl:tea +USE_LDCONFIG= ${PREFIX}/lib/${TCL_PKG} WRKSRC= ${WRKDIR}/${PORTNAME} -PLIST_FILES= lib/udp${PORTVERSION}/libudp${PORTVERSION}.so \ - lib/udp${PORTVERSION}/pkgIndex.tcl \ +TEST_TARGET= test + +PLIST_FILES= lib/${TCL_PKG}/lib${TCL_PKG}.so \ + lib/${TCL_PKG}/pkgIndex.tcl \ %%PORTDOCS%%man/mann/udp.n.gz .include Modified: head/security/tclgpg/Makefile ============================================================================== --- head/security/tclgpg/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/security/tclgpg/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -15,13 +15,10 @@ LICENSE= BSD2CLAUSE BUILD_DEPENDS= dtplite:devel/tcllib RUN_DEPENDS= gpg:security/gnupg1 -USES= autoreconf gmake tcl -GNU_CONFIGURE= yes +USES= autoreconf gmake tcl:tea USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/tclgpg-4cfd9fa949 -CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} - PLIST_FILES= lib/gpg1.0/libgpg1.0.so \ lib/gpg1.0/pkgIndex.tcl \ lib/gpg1.0/tclgpg.tcl \ Modified: head/security/tclsasl/Makefile ============================================================================== --- head/security/tclsasl/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/security/tclsasl/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -12,14 +12,10 @@ COMMENT= Tcl interface to the Cyrus SASL LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -USES= tcl libtool tar:tgz -GNU_CONFIGURE= yes +USES= tcl:tea libtool tar:tgz USE_LDCONFIG= yes -CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ - --with-tclinclude=${TCL_INCLUDEDIR} \ - --with-cyrus-sasl=${LOCALBASE} \ - --prefix=${PREFIX} +CONFIGURE_ARGS= --with-cyrus-sasl=${LOCALBASE} CONFIGURE_ENV= INSTALL="${INSTALL_DATA}" STAGEDIR="${STAGEDIR}" PORTDOCS= tclsasl.html Modified: head/x11-toolkits/blt/Makefile ============================================================================== --- head/x11-toolkits/blt/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/x11-toolkits/blt/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -15,13 +15,12 @@ LICENSE= MIT WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:R} -USES= gmake jpeg shebangfix tk zip +USES= gmake jpeg shebangfix tk:tea zip SHEBANG_FILES= demos/scripts/xcolors.tcl SHEBANG_LANG= bltwish bltwish_OLD_CMD=../bltwish bltwish_CMD= ${PREFIX}/bin/bltwish # installed by this port, so not LOCALBASE USE_LDCONFIG= yes -GNU_CONFIGURE= yes CFLAGS+= -I${TCL_INCLUDEDIR}/generic \ -I${TK_INCLUDEDIR}/generic \ -I${TK_INCLUDEDIR}/unix @@ -30,13 +29,7 @@ MAKE_JOBS_UNSAFE=yes PLIST_SUB+= BLTVER=${PORTVERSION:R} \ BLTSHORTVER=${PORTVERSION:R:S/.//} -CONFIGURE_ARGS+=--prefix=${PREFIX} \ - --exec_prefix=${PREFIX} \ - --enable-jpeg=${LOCALBASE} \ - --with-tcl=${TCL_LIBDIR} \ - --with-tk=${TK_LIBDIR} \ - --with-tcllibs=${LOCALBASE}/lib \ - --with-tklibs=${LOCALBASE}/lib +CONFIGURE_ARGS= --enable-jpeg=${LOCALBASE} \ post-patch: ${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ Modified: head/x11-toolkits/iwidgets/Makefile ============================================================================== --- head/x11-toolkits/iwidgets/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/x11-toolkits/iwidgets/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -14,12 +14,8 @@ COMMENT= Iwidgets - [incr Widgets] compa LIB_DEPENDS= libitk.so:x11-toolkits/itk NO_BUILD= yes -HAS_CONFIGURE= yes -USES= tk -CONFIGURE_ARGS= --prefix=${PREFIX} \ - --with-tcl=${TCL_LIBDIR} \ - --with-tk=${TK_LIBDIR} \ - --with-itcl=${LOCALBASE} +USES= tk:tea +CONFIGURE_ARGS= --with-itcl=${LOCALBASE} SUB_LIST= IWIDGETS=${DISTNAME} SUB_FILES= pkg-message PLIST_SUB= IWIDGETS=${DISTNAME} Modified: head/x11-toolkits/tile/Makefile ============================================================================== --- head/x11-toolkits/tile/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/x11-toolkits/tile/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -12,15 +12,8 @@ COMMENT= Themed widget set for Tk LICENSE= MIT LICENSE_FILE= ${WRKSRC}/license.terms -USES= autoreconf tk +USES= autoreconf tk:tea -GNU_CONFIGURE= yes -TKPKG= ${PORTNAME}${PORTVERSION} -PLIST_SUB= VER=${PORTVERSION} TKPKG=${TKPKG} - -CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \ - --with-tk=${TK_LIBDIR} \ - --exec-prefix=${PREFIX} --enable-shared CONFIGURE_ENV+= TCL_INCLUDEDIR="${TCL_INCLUDEDIR}" \ TK_INCLUDEDIR="${TK_INCLUDEDIR}" Modified: head/x11-toolkits/tile/pkg-plist ============================================================================== --- head/x11-toolkits/tile/pkg-plist Thu Apr 21 16:43:14 2016 (r413746) +++ head/x11-toolkits/tile/pkg-plist Thu Apr 21 16:48:50 2016 (r413747) @@ -1,32 +1,32 @@ include/tkTheme.h include/ttkDecls.h lib/libttkstub.a -lib/%%TKPKG%%/altTheme.tcl -lib/%%TKPKG%%/aquaTheme.tcl -lib/%%TKPKG%%/button.tcl -lib/%%TKPKG%%/clamTheme.tcl -lib/%%TKPKG%%/classicTheme.tcl -lib/%%TKPKG%%/combobox.tcl -lib/%%TKPKG%%/cursors.tcl -lib/%%TKPKG%%/defaults.tcl -lib/%%TKPKG%%/dialog.tcl -lib/%%TKPKG%%/entry.tcl -lib/%%TKPKG%%/fonts.tcl -lib/%%TKPKG%%/icons.tcl -lib/%%TKPKG%%/keynav.tcl -lib/%%TKPKG%%/menubutton.tcl -lib/%%TKPKG%%/notebook.tcl -lib/%%TKPKG%%/paned.tcl -lib/%%TKPKG%%/pkgIndex.tcl -lib/%%TKPKG%%/progress.tcl -lib/%%TKPKG%%/scale.tcl -lib/%%TKPKG%%/scrollbar.tcl -lib/%%TKPKG%%/sizegrip.tcl -lib/%%TKPKG%%/spinbox.tcl -lib/%%TKPKG%%/tile.so -lib/%%TKPKG%%/tile.tcl -lib/%%TKPKG%%/treeview.tcl -lib/%%TKPKG%%/utils.tcl -lib/%%TKPKG%%/vistaTheme.tcl -lib/%%TKPKG%%/winTheme.tcl -lib/%%TKPKG%%/xpTheme.tcl +lib/%%TCL_PKG%%/altTheme.tcl +lib/%%TCL_PKG%%/aquaTheme.tcl +lib/%%TCL_PKG%%/button.tcl +lib/%%TCL_PKG%%/clamTheme.tcl +lib/%%TCL_PKG%%/classicTheme.tcl +lib/%%TCL_PKG%%/combobox.tcl +lib/%%TCL_PKG%%/cursors.tcl +lib/%%TCL_PKG%%/defaults.tcl +lib/%%TCL_PKG%%/dialog.tcl +lib/%%TCL_PKG%%/entry.tcl +lib/%%TCL_PKG%%/fonts.tcl +lib/%%TCL_PKG%%/icons.tcl +lib/%%TCL_PKG%%/keynav.tcl +lib/%%TCL_PKG%%/menubutton.tcl +lib/%%TCL_PKG%%/notebook.tcl +lib/%%TCL_PKG%%/paned.tcl +lib/%%TCL_PKG%%/pkgIndex.tcl +lib/%%TCL_PKG%%/progress.tcl +lib/%%TCL_PKG%%/scale.tcl +lib/%%TCL_PKG%%/scrollbar.tcl +lib/%%TCL_PKG%%/sizegrip.tcl +lib/%%TCL_PKG%%/spinbox.tcl +lib/%%TCL_PKG%%/tile.so +lib/%%TCL_PKG%%/tile.tcl +lib/%%TCL_PKG%%/treeview.tcl +lib/%%TCL_PKG%%/utils.tcl +lib/%%TCL_PKG%%/vistaTheme.tcl +lib/%%TCL_PKG%%/winTheme.tcl +lib/%%TCL_PKG%%/xpTheme.tcl Modified: head/x11-toolkits/tix/Makefile ============================================================================== --- head/x11-toolkits/tix/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/x11-toolkits/tix/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -13,17 +13,7 @@ COMMENT= Extension to the Tk toolkit WRKSRC= ${WRKDIR}/Tix${DISTVERSION} USE_LDCONFIG= yes -GNU_CONFIGURE= yes -USES= tk -CONFIGURE_ARGS= --enable-shared --enable-sam \ - --with-tclconfig="${TCL_LIBDIR}" \ - --with-tkconfig="${TK_LIBDIR}" \ - --with-tclinclude="${TCL_INCLUDEDIR}" \ - --with-tkinclude="${TK_INCLUDEDIR}" \ - --prefix=${PREFIX} \ - --exec-prefix=${PREFIX} -# this should probably be added to bsd.port.mk -CONFIGURE_ENV= PREFIX=${PREFIX} +USES= tk:tea TIX_LIB= libTix${PORTVERSION}.so TIX_LIB_FILE= ${TIX_LIB}.0 Modified: head/x11-toolkits/tk84/Makefile ============================================================================== --- head/x11-toolkits/tk84/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/x11-toolkits/tk84/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -25,14 +25,11 @@ WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERS ALL_TARGET= all INSTALL_TARGET= install -USES+= tcl:${SHORT_TK_VER} +USES+= tcl:${SHORT_TK_VER},tea USE_LDCONFIG= yes USE_XORG= x11 CFLAGS+= -I${TCL_INCLUDEDIR}/generic -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared \ - --enable-man-suffix=.${MAN_SUFFIX} \ - --with-tcl=${TCL_LIBDIR} \ +CONFIGURE_ARGS= --enable-man-suffix=.${MAN_SUFFIX} \ --includedir=${PREFIX}/include/tk${TK_VER} CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1 Modified: head/x11-toolkits/tk85/Makefile ============================================================================== --- head/x11-toolkits/tk85/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/x11-toolkits/tk85/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -16,18 +16,15 @@ LICENSE_NAME= Tcl/Tk License LICENSE_FILE= ${WRKSRC}/../license.terms LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES+= tcl:${SHORT_TK_VER} +USES+= tcl:${SHORT_TK_VER},tea USE_XORG= x11 xft xscrnsaver USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}/unix -GNU_CONFIGURE= yes TK_VER= ${PORTVERSION:R} SHORT_TK_VER= ${TK_VER:S/.//} -CONFIGURE_ARGS= --enable-shared \ - --enable-xss \ +CONFIGURE_ARGS= --enable-xss \ --enable-xft \ --enable-man-suffix=.${MAN_SUFFIX} \ - --with-tcl=${TCL_LIBDIR} \ --includedir=${PREFIX}/include/tk${TK_VER} CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1 \ Modified: head/x11-toolkits/tk86/Makefile ============================================================================== --- head/x11-toolkits/tk86/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/x11-toolkits/tk86/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -29,14 +29,11 @@ ALL_TARGET= all INSTALL_TARGET= install-strip USE_LDCONFIG= yes -USES+= tcl:${SHORT_TK_VER} +USES+= tcl:${SHORT_TK_VER},tea USE_XORG= x11 xft xscrnsaver -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared \ - --enable-xss \ +CONFIGURE_ARGS= --enable-xss \ --enable-xft \ --enable-man-suffix=.${MAN_SUFFIX} \ - --with-tcl=${TCL_LIBDIR} \ --includedir=${PREFIX}/include/tk${TK_VER} CONFIGURE_ENV= PORTSDIR=${PORTSDIR} Modified: head/x11-toolkits/tkdnd/Makefile ============================================================================== --- head/x11-toolkits/tkdnd/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/x11-toolkits/tkdnd/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -10,18 +10,11 @@ DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= tcltk@FreeBSD.org COMMENT= Native drag and drop capabilities for Tk -USES+= tk:85+ +USES+= tk:85+,tea USE_XORG= x11 xext -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --exec-prefix=${PREFIX} \ - --with-tcl=${TCL_LIBDIR} \ - --with-tk=${TK_LIBDIR} \ - --with-tclinclude=${TCL_INCLUDEDIR} \ - --with-tkinclude=${TK_INCLUDEDIR} -TKPKG= ${PORTNAME}${PORTVERSION} -PLIST_SUB= TKPKG=${TKPKG} -USE_LDCONFIG= ${PREFIX}/lib/${TKPKG} +TCL_PKG= ${PORTNAME}${PORTVERSION} +USE_LDCONFIG= ${PREFIX}/lib/${TCL_PKG} WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} post-install: Modified: head/x11-toolkits/tkdnd/pkg-plist ============================================================================== --- head/x11-toolkits/tkdnd/pkg-plist Thu Apr 21 16:43:14 2016 (r413746) +++ head/x11-toolkits/tkdnd/pkg-plist Thu Apr 21 16:48:50 2016 (r413747) @@ -1,9 +1,9 @@ -lib/%%TKPKG%%/libtkdnd.so.1 -lib/%%TKPKG%%/pkgIndex.tcl -lib/%%TKPKG%%/tkdnd.tcl -lib/%%TKPKG%%/tkdnd_compat.tcl -lib/%%TKPKG%%/tkdnd_generic.tcl -lib/%%TKPKG%%/tkdnd_macosx.tcl -lib/%%TKPKG%%/tkdnd_unix.tcl -lib/%%TKPKG%%/tkdnd_windows.tcl +lib/%%TCL_PKG%%/libtkdnd.so.1 +lib/%%TCL_PKG%%/pkgIndex.tcl +lib/%%TCL_PKG%%/tkdnd.tcl +lib/%%TCL_PKG%%/tkdnd_compat.tcl +lib/%%TCL_PKG%%/tkdnd_generic.tcl +lib/%%TCL_PKG%%/tkdnd_macosx.tcl +lib/%%TCL_PKG%%/tkdnd_unix.tcl +lib/%%TCL_PKG%%/tkdnd_windows.tcl man/mann/tkDND.n.gz Modified: head/x11-toolkits/tktable/Makefile ============================================================================== --- head/x11-toolkits/tktable/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/x11-toolkits/tktable/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -16,26 +16,10 @@ LICENSE_NAME= Tcl/Tk License LICENSE_FILE= ${WRKSRC}/license.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES+= tk +USES+= tk:tea +TCL_PKG= ${DISTNAME} USE_LDCONFIG= ${PREFIX}/lib/${DISTNAME} - -GNU_CONFIGURE= yes - -PLIST_SUB= DISTNAME=${DISTNAME} - -CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ - --with-tk=${TK_LIBDIR} \ - --with-tclinclude=${TCL_INCLUDEDIR} \ - --with-tkinclude=${TK_INCLUDEDIR} \ - --with-x \ - --prefix=${PREFIX} \ - --exec-prefix=${PREFIX} - -.if defined(MAINTAINER_MODE) -test: build - (cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test) -.endif +TEST_TARGET= test post-patch: @${REINPLACE_CMD} -e 's/FreeBSD-\*/FreeBSD-*|DragonFly-*/' \ Modified: head/x11-toolkits/tktable/pkg-plist ============================================================================== --- head/x11-toolkits/tktable/pkg-plist Thu Apr 21 16:43:14 2016 (r413746) +++ head/x11-toolkits/tktable/pkg-plist Thu Apr 21 16:48:50 2016 (r413747) @@ -1,4 +1,4 @@ -lib/%%DISTNAME%%/lib%%DISTNAME%%.so -lib/%%DISTNAME%%/tktable.py -lib/%%DISTNAME%%/tkTable.tcl -lib/%%DISTNAME%%/pkgIndex.tcl +lib/%%TCL_PKG%%/lib%%TCL_PKG%%.so +lib/%%TCL_PKG%%/tktable.py +lib/%%TCL_PKG%%/tkTable.tcl +lib/%%TCL_PKG%%/pkgIndex.tcl Modified: head/x11-toolkits/tktray/Makefile ============================================================================== --- head/x11-toolkits/tktray/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/x11-toolkits/tktray/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -10,16 +10,11 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= tcltk@FreeBSD.org COMMENT= System tray icon support -USES+= tk +USES+= tk:tea USE_XORG= x11 xext -GNU_CONFIGURE= yes -CONFIGURE_ARGS= -exec-prefix=${PREFIX} \ - --with-tcl=${TCL_LIBDIR} \ - --with-tk=${TK_LIBDIR} -TKPKG= ${PORTNAME}${PORTVERSION} -PLIST_FILES= lib/${TKPKG}/libtktray.so.1 \ - lib/${TKPKG}/pkgIndex.tcl \ +PLIST_FILES= lib/${TCL_PKG}/libtktray.so.1 \ + lib/${TCL_PKG}/pkgIndex.tcl \ man/mann/${PORTNAME}.n.gz .include Modified: head/x11-toolkits/tktreectrl/Makefile ============================================================================== --- head/x11-toolkits/tktreectrl/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/x11-toolkits/tktreectrl/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -9,16 +9,11 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Multi-column hierarchical listbox widget -USES= tk:86 +USES= tk:86,tea USE_XORG= x11 -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \ - --with-tk=${TK_LIBDIR} \ - --exec-prefix=${PREFIX} \ - --enable-shared -TKPKG= treectrl${PORTVERSION} -USE_LDCONFIG= ${PREFIX}/lib/${TKPKG} -PLIST_SUB= TKPKG=${TKPKG} +TCL_PKG= treectrl${PORTVERSION} +USE_LDCONFIG= ${PREFIX}/lib/${TCL_PKG} +PLIST_SUB= TCL_PKG=${TCL_PKG} post-patch: @${REINPLACE_CMD} -e 's/FreeBSD-\*/FreeBSD-*|DragonFly-*/' \ Modified: head/x11-toolkits/tktreectrl/pkg-plist ============================================================================== --- head/x11-toolkits/tktreectrl/pkg-plist Thu Apr 21 16:43:14 2016 (r413746) +++ head/x11-toolkits/tktreectrl/pkg-plist Thu Apr 21 16:48:50 2016 (r413747) @@ -1,7 +1,7 @@ -lib/%%TKPKG%%/filelist-bindings.tcl -lib/%%TKPKG%%/htmldoc/What-is-New-in-TkTreeCtrl.html -lib/%%TKPKG%%/htmldoc/treectrl.html -lib/%%TKPKG%%/libtreectrl.so.1 -lib/%%TKPKG%%/pkgIndex.tcl -lib/%%TKPKG%%/treectrl.tcl +lib/%%TCL_PKG%%/filelist-bindings.tcl +lib/%%TCL_PKG%%/htmldoc/What-is-New-in-TkTreeCtrl.html +lib/%%TCL_PKG%%/htmldoc/treectrl.html +lib/%%TCL_PKG%%/libtreectrl.so.1 +lib/%%TCL_PKG%%/pkgIndex.tcl +lib/%%TCL_PKG%%/treectrl.tcl man/mann/treectrl.n.gz Modified: head/x11/tkXwin/Makefile ============================================================================== --- head/x11/tkXwin/Makefile Thu Apr 21 16:43:14 2016 (r413746) +++ head/x11/tkXwin/Makefile Thu Apr 21 16:48:50 2016 (r413747) @@ -10,16 +10,10 @@ MASTER_SITES= http://beepcore-tcl.source MAINTAINER= dsh@vlink.ru COMMENT= Tcl/Tk library to detect idle periods of an X session -GNU_CONFIGURE= yes -USES= libtool tk:84 tar:tgz +USES= libtool tk:84,tea tar:tgz USE_XORG= xt xscrnsaver USE_LDCONFIG= yes -CONFIGURE_ARGS= --prefix=${PREFIX} \ - --with-tcl=${TCL_LIBDIR} \ - --with-tclinclude=${TCL_INCLUDEDIR} \ - --with-tk=${TK_LIBDIR} \ - --with-tkinclude=${TK_INCLUDEDIR} CONFIGURE_ENV= INSTALL="${INSTALL_DATA}" .include