[Monotone-commits-diffs] net.venge.monotone: b56f292493f24460669039c877d51be6c28e9971

[code]

revision:            b56f292493f24460669039c877d51be6c28e9971
date:                2011-03-22T13:26:09
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
merge of '40ca0bb7367dc73f024da6ded659be69cfac1144'
     and 'b62ffe239f2f05e05a42ed9f7add4708417fa727'

manifest:
format_version "1"

new_manifest [892ad9a94d8de29aab4575f2a8a449b0e2d91aab]

old_revision [40ca0bb7367dc73f024da6ded659be69cfac1144]

rename "cygport/monotone-1.0-1.cygport"
    to "cygport/monotone.cygport"

rename "cygport/monotone-1.0-1.cygwin.patch"
    to "cygport/monotone.cygwin.patch"

patch "Makefile.am"
 from [8df20d82b2cf66b3d26e59e5302babd78780fec9]
   to [d8bebdb36192f09f35b5737b9975fce92b11eeb9]

patch "cygport/README.txt"
 from [8b684783ed31d6dc1081daaa8b8536f88110ec1b]
   to [361e69b992054b76cba996af183076b6a2cd0bce]

old_revision [b62ffe239f2f05e05a42ed9f7add4708417fa727]

patch "src/std_hooks.lua"
 from [30949d110cc1ed86d98f4f437fda16778a3e85bb]
   to [ada658bd275399032411e0f520d9900bad966dc4]
============================================================
--- Makefile.am	8df20d82b2cf66b3d26e59e5302babd78780fec9
+++ Makefile.am	d8bebdb36192f09f35b5737b9975fce92b11eeb9
@@ -406,8 +406,8 @@ EXTRA_DIST =								\
 	mac/monotone.pmproj mac/monotone-pkg-logo.gif			\
 									\
 	cygport/README.txt						\
-	cygport/monotone-1.0-1.cygwin.patch				\
-	cygport/monotone-1.0-1.cygport					\
+	cygport/monotone.cygwin.patch					\
+	cygport/monotone.cygport					\
 									\
 	notes/release-checklist.txt					\
 	notes/README.testing notes/tester.txt notes/testsuite.txt	\
============================================================
--- cygport/README.txt	8b684783ed31d6dc1081daaa8b8536f88110ec1b
+++ cygport/README.txt	361e69b992054b76cba996af183076b6a2cd0bce
@@ -3,8 +3,8 @@
 We use the cygport Cygwin package.
 
 $ cd monotone/cygport
-$ mtn mv monotone-$OLD-1.cygport monotone-$NEW-1.cygport
-$ mtn mv monotone-$OLD-1.cygwin.patch monotone-$NEW-1.cygwin.patch
+$ ln -s monotone.cygport monotone-$NEW-1.cygport
+$ ln -s monotone.cygwin.patch monotone-$NEW-1.cygwin.patch
 
     edit *.cygport and/or *.patch as needed
     add the new version to Port Notes in *.patch
@@ -12,7 +12,7 @@
 $ cd ../monotone-build_cygwin; make dist-gzip
 $ cp ../monotone-build_cygwin/monotone-$NEW.tar.gz .
 $ cygport monotone-$NEW-1 all
-$ cp monotone-$NEW-1/spkg/monotone-$NEW-1.cygwin.patch .
+$ cp monotone-$NEW-1/spkg/monotone.cygwin.patch .
 
 If cygport hangs, it may be due to a parallel make bug. Try the
 following:
============================================================
--- src/std_hooks.lua	30949d110cc1ed86d98f4f437fda16778a3e85bb
+++ src/std_hooks.lua	ada658bd275399032411e0f520d9900bad966dc4
@@ -1523,12 +1523,20 @@ function get_man_page_formatter_command(
    --
    -- On MinGW, 'popen' runs 'cmd.exe' with the inherited path. MinGW
    -- does not (currently) provide nroff or equivalent. So we assume
-   -- sh, nroff and less are also installed, from Cygwin or some other
-   -- toolset.
+   -- sh, nroff, locale and less are also installed, from Cygwin or
+   -- some other toolset.
+   --
+   -- GROFF_ENCODING is an environment variable that, when set, tells
+   -- groff (called by nroff where applicable) to use preconv to convert
+   -- the input from the given encoding to something groff understands.
+   -- For example, groff doesn NOT understand raw UTF-8 as input, but
+   -- it does understand unicode, which preconv will happily provide.
+   -- This doesn't help people that don't use groff, unfortunately.
+   -- Patches are welcome!
    if string.sub(get_ostype(), 1, 7) == "Windows" then
-      return string.format("sh -c 'nroff -man -rLL=%dn' | less -R", term_width)
+      return string.format("sh -c 'GROFF_ENCODING=`locale charmap` nroff -man -rLL=%dn' | less -R", term_width)
    else
-      return string.format("nroff -man -rLL=%dn | less -R", term_width)
+      return string.format("GROFF_ENCODING=`locale charmap` nroff -man -rLL=%dn | less -R", term_width)
    end
 end