svn commit: r305648 - head/devel/tcllib

[Pietro Cerutti]

Fixed, thanks. Sorry it took so long, my mailfilter didn't correctly
ring bell for this mail ;)

On 2012-Oct-10, 09:28, Bryan Drewery wrote:
> 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:
> 
> =======================<phase: patch    >==========================
> ===>  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 at freenode/EFNet

-- 
Pietro Cerutti
The FreeBSD Project
gahr at FreeBSD.org

PGP Public Key:
http://gahr.ch/pgp
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20121011/4b864d48/attachment.sig>