From owner-svn-ports-branches@FreeBSD.ORG Mon Jan 13 11:41:00 2014 Return-Path: Delivered-To: svn-ports-branches@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 ESMTPS id 586C3531; Mon, 13 Jan 2014 11:41:00 +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 442F3159D; Mon, 13 Jan 2014 11:41:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0DBf0HX044988; Mon, 13 Jan 2014 11:41:00 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0DBexBs044983; Mon, 13 Jan 2014 11:40:59 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201401131140.s0DBexBs044983@svn.freebsd.org> From: Pietro Cerutti Date: Mon, 13 Jan 2014 11:40:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339585 - in branches/2014Q1/textproc/tclExpat: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jan 2014 11:41:00 -0000 Author: gahr Date: Mon Jan 13 11:40:59 2014 New Revision: 339585 URL: http://svnweb.freebsd.org/changeset/ports/339585 Log: MFH: r339582 - Convert to USES=tcl - STAGE-clean - Respect PREFIX Approved by: portmgr Modified: branches/2014Q1/textproc/tclExpat/Makefile (contents, props changed) branches/2014Q1/textproc/tclExpat/distinfo (contents, props changed) branches/2014Q1/textproc/tclExpat/files/Makefile (contents, props changed) branches/2014Q1/textproc/tclExpat/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/textproc/tclExpat/Makefile ============================================================================== --- branches/2014Q1/textproc/tclExpat/Makefile Mon Jan 13 11:36:40 2014 (r339584) +++ branches/2014Q1/textproc/tclExpat/Makefile Mon Jan 13 11:40:59 2014 (r339585) @@ -8,19 +8,18 @@ CATEGORIES= textproc tcl MASTER_SITES= http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}/sources/ MAINTAINER= mi@aldan.algebra.com -COMMENT= The TCL interface to Expat library +COMMENT= Tcl interface to Expat library -LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 USE_LDCONFIG= yes -USE_TCL= 84+ +USES= tcl PLIST_SUB+= TCL_VERSION=${TCL_VER} MAKEFILE= ${FILESDIR}/Makefile MAKE_ENV+= TCL_VERSION=${TCL_VER} -NO_STAGE= yes # Remove the old version of expat bundled with the package: post-extract: ${RM} -rf ${WRKSRC}/expat @@ -32,12 +31,10 @@ post-build test: cd ${WRKSRC} && ${TCLSH} test-error.tcl post-install: - ${MKDIR} ${LOCALBASE}/lib/tcl${TCL_VER}/${PORTNAME} + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} ${SED} 's|PREFIX|${PREFIX}|' < ${FILESDIR}/pkgIndex.tcl.in > \ - ${LOCALBASE}/lib/tcl${TCL_VER}/${PORTNAME}/pkgIndex.tcl -.if !defined(NOPORTDOCS) - ${MKDIR} ${LOCALBASE}/share/doc/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/README ${LOCALBASE}/share/doc/${PORTNAME}/ -.endif + ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/pkgIndex.tcl + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Modified: branches/2014Q1/textproc/tclExpat/distinfo ============================================================================== --- branches/2014Q1/textproc/tclExpat/distinfo Mon Jan 13 11:36:40 2014 (r339584) +++ branches/2014Q1/textproc/tclExpat/distinfo Mon Jan 13 11:40:59 2014 (r339585) @@ -1,2 +1,2 @@ -SHA256 (TclExpat-1.1.tar.gz) = 3403e26a6cd3e84946a805d4482e7cf241af76c12bd2ec851b7f442bff3572a8 -SIZE (TclExpat-1.1.tar.gz) = 268538 +SHA256 (TclExpat-1.1.tar.gz) = c8bc32b2d38faebba98098e5047a932900a2b08d9f378182324f3c8b87731e40 +SIZE (TclExpat-1.1.tar.gz) = 269845 Modified: branches/2014Q1/textproc/tclExpat/files/Makefile ============================================================================== --- branches/2014Q1/textproc/tclExpat/files/Makefile Mon Jan 13 11:36:40 2014 (r339584) +++ branches/2014Q1/textproc/tclExpat/files/Makefile Mon Jan 13 11:40:59 2014 (r339585) @@ -4,7 +4,7 @@ SRCS= tclexpat.c SHLIB_NAME= libtclexpat.so.1 -LIBDIR= ${LOCALBASE}/lib +LIBDIR= ${PREFIX}/lib TCL_VERSION?= 8.4 TCL_DVER?= ${TCL_VERSION:S/.//} Modified: branches/2014Q1/textproc/tclExpat/pkg-plist ============================================================================== --- branches/2014Q1/textproc/tclExpat/pkg-plist Mon Jan 13 11:36:40 2014 (r339584) +++ branches/2014Q1/textproc/tclExpat/pkg-plist Mon Jan 13 11:40:59 2014 (r339585) @@ -1,5 +1,5 @@ -lib/tcl%%TCL_VERSION%%/TclExpat/pkgIndex.tcl -@dirrm lib/tcl%%TCL_VERSION%%/TclExpat +lib/TclExpat/pkgIndex.tcl +@dirrm lib/TclExpat lib/libtclexpat.so.1 lib/libtclexpat.so %%PORTDOCS%%%%DOCSDIR%%/README