From owner-svn-ports-head@FreeBSD.ORG  Fri Jan 17 10:33:09 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7FB50390;
 Fri, 17 Jan 2014 10:33:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6C7E014DD;
 Fri, 17 Jan 2014 10:33:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HAX9bF020938;
 Fri, 17 Jan 2014 10:33:09 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HAX99I020937;
 Fri, 17 Jan 2014 10:33:09 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201401171033.s0HAX99I020937@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Fri, 17 Jan 2014 10:33:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r340026 - head/net-im/libpurple
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Jan 2014 10:33:09 -0000

Author: gahr
Date: Fri Jan 17 10:33:08 2014
New Revision: 340026
URL: http://svnweb.freebsd.org/changeset/ports/340026
QAT: https://qat.redports.org/buildarchive/r340026/

Log:
  - Convert to USES=tk

Modified:
  head/net-im/libpurple/Makefile

Modified: head/net-im/libpurple/Makefile
==============================================================================
--- head/net-im/libpurple/Makefile	Fri Jan 17 10:30:16 2014	(r340025)
+++ head/net-im/libpurple/Makefile	Fri Jan 17 10:33:08 2014	(r340026)
@@ -83,10 +83,10 @@ NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTCLTK}
-USE_TK=			yes
-CFLAGS+=		-I${LOCALBASE}/include/tk${TK_VER} -I${LOCALBASE}/include/tcl${TCL_VER}
-CONFIGURE_ARGS+=	--with-tclconfig=${LOCALBASE}/lib/tcl${TCL_VER} \
-			--with-tkconfig=${LOCALBASE}/lib/tk${TK_VER}
+USES+=			tk
+CFLAGS+=		-I${TK_INCLUDEDIR} -I${TCL_INCLUDEDIR}
+CONFIGURE_ARGS+=	--with-tclconfig=${TCL_LIBDIR} \
+			--with-tkconfig=${TK_LIBDIR}
 PLIST_SUB+=		TCL:=""
 .else
 CONFIGURE_ARGS+=	--disable-tcl
@@ -314,8 +314,8 @@ post-patch:
 		-e 's|-lpanel |-lpanel -lncurses|g' \
 		-e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \
 		-e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} $$LIBDL|-lsilc -lsilcclient ${PTHREAD_LIBS} ${ICONV_LIB}|' \
-		-e 's|TCL_VERSION found but 8.3 required|TCL_VERSION found but ${TCLTK_VER} required|g' \
-		-e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${TCLTK_VER:E}|' \
+		-e 's|TCL_VERSION found but 8.3 required|TCL_VERSION found but ${TCL_VER} required|g' \
+		-e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${TCL_VER:E}|' \
 			${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/bin/bash|${SH}|' \
 			${WRKSRC}/libpurple/purple-send \