Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Apr 2016 12:45:17 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r413730 - in head: astro/tclgeomap astro/tkgeomap audio/snack databases/casstcl databases/pgtcl databases/speedtables databases/tcl-lmdb databases/tcl-sqlite3 databases/tdbc devel/gcvs ...
Message-ID:  <201604211245.u3LCjHjw073115@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Thu Apr 21 12:45:16 2016
New Revision: 413730
URL: https://svnweb.freebsd.org/changeset/ports/413730

Log:
  Convert a few more ports to USES=tcl:tea

Modified:
  head/astro/tclgeomap/Makefile
  head/astro/tkgeomap/Makefile
  head/audio/snack/Makefile
  head/databases/casstcl/Makefile
  head/databases/pgtcl/Makefile
  head/databases/pgtcl/pkg-descr
  head/databases/speedtables/Makefile
  head/databases/tcl-lmdb/Makefile
  head/databases/tcl-sqlite3/Makefile
  head/databases/tdbc/Makefile
  head/devel/gcvs/Makefile
  head/devel/yajl-tcl/Makefile
  head/devel/ztcl/Makefile

Modified: head/astro/tclgeomap/Makefile
==============================================================================
--- head/astro/tclgeomap/Makefile	Thu Apr 21 12:21:59 2016	(r413729)
+++ head/astro/tclgeomap/Makefile	Thu Apr 21 12:45:16 2016	(r413730)
@@ -11,10 +11,7 @@ COMMENT=	Read, manipulate, and display g
 
 LICENSE=	GPLv2
 
-USES+=		tcl
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
-		--with-tclinclude=${TCL_INCLUDEDIR}
+USES+=		tcl:tea
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 USE_LDCONFIG=	yes
 

Modified: head/astro/tkgeomap/Makefile
==============================================================================
--- head/astro/tkgeomap/Makefile	Thu Apr 21 12:21:59 2016	(r413729)
+++ head/astro/tkgeomap/Makefile	Thu Apr 21 12:45:16 2016	(r413730)
@@ -13,11 +13,8 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libtclgeomap.so:astro/tclgeomap
 
-USES+=		tk
-GNU_CONFIGURE=	yes
+USES+=		tk:tea
 CONFIGURE_ARGS=	--with-tclgeomap-include=${LOCALBASE}/include/tclgeomap --with-x \
-		--with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR} \
-		--with-tk=${TK_LIBDIR} --with-tkinclude=${TK_INCLUDEDIR} \
 		--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
 MAKE_ENV+=	TCLGEOMAP_LIB="-L ${LOCALBASE}/lib -ltclgeomap"
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix

Modified: head/audio/snack/Makefile
==============================================================================
--- head/audio/snack/Makefile	Thu Apr 21 12:21:59 2016	(r413729)
+++ head/audio/snack/Makefile	Thu Apr 21 12:45:16 2016	(r413730)
@@ -14,11 +14,8 @@ COMMENT=	Sound toolkit for scripting lan
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
-USES=		tk
+USES=		tk:tea
 USE_LDCONFIG=	${PREFIX}/lib/snack${PORTVERSION:R}
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
-		--with-tk=${TK_LIBDIR}
 MAKE_ENV=	prefix=${PREFIX} exec_prefix=${PREFIX}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix

Modified: head/databases/casstcl/Makefile
==============================================================================
--- head/databases/casstcl/Makefile	Thu Apr 21 12:21:59 2016	(r413729)
+++ head/databases/casstcl/Makefile	Thu Apr 21 12:45:16 2016	(r413730)
@@ -13,10 +13,7 @@ LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libcassandra.so:databases/cassandra-cpp-driver
 
-USES=		autoreconf tcl:85+
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
-		--exec-prefix=${PREFIX}
+USES=		autoreconf tcl:85+,tea
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	flightaware

Modified: head/databases/pgtcl/Makefile
==============================================================================
--- head/databases/pgtcl/Makefile	Thu Apr 21 12:21:59 2016	(r413729)
+++ head/databases/pgtcl/Makefile	Thu Apr 21 12:45:16 2016	(r413730)
@@ -19,12 +19,12 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 OPTIONS_DEFINE=	DOCS
 
 .if defined(PGTCL_SLAVE)
-USES=		pgsql:${PGTCL_SLAVE} tcl
+USES=		pgsql:${PGTCL_SLAVE}
 .else
-USES=		pgsql tcl
+USES=		pgsql
 .endif
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR}
+
+USES+=		tcl:tea
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
 USE_LDCONFIG=	${LIBDIR}
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}

Modified: head/databases/pgtcl/pkg-descr
==============================================================================
--- head/databases/pgtcl/pkg-descr	Thu Apr 21 12:21:59 2016	(r413729)
+++ head/databases/pgtcl/pkg-descr	Thu Apr 21 12:45:16 2016	(r413730)
@@ -2,4 +2,4 @@ A TCL extension for accessing PostgreSQL
 to come bunlded with PostgreSQL itself, but was split into a
 separate project in more recent version (8+).
 
-WWW:	http://pgfoundry.org/projects/pgtclng/
+WWW: http://pgfoundry.org/projects/pgtclng/

Modified: head/databases/speedtables/Makefile
==============================================================================
--- head/databases/speedtables/Makefile	Thu Apr 21 12:21:59 2016	(r413729)
+++ head/databases/speedtables/Makefile	Thu Apr 21 12:45:16 2016	(r413730)
@@ -18,11 +18,8 @@ LIB_DEPENDS=	libtclx8.4.so:lang/tclX \
 USE_GITHUB=	yes
 GH_ACCOUNT=	flightaware
 
-USES=		autoreconf tcl
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \
-		--with-boost=${PREFIX} \
-		--with-tcl=${TCL_LIBDIR}
+USES=		autoreconf tcl:tea
+CONFIGURE_ARGS=	--with-boost=${LOCALBASE}
 
 PORTDOCS=	*
 

Modified: head/databases/tcl-lmdb/Makefile
==============================================================================
--- head/databases/tcl-lmdb/Makefile	Thu Apr 21 12:21:59 2016	(r413729)
+++ head/databases/tcl-lmdb/Makefile	Thu Apr 21 12:45:16 2016	(r413730)
@@ -15,22 +15,17 @@ LIB_DEPENDS=	liblmdb.so:databases/lmdb
 USE_GITHUB=	yes
 GH_ACCOUNT=	ray2501
 
-USES=		gmake tcl
-GNU_CONFIGURE=	yes
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} --with-system-lmdb
-CONFIGURE_ENV+=	CPPFLAGS="${CFLAGS}"
+USES=		gmake tcl:tea
+CONFIGURE_ARGS=	--with-system-lmdb
 
 TEST_TARGET=	test
 
-TCLPKG=		lmdb${PORTVERSION}
-PLIST_FILES=	lib/${TCLPKG}/lib${TCLPKG}.so \
-		lib/${TCLPKG}/pkgIndex.tcl \
+PLIST_FILES=	lib/${TCL_PKG}/lib${TCL_PKG}.so \
+		lib/${TCL_PKG}/pkgIndex.tcl \
 		man/mann/lmdb.n.gz
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${TCLPKG}/lib${TCLPKG}.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${TCL_PKG}/lib${TCL_PKG}.so
 
 .include <bsd.port.mk>
 

Modified: head/databases/tcl-sqlite3/Makefile
==============================================================================
--- head/databases/tcl-sqlite3/Makefile	Thu Apr 21 12:21:59 2016	(r413729)
+++ head/databases/tcl-sqlite3/Makefile	Thu Apr 21 12:45:16 2016	(r413730)
@@ -19,14 +19,13 @@ OPTIONS_DEFAULT=	THREADS
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tea
 
-USES=		pkgconfig tcl
+USES=		pkgconfig tcl:tea
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
 
 CFLAGS+=	-Os
 CFLAGS+=	`pkg-config --cflags sqlite3`
 LDFLAGS+=	`pkg-config --libs sqlite3`
-CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR} --with-system-sqlite
+CONFIGURE_ARGS=	--with-system-sqlite
 
 THREADS_CONFIGURE_ENABLE=	threads
 

Modified: head/databases/tdbc/Makefile
==============================================================================
--- head/databases/tdbc/Makefile	Thu Apr 21 12:21:59 2016	(r413729)
+++ head/databases/tdbc/Makefile	Thu Apr 21 12:45:16 2016	(r413730)
@@ -20,12 +20,12 @@ OPTIONS_DEFINE=	MYSQL PGSQL SQLITE ODBC
 OPTIONS_DEFAULT=MYSQL PGSQL SQLITE ODBC
 OPTIONS_SUB=	yes
 
-USES=		tcl:86
+USES=		tcl:86,tea
 USE_LDCONFIG=	yes
 MAKE_ENV+=	DESTDIR=${STAGEDIR}
-CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} --with-tcloo=${TCL_LIBDIR} \
-		--prefix=${PREFIX} --exec-prefix=${PREFIX} \
-		--with-tdbc=${WRKDIR}/tdbc${PORTVERSION} --enable-threads \
+CONFIGURE_ARGS+=--with-tcloo=${TCL_LIBDIR} \
+		--with-tdbc=${WRKDIR}/tdbc${PORTVERSION} \
+		--enable-threads \
 		--mandir=${PREFIX}/man \
 		--includedir=${PREFIX}/include/tdbc
 PLIST_SUB+=	VERSION=${DISTVERSION} \

Modified: head/devel/gcvs/Makefile
==============================================================================
--- head/devel/gcvs/Makefile	Thu Apr 21 12:21:59 2016	(r413729)
+++ head/devel/gcvs/Makefile	Thu Apr 21 12:45:16 2016	(r413730)
@@ -14,11 +14,8 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GNOME=	gtk12
-USES=		autoreconf gmake tk:wrapper
-GNU_CONFIGURE=	yes
+USES=		autoreconf gmake tk:wrapper,tea
 CXXFLAGS:=	${CXXFLAGS:N-std=*:N:}
-CONFIGURE_ARGS=	--with-tclinclude=${TCL_INCLUDEDIR} \
-		--with-tcllib=${TCL_LIBDIR}
 EXTRACT_AFTER_ARGS=--exclude cvsunix --exclude 'getline.[ch]' --exclude 'getopt*.[ch]'
 
 post-patch:

Modified: head/devel/yajl-tcl/Makefile
==============================================================================
--- head/devel/yajl-tcl/Makefile	Thu Apr 21 12:21:59 2016	(r413729)
+++ head/devel/yajl-tcl/Makefile	Thu Apr 21 12:45:16 2016	(r413730)
@@ -16,17 +16,13 @@ LIB_DEPENDS=	libyajl.so:devel/yajl
 USE_GITHUB=	yes
 GH_ACCOUNT=	flightaware
 
-USES+=		pkgconfig tcl:85+
-USE_AUTOTOOLS=	autoconf
-CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \
-		--exec-prefix=${PREFIX}
+USES+=		autoreconf pkgconfig tcl:85+,tea
+
+TEST_TARGET=	test
+TEST_DEPENDS=	dtplite:devel/tcllib
 
 PLIST_FILES=	lib/yajltcl${PORTVERSION}/libyajltcl.so.1 \
 		lib/yajltcl${PORTVERSION}/pkgIndex.tcl \
 		lib/yajltcl${PORTVERSION}/yajl.tcl
 
-regression-test: build
-#	Requires devel/tcllib
-	cd ${WRKSRC} && ${MAKE} test
-
 .include <bsd.port.mk>

Modified: head/devel/ztcl/Makefile
==============================================================================
--- head/devel/ztcl/Makefile	Thu Apr 21 12:21:59 2016	(r413729)
+++ head/devel/ztcl/Makefile	Thu Apr 21 12:45:16 2016	(r413730)
@@ -17,19 +17,16 @@ LIB_DEPENDS=	libtclmore0.so:devel/tclmor
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		gmake tcl
-GNU_CONFIGURE=	yes
+USES=		gmake tcl:tea
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_src$//}
 
 INFO=		${PORTNAME} ${PORTNAME}-zlib
 
-CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \
-		--with-tclinclude=${TCL_INCLUDEDIR} \
-		--with-tclmorescripts=${LOCALBASE}/libexec/tclmore \
+CONFIGURE_ARGS=	--with-tclmorescripts=${LOCALBASE}/libexec/tclmore \
 		--enable-threads
 MAKE_ENV+=	STAGEDIR=${STAGEDIR}
-CPPFLAGS+=	-I ${LOCALBASE}/include -I ${TCL_INCLUDEDIR}
+CPPFLAGS+=	-I ${LOCALBASE}/include
 LDFLAGS+=	-L ${LOCALBASE}/lib
 
 PORTDOCS=	*



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604211245.u3LCjHjw073115>