From owner-svn-ports-head@FreeBSD.ORG  Tue Oct  1 07:45:53 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id E978D3A5;
 Tue,  1 Oct 2013 07:45:53 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
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 BCC542550;
 Tue,  1 Oct 2013 07:45:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r917jrBa079215;
 Tue, 1 Oct 2013 07:45:53 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r917jrIK079214;
 Tue, 1 Oct 2013 07:45:53 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201310010745.r917jrIK079214@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Tue, 1 Oct 2013 07:45:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r328929 - head/devel/tclcl
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.14
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: Tue, 01 Oct 2013 07:45:54 -0000

Author: gahr
Date: Tue Oct  1 07:45:53 2013
New Revision: 328929
URL: http://svnweb.freebsd.org/changeset/ports/328929

Log:
  - Convert to USES+=tk
  - Convert to new LIB_DEPENDS format
  - STAGE-clean

Modified:
  head/devel/tclcl/Makefile

Modified: head/devel/tclcl/Makefile
==============================================================================
--- head/devel/tclcl/Makefile	Tue Oct  1 07:43:51 2013	(r328928)
+++ head/devel/tclcl/Makefile	Tue Oct  1 07:45:53 2013	(r328929)
@@ -12,7 +12,7 @@ COMMENT=	Tcl/C++ interface used by ns an
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	otcl:${PORTSDIR}/lang/otcl
+LIB_DEPENDS=	libotcl.so:${PORTSDIR}/lang/otcl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -21,15 +21,14 @@ USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 PORTDOCS=	CHANGES.html TODO.html
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 # We have to link against the same Tcl/Tk version as OTcl does
 .if exists(${LOCALBASE}/bin/otclsh)
 OTCL_TCLVER!=	${ECHO_CMD} puts \$$tcl_version | ${LOCALBASE}/bin/otclsh
-USE_TK=		${OTCL_TCLVER:S/.//}
+USES+=		tk:${OTCL_TCLVER:S/.//}
 .else
-USE_TK=		84+
+USES+=		tk
 .endif
 
 CONFIGURE_ARGS=	--with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER}
@@ -42,18 +41,18 @@ post-patch:
 		-e 's|../include|${TK_INCLUDEDIR}/generic|g' ${WRKSRC}/conf/configure.in.tk
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tcl2c++ ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/otcldoc ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/include/tclcl
-	${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include/tclcl
-	${INSTALL_DATA} ${WRKSRC}/libtclcl.a ${PREFIX}/lib
-	@${LN} -sf ${PREFIX}/lib/libtclcl.a ${PREFIX}/lib/libTcl.a
+	${INSTALL_PROGRAM} ${WRKSRC}/tcl2c++ ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/otcldoc ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/tclcl
+	${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/tclcl
+	${INSTALL_DATA} ${WRKSRC}/libtclcl.a ${STAGEDIR}${PREFIX}/lib
+	@${LN} -sf ${PREFIX}/lib/libtclcl.a ${STAGEDIR}${PREFIX}/lib/libTcl.a
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif