Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/utils
In directory vz-cvs-3.sog:/tmp/cvs-serv24124/utils
Modified Files:
sed.info sed.patch
Log Message:
Patch GNU sed, in an attempt to work around locale/encoding issues compaed to
Apple/BSD sed
Index: sed.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/utils/sed.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sed.patch 28 Jul 2011 15:02:00 -0000 1.1
+++ sed.patch 6 Jun 2012 10:23:13 -0000 1.2
@@ -1,21 +1,11 @@
-diff -ru sed-4.1.5/configure sed-4.1.5-patched/configure
---- sed-4.1.5/configure 2006-02-03 10:24:40.000000000 +0100
-+++ sed-4.1.5-patched/configure 2006-12-27 23:17:58.000000000 +0100
-@@ -11265,13 +11265,13 @@
- esac
- done ;;
- gettext-fix )
-- sed -e '/^mkinstalldirs *=/a\' \
-- -e "install_sh=$install_sh" \
-+ sed -e "/^mkinstalldirs *=/a\\
-+install_sh=$install_sh" \
- -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
- intl/Makefile > intl/Makefile.tmp
- mv intl/Makefile.tmp intl/Makefile
-- sed -e '/^mkinstalldirs *=/a\' \
-- -e "install_sh=$install_sh" \
-+ sed -e "/^mkinstalldirs *=/a\\
-+install_sh=$install_sh" \
- -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
- po/Makefile > po/Makefile.tmp
- mv po/Makefile.tmp po/Makefile ;;
+diff -ru sed-4.2.1/lib/localcharset.c sed-4.2.1-patched/lib/localcharset.c
+--- sed-4.2.1/lib/localcharset.c 2009-06-03 21:10:51.000000000 +0200
++++ sed-4.2.1-patched/lib/localcharset.c 2012-06-06 10:58:36.000000000
+0200
+@@ -248,6 +248,7 @@
+ "SJIS" "\0" "SHIFT_JIS" "\0"
+ "ARMSCII-8" "\0" "ARMSCII-8" "\0"
+ "PT154" "\0" "PT154" "\0"
++ "US-ASCII" "\0" "ASCII" "\0"
+ /*"ISCII-DEV" "\0" "?" "\0"*/
+ "*" "\0" "UTF-8" "\0";
+ # endif
Index: sed.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/utils/sed.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sed.info 13 Sep 2011 09:12:33 -0000 1.2
+++ sed.info 6 Jun 2012 10:23:13 -0000 1.3
@@ -16,13 +16,18 @@
Package: sed
Version: 4.2.1
-Revision: 2
+Revision: 3
Maintainer: Max Horn <m...@quendi.de>
#
-Source: gnu
-Source-MD5: f0fd4d7da574d4707e442285fd2d3b86
Depends: libgettext8-shlibs, libiconv
BuildDepends: libgettext8-dev, gettext-bin, gettext-tools, libiconv-dev, fink
(>= 0.24.12-1)
+#
+Source: gnu
+Source-MD5: f0fd4d7da574d4707e442285fd2d3b86
+#
+PatchFile: %n.patch
+PatchFile-MD5: be16fff7e2ebe12692382a4256dbd251
+#
ConfigureParams: --with-libiconv-prefix=%p --mandir=%p/share/man
--infodir=%p/share/info --program-prefix=g
InstallScript: <<
make install DESTDIR=%d
@@ -39,6 +44,7 @@
update-alternatives --remove sed %p/bin/gsed
fi
<<
+InfoTest: TestScript: make check || exit 2
#
Description: The stream editor, GNU version
DescDetail: <<
@@ -47,6 +53,11 @@
<<
DescPackaging: <<
Previous revisions by Christoph Pfisterer and Sylvain Cuaz.
+
+ The patch works around an issue that occurs when e.g. setting LC_ALL=C;
+ in tat case, calling nl_langinfo(CODESET) on Mac OS X returns "US-ASCII",
+ which GNU sed maps to "UTF-8"; but in this situation, Mac OS X also
+ overrides MB_CUR_MAX to be 1; this then leads to trouble.
<<
License: GPL
Homepage: http://www.gnu.org/software/sed/sed.html
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
