diff options
| author | gahr <gahr@FreeBSD.org> | 2012-03-06 16:02:51 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2012-03-06 16:02:51 +0800 |
| commit | ecec8807cf5b05c34bd52d03e7e321010932ea6c (patch) | |
| tree | fe8ab6b5cfec6cfa8cca897357e3424dd35621e3 | |
| parent | cdcdb27c9d1fb2d80347ad011103d4abeecdafb4 (diff) | |
| download | freebsd-ports-gnome-ecec8807cf5b05c34bd52d03e7e321010932ea6c.tar.gz freebsd-ports-gnome-ecec8807cf5b05c34bd52d03e7e321010932ea6c.tar.zst freebsd-ports-gnome-ecec8807cf5b05c34bd52d03e7e321010932ea6c.zip | |
- import a patch from upstreams CVS to fix the expected result of a test
Reported by: Mikhail Teterin <mi+thun@aldan.algebra.com>
Thanks to: Andreas Kupries <andreask@activestate.com>
| -rw-r--r-- | devel/tcllib/Makefile | 6 | ||||
| -rw-r--r-- | devel/tcllib/files/patch-doctools | 23 |
2 files changed, 29 insertions, 0 deletions
diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile index 87950a34ef4f..6f3cbff2100c 100644 --- a/devel/tcllib/Makefile +++ b/devel/tcllib/Makefile @@ -36,6 +36,12 @@ post-patch: ${WRKSRC}/Makefile.in ${FIND} ${WRKSRC}/apps -type f ! -name "*.man" | ${XARGS} \ ${REINPLACE_CMD} -e 's,exec tclsh,exec ${TCLSH},' + # + # patch(1) adds a newline at eof, so we need to remove it here + # + ${AWK} 'NR > 1 { print h } { h = $$0 } END { ORS = ""; print h }' \ + ${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 RUNTEST= ${SETENV} LANG=C DISPLAY= ${MAKE} -C ${WRKSRC} test MYID != ${ID} -u diff --git a/devel/tcllib/files/patch-doctools b/devel/tcllib/files/patch-doctools new file mode 100644 index 000000000000..54673a20ad4e --- /dev/null +++ b/devel/tcllib/files/patch-doctools @@ -0,0 +1,23 @@ +--- modules/doctools/ChangeLog.orig 2011/12/13 18:59:14 1.165 ++++ modules/doctools/ChangeLog 2012/02/28 03:14:50 1.166 +@@ -1,3 +1,9 @@ ++2012-02-27 Andreas Kupries <aku@hephaistos> ++ ++ * tests/text/04: Update the expected the result to match the new ++ actual result. See the 2011-12-13 last-second bugfix in ++ textutil::adjust::undent for the cause. ++ + 2011-12-13 Andreas Kupries <andreas_kupries@users.sourceforge.net> + + * +--- modules/doctools/tests/text/04.orig 2012-03-05 16:05:43.000000000 +0100 ++++ modules/doctools/tests/text/04 2012-03-05 16:05:51.000000000 +0100 +@@ -14,7 +14,7 @@ + BEGINNE HIER + + +-| Example Block More Lines ++| Example Block More Lines + + + | Inlined Example \ |