r353 - in x86/branches/utf8: . etc initramfs packages/groff packages/lynx packages/man packages/nano packages/psmisc packages/sysklogd packages/texinfo packages/wget

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sun Jul 17 00:54:05 PDT 2005


Author: alexander
Date: 2005-07-17 01:53:48 -0600 (Sun, 17 Jul 2005)
New Revision: 353

Added:
   x86/branches/utf8/packages/man/man-1.5p-disable_japanese-1.patch
   x86/branches/utf8/packages/psmisc/psmisc-21.6-acsc-1a.patch
   x86/branches/utf8/packages/psmisc/psmisc-21.6-acsc-1b.patch
Modified:
   x86/branches/utf8/BUGS
   x86/branches/utf8/Makefile
   x86/branches/utf8/etc/nanorc
   x86/branches/utf8/initramfs/init
   x86/branches/utf8/packages/groff/groff-1.19.1-force_ascii-1.patch
   x86/branches/utf8/packages/lynx/Makefile
   x86/branches/utf8/packages/man/Makefile
   x86/branches/utf8/packages/nano/Makefile
   x86/branches/utf8/packages/psmisc/Makefile
   x86/branches/utf8/packages/sysklogd/Makefile
   x86/branches/utf8/packages/texinfo/texinfo-4.8-multibyte-1.patch
   x86/branches/utf8/packages/wget/Makefile
Log:
Built packages before lfs-bootscripts.


Modified: x86/branches/utf8/BUGS
===================================================================
--- x86/branches/utf8/BUGS	2005-07-17 02:58:51 UTC (rev 352)
+++ x86/branches/utf8/BUGS	2005-07-17 07:53:48 UTC (rev 353)
@@ -30,3 +30,27 @@
   Please don't report that as a bug. Without this patch, the status line
   length is incorrect and manual pages containing hyphens and other characters
   rendered by Groff as multibte ones are wrapped incorrectly.
+
+slang:
+  slang 2.x supports UTF-8, but most slang-based apps either don't support
+  UTF-8 or expect patched slang-1.4.9 instead of 2.x. Package removed.
+
+nano:
+  Stable versions of nano don't support UTF-8. Fixed by installing the
+  development version. This package will be removed after a single bug
+  report in non-UTF-8 locale without a known fix.
+
+zip/unzip:
+  These packages assume ISO-8859-1 as the character set for UNIX and CP850
+  for the character set of filenames stored in the archives. Conversion tables
+  are hard-coded. The only way to unzip a file with national filenames in it
+  when such assumption is not true is to use WinZip or a similar program
+  under Wine. Or, install convmv and undo the filename damage done by zip/unzip.
+  WONTFIX. Package installed only because other packages build-depend on it.
+
+curl:
+  Built without libidn.
+
+lynx:
+  truncates text in the header and the status line prematurely (uses byte count
+  instead of properly calculated string width).

Modified: x86/branches/utf8/Makefile
===================================================================
--- x86/branches/utf8/Makefile	2005-07-17 02:58:51 UTC (rev 352)
+++ x86/branches/utf8/Makefile	2005-07-17 07:53:48 UTC (rev 353)
@@ -175,11 +175,11 @@
 	ch-iproute2 ch-perl ch-texinfo ch-autoconf ch-automake ch-bash
 
 post-bash: ch-file ch-libtool ch-bzip2 ch-diffutils ch-kbd ch-e2fsprogs ch-grep ch-grub ch-gzip \
-	ch-hotplug stop-here ch-man ch-make ch-module-init-tools ch-patch ch-procps ch-psmisc ch-shadow \
+	ch-hotplug ch-man ch-make ch-module-init-tools ch-patch ch-procps ch-psmisc ch-shadow \
 	ch-sysklogd ch-sysvinit ch-tar ch-udev ch-util-linux ch-environment
 
-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-slang ch-nano ch-joe ch-screen ch-curl ch-zip \
-	ch-unzip ch-lynx ch-libxml2 ch-expat ch-subversion ch-lfs-bootscripts ch-docbook-xml ch-libxslt \
+blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano ch-joe ch-screen ch-curl ch-zip \
+	ch-unzip ch-lynx ch-libxml2 ch-expat ch-subversion stop-here ch-lfs-bootscripts ch-docbook-xml ch-libxslt \
 	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng ch-freetype ch-fontconfig ch-Xorg ch-freefont ch-inputattach \
 	ch-fonts-dejavu ch-update-fontsdir ch-libjpeg ch-libtiff ch-links ch-openssh ch-pkgconfig ch-glib2 \
 	ch-libungif ch-imlib2 ch-pango ch-atk ch-gtk2 ch-cvs ch-popt ch-samba ch-libIDL ch-firefox ch-thunderbird \

Modified: x86/branches/utf8/etc/nanorc
===================================================================
--- x86/branches/utf8/etc/nanorc	2005-07-17 02:58:51 UTC (rev 352)
+++ x86/branches/utf8/etc/nanorc	2005-07-17 07:53:48 UTC (rev 353)
@@ -108,7 +108,7 @@
 color blue "//.*"
 color blue start="/\*" end="\*/"
 color brightblue start="/\*\*" end="\*/"
-color brightgreen,brightgreen "[ 	]+$"
+color brightgreen,green "[ 	]+$"
 
 ## Here is an example for your .nanorc
 ##
@@ -140,7 +140,7 @@
 color yellow "<i>"
 color cyan "<str>"
 color brightred "Section" "EndSection" "SubSection" "EndSubSection"
-color yellow "\<(InputDevice|Screen|Identifier|FontPath|RgbPath|ModulePath|Load|Driver|Device|Option|VendorName|ModelName|HorizSync|VertRefresh|Modeline|DisplaySize|BoardName|Monitor|DefaultDepth|)\>
+color yellow "\<(InputDevice|Screen|Identifier|FontPath|RgbPath|ModulePath|Load|Driver|Device|Option|VendorName|ModelName|HorizSync|VertRefresh|Modeline|DisplaySize|BoardName|Monitor|DefaultDepth|)\>"
 color brightblue "^#.*" "^;.*" "^!.*" "[[:space:]]#.*" "[[\t]]#.*"
 
 syntax "bash" "\.sh$"

Modified: x86/branches/utf8/initramfs/init
===================================================================
--- x86/branches/utf8/initramfs/init	2005-07-17 02:58:51 UTC (rev 352)
+++ x86/branches/utf8/initramfs/init	2005-07-17 07:53:48 UTC (rev 353)
@@ -1,6 +1,6 @@
 #!/bin/sh
 LABEL="LFS_CD"
-DEVS=`echo /dev/hd* /dev/scd*`
+DEVS=`echo /dev/hd* /dev/sr*`
 
 while [ -z "$CDROM" ] && [ "$TIMEOUT" != "..............." ] ; do
 	for DEV in $DEVS ; do

Modified: x86/branches/utf8/packages/groff/groff-1.19.1-force_ascii-1.patch
===================================================================
--- x86/branches/utf8/packages/groff/groff-1.19.1-force_ascii-1.patch	2005-07-17 02:58:51 UTC (rev 352)
+++ x86/branches/utf8/packages/groff/groff-1.19.1-force_ascii-1.patch	2005-07-17 07:53:48 UTC (rev 353)
@@ -58,7 +58,7 @@
 +# in multibyte locales
 +# Depends upon texinfo-4.8-multibyte-1.patch
 +
-+if [ "$LANGUAGE" = "C" ] && [ "$LC_ALL" = "C" ]
++if [ "$LANGUAGE" = "C" ] && [ $"LANG" = "C" ] && [ "$LC_ALL" = "C" ]
 +then
 +  # Override user-supplied -T option, if any
 +  T=-Tascii

Modified: x86/branches/utf8/packages/lynx/Makefile
===================================================================
--- x86/branches/utf8/packages/lynx/Makefile	2005-07-17 02:58:51 UTC (rev 352)
+++ x86/branches/utf8/packages/lynx/Makefile	2005-07-17 07:53:48 UTC (rev 353)
@@ -24,7 +24,7 @@
 	@if [ ! -f /usr/bin/lynx ] ; then unpack $(FILE) && cd $(DIR) && \
 	 ./configure --prefix=/usr --libdir=/etc --with-zlib --with-bzlib \
 	    --enable-nls --with-ssl --enable-charset-choice \
-	    --enable-locale-charset && \
+	    --enable-locale-charset --with-screen=ncursesw && \
 	 make -j3 && make install && \
 	 sed -i 's/#LOCALE_CHARSET:FALSE/LOCALE_CHARSET:TRUE/' /etc/lynx.cfg && \
 	 make docdir=/usr/share/doc/$(NM)-$(VRS)/lynx_doc helpdir=/usr/share/doc/$(NM)-$(VRS)/lynx_help install-doc && \

Modified: x86/branches/utf8/packages/man/Makefile
===================================================================
--- x86/branches/utf8/packages/man/Makefile	2005-07-17 02:58:51 UTC (rev 352)
+++ x86/branches/utf8/packages/man/Makefile	2005-07-17 07:53:48 UTC (rev 353)
@@ -5,8 +5,8 @@
 VRS= 1.5p
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
+PATCH= $(DIR)-disable_japanese-1.patch
 URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH1)
 
 # RULES
 
@@ -22,9 +22,11 @@
 	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
 	 mv $(FILE) $(SRC) ; fi
 	@if [ ! -f /usr/bin/man ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
+	 patch -Np1 -i ../$(PATCH) && \
 	 sed -i 's at -is@&R at g' configure && \
+	 sed -i 's@ -Tlatin1@@' configure && \
 	 sed -i 's at MANPATH./usr/man@#&@g' src/man.conf.in && \
-	 ./configure -confdir=/etc && make && \
+	 ./configure +lang none -confdir=/etc && make && \
 	 make install ; fi
 	@make clean
 	 

Added: x86/branches/utf8/packages/man/man-1.5p-disable_japanese-1.patch
===================================================================
--- x86/branches/utf8/packages/man/man-1.5p-disable_japanese-1.patch	2005-07-17 02:58:51 UTC (rev 352)
+++ x86/branches/utf8/packages/man/man-1.5p-disable_japanese-1.patch	2005-07-17 07:53:48 UTC (rev 353)
@@ -0,0 +1,77 @@
+Submitted By: Alexander E. Patrakov
+Date: 2005-07-16
+Initial Package Version: 1.5p
+Upstream status: Hack, won't submit
+Description: Disables Japanese logic for man, because LFS doesn't have
+Japanese groff.
+
+diff -ur man-1.5p.orig/src/man.c man-1.5p/src/man.c
+--- man-1.5p.orig/src/man.c	2005-01-08 13:08:09.000000000 +0500
++++ man-1.5p/src/man.c	2005-07-16 10:26:35.831352608 +0600
+@@ -80,7 +80,6 @@
+ int fsstnd;
+ int noautopath;
+ int nocache;
+-static int is_japanese;
+ static char *language;
+ static char **section_list;
+ 
+@@ -437,17 +436,13 @@
+ parse_roff_directive (char *cp, const char *file, char *buf, int buflen) {
+      char c;
+      int tbl_found = 0;
+-     int use_jroff;
+-
+-     use_jroff = (is_japanese &&
+-		   (strstr(file, "/jman/") || is_lang_page(language, file)));
+ 
+      while ((c = *cp++) != '\0') {
+ 	  switch (c) {
+ 	  case 'e':
+ 	       if (debug)
+ 		    gripe (FOUND_EQN);
+-	       add_directive((do_troff ? "EQN" : use_jroff ? "JNEQN": "NEQN"),
++	       add_directive((do_troff ? "EQN" : "NEQN"),
+ 			     file, buf, buflen);
+ 	       break;
+ 
+@@ -496,7 +491,7 @@
+      if (*buf == 0)
+ 	  return 1;
+ 
+-     add_directive (do_troff ? "TROFF" : use_jroff ? "JNROFF" : "NROFF",
++     add_directive (do_troff ? "TROFF" : "NROFF",
+ 		    "", buf, buflen);
+ 
+      if (tbl_found && !do_troff && *getval("COL"))
+@@ -1160,7 +1155,6 @@
+ 		/* nothing */;
+ 
+ 	language = lang;
+-	is_japanese = (lang && strncmp(lang, "ja", 2) == 0);
+ }
+ 
+ /*
+diff -ur man-1.5p.orig/src/man.conf.in man-1.5p/src/man.conf.in
+--- man-1.5p.orig/src/man.conf.in	2005-01-08 23:50:45.000000000 +0500
++++ man-1.5p/src/man.conf.in	2005-07-16 10:23:41.344878584 +0600
+@@ -77,7 +77,7 @@
+ # (generally one enables/disable cat page creation by creating/deleting
+ # the directory they would live in - man never does mkdir)
+ # 
+-#NOCACHE
++NOCACHE
+ #
+ # Useful paths - note that COL should not be defined when
+ # NROFF is defined as "groff -Tascii" or "groff -Tlatin1";
+@@ -90,10 +90,8 @@
+ #
+ TROFF		@troff@
+ NROFF		@nroff@
+-JNROFF		@jnroff@
+ EQN		@eqn@
+ NEQN		@neqn@
+-JNEQN		@jneqn@
+ TBL		@tbl@
+ @nocol at COL		@col@
+ REFER		@refer@

Modified: x86/branches/utf8/packages/nano/Makefile
===================================================================
--- x86/branches/utf8/packages/nano/Makefile	2005-07-17 02:58:51 UTC (rev 352)
+++ x86/branches/utf8/packages/nano/Makefile	2005-07-17 07:53:48 UTC (rev 353)
@@ -2,10 +2,11 @@
 
 # Package versions
 NM= nano
-VRS= 1.2.4
+# Stable versions of nano don't support UTF-8
+VRS= 1.3.8
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.gz
-URL= http://www.nano-editor.org/dist/v1.2/$(FILE)
+URL= http://www.nano-editor.org/dist/v1.3/$(FILE)
 
 #RULES
 
@@ -21,10 +22,10 @@
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
 	@if [ ! -f /usr/bin/nano ] ; then unpack $(FILE) && cd $(DIR) && \
 	 ./configure --prefix=/usr --sysconfdir=/etc --enable-color --enable-multibuffer \
-	 --enable-nanorc && \
+	 --enable-nanorc --enable-utf8 && \
 	 make -j3 && make install && \
 	 mkdir -p /usr/share/doc/nano/examples && \
-	 cp nanorc.sample /usr/share/doc/nano/examples && \
+	 cp doc/nanorc.sample /usr/share/doc/nano/examples && \
 	 cp $(ROOT)/etc/nanorc /etc ; fi
 	@make clean
 

Modified: x86/branches/utf8/packages/psmisc/Makefile
===================================================================
--- x86/branches/utf8/packages/psmisc/Makefile	2005-07-17 02:58:51 UTC (rev 352)
+++ x86/branches/utf8/packages/psmisc/Makefile	2005-07-17 07:53:48 UTC (rev 353)
@@ -6,6 +6,8 @@
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
 URL= $(HTTP)/$(NM)/$(FILE)
+# This patch is relevant for non-UTF-8 locales
+PATCH= $(DIR)-acsc-1b.patch
 
 # RULES
 
@@ -21,6 +23,7 @@
 	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
 	 mv $(FILE) $(SRC) ; fi
 	@if [ ! -f /bin/killall ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
+	 patch -Np1 -i ../$(PATCH) && \
 	 ./configure --prefix=/usr --exec-prefix="" && \
 	 make -j3 && make install && \
 	 mv /bin/pstree* /usr/bin && ln -sf pstree /usr/bin/pstree.x11 ; fi

Added: x86/branches/utf8/packages/psmisc/psmisc-21.6-acsc-1a.patch
===================================================================
--- x86/branches/utf8/packages/psmisc/psmisc-21.6-acsc-1a.patch	2005-07-17 02:58:51 UTC (rev 352)
+++ x86/branches/utf8/packages/psmisc/psmisc-21.6-acsc-1a.patch	2005-07-17 07:53:48 UTC (rev 353)
@@ -0,0 +1,52 @@
+Submitted by: Alexander E. Patrakov
+Date: 2005-06-05
+Initial Package Version: 21.6
+Upstream Status: Not Submitted - Hack
+Origin: Alexander E. Patrakov
+Description: This patch disables the use of VT100 line drwaing characters
+by default in pstree. They are still accessible by runnung pstree -G.
+
+Rationale: Use of VT100 line drawing characters is the origin of at least two
+important bugs:
+
+1) In non-ISO-8859-1 8-bit locales on Linux console, pstree sends the
+\033(0 escape sequence to the terminal. This means "Use ISO-8859-1 translation
+table" and therefore breaks the display of all national characters after
+running pstree. (echo -e '\033(K' is the fix).
+
+2) pstree may break line without turning off ACS mode. If this happens in the
+last line of output, the subsequent bash prompt and everything else is turned
+into meaningless line-drawing characters. Example:
+
+http://sourceforge.net/tracker/index.php?func=detail&aid=1195650&group_id=15273&atid=115273
+
+There are other bugs, e. g. misaligning of line-drawing characters in Konsole
+and cutting the line at less than 80 columns, that are also avoided by default
+due to non-use of VT100 line drawing characters.
+
+--- psmisc-21.6/src/pstree.c	2005-06-05 10:43:16.000000000 +0600
++++ psmisc-21.6/src/pstree.c	2005-06-05 10:49:07.000000000 +0600
+@@ -757,7 +757,6 @@
+   const struct passwd *pw;
+   pid_t pid, highlight;
+   char termcap_area[1024];
+-  char *termname;
+   int c;
+   char *tmpstr;
+ 
+@@ -788,15 +787,6 @@
+   if (!strcmp(nl_langinfo(CODESET), "UTF-8")) {
+     /* Use UTF-8 symbols if the locale's character set is UTF-8. */
+     sym = &sym_utf;
+-  } else if ((termname = getenv ("TERM")) && \
+-             (strlen (termname) > 0) && \
+-             (setupterm (NULL, 1 /* stdout */, NULL) == OK) && \
+-             (tigetstr ("acsc") > 0)) {
+-    /*
+-     * Failing that, if TERM is defined, a non-null value, and the terminal
+-     * has the VT100 graphics charset, use it.
+-     */
+-    sym = &sym_vt100;
+   } else {
+     /* Otherwise, fall back to ASCII. */
+     sym = &sym_ascii;

Added: x86/branches/utf8/packages/psmisc/psmisc-21.6-acsc-1b.patch
===================================================================
--- x86/branches/utf8/packages/psmisc/psmisc-21.6-acsc-1b.patch	2005-07-17 02:58:51 UTC (rev 352)
+++ x86/branches/utf8/packages/psmisc/psmisc-21.6-acsc-1b.patch	2005-07-17 07:53:48 UTC (rev 353)
@@ -0,0 +1,79 @@
+Submitted by: Alexander E. Patrakov
+Date: 2005-06-05
+Initial Package Version: 21.6
+Upstream Status: Not Submitted - Test version
+Origin: Alexander E. Patrakov
+Description: This patch fixes some (but not all) bugs resulting from improper
+use of VT100 line drawing characters by pstree.
+
+Detalils: Use of VT100 line drawing characters is the origin of at least two
+important bugs:
+
+1) In non-ISO-8859-1 8-bit locales on Linux console, pstree sends the
+\033(0 escape sequence to the terminal. This means "Use ISO-8859-1 translation
+table" and therefore breaks the display of all national characters after
+running pstree. (echo -e '\033(K' is the fix).
+
+2) pstree may break line without turning off ACS mode. If this happens in the
+last line of output, the subsequent bash prompt and everything else is turned
+into meaningless line-drawing characters. Example:
+
+http://sourceforge.net/tracker/index.php?func=detail&aid=1195650&group_id=15273&atid=115273
+
+These two bugs are fixed, but the fix is not 100% correct: VT_END contains two
+escape sequences, one for linux console and one for xterm. The patch relies
+upon the fact that each of those two terminals ignores the escape sequence for
+the other terminal type.
+
+There are other, unfixed bugs, e. g. misaligning of line-drawing characters
+in Konsole and cutting the line at less than 80 columns.
+
+--- psmisc-21.6/src/pstree.c.orig	2005-06-05 10:43:16.000000000 +0600
++++ psmisc-21.6/src/pstree.c	2005-06-05 11:11:15.000000000 +0600
+@@ -43,7 +43,7 @@
+ #define UTF_HD	"\342\224\254"	/* U+252C, Horizontal and down */
+ 
+ #define VT_BEG	"\033(0\017"	/* use graphic chars */
+-#define VT_END	"\033(B"	/* back to normal char set */
++#define VT_END	"\033(B\033(K"	/* back to normal char set */
+ #define VT_V	"x"		/* see UTF definitions above */
+ #define VT_VR	"t"
+ #define VT_H	"q"
+@@ -82,10 +82,11 @@
+   const char *last_2;		/* `- */
+   const char *single_3;		/* --- */
+   const char *first_3;		/* -+- */
++  const char *new_line;
+ }
+ sym_ascii =
+ {
+-"  ", "|-", "| ", "`-", "---", "-+-"}
++"  ", "|-", "| ", "`-", "---", "-+-", "\n"}
+ 
+ , sym_utf =
+ {
+@@ -93,13 +94,13 @@
+     UTF_VR UTF_H,
+ 
+     UTF_V " ",
+-    UTF_UR UTF_H, UTF_H UTF_H UTF_H, UTF_H UTF_HD UTF_H}, sym_vt100 =
++    UTF_UR UTF_H, UTF_H UTF_H UTF_H, UTF_H UTF_HD UTF_H, "\n"}, sym_vt100 =
+ {
+   "  ",
+     VT_BEG VT_VR VT_H VT_END,
+     VT_BEG VT_V VT_END " ",
+     VT_BEG VT_UR VT_H VT_END,
+-    VT_BEG VT_H VT_H VT_H VT_END, VT_BEG VT_H VT_HD VT_H VT_END}
++    VT_BEG VT_H VT_H VT_H VT_END, VT_BEG VT_H VT_HD VT_H VT_END, "\n" VT_END}
+ 
+ , *sym = &sym_ascii;
+ 
+@@ -199,7 +200,7 @@
+   if (last_char && cur_x == output_width)
+     putchar (last_char);
+   last_char = 0;
+-  putchar ('\n');
++  out_string(sym->new_line);
+   cur_x = 1;
+ }
+ 

Modified: x86/branches/utf8/packages/sysklogd/Makefile
===================================================================
--- x86/branches/utf8/packages/sysklogd/Makefile	2005-07-17 02:58:51 UTC (rev 352)
+++ x86/branches/utf8/packages/sysklogd/Makefile	2005-07-17 07:53:48 UTC (rev 353)
@@ -6,9 +6,10 @@
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
 PATCH=$(DIR)-fixes-1.patch
+PATCH2=$(DIR)-8bit-1.patch
 URL= $(HTTP)/$(NM)/$(FILE)
 URL1= $(HTTP)/$(NM)/$(PATCH)
-
+URL2= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH2)
 # RULES
 
 .PHONY:  clean stage2 chroot
@@ -24,8 +25,10 @@
 	 mv $(FILE) $(SRC) ; fi
 	@if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL1) && \
 	 mv $(PATCH) $(SRC) ; fi
+	@if [ ! -f $(PATCH2) ] ; then $(WGET) $(URL2) ; fi
 	@if [ ! -f /etc/syslog.conf ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
 	 patch -Np1 -i $(SRC)/$(PATCH) && \
+	 patch -Np1 -i ../$(PATCH2) && \
 	 make -j3 && make install && \
 	 cp -ra $(ROOT)/etc/syslog.conf /etc ; fi
 	@make clean

Modified: x86/branches/utf8/packages/texinfo/texinfo-4.8-multibyte-1.patch
===================================================================
--- x86/branches/utf8/packages/texinfo/texinfo-4.8-multibyte-1.patch	2005-07-17 02:58:51 UTC (rev 352)
+++ x86/branches/utf8/packages/texinfo/texinfo-4.8-multibyte-1.patch	2005-07-17 07:53:48 UTC (rev 353)
@@ -23,7 +23,7 @@
 diff -ur texinfo-4.8/info/man.c texinfo-4.8.hacked/info/man.c
 --- texinfo-4.8/info/man.c	2004-04-11 23:56:46.000000000 +0600
 +++ texinfo-4.8.hacked/info/man.c	2005-07-12 12:08:40.267026800 +0600
-@@ -325,6 +325,14 @@
+@@ -325,6 +325,17 @@
        freopen (NULL_DEVICE, "r", stdin);
        dup2 (pipes[1], fileno (stdout));
  
@@ -31,8 +31,11 @@
 +        {
 +          /* Info has trouble wrapping man output if it contains
 +             multibyte characters */
++          setenv("LANGUAGE", "C", 1);
++          setenv("LANG", "C", 1);
++          setenv("LC_MESSAGES", "C", 1);
++          setenv("LC_CTYPE", "C", 1);
 +          setenv("LC_ALL", "C", 1);
-+          setenv("LANGUAGE", "C", 1);
 +        }
 +
        execv (formatter_args[0], formatter_args);

Modified: x86/branches/utf8/packages/wget/Makefile
===================================================================
--- x86/branches/utf8/packages/wget/Makefile	2005-07-17 02:58:51 UTC (rev 352)
+++ x86/branches/utf8/packages/wget/Makefile	2005-07-17 07:53:48 UTC (rev 353)
@@ -32,7 +32,7 @@
 	@if [ ! -f $(FILE) ] ; then $(WD)/bin/ftpget ; fi
 	@if [ ! -f /usr/bin/$(NM) ] ; then \
 	 unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr --with-ssl && \
+	 ./configure --prefix=/usr --sysconfdir=/etc --with-ssl && \
 	 make -j3 && make install ; fi
 	@make clean
 




More information about the livecd mailing list