[cvs] dists/10.4/stable/main/finkinfo/base debianutils.info, 1.6, 1.7 dpkg.info, 1.20, 1.21 fink-10.5.info, 1.46, 1.47 fink-10.6.info, 1.35, 1.36 fink-x86_64.info, 1.36, 1.37 gettext-tools.info, 1.11, 1.12 libgettext3-shlibs.info, 1.8, 1.9 libgettext8-shlibs.info, 1.3, 1.4 libgettext8-shlibs.patch, 1.2, 1.3 libiconv.info, 1.9, 1.10 libiconv.patch, 1.4, 1.5 tar.info, 1.10, 1.11

Wed, 29 Aug 2012 10:53:27 -0700 

Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/base
In directory vz-cvs-3.sog:/tmp/cvs-serv21698/10.4/stable/main/finkinfo/base

Modified Files:
        debianutils.info dpkg.info fink-10.5.info fink-10.6.info 
        fink-x86_64.info gettext-tools.info libgettext3-shlibs.info 
        libgettext8-shlibs.info libgettext8-shlibs.patch libiconv.info 
        libiconv.patch tar.info 
Log Message:
Releasing fink-0.34.3.
Also, update Essential packages for libgettext8, and even update that.

Index: debianutils.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/debianutils.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- debianutils.info    31 Jul 2012 16:00:19 -0000      1.6
+++ debianutils.info    29 Aug 2012 17:53:15 -0000      1.7
@@ -1,84 +1,45 @@
 Package: debianutils
-Version: 4.3.2
-Revision: 2
+Version: 1.23
+Revision: 11
 Essential: true
 Maintainer: Fink Core Group <fink-c...@lists.sourceforge.net>
-## Remove po4a
 BuildDepends: fink (>= 0.24.12-1)
-Depends: base-files, sensible-utils
-Conflicts: mktemp, ftpfiles (<< 20030406-1)
-Replaces: mktemp, tetex, ftpfiles (<< 20030406-1)
-Source: mirror:debian:pool/main/d/%n/%n_%v.tar.gz
-Source-MD5: 6270998707ed0d0894b981e2e9dbb912
+Depends: base-files
+Conflicts: mktemp
+Replaces: mktemp, tetex
+Provides: mktemp
+Source: mirror:sourceforge:fink/%n_%v.tar.gz
+Source-MD5: 232b5bc916a1e2af43fde890f840a304
 SourceDirectory: %n-%v
-PatchScript: <<
-### fix use of chown/mod --reference which isn't supported in /bin/chown/mod
-perl -pi -e 's,chown --reference=\$file,chown root:admin,g' add-shell
-perl -pi -e 's,chmod --reference=\$file,chmod 644,g' add-shell
-
-#cd po4a && po4a --no-backups po4a.conf
-perl -pi -e 's,SUBDIRS = po4a,SUBDIRS = ,g' Makefile.in
-perl -pi -e 's,Makefile po4a/Makefile po4a/fr/Makefile po4a/sl/Makefile 
po4a/de/Makefile po4a/es/Makefile,Makefile,g' configure
-<<
-ConfigureParams: --mandir=%p/share/man
-CompileScript: <<
-DEBIANUTILS_VERSION="%v" ./configure %c
-make
-<<
+PatchFile: %n.patch
+PatchFile-MD5: b08afef2d893e68a12fe2b3823c2a502
 InstallScript: <<
-#!/bin/sh -ev
-install -d -m 0755 %d/DEBIAN \
-                  %i/bin \
-                  %i/sbin \
-                  %i/share/man/man1 \
-                  %i/share/man/man8 \
-                  %i/share/doc/%n \
-                  %i/share/%n
-make install DESTDIR=%d INSTALL_PROGRAM="install -m 0755"
-rm %i/sbin/installkernel \
-   %i/share/man/man8/installkernel.8
-install -m 0644 debian/shells %i/share/%n
-<<
-PostInstScript: <<
-if test -z "$2" && test ! -f %p/etc/shells
-then
-        cp -p %p/share/debianutils/shells %p/etc/shells
-fi
-
-# Add all the default Lion shells
-add-shell /bin/bash /bin/csh /bin/ksh /bin/tcsh /bin/zsh /usr/bin/screen
-
-if [ configure = "$1" ]; then
-    if which update-mime >/dev/null;
-    then
-        update-mime
-    fi
-fi
-<<
-PostRmScript: <<
-if [ remove = "$1" -o disappear = "$1" ]; then
-    if which update-mime >/dev/null;
-    then
-        update-mime
-    fi
-fi
-<<
-DocFiles: debian/copyright debian/changelog debian/README.shells
-Description: Misc utilities specific to Debian/Fink
-DescDetail: <<
-This package provides a number of small utilities which are used
-primarily by the installation scripts of Debian packages, although
-you may use them directly.
-.
-The specific utilities included are:
-add-shell ischroot remove-shell run-parts savelog
-tempfile which
+  #!/bin/sh -ev
+  INSTALL=install
+  INSTALL_FILE="$INSTALL -p -m 644"
+  INSTALL_PROGRAM="$INSTALL -p -m 755"
+  INSTALL_SCRIPT="$INSTALL -p -m 755"
+  INSTALL_DIR="$INSTALL -p -d -m 755"
+  $INSTALL_DIR %i/bin \
+               %i/sbin \
+               %i/share/man/man1 \
+               %i/share/man/man8 \
+               %i/share/man/fr/man8
+  $INSTALL_PROGRAM readlink run-parts tempfile mktemp %i/sbin
+  $INSTALL_SCRIPT which savelog sensible-editor sensible-pager %i/bin
+  $INSTALL_FILE run-parts.8 savelog.8 %i/share/man/man8
+  $INSTALL_FILE which.1 tempfile.1 sensible-editor.1 mktemp.1 readlink.1 \
+                %i/share/man/man1
+  $INSTALL_FILE savelog.fr.8 %i/share/man/fr/man8/savelog.8
+  ln -s sensible-editor.1 %i/share/man/man1/sensible-pager.1
 <<
+DocFiles: debian/copyright debian/changelog
+Description: Misc. utilities specific to Debian (and Fink)
+DescDetail: Includes the commands: mktemp, readlink, tempfile, and run-parts
 DescPort: <<
- Newer version no longer have mktemp or readlink, as they are in coreutils.
- Providing symlink from tempfile to mktemp for now, so the many packages that
- use it don't break, but this packages should change to gmktmp and bdep on
- coreutils.
+ Both run-parts and tempfile require the getopt() routines from glibc.
+ The versions included here come from glibc-2.2.4
+ Thanks to Justin Hallett for the 1.22.5 port.
 <<
-Homepage: http://packages.debian.org/unstable/debianutils
+Homepage: http://packages.debian.org/unstable/base/debianutils.html
 License: GPL

Index: tar.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/tar.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- tar.info    30 Jul 2012 17:40:23 -0000      1.10
+++ tar.info    29 Aug 2012 17:53:15 -0000      1.11
@@ -1,16 +1,15 @@
 Package: tar
 Version: 1.26
-Revision: 1
+Revision: 2
 Essential: yes
-# libgettext8-shlibs isn't Essential yet so we have to stick with 3.
-Depends: libgettext3-shlibs, libiconv, gzip, bzip2, base-files
+Depends: libgettext8-shlibs (>= 0.18.1.1-1), libiconv (>= 1.12-4.1), gzip, 
bzip2, base-files
 BuildAsNobody: false
 Source: mirror:sourceforge:fink/%n-%v.tar.bz2
 #Source: mirror:gnu:%n/%n-%v.tar.bz2
 Source-MD5: 2cee42a2ff4f1cd4f9298eeeb2264519
 ConfigureParams: --program-transform-name=s/tar/gtar/ --infodir=%p/share/info 
--libexecdir=%p/lib --disable-dependency-tracking FORCE_UNSAFE_CONFIGURE=1
 CompileScript: <<
- %p/bin/fink -y install libgettext3-dev libiconv-dev
+ %p/bin/fink -y install libgettext8-dev libiconv-dev
  ./configure %c
  make
 <<

Index: libiconv.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/libiconv.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libiconv.patch      16 Jul 2008 20:44:14 -0000      1.4
+++ libiconv.patch      29 Aug 2012 17:53:15 -0000      1.5
@@ -1,37 +1,3 @@
-diff -ruN gettext-0.14.5/gettext-tools/lib/execute.c 
gettext-0.14.5-patched/gettext-tools/lib/execute.c
---- gettext-0.14.5/gettext-tools/lib/execute.c 2005-05-20 13:19:48.000000000 
-0700
-+++ gettext-0.14.5-patched/gettext-tools/lib/execute.c 2006-08-14 
05:21:26.000000000 -0700
-@@ -62,7 +62,12 @@
- #endif
- 
- #ifndef HAVE_ENVIRON_DECL
--extern char **environ;
-+# ifdef __APPLE__
-+#  include <crt_externs.h>
-+#  define environ (*_NSGetEnviron())
-+# else
-+   extern char **environ;
-+# endif
- #endif
- 
- #ifndef STDIN_FILENO
-diff -ruN gettext-0.14.5/gettext-tools/lib/pipe.c 
gettext-0.14.5-patched/gettext-tools/lib/pipe.c
---- gettext-0.14.5/gettext-tools/lib/pipe.c    2005-05-20 13:25:23.000000000 
-0700
-+++ gettext-0.14.5-patched/gettext-tools/lib/pipe.c    2006-08-14 
05:22:02.000000000 -0700
-@@ -61,7 +61,12 @@
- #endif
- 
- #ifndef HAVE_ENVIRON_DECL
--extern char **environ;
-+# ifdef __APPLE__
-+#  include <crt_externs.h>
-+#  define environ (*_NSGetEnviron())
-+# else
-+   extern char **environ;
-+# endif
- #endif
- 
- #ifndef STDIN_FILENO
 diff -Nurd libiconv-1.12/lib/aliases.gperf libiconv-1.12/lib/aliases.gperf
 --- libiconv-1.12/lib/aliases.gases.gperf 
libiconv-1.12/lib/aliases.gperf00000 
-0700b/pipe.cte.cle-dependency-tracking 
FORCE_UNSAFE_CONFIGURE=1¶*Ð,Fêÿ@-Fêÿó˜Ì8¶*€ºÍ8¶*è¤í8¶*’ˆé9¶*@-Fêÿ€ 
:¶*P"Fêÿ !Fêÿë­Ì8¶*6 
èè!è!Ð,Fêÿ@-FêÿxDé9¶*P#Fêÿ"‘Ì8¶*®Ì8¶*Ð,FêÿðÌ8¶*-FêÿÀ?M:¶*ó˜Ì8¶*0M:¶*Ø4M:¶*¨9M:¶*€ºÍ8¶*xDé9¶*P#Fêÿ
 "Fêÿë­Ì8¶*à!à!Ð,Fêÿ@-FêÿÈ
É9¶*0$Fêÿ"‘Ì8¶*®Ì8¶*Ð,FêÿðÌ8¶*-Fêÿ-Fêÿø,Fêÿ«í8¶*Œp˜@-Fêÿó˜Ì8¶*€ºÍ8¶*0$Fêÿ#Fêÿë­Ì8¶*GHIJKMNOPÐ,Fêÿ@-FêÿHş9¶*Ð%Fêÿ"‘Ì8¶*®Ì8¶*Ð,Fêÿ0?M:¶*ó˜Ì8¶*Pé9¶* ù|9¶*0M:¶*Ø4M:¶*¨9M:¶*€ºÍ8¶*Hş9¶*Ð%Fêÿ$Fêÿë­Ì8¶*8ş9¶*Ð%Fêÿ@$Fêÿë­Ì8¶*(ş9¶*Ð%Fêÿp$Fêÿë­Ì8¶*ş9¶*Ð%Fêÿ $Fêÿë­Ì8¶*
  ¨>M:¶*ó˜Ì8¶*¨9M:¶* 
FêÿŠH}9¶*æ—Ì8¶*Ø4M:¶*@%FêÿyH}9¶*æ—Ì8¶*0M:¶*p%FêÿZH}9¶*æ—Ì8¶*Øô|9¶*Pé9¶* ù|9¶*0M:¶*ØTé9¶*Ø4M:¶*¨9M:¶*€ºÍ8¶*«í8¶*ÍH9¶*@-Fêÿp‹|9¶*
 
'Fêÿð%Fêÿë­Ì8¶*5678:<=>?@BDÐ,Fêÿ@-FêÿàÍE9¶*@-Fêÿó˜Ì8¶*è¤í8¶* %FêÿÍH9¶*æ—Ì8¶*è¤í8¶*Õ_@fÆS
 
Qöl±íÁã9¶*@-FêÿàÍE9¶*0(Fêÿ'Fêÿë­Ì8¶*u]ÞÓ
     
4Q ÷U^Qʉ§¶uª¹ñìò*ēv´bN9¶*€.FêÿF`°:¶*F`°:¶*?µK9¶*@.FêÿÐ,Fêÿ`)Fêÿ-Fêÿ-Fêÿø,FêÿÀ/FêÿB`°:¶*.FêÿØTé9¶* Yé9¶*€ºÍ8¶*ÿÿÿÿÿÿÿÿB`°:¶*H-Fêÿë­Ì8perf
       2007-11-11 11:47:01.000000000 -0500
 +++ libiconv-1.12/lib/aliases.gperf    2008-01-24 10:49:22.000000000 -0500

Index: libgettext3-shlibs.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/base/libgettext3-shlibs.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- libgettext3-shlibs.info     13 Jun 2010 19:12:00 -0000      1.8
+++ libgettext3-shlibs.info     29 Aug 2012 17:53:15 -0000      1.9
@@ -1,6 +1,6 @@
 Package: libgettext3-shlibs
 Version: 0.14.5
-Revision: 4
+Revision: 5
 #Source: mirror:gnu:gettext/gettext-%v.tar.gz
 Source: mirror:sourceforge:fink/gettext-%v.tar.gz
 Source-MD5: e2f6581626a22a0de66dce1d81d00de3
@@ -10,7 +10,8 @@
  patch -p1 < %{PatchFile}
  cd build-aux; perl -pi -e 's/.*chmod.*777.*$//g' ltmain.sh
 <<
-Essential: yes
+# Supplanted as essential by libgettext8-shlibs-0.18.1.1-1
+#Essential: yes
 Depends: libiconv, libiconv-bin, base-files
 BuildDepends: libiconv-dev, fink (>= 0.24.12)
 Conflicts: libgettext3

Index: fink-10.5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/fink-10.5.info,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- fink-10.5.info      5 Aug 2012 00:20:19 -0000       1.46
+++ fink-10.5.info      29 Aug 2012 17:53:15 -0000      1.47
@@ -1,11 +1,9 @@
 Info4: <<
 Package: fink
-Version: 0.34.2
+Version: 0.34.3
 Revision: 41
 Distribution: 10.5
 Depends: base-files
-Suggests: <<
-<<
 Recommends: <<
  apt (>= 0.5.4-41)
 <<
@@ -13,7 +11,7 @@
 Replaces: gcc3.1 (= 1175-6)
 Essential: yes
 Source: mirror:custom:fink/%n-%v.tar.gz
-Source-MD5: 7ffb5e010cd7b2ffc093bcc09565da5d
+Source-MD5: 17e6f6c220505387b69594864bb087f3
 NoSetPATH: true
 BuildAsNobody: false
 CompileScript: <<

Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/dpkg.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- dpkg.info   1 Aug 2012 15:36:43 -0000       1.20
+++ dpkg.info   29 Aug 2012 17:53:15 -0000      1.21
@@ -1,40 +1,67 @@
 Package: dpkg
 Version: 1.10.21
-Revision: 1233
+Revision: 1234
 GCC: 4.0
 BuildDepends: fink (>= 0.30.0)
-Depends: libgettext3-shlibs, libiconv (>= 1.11-1), gzip, tar, 
libncurses5-shlibs (>= 5.4-20041023-1006)
+Depends: libgettext8-shlibs (>= 0.18.1.1-1), libiconv (>= 1.11-1), gzip, tar, 
libncurses5-shlibs (>= 5.4-20041023-1006)
 BuildConflicts: (%m = powerpc) gcc45, (%m = powerpc) gcc46, (%m = powerpc) 
gcc47
 Essential: yes
+UseMaxBuildJobs: false
 BuildAsNobody: false
 Maintainer: Fink Core Group <fink-c...@lists.sourceforge.net>
 Source: mirror:sourceforge:fink/dpkg_%v.tar.gz
 SourceDirectory: dpkg-%v
 Source-MD5: a9f6c43891db74d727beab7dfc0ee663
-Source2: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
-Source2-MD5: e2f6581626a22a0de66dce1d81d00de3
+#Source2: mirror:gnu:gettext/gettext-0.18.1.1.tar.gz
+Source2: mirror:sourceforge:fink/gettext-0.18.1.1.tar.gz
+Source2-MD5: 3dd55b952826d2b32f51308f2f91aa89
 PatchFile: %n.patch
 PatchFile-MD5: 62c4558d3ae7c3107fefaa031b9cf697
-PatchFile2: libgettext3-shlibs.patch
-PatchFile2-MD5: 3799b4f059212628bac707e5365856b3
+PatchFile2: libgettext8-shlibs.patch
+PatchFile2-MD5: 34a11cf58bde5e40fd110004731fb574
 PatchScript: <<
  cd %b/..; sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p0
  cd %b/..; sed 's|@PREFIX@|%p|g' < %{PatchFile2} | patch -p0
- cd %b/../gettext-0.14.5/build-aux; perl -pi -e 's/.*chmod.*777.*$//g' 
ltmain.sh
- cd %b/../gettext-0.14.5; perl -pi -e 's/extern char \*stpncpy \(char \*dest, 
const char \*src, size_t n\)\;//g' gettext-tools/configure
+ cd %b/../gettext-0.18.1.1/build-aux; perl -pi -e 's/.*chmod.*777.*$//g' 
ltmain.sh
  cd optlib; perl -pi -e 's/(getopt|getopt1).c//g' Makefile.in; rm getopt*
  echo "x86_64-darwin           darwin-x86_64   darwin-x86_64" >> %b/archtable
 <<
 SetCFLAGS: -I%p/include
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
 CompileScript: <<
- if [ $UID -ne 0 ]; then echo "dpkg cannot be built with --build-as-nobody"; 
exit 1; fi
-
- %p/bin/fink -y install gettext-bin libgettext3-dev libiconv-dev libncurses5
- cd %b/../gettext-0.14.5/gettext-tools; env EMACS=no ./configure 
--prefix="%b/../_inst%p" --infodir='${prefix}/share/info' 
--mandir='${prefix}/share/man' --with-included-gettext --disable-csharp 
--disable-rpath --disable-shared; make; rm -rf %b/../_inst; make install
- PERL=/usr/bin/perl ac_cv_path_MSGFMT="%b/../_inst%p/bin/msgfmt" 
ac_cv_path_XGETTEXT="%b/../_inst%p/bin/xgettext" ./configure 
--build=%m-apple-darwin %c
- /usr/bin/make
+       #!/bin/sh -ev
+       if [ $UID -ne 0 ]; then echo "dpkg cannot be built with 
--build-as-nobody"; exit 1; fi
+       
+       ### First build the local gettext-tools to get msgfmt and xgettext 
+       ### If gettext-tools gets updated, make sure these ./configure 
parameters 
+       ### match the new package parameters (except build static only here).
+       ### Not necessary, but will avoid unforeseen consequences.
+       %p/bin/fink -y install gettext-bin libgettext8-dev libiconv-dev 
libncurses5
+       cd %b/../gettext-0.18.1.1/gettext-tools
+       env EMACS=no ./configure \
+       --prefix="%b/../_inst%p" \
+       --infodir='${prefix}/share/info' \
+       --mandir='${prefix}/share/man' \
+       --with-included-gettext \
+       --disable-csharp \
+       --disable-rpath \
+       --disable-libasprintf \
+       --disable-shared \
+       --with-included-glib \
+       --with-included-libcroco \
+       --with-included-libxml \
+       --with-included-libunistring \
+       --without-git \
+       --without-cvs \
+       ac_cv_prog_AWK=/usr/bin/awk \
+       ac_cv_path_GREP=/usr/bin/grep \
+       ac_cv_path_SED=/usr/bin/sed
+       make
+       rm -rf %b/../_inst
+       make install
+       ### Now actually build dpkg using msgfmt and xgettext we just compiled
+       cd %b
+       PERL=/usr/bin/perl ac_cv_path_MSGFMT="%b/../_inst%p/bin/msgfmt" 
ac_cv_path_XGETTEXT="%b/../_inst%p/bin/xgettext" ./configure 
--build=%m-apple-darwin %c
+       /usr/bin/make
 <<
 ConfigureParams: --without-start-stop-daemon --without-sgml-doc 
--with-admindir=%p/var/lib/dpkg --mandir=%p/share/man --infodir=%p/share/info 
--srcdir=%b
 InstallScript: <<

Index: fink-10.6.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/fink-10.6.info,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- fink-10.6.info      5 Aug 2012 00:20:19 -0000       1.35
+++ fink-10.6.info      29 Aug 2012 17:53:15 -0000      1.36
@@ -1,11 +1,9 @@
 Info4: <<
 Package: fink
-Version: 0.34.2
+Version: 0.34.3
 Revision: 51
 Distribution: 10.6
 Depends: base-files
-Suggests: <<
-<<
 Recommends: <<
  apt (>= 0.5.4-41)
 <<
@@ -13,7 +11,7 @@
 Replaces: gcc3.1 (= 1175-6)
 Essential: yes
 Source: mirror:custom:fink/%n-%v.tar.gz
-Source-MD5: 7ffb5e010cd7b2ffc093bcc09565da5d
+Source-MD5: 17e6f6c220505387b69594864bb087f3
 NoSetPATH: true
 BuildAsNobody: false
 CompileScript: <<

Index: libgettext8-shlibs.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/base/libgettext8-shlibs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libgettext8-shlibs.patch    15 Jul 2011 04:24:58 -0000      1.2
+++ libgettext8-shlibs.patch    29 Aug 2012 17:53:15 -0000      1.3
@@ -1,170 +1,25 @@
-diff -uNr gettext-0.17/gettext-runtime/configure 
gettext-0.17-new/gettext-runtime/configure
---- gettext-0.17/gettext-runtime/configure     2007-11-06 18:33:39.000000000 
-0500
-+++ gettext-0.17-new/gettext-runtime/configure 2011-07-01 15:03:36.000000000 
-0400
-@@ -31673,7 +31673,7 @@
-         _Bool n[m];
-         char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-         char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
--        #if defined __xlc__ || defined __GNUC__
-+        #if defined __xlc__
-          /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
-             reported by James Lemley on 2005-10-05; see
-             
http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
-diff -uNr gettext-0.17/gettext-runtime/gnulib-lib/setenv.c 
gettext-0.17-new/gettext-runtime/gnulib-lib/setenv.c
---- gettext-0.17/gettext-runtime/gnulib-lib/setenv.c   2007-10-07 
16:28:16.000000000 -0400
-+++ gettext-0.17-new/gettext-runtime/gnulib-lib/setenv.c       2007-12-06 
16:31:05.000000000 -0500
-@@ -37,9 +37,14 @@
- #endif
- 
- #if !_LIBC
--# define __environ    environ
--# ifndef HAVE_ENVIRON_DECL
--extern char **environ;
-+# define __environ   environ
-+# if ! HAVE_ENVIRON_DECL
-+#  ifdef __APPLE__
-+#   include <crt_externs.h>
-+#   define environ (*_NSGetEnviron())
-+#  else
-+    extern char **environ;
-+#  endif
- # endif
- #endif
- 
-diff -uNr gettext-0.17/gettext-runtime/libasprintf/Makefile.in 
gettext-0.17-new/gettext-runtime/libasprintf/Makefile.in
---- gettext-0.17/gettext-runtime/libasprintf/Makefile.in       2007-11-06 
18:35:22.000000000 -0500
-+++ gettext-0.17-new/gettext-runtime/libasprintf/Makefile.in   2007-12-06 
16:31:05.000000000 -0500
-@@ -290,7 +290,7 @@
+diff -uNr gettext-0.18.1.1/gettext-runtime/libasprintf/Makefile.in 
gettext-0.18.1.1-new/gettext-runtime/libasprintf/Makefile.in
+--- gettext-0.18.1.1/gettext-runtime/libasprintf/Makefile.in   2007-11-06 
18:35:22.000000000 -0500
++++ gettext-0.18.1.1-new/gettext-runtime/libasprintf/Makefile.in       
2007-12-06 16:31:05.000000000 -0500
+@@ -394,7 +394,7 @@
  # How to build libasprintf.
  # With libtool 1.5.14, on some platforms, like BeOS, "libtool --tag=CXX" fails
  # to create a shared library, however "libtool --tag=CC" succeeds.
 -libasprintf_la_LDFLAGS = @LTNOUNDEF@
 +libasprintf_la_LDFLAGS = @LTNOUNDEF@ -static
- MAKEINFOFLAGS = --no-split
- info_TEXINFOS = autosprintf.texi
- CLEANFILES = autosprintf.pdf
-diff -uNr gettext-0.17/gettext-tools/configure 
gettext-0.17-new/gettext-tools/configure
---- gettext-0.17/gettext-tools/configure       2007-11-06 18:37:40.000000000 
-0500
-+++ gettext-0.17-new/gettext-tools/configure   2011-07-01 15:03:32.000000000 
-0400
-@@ -35335,7 +35335,7 @@
-         _Bool n[m];
-         char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-         char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
--        #if defined __xlc__ || defined __GNUC__
-+        #if defined __xlc__
-          /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
-             reported by James Lemley on 2005-10-05; see
-             
http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
-diff -uNr gettext-0.17/gettext-tools/doc/gettext.info 
gettext-0.17-new/gettext-tools/doc/gettext.info
---- gettext-0.17/gettext-tools/doc/gettext.info        2007-11-01 
22:23:13.000000000 -0400
-+++ gettext-0.17-new/gettext-tools/doc/gettext.info    2007-12-06 
16:30:28.000000000 -0500
-@@ -1,7 +1,7 @@
--INFO-DIR-SECTION GNU Gettext Utilities
--START-INFO-DIR-ENTRY
- This is gettext.info, produced by makeinfo version 4.11 from gettext.texi.
- 
-+INFO-DIR-SECTION GNU Gettext Utilities
-+START-INFO-DIR-ENTRY
- * gettext: (gettext).                          GNU gettext utilities.
- * autopoint: (gettext)autopoint Invocation.    Copy gettext infrastructure.
- * envsubst: (gettext)envsubst Invocation.      Expand environment variables.
-diff -uNr gettext-0.17/gettext-tools/gnulib-lib/execute.c 
gettext-0.17-new/gettext-tools/gnulib-lib/execute.c
---- gettext-0.17/gettext-tools/gnulib-lib/execute.c    2007-10-07 
16:29:19.000000000 -0400
-+++ gettext-0.17-new/gettext-tools/gnulib-lib/execute.c        2007-12-06 
16:31:05.000000000 -0500
-@@ -55,7 +55,12 @@
- #endif
- 
- #if ! HAVE_ENVIRON_DECL
--extern char **environ;
-+# ifdef __APPLE__
-+#  include <crt_externs.h>
-+#  define environ (*_NSGetEnviron())
-+# else
-+   extern char **environ;
-+# endif
- #endif
- 
- #ifndef STDIN_FILENO
-diff -uNr gettext-0.17/gettext-tools/gnulib-lib/pipe.c 
gettext-0.17-new/gettext-tools/gnulib-lib/pipe.c
---- gettext-0.17/gettext-tools/gnulib-lib/pipe.c       2007-10-07 
16:29:34.000000000 -0400
-+++ gettext-0.17-new/gettext-tools/gnulib-lib/pipe.c   2007-12-06 
16:31:05.000000000 -0500
-@@ -54,7 +54,12 @@
- #endif
- 
- #if ! HAVE_ENVIRON_DECL
--extern char **environ;
-+# ifdef __APPLE__
-+#  include <crt_externs.h>
-+#  define environ (*_NSGetEnviron())
-+# else
-+   extern char **environ;
-+# endif
- #endif
- 
- #ifndef STDIN_FILENO
-diff -uNr gettext-0.17/gettext-tools/gnulib-lib/setenv.c 
gettext-0.17-new/gettext-tools/gnulib-lib/setenv.c
---- gettext-0.17/gettext-tools/gnulib-lib/setenv.c     2007-10-07 
16:29:34.000000000 -0400
-+++ gettext-0.17-new/gettext-tools/gnulib-lib/setenv.c 2007-12-06 
16:31:05.000000000 -0500
-@@ -38,8 +38,13 @@
- 
- #if !_LIBC
- # define __environ    environ
--# ifndef HAVE_ENVIRON_DECL
--extern char **environ;
-+# if ! HAVE_ENVIRON_DECL
-+#  ifdef __APPLE__
-+#   include <crt_externs.h>
-+#   define environ (*_NSGetEnviron())
-+#  else
-+    extern char **environ;
-+#  endif
- # endif
- #endif
- 
-diff -uNr gettext-0.17/gettext-tools/gnulib-lib/unsetenv.c 
gettext-0.17-new/gettext-tools/gnulib-lib/unsetenv.c
---- gettext-0.17/gettext-tools/gnulib-lib/unsetenv.c   2007-10-07 
16:29:39.000000000 -0400
-+++ gettext-0.17-new/gettext-tools/gnulib-lib/unsetenv.c       2007-12-06 
16:31:05.000000000 -0500
-@@ -27,8 +27,13 @@
- 
- #if !_LIBC
- # define __environ    environ
--# ifndef HAVE_ENVIRON_DECL
--extern char **environ;
-+# if ! HAVE_ENVIRON_DECL
-+#  ifdef __APPLE__
-+#   include <crt_externs.h>
-+#   define environ (*_NSGetEnviron())
-+#  else
-+    extern char **environ;
-+#  endif
- # endif
- #endif
- 
-diff -uNr gettext-0.17/gettext-tools/gnulib-tests/test-stdbool.c 
gettext-0.17-new/gettext-tools/gnulib-tests/test-stdbool.c
---- gettext-0.17/gettext-tools/gnulib-tests/test-stdbool.c     2007-10-07 
16:29:47.000000000 -0400
-+++ gettext-0.17-new/gettext-tools/gnulib-tests/test-stdbool.c 2011-07-01 
15:03:25.000000000 -0400
-@@ -61,7 +61,7 @@
- char o[sizeof n == m * sizeof n[0] ? 1 : -1];
- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
- #if 0 /* Cannot be guaranteed with gnulib's <stdbool.h>.  */
--#if defined __xlc__ || defined __GNUC__
-+#if defined __xlc__
-  /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
-     reported by James Lemley on 2005-10-05; see
-     http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
-diff -uNr gettext-0.17/gettext-tools/src/Makefile.in 
gettext-0.17-new/gettext-tools/src/Makefile.in
---- gettext-0.17/gettext-tools/src/Makefile.in 2007-11-06 18:40:15.000000000 
-0500
-+++ gettext-0.17-new/gettext-tools/src/Makefile.in     2011-07-01 
12:26:14.000000000 -0400
-@@ -1706,10 +1706,10 @@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(urlget_CPPFLAGS) 
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o urlget-urlget.obj `if test -f 
'urlget.c'; then $(CYGPATH_W) 'urlget.c'; else $(CYGPATH_W) 
'$(srcdir)/urlget.c'; fi`
- 
- xgettext-xgettext.o: xgettext.c
--      $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) 
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-xgettext.o `test -f 
'xgettext.c' || echo '$(srcdir)/'`xgettext.c
-+      $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) 
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -O4 -c -o xgettext-xgettext.o `test -f 
'xgettext.c' || echo '$(srcdir)/'`xgettext.c
- 
- xgettext-xgettext.obj: xgettext.c
--      $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) 
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-xgettext.obj `if test -f 
'xgettext.c'; then $(CYGPATH_W) 'xgettext.c'; else $(CYGPATH_W) 
'$(srcdir)/xgettext.c'; fi`
-+      $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) 
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -O4 -c -o xgettext-xgettext.obj `if test -f 
'xgettext.c'; then $(CYGPATH_W) 'xgettext.c'; else $(CYGPATH_W) 
'$(srcdir)/xgettext.c'; fi`
- 
- xgettext-x-c.o: x-c.c
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xgettext_CPPFLAGS) 
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xgettext-x-c.o `test -f 'x-c.c' || 
echo '$(srcdir)/'`x-c.c
+ libgnu_la_SOURCES = dummy.c
+ libgnu_la_LIBADD = $(gl_LTLIBOBJS) @LTALLOCA@
+ libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS) @LTALLOCA@
+diff -uNr gettext-0.18.1.1/gettext-runtime/libasprintf/Makefile.in 
gettext-0.18.1.1-new/gettext-runtime/libasprintf/Makefile.in
+--- gettext-0.18.1.1/gettext-tools/configure 2010-06-06 13:12:20.000000000 
-0700
++++ gettext-0.18.1.1-new/gettext-tools/configure 2010-08-13 23:24:09.000000000 
-0700
+@@ -40606,7 +40606,9 @@
+ #include <stdlib.h>
+ #include <string.h> /* for strcpy */
+ /* The stpncpy prototype is missing in <string.h> on AIX 4.  */
++#ifndef stpncpy
+ extern char *stpncpy (char *dest, const char *src, size_t n);
++#endif
+ int main () {
+   const char *src = "Hello";
+   char dest[10];

Index: libgettext8-shlibs.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/base/libgettext8-shlibs.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libgettext8-shlibs.info     15 Jul 2011 04:24:58 -0000      1.3
+++ libgettext8-shlibs.info     29 Aug 2012 17:53:15 -0000      1.4
@@ -1,30 +1,49 @@
 Package: libgettext8-shlibs
-Version: 0.17
-Revision: 19
-Source: mirror:gnu:gettext/gettext-%v.tar.gz
-#Source: mirror:sourceforge:fink/gettext-%v.tar.gz
-#Source: http://ftp.gnu.org/pub/gnu/gettext/gettext-%v.tar.gz
-Source-MD5: 58a2bc6d39c0ba57823034d55d65d606
+Version: 0.18.1.1
+Revision: 1
+#Source: mirror:gnu:gettext/gettext-%v.tar.gz
+Source: mirror:sourceforge:fink/gettext-%v.tar.gz
+Source-MD5: 3dd55b952826d2b32f51308f2f91aa89
 PatchFile: %n.patch
-PatchFile-MD5: 9db9231d64d3580f367190aeee292ee6
+PatchFile-MD5: 34a11cf58bde5e40fd110004731fb574
 PatchScript: <<
  patch -p1 < %{PatchFile}
  cd build-aux; perl -pi -e 's/.*chmod.*777.*$//g' ltmain.sh
 <<
-# not yet used by fink core or bootstrap packages
-#Essential: yes
+Essential: yes
 Depends: libiconv, libiconv-bin, base-files
 BuildDepends: libiconv-dev, fink (>= 0.24.12)
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
+#UseMaxBuildJobs: false
 SetCFLAGS: -Os
-ConfigureParams: --mandir='%p/share/man' --with-included-gettext 
--disable-csharp --disable-rpath --disable-libasprintf --disable-static
-CompileScript: cd gettext-runtime; env EMACS=no CCACHE_DISABLE=1 ./configure 
%c ; make
+ConfigureParams: <<
+       --mandir='%p/share/man' \
+       --with-included-gettext \
+       --disable-csharp \
+       --disable-rpath \
+       --disable-libasprintf \
+       --disable-static \
+       --with-included-glib \
+       --with-included-libcroco \
+       --with-included-libxml \
+       --with-included-libunistring \
+       --without-git \
+       --without-cvs \
+       ac_cv_prog_AWK=/usr/bin/awk \
+       ac_cv_path_GREP=/usr/bin/grep \
+       ac_cv_path_SED=/usr/bin/sed
+<<
+CompileScript: <<
+       #!/bin/sh -ev
+       cd gettext-runtime
+       env EMACS=no CCACHE_DISABLE=1 ./configure %c
+       make
+<<
 InstallScript: <<
- cd gettext-runtime; make install DESTDIR=%d
- rm %i/lib/charset.alias
- #No need for dependency_libs in .la files if not building static libs
- perl -pi -e "s/dependency_libs=.*$/dependency_libs=''/" %i/lib/libintl.la
+       #!/bin/sh -ev
+       cd gettext-runtime
+       make install DESTDIR=%d
+       #No need for dependency_libs in .la files if not building static libs
+       perl -pi -e "s/dependency_libs=.*$/dependency_libs=''/" 
%i/lib/libintl.la
 <<
 DocFiles: README* AUTHORS gettext-runtime/BUGS COPYING* NEWS THANKS ChangeLog* 
 Description: GNU Internationalization utils (shared libs)
@@ -63,9 +82,6 @@
 <<
 
 DescPort: <<
-  charset.alias is deleted because it is empty on Darwin anyway and
-  causes unnecessary conflicts between packages.
-
   The emacs files have been moved to a separate gettext-emacs package
   (EMACS=no prevents them from being compiled here).
 <<
@@ -79,14 +95,10 @@
   However, we have retained the idea of a gettext-doc splitoff from
   the previous version of libgettext3-shlibs, which was prepared by
   Chris Zubrzycki.
-
-       Don't bother checking for AIX-specific bug (test is bugged on
-       clang). See:
-       http://lists.gnu.org/archive/html/bug-autoconf/2010-08/msg00116.html
 <<
 
 Shlibs: <<
-  %p/lib/libintl.8.dylib 9.0.0 %n (>= 0.17-1)
+  %p/lib/libintl.8.dylib 10.0.0 %n (>= 0.18-1)
 <<
 InfoTest: <<
        TestScript: cd gettext-runtime; make check || exit 2

Index: fink-x86_64.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/fink-x86_64.info,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- fink-x86_64.info    5 Aug 2012 00:20:19 -0000       1.36
+++ fink-x86_64.info    29 Aug 2012 17:53:15 -0000      1.37
@@ -1,12 +1,10 @@
 Info4: <<
 Package: fink
-Version: 0.34.2
+Version: 0.34.3
 Revision: 46
 Distribution: 10.5
 Architecture: x86_64
 Depends: base-files, perl588-core
-Suggests: <<
-<<
 Recommends: <<
  apt (>= 0.5.4-41)
 <<
@@ -14,7 +12,7 @@
 Replaces: gcc3.1 (= 1175-6)
 Essential: yes
 Source: mirror:custom:fink/%n-%v.tar.gz
-Source-MD5: 7ffb5e010cd7b2ffc093bcc09565da5d
+Source-MD5: 17e6f6c220505387b69594864bb087f3
 NoSetPATH: true
 CompileScript: <<
  make test PREFIX=%p ARCHITECTURE=%m DISTRIBUTION=10.5

Index: gettext-tools.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/base/gettext-tools.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gettext-tools.info  14 Dec 2011 02:42:39 -0000      1.11
+++ gettext-tools.info  29 Aug 2012 17:53:15 -0000      1.12
@@ -1,15 +1,17 @@
 Package: gettext-tools
-Version: 0.17
-Revision: 18
-Source: mirror:gnu:gettext/gettext-%v.tar.gz
-#Source: mirror:sourceforge:fink/gettext-%v.tar.gz
-Source-MD5: 58a2bc6d39c0ba57823034d55d65d606
+Version: 0.18.1.1
+Revision: 1
+#Source: mirror:gnu:gettext/gettext-%v.tar.gz
+Source: mirror:sourceforge:fink/gettext-%v.tar.gz
+Source-MD5: 3dd55b952826d2b32f51308f2f91aa89
 PatchFile: libgettext8-shlibs.patch
-PatchFile-MD5: 9db9231d64d3580f367190aeee292ee6
+PatchFile-MD5: 34a11cf58bde5e40fd110004731fb574
+PatchFile2: gettext-tools-tests.patch
+PatchFile2-MD5: 964de69b23cdfedc1691cf7825886af9
 PatchScript: <<
  patch -p1 < %{PatchFile}
+ patch -p1 < %{PatchFile2}
  perl -pi -e 's/.*chmod.*777.*$//g' build-aux/ltmain.sh
- perl -pi -e 's/extern char \*stpncpy \(char \*dest, const char \*src, size_t 
n\)\;//g' gettext-tools/configure
 <<
 Depends: <<
        expat1-shlibs (>= 2.0.1-1),
@@ -20,49 +22,62 @@
 Suggests: gettext-doc
 BuildDepends: <<
        expat1 (>= 2.0.1-1),
-       fink (>= 0.28.0),
+       fink (>= 0.30.0),
        libgettext8-dev (>= %v-1),
        libiconv-dev (>= 1.12-3),
        libncurses5 (>= 5.4-20041023-1011)
 <<
-BuildConflicts: gcc45, gcc46, gcc47
 Conflicts: gettext-tools-0.17
 Replaces: gettext-dev (<= 0.10.40-20), gettext (<= 0.10.40-4), gettext-bin (<= 
0.10.40-20), libgettext3-shlibs (<< 0.14.5-1), libgettextpo2-shlibs (<< 
0.14.5-2), gettext-tools-0.17
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
-ConfigureParams: --infodir='${prefix}/share/info' 
--mandir='${prefix}/share/man' --with-included-gettext --disable-csharp 
--disable-rpath --disable-java --disable-native-java --with-included-glib 
--with-included-libcroco --with-included-libxml
+
+### When gettext-tools gets updated, make sure these ./configure parameters 
+### match the package parameters (except build shared only here) in the 
+### internal gettext builds for dpkg and libiconv.
+### Not necessary, but will avoid unforeseen consequences.
+ConfigureParams: <<
+       --infodir='${prefix}/share/info' \
+       --mandir='${prefix}/share/man' \
+       --with-included-gettext \
+       --disable-csharp \
+       --disable-rpath \
+       --disable-libasprintf \
+       --disable-java \
+       --disable-native-java \
+       --with-included-glib \
+       --with-included-libcroco \
+       --with-included-libxml \
+       --with-included-libunistring \
+       --without-git \
+       --without-cvs \
+       ac_cv_prog_AWK=/usr/bin/awk \
+       ac_cv_path_GREP=/usr/bin/grep \
+       ac_cv_path_SED=/usr/bin/sed
+<<
 CompileScript: <<
        #!/bin/sh -ev
-       # test for Xcode 4.2 compiler
-       if  [[ -n `gcc --version | grep llvm-g`  ]]
-       then 
-               export CXX='clang++ -arch %m'
-               export CC='clang -arch %m'
-       fi
        cd gettext-tools
        env EMACS=no ./configure %c
-       make
+       make -w
+<<
+InfoTest: <<
+       TestScript: <<
+               cd gettext-tools; LC_ALL=C make -k check || exit 2
+       <<
 <<
-#InfoTest: <<
-#      TestScript: <<
-#              # some self-tests fail (see DescPackaging)
-#              cd gettext-tools; LC_ALL=C make -k check || exit 2
-#      <<
-#<<
 InstallScript: <<
- cd gettext-tools; make install prefix=%i
- rm %i/lib/libgettextlib.*
- rm %i/lib/libgettextsrc.*
- rm %i/lib/charset.alias
- rm %i/lib/libintl*
- rm %i/include/libintl.h
- rm %i/share/locale/locale.alias
+       #!/bin/sh -ev
+       cd gettext-tools; make install prefix=%i
+       rm %i/lib/libgettextlib.*
+       rm %i/lib/libgettextsrc.*
+       rm %i/lib/libintl*
+       rm %i/include/libintl.h
+       rm %i/share/locale/locale.alias
 <<
 DocFiles: README* AUTHORS COPYING* NEWS THANKS ChangeLog* 
 InfoDocs: gettext.info
 Shlibs: <<
-  !%p/lib/libgettextlib-0.17.dylib
-  !%p/lib/libgettextsrc-0.17.dylib
+  !%p/lib/libgettextlib-0.18.1.dylib
+  !%p/lib/libgettextsrc-0.18.1.dylib
 <<
 Description: GNU Internationalization utils (shared libs)
 
@@ -94,7 +109,7 @@
  Files: lib/libgettextpo.*.dylib
  DocFiles: README* AUTHORS COPYING* NEWS THANKS ChangeLog*
  Shlibs: <<
-   %p/lib/libgettextpo.0.dylib 5.0.0 %n (>= 0.17-15)
+   %p/lib/libgettextpo.0.dylib 6.0.0 %n (>= 0.18-1)
  <<
 <<
 
@@ -111,11 +126,12 @@
 <<
 
 DescPort: <<
-  charset.alias is deleted because it is empty on Darwin anyway and
-  causes unnecessary conflicts between packages.
-
   The emacs files have been moved to a separate gettext-emacs package
   (EMACS=no prevents them from being compiled here).
+  
+  xgettext.c finds a bug in clang from Xcode < 4.2 at anything above -O0
+  So, set CFLAGS to -O0 (or have a BDep Xcode >= 4.3).
+  http://llvm.org/bugs/show_bug.cgi?id=9892
 <<
 
 DescPackaging: <<
@@ -142,30 +158,17 @@
   and overlay it with shims or a few local sources, but safer to use
   consistent set and follow upstream recommendations.
 
-       Leaving self-tests disabled because several are failing...
-
-               msgmerge: `mm-p-2.po': No such file or directory
-               FAIL: msgmerge-properties-2
-
-               msgmerge: `mm-u-2.po': No such file or directory
-               FAIL: msgmerge-update-2
+       Tests that would fail otherwise:
 
-               prog.cc:16:25: error: autosprintf.h: No such file or directory
-               prog.cc:17: error: 'gnu' has not been declared
-               prog.cc: In function 'int main(int, char**)':
-               prog.cc:34: error: 'autosprintf' was not declared in this scope
-               FAIL: lang-c++
+       lang-c++ complains about "autosprintf.h" not being found, so we
+       disable 'libasprintf' at ./configure to match libgettext8-shlibs.
 
-               1c1
-               [non-ascii-safe strings]
-               FAIL: lang-bash
+       lang-bash test fails because system-bash does not have iconv support.
+       So we make it exit out immediately rather than failing.
 
        Don't bother checking for AIX-specific bug (test is bugged on
        clang). See:
        http://lists.gnu.org/archive/html/bug-autoconf/2010-08/msg00116.html
-       
-       Doesn't build with llvm-gcc-4.2, so switch to clang if that is the only
-       "gcc".
 <<
 
 

Index: libiconv.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/libiconv.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- libiconv.info       11 Oct 2010 21:34:10 -0000      1.9
+++ libiconv.info       29 Aug 2012 17:53:15 -0000      1.10
@@ -1,19 +1,19 @@
 Package: libiconv
 Version: 1.12
-Revision: 4
+Revision: 5
 #Source: mirror:sourceforge:fink/%n-%v.tar.gz
 Source: mirror:gnu:libiconv/libiconv-%v.tar.gz
 Source-MD5: c2be282595751535a618ae0edeb8f648
-Source2: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
-#Source2: mirror:gnu:gettext/gettext-0.14.5.tar.gz
-Source2-MD5: e2f6581626a22a0de66dce1d81d00de3
+#Source2: mirror:gnu:gettext/gettext-0.18.1.1.tar.gz
+Source2: mirror:sourceforge:fink/gettext-0.18.1.1.tar.gz
+Source2-MD5: 3dd55b952826d2b32f51308f2f91aa89
 Source3: mirror:gnu:gperf/gperf-3.0.3.tar.gz
 Source3-MD5: cc20e58975a38075440423c8fb85fd00
 PatchFile: %n.patch
-PatchFile-MD5: 26a2985e0f58100fd74756547394883d
+PatchFile-MD5: a96d5622ed197552b36c7eea1e5c6ccf
 PatchScript: <<
  cd %b/..; patch -p0 < %{PatchFile}
- cd %b/../gettext-0.14.5/build-aux; perl -pi -e 's/.*chmod.*777.*$//g' 
ltmain.sh
+ cd %b/../gettext-0.18.1.1/build-aux; perl -pi -e 's/.*chmod.*777.*$//g' 
ltmain.sh
 <<
 Essential: yes
 Depends: base-files
@@ -35,8 +35,6 @@
 <<
 NoSetLDFLAGS: true
 NoSetCPPFLAGS: true
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
 CompileScript: <<
 #! /bin/sh -ex
 PATH=/bin:/sbin:/usr/bin:/usr/sbin
@@ -51,14 +49,39 @@
 x86_64) PATH=%p/var/lib/fink/path-prefix-10.6:$PATH ;;
 esac
 
+### build gperf
 cd %b/../gperf-3.0.3
 ./configure --prefix=%p
 make
-cd %b/../gettext-0.14.5/gettext-runtime
-EMACS=no CPPFLAGS="-I%b/../_inst%p/include" LDFLAGS="-L%b/../_inst%p/lib" 
am_cv_func_iconv=no ./configure --prefix=%p --infodir='${prefix}/share/info' 
--mandir='${prefix}/share/man' --with-included-gettext --disable-csharp 
--disable-rpath --disable-shared
+
+### Build our local gettext-runtime.
+### If gettext gets updated, make sure these ./configure parameters 
+### match the new package parameters (except build static only here).
+### Not necessary, but will avoid unforeseen consequences.
+cd %b/../gettext-0.18.1.1/gettext-runtime
+EMACS=no CPPFLAGS="-I%b/../_inst%p/include" LDFLAGS="-L%b/../_inst%p/lib" 
am_cv_func_iconv=no ./configure \
+       --prefix=%p \
+       --infodir='${prefix}/share/info' \
+       --mandir='%p/share/man' \
+       --with-included-gettext \
+       --disable-csharp \
+       --disable-rpath \
+       --disable-libasprintf \
+       --disable-shared \
+       --with-included-glib \
+       --with-included-libcroco \
+       --with-included-libxml \
+       --with-included-libunistring \
+       --without-git \
+       --without-cvs \
+       ac_cv_prog_AWK=/usr/bin/awk \
+       ac_cv_path_GREP=/usr/bin/grep \
+       ac_cv_path_SED=/usr/bin/sed
 make
 rm -rf %b/../_inst
 make install DESTDIR=%b/../_inst
+
+### now build iconv
 cd %b/../libiconv-%v
 make -f Makefile.devel GPERF=%b/../gperf-3.0.3/src/gperf
 am_cv_func_iconv="yes"
@@ -68,6 +91,9 @@
 find . -name Makefile | xargs perl -pi -e 
's|\@LIBINTL_STATIC\@|%b/../_inst%p/lib/libintl.a 
-Wl,-framework,CoreFoundation|g'
 make
 <<
+InfoTest: <<
+       TestScript: make check || exit 2
+<<
 InstallScript: <<
 mkdir -p %i/share/man %i/share/doc/%n
 make install prefix=%i docdir=%i/share/doc/%n



------------------------------------------------------------------------------
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

Reply via email to