Date: Thu, 11 Oct 2012 15:32:24 +0200 From: Pietro Cerutti <gahr@FreeBSD.org> To: Bryan Drewery <bdrewery@FreeBSD.org> Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: svn commit: r305648 - head/devel/tcllib Message-ID: <20121011133224.GB56059@gahrfit.gahr.ch> In-Reply-To: <50758617.8030109@FreeBSD.org> References: <201210101228.q9ACSN9w026185@svn.freebsd.org> <50758617.8030109@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--UFHRwCdBEJvubb2X Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 > >=20 > > Log: > > - Do not install the try.n manpage when using Tcl 8.6, cause try/catc= h/finally > > are part of Tcl 8.6 core and the relevant manpage is installed by l= ang/tcl86 > > http://www.tcl.tk/cgi-bin/tct/tip/329.html >=20 > This causes patch error on 7.4: >=20 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D<pha= se: patch >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D > =3D=3D=3D> Patching for tcllib-1.14_1 > =3D=3D=3D> 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 =3D $0 } END { ORS =3D ""; print h }' > /wrkdirs/usr/ports/devel/tcllib/work/tcllib-1.14/modules/doctools/tests/t= ext/04 > > > /wrkdirs/usr/ports/devel/tcllib/work/tcllib-1.14/modules/doctools/tests/t= ext/04.new > /bin/mv > /wrkdirs/usr/ports/devel/tcllib/work/tcllib-1.14/modules/doctools/tests/t= ext/04.new > /wrkdirs/usr/ports/devel/tcllib/work/tcllib-1.14/modules/doctools/tests/t= ext/04 > # try(n) is part of Tcl core since 8.6 > MANN+=3D try.n > MANN+=3D: not found > *** Error code 127 >=20 > Stop in /usr/ports/devel/tcllib. >=20 >=20 >=20 > >=20 > > Modified: > > head/devel/tcllib/Makefile > > head/devel/tcllib/Makefile.man > >=20 > > Modified: head/devel/tcllib/Makefile > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- 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 @@ > > =20 > > PORTNAME=3D tcllib > > PORTVERSION=3D 1.14 > > +PORTREVISION=3D 1 > > CATEGORIES=3D devel tcl > > MASTER_SITES=3D SF > > =20 > > @@ -43,6 +44,14 @@ post-patch: > > ${WRKSRC}/modules/doctools/tests/text/04 > ${WRKSRC}/modules/docto= ols/tests/text/04.new > > ${MV} ${WRKSRC}/modules/doctools/tests/text/04.new ${WRKSRC}/modules/= doctools/tests/text/04 > > =20 > > + # try(n) is part of Tcl core since 8.6 > > +.if ${TCL_VER:S/.//} < 86 > > + MANN+=3D try.n > > +.else > > + ${MV} ${WRKSRC}/modules/try/try.man ${WRKSRC}/modules/try/try.man.noi= nstall > > +.endif > > + > > + > > RUNTEST=3D ${SETENV} LANG=3DC DISPLAY=3D ${MAKE} -C ${WRKSRC} test > > MYID !=3D ${ID} -u > > .if ${MYID} =3D=3D 0 > >=20 > > Modified: head/devel/tcllib/Makefile.man > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- 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=3D S3.n \ > > traverse.n \ > > treeql.n \ > > trim.n \ > > - try.n \ > > uevent.n \ > > uevent_onidle.n \ > > unicode.n \ > >=20 >=20 >=20 > --=20 > Regards, > Bryan Drewery > bdrewery@freenode/EFNet --=20 Pietro Cerutti The FreeBSD Project gahr@FreeBSD.org PGP Public Key: http://gahr.ch/pgp --UFHRwCdBEJvubb2X Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlB2ymcACgkQwMJqmJVx945fpQCgxEtvkw47/eK38YqOVsA/i9Xe p4oAmgJu4nZHPPzp+YOcbtI2hcm2ctXL =AbFu -----END PGP SIGNATURE----- --UFHRwCdBEJvubb2X--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121011133224.GB56059>