From owner-svn-ports-head@FreeBSD.ORG Wed Oct 10 14:28:41 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AC25E2B0 for ; Wed, 10 Oct 2012 14:28:41 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id 83E598FC24 for ; Wed, 10 Oct 2012 14:28:41 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9AESfp7099772 for ; Wed, 10 Oct 2012 14:28:41 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9AESfCu099766 for svn-ports-head@freebsd.org; Wed, 10 Oct 2012 14:28:41 GMT (envelope-from bdrewery) Received: (qmail 47026 invoked from network); 10 Oct 2012 09:28:39 -0500 Received: from unknown (HELO ?192.168.0.74?) (freebsd@shatow.net@74.94.87.209) by sweb.xzibition.com with ESMTPA; 10 Oct 2012 09:28:39 -0500 Message-ID: <50758617.8030109@FreeBSD.org> Date: Wed, 10 Oct 2012 09:28:39 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:15.0) Gecko/20120907 Thunderbird/15.0.1 MIME-Version: 1.0 To: Pietro Cerutti Subject: Re: svn commit: r305648 - head/devel/tcllib References: <201210101228.q9ACSN9w026185@svn.freebsd.org> In-Reply-To: <201210101228.q9ACSN9w026185@svn.freebsd.org> X-Enigmail-Version: 1.4.4 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Oct 2012 14:28:41 -0000 X-List-Received-Date: Wed, 10 Oct 2012 14:28:41 -0000 On 10/10/2012 7:28 AM, Pietro Cerutti wrote: > Author: gahr > Date: Wed Oct 10 12:28:22 2012 > New Revision: 305648 > URL: http://svn.freebsd.org/changeset/ports/305648 > > Log: > - Do not install the try.n manpage when using Tcl 8.6, cause try/catch/finally > are part of Tcl 8.6 core and the relevant manpage is installed by lang/tcl86 > http://www.tcl.tk/cgi-bin/tct/tip/329.html This causes patch error on 7.4: ================================================= ===> Patching for tcllib-1.14_1 ===> Applying FreeBSD patches for tcllib-1.14_1 # # Ensure, the detailed output of vendors' self-tests is # available in addition to the pretty progress report: # /usr/bin/sed -i.bak -e 's,test run,test run -l testlog,' -e 's,$(libdir)/@PACKAGE@@VERSION@,$(libdir)/@PACKAGE@,' /wrkdirs/usr/ports/devel/tcllib/work/tcllib-1.14/Makefile.in /usr/bin/find /wrkdirs/usr/ports/devel/tcllib/work/tcllib-1.14/apps -type f ! -name "*.man" | /usr/bin/xargs /usr/bin/sed -i.bak -e 's,exec tclsh,exec /usr/local/bin/tclsh8.5,' # # patch(1) adds a newline at eof, so we need to remove it here # /usr/bin/awk 'NR > 1 { print h } { h = $0 } END { ORS = ""; print h }' /wrkdirs/usr/ports/devel/tcllib/work/tcllib-1.14/modules/doctools/tests/text/04 > /wrkdirs/usr/ports/devel/tcllib/work/tcllib-1.14/modules/doctools/tests/text/04.new /bin/mv /wrkdirs/usr/ports/devel/tcllib/work/tcllib-1.14/modules/doctools/tests/text/04.new /wrkdirs/usr/ports/devel/tcllib/work/tcllib-1.14/modules/doctools/tests/text/04 # try(n) is part of Tcl core since 8.6 MANN+= try.n MANN+=: not found *** Error code 127 Stop in /usr/ports/devel/tcllib. > > Modified: > head/devel/tcllib/Makefile > head/devel/tcllib/Makefile.man > > Modified: head/devel/tcllib/Makefile > ============================================================================== > --- head/devel/tcllib/Makefile Wed Oct 10 12:20:32 2012 (r305647) > +++ head/devel/tcllib/Makefile Wed Oct 10 12:28:22 2012 (r305648) > @@ -7,6 +7,7 @@ > > PORTNAME= tcllib > PORTVERSION= 1.14 > +PORTREVISION= 1 > CATEGORIES= devel tcl > MASTER_SITES= SF > > @@ -43,6 +44,14 @@ post-patch: > ${WRKSRC}/modules/doctools/tests/text/04 > ${WRKSRC}/modules/doctools/tests/text/04.new > ${MV} ${WRKSRC}/modules/doctools/tests/text/04.new ${WRKSRC}/modules/doctools/tests/text/04 > > + # try(n) is part of Tcl core since 8.6 > +.if ${TCL_VER:S/.//} < 86 > + MANN+= try.n > +.else > + ${MV} ${WRKSRC}/modules/try/try.man ${WRKSRC}/modules/try/try.man.noinstall > +.endif > + > + > RUNTEST= ${SETENV} LANG=C DISPLAY= ${MAKE} -C ${WRKSRC} test > MYID != ${ID} -u > .if ${MYID} == 0 > > Modified: head/devel/tcllib/Makefile.man > ============================================================================== > --- head/devel/tcllib/Makefile.man Wed Oct 10 12:20:32 2012 (r305647) > +++ head/devel/tcllib/Makefile.man Wed Oct 10 12:28:22 2012 (r305648) > @@ -303,7 +303,6 @@ MANN= S3.n \ > traverse.n \ > treeql.n \ > trim.n \ > - try.n \ > uevent.n \ > uevent_onidle.n \ > unicode.n \ > -- Regards, Bryan Drewery bdrewery@freenode/EFNet