Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/base
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25168
Modified Files:
dpkg.info gettext-tools-tests.patch gettext-tools.info
libgettext8-shlibs.info libgettext8-shlibs.patch libiconv.info
libiconv.patch
Log Message:
bump to gettext 0.18.3.1
Index: libiconv.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/libiconv.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libiconv.patch 29 Aug 2012 17:53:15 -0000 1.5
+++ libiconv.patch 25 Aug 2013 02:33:04 -0000 1.6
@@ -1,6 +1,6 @@
-diff -Nurd libiconv-1.12/lib/aliases.gperf libiconv-1.12/lib/aliases.gperf
---- libiconv-1.12/lib/aliases.gperf 2007-11-11 11:47:01.000000000 -0500
-+++ libiconv-1.12/lib/aliases.gperf 2008-01-24 10:49:22.000000000 -0500
+diff -Nurd libiconv-1.14/lib/aliases.gperf libiconv-1.14/lib/aliases.gperf
+--- libiconv-1.14/lib/aliases.gperf 2007-11-11 11:47:01.000000000 -0500
++++ libiconv-1.14/lib/aliases.gperf 2008-01-24 10:49:22.000000000 -0500
@@ -21,6 +21,9 @@
US, ei_ascii
CSASCII, ei_ascii
@@ -11,10 +11,10 @@
UCS-2, ei_ucs2
ISO-10646-UCS-2, ei_ucs2
CSUNICODE, ei_ucs2
-diff -Nurd libiconv-1.12/lib/converters.h libiconv-1.12/lib/converters.h
---- libiconv-1.12/lib/converters.h 2007-05-25 19:18:25.000000000 -0400
-+++ libiconv-1.12/lib/converters.h 2008-01-24 10:49:22.000000000 -0500
-@@ -113,6 +113,7 @@
+diff -Nurd libiconv-1.14/lib/converters.h libiconv-1.14/lib/converters.h
+--- libiconv-1.14/lib/converters.h 2007-05-25 19:18:25.000000000 -0400
++++ libiconv-1.14/lib/converters.h 2008-01-24 10:49:22.000000000 -0500
+@@ -119,6 +119,7 @@
/* General multi-byte encodings */
#include "utf8.h"
#include "ucs2.h"
@@ -22,19 +22,12 @@
#include "ucs2be.h"
#include "ucs2le.h"
#include "ucs4.h"
-diff -Nurd libiconv-1.12/lib/encodings.def libiconv-1.12/lib/encodings.def
---- libiconv-1.12/lib/encodings.def 2007-05-25 19:17:48.000000000 -0400
-+++ libiconv-1.12/lib/encodings.def 2008-01-24 10:49:22.000000000 -0500
-@@ -55,12 +55,18 @@
- /* General multi-byte encodings */
-
- DEFENCODING(( "UTF-8", /* IANA, RFC 2279 */
-- /*"UTF8", JDK 1.1 */
-+ "UTF8", /* JDK 1.1 */
- /*"CP65001", Windows */
- ),
- utf8,
- { utf8_mbtowc, NULL }, { utf8_wctomb, NULL })
+diff -Nurd libiconv-1.14/lib/encodings.def libiconv-1.14/lib/encodings.def
+--- libiconv-1.14/lib/encodings.def 2007-05-25 19:17:48.000000000 -0400
++++ libiconv-1.14/lib/encodings.def 2008-01-24 10:49:22.000000000 -0500
+@@ -69,6 +69,12 @@
+ utf8)
+ #endif
+DEFENCODING(( "UTF-8-MAC", /* utf8-nfd */
+ "UTF8-MAC", /* label from samba 2.2jp */
@@ -45,9 +38,9 @@
DEFENCODING(( "UCS-2", /* glibc */
"ISO-10646-UCS-2", /* IANA */
"csUnicode", /* IANA */
-diff -Nurd libiconv-1.12/lib/flags.h libiconv-1.12/lib/flags.h
---- libiconv-1.12/lib/flags.h 2007-11-11 11:47:36.000000000 -0500
-+++ libiconv-1.12/lib/flags.h 2008-01-24 10:49:22.000000000 -0500
+diff -Nurd libiconv-1.14/lib/flags.h libiconv-1.14/lib/flags.h
+--- libiconv-1.14/lib/flags.h 2007-11-11 11:47:36.000000000 -0500
++++ libiconv-1.14/lib/flags.h 2008-01-24 10:49:22.000000000 -0500
@@ -14,6 +14,7 @@
#define ei_ascii_oflags (0)
@@ -56,10 +49,10 @@
#define ei_ucs2_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS |
HAVE_HANGUL_JAMO)
#define ei_ucs2be_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS |
HAVE_HANGUL_JAMO)
#define ei_ucs2le_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS |
HAVE_HANGUL_JAMO)
-diff -Nurd libiconv-1.12/lib/iconv.c libiconv-1.12/lib/iconv.c
---- libiconv-1.12/lib/iconv.c 2007-04-23 17:24:57.000000000 -0400
-+++ libiconv-1.12/lib/iconv.c 2008-01-24 10:49:22.000000000 -0500
-@@ -726,6 +726,29 @@
+diff -Nurd libiconv-1.14/lib/iconv.c libiconv-1.14/lib/iconv.c
+--- libiconv-1.14/lib/iconv.c 2007-04-23 17:24:57.000000000 -0400
++++ libiconv-1.14/lib/iconv.c 2008-01-24 10:49:22.000000000 -0500
+@@ -605,6 +605,29 @@
strong_alias (libiconv_open, iconv_open)
strong_alias (libiconv, iconv)
strong_alias (libiconv_close, iconv_close)
@@ -89,9 +82,9 @@
#endif
#endif
-diff -Nurd libiconv-1.12/lib/utf8mac.h libiconv-1.12/lib/utf8mac.h
---- libiconv-1.12/lib/utf8mac.h 1969-12-31 19:00:00.000000000 -0500
-+++ libiconv-1.12/lib/utf8mac.h 2008-01-24 10:49:22.000000000 -0500
+diff -Nurd libiconv-1.14/lib/utf8mac.h libiconv-1.14/lib/utf8mac.h
+--- libiconv-1.14/lib/utf8mac.h 1969-12-31 19:00:00.000000000 -0500
++++ libiconv-1.14/lib/utf8mac.h 2008-01-24 10:49:22.000000000 -0500
@@ -0,0 +1,1608 @@
+/*
+ * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
@@ -1701,9 +1694,9 @@
+
+ return len;
+}
-diff -Nurd libiconv-1.12/man/iconv.1 libiconv-1.12/man/iconv.1
---- libiconv-1.12/man/iconv.1 2007-10-07 14:23:11.000000000 -0400
-+++ libiconv-1.12/man/iconv.1 2008-01-24 10:50:02.000000000 -0500
+diff -Nurd libiconv-1.14/man/iconv.1 libiconv-1.14/man/iconv.1
+--- libiconv-1.14/man/iconv.1 2007-10-07 14:23:11.000000000 -0400
++++ libiconv-1.14/man/iconv.1 2008-01-24 10:50:02.000000000 -0500
@@ -104,5 +104,4 @@
.SH "CONFORMING TO"
POSIX:2001
@@ -1711,22 +1704,22 @@
-.BR iconv_open (3),
-.BR locale (7)
+.BR iconv_open (3)
-diff -Nurd libiconv-1.12/src/Makefile.in libiconv-1.12/src/Makefile.in
---- libiconv-1.12/src/Makefile.in 2007-05-27 18:15:52.000000000 -0400
-+++ libiconv-1.12/src/Makefile.in 2008-01-24 10:51:45.000000000 -0500
-@@ -104,7 +104,7 @@
+diff -Nurd libiconv-1.14/src/Makefile.in libiconv-1.14/src/Makefile.in
+--- libiconv-1.14/src/Makefile.in 2007-05-27 18:15:52.000000000 -0400
++++ libiconv-1.14/src/Makefile.in 2008-01-24 10:51:45.000000000 -0500
+@@ -113,7 +113,7 @@
if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs)
$(DESTDIR)$(bindir) ; fi
case "@host_os@" in \
- hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@
../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@
$(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b
-Wl,$(libdir)"; fi` -o iconv;; \
-- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS)
iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@
$(OBJECTS_RES_@WOE32@) -o iconv;; \
-+ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS)
iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LIBINTL_STATIC@
$(OBJECTS_RES_@WOE32@) -o iconv;; \
+ hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@
../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@
$(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b
-Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
+- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS)
iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@
$(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
++ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS)
iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LIBINTL_STATIC@
$(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
esac
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv
$(DESTDIR)$(bindir)/iconv
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM)
iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
-diff -Nurd libiconv-1.12/src/iconv.c libiconv-1.12/src/iconv.c
---- libiconv-1.12/src/iconv.c 2007-07-07 13:07:36.000000000 -0400
-+++ libiconv-1.12/src/iconv.c 2008-01-24 10:49:22.000000000 -0500
-@@ -976,6 +976,10 @@
+diff -Nurd libiconv-1.14/src/iconv.c libiconv-1.14/src/iconv.c
+--- libiconv-1.14/src/iconv.c 2007-07-07 13:07:36.000000000 -0400
++++ libiconv-1.14/src/iconv.c 2008-01-24 10:49:22.000000000 -0500
+@@ -981,6 +981,10 @@
const char *option = argv[i] + 1;
if (*option == '\0')
usage(1);
@@ -1737,3 +1730,16 @@
for (; *option; option++)
switch (*option) {
case 'c': discard_unconvertible = 1; break;
+--- libiconv-1.14/Makefile.devel 2011-07-03 10:05:11.000000000 -0400
++++ libiconv-1.14/Makefile.devel 2012-11-29 12:37:45.000000000 -0500
+@@ -19,9 +19,7 @@
+ all : configures config.h.in \
+ srclib/Makefile.gnulib srclib/Makefile.in \
+ include/iconv.h.build.in \
+- lib/aliases.h lib/aliases_sysaix.h lib/aliases_syshpux.h
lib/aliases_sysosf1.h lib/aliases_syssolaris.h \
+- lib/aliases_aix.h lib/aliases_aix_sysaix.h \
+- lib/aliases_osf1.h lib/aliases_osf1_sysosf1.h \
++ lib/aliases.h \
+ lib/aliases_dos.h \
+ lib/aliases_extra.h \
+ lib/flags.h lib/translit.h \
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/dpkg.info,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- dpkg.info 10 Jun 2013 01:33:08 -0000 1.24
+++ dpkg.info 25 Aug 2013 02:33:04 -0000 1.25
@@ -1,9 +1,9 @@
Package: dpkg
Version: 1.10.21
-Revision: 1236
+Revision: 1237
GCC: 4.0
BuildDepends: fink (>= 0.30.0)
-Depends: libgettext8-shlibs (>= 0.18.2.1-1), libiconv (>= 1.11-1), gzip, tar,
libncurses5-shlibs (>= 5.4-20041023-1006)
+Depends: libgettext8-shlibs (>= 0.18.3.1-1), libiconv (>= 1.11-1), gzip, tar,
libncurses5-shlibs (>= 5.4-20041023-1006)
Essential: yes
UseMaxBuildJobs: false
BuildAsNobody: false
@@ -11,17 +11,17 @@
Source: mirror:sourceforge:fink/dpkg_%v.tar.gz
SourceDirectory: dpkg-%v
Source-MD5: a9f6c43891db74d727beab7dfc0ee663
-Source2: mirror:gnu:gettext/gettext-0.18.2.1.tar.gz
-#Source2: mirror:sourceforge:fink/gettext-0.18.2.1.tar.gz
-Source2-MD5: 034c8103b14654ebd300fadac44d6f14
+Source2: mirror:gnu:gettext/gettext-0.18.3.1.tar.gz
+#Source2: mirror:sourceforge:fink/gettext-0.18.3.1.tar.gz
+Source2-MD5: 3fc808f7d25487fc72b5759df7419e02
PatchFile: %n.patch
PatchFile-MD5: 62c4558d3ae7c3107fefaa031b9cf697
PatchFile2: libgettext8-shlibs.patch
-PatchFile2-MD5: 0fc008bcbe67004c6f2bcbf5581ef1c3
+PatchFile2-MD5: 0fa124a9e56f702eb9f817ebd10aae5f
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.18.2.1/build-aux; perl -pi -e 's/.*chmod.*777.*$//g'
ltmain.sh
+ cd %b/../gettext-0.18.3.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
<<
@@ -35,7 +35,7 @@
### 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.2.1/gettext-tools
+ cd %b/../gettext-0.18.3.1/gettext-tools
env EMACS=no JAVA=/usr/bin/java GCJ=/usr/bin/javac ./configure \
--prefix="%b/../_inst%p" \
--infodir='${prefix}/share/info' \
Index: gettext-tools-tests.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/base/gettext-tools-tests.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gettext-tools-tests.patch 29 Aug 2012 18:51:25 -0000 1.1
+++ gettext-tools-tests.patch 25 Aug 2013 02:33:04 -0000 1.2
@@ -6,6 +6,6 @@
+echo "Skipping test: Darwin's bash lacks iconv support"; rm -fr $tmpfiles;
exit 77;
+
- tmpfiles="$tmpfiles prog.sh"
- cat <<\EOF > prog.sh
+ tmpfiles="$tmpfiles prog.bash"
+ cat <<\EOF > prog.bash
#! /bin/bash
Index: libgettext8-shlibs.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/base/libgettext8-shlibs.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libgettext8-shlibs.patch 30 Mar 2013 02:25:00 -0000 1.4
+++ libgettext8-shlibs.patch 25 Aug 2013 02:33:04 -0000 1.5
@@ -1,7 +1,7 @@
-diff -uNr gettext-0.18.2.1/gettext-runtime/libasprintf/Makefile.in
gettext-0.18.2.1.fink/gettext-runtime/libasprintf/Makefile.in
---- gettext-0.18.2.1/gettext-runtime/libasprintf/Makefile.in 2013-03-05
03:41:30.000000000 -0500
-+++ gettext-0.18.2.1.fink/gettext-runtime/libasprintf/Makefile.in
2013-03-21 15:33:38.000000000 -0400
-@@ -483,7 +483,7 @@
+diff -uNr gettext-0.18.3.1-orig/gettext-runtime/libasprintf/Makefile.in
gettext-0.18.3.1/gettext-runtime/libasprintf/Makefile.in
+--- gettext-0.18.3.1-orig/gettext-runtime/libasprintf/Makefile.in
2013-08-15 12:26:30.000000000 -0400
++++ gettext-0.18.3.1/gettext-runtime/libasprintf/Makefile.in 2013-08-21
20:59:51.000000000 -0400
+@@ -529,7 +529,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.
@@ -10,10 +10,10 @@
libgnu_la_SOURCES = size_max.h xsize.h xsize.c
libgnu_la_LIBADD = $(gl_LTLIBOBJS) @LTALLOCA@
libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS) @LTALLOCA@
-diff -uNr gettext-0.18.2.1/gettext-tools/src/Makefile.in
gettext-0.18.2.1.fink/gettext-tools/src/Makefile.in
---- gettext-0.18.2.1/gettext-tools/src/Makefile.in 2013-03-05
03:43:55.000000000 -0500
-+++ gettext-0.18.2.1.fink/gettext-tools/src/Makefile.in 2013-03-21
15:36:15.000000000 -0400
-@@ -2744,10 +2744,10 @@
+diff -uNr gettext-0.18.3.1-orig/gettext-tools/src/Makefile.in
gettext-0.18.3.1/gettext-tools/src/Makefile.in
+--- gettext-0.18.3.1-orig/gettext-tools/src/Makefile.in 2013-08-15
12:31:16.000000000 -0400
++++ gettext-0.18.3.1/gettext-tools/src/Makefile.in 2013-08-21
20:59:51.000000000 -0400
+@@ -2840,10 +2840,10 @@
$(AM_V_CC)$(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
Index: libgettext8-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/base/libgettext8-shlibs.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- libgettext8-shlibs.info 10 Jun 2013 01:33:08 -0000 1.8
+++ libgettext8-shlibs.info 25 Aug 2013 02:33:04 -0000 1.9
@@ -1,18 +1,20 @@
Package: libgettext8-shlibs
-Version: 0.18.2.1
+Version: 0.18.3.1
Revision: 1
Source: mirror:gnu:gettext/gettext-%v.tar.gz
#Source: mirror:sourceforge:fink/gettext-%v.tar.gz
-Source-MD5: 034c8103b14654ebd300fadac44d6f14
+Source-MD5: 3fc808f7d25487fc72b5759df7419e02
+# libgettext8-shlibs.patch must be regenerated for every update since
+# dpkg uses it and needs the correct full file headers for patch -p0
PatchFile: %n.patch
-PatchFile-MD5: 0fc008bcbe67004c6f2bcbf5581ef1c3
+PatchFile-MD5: 0fa124a9e56f702eb9f817ebd10aae5f
PatchScript: <<
patch -p1 < %{PatchFile}
cd build-aux; perl -pi -e 's/.*chmod.*777.*$//g' ltmain.sh
<<
Essential: yes
Depends: libiconv, libiconv-bin, base-files
-BuildDepends: libiconv-dev, fink (>= 0.24.12)
+BuildDepends: libiconv-dev
#UseMaxBuildJobs: false
SetCFLAGS: -Os
ConfigureParams: <<
Index: gettext-tools.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/base/gettext-tools.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gettext-tools.info 10 Jun 2013 01:33:08 -0000 1.16
+++ gettext-tools.info 25 Aug 2013 02:33:04 -0000 1.17
@@ -1,13 +1,13 @@
Package: gettext-tools
-Version: 0.18.2.1
+Version: 0.18.3.1
Revision: 1
Source: mirror:gnu:gettext/gettext-%v.tar.gz
#Source: mirror:sourceforge:fink/gettext-%v.tar.gz
-Source-MD5: 034c8103b14654ebd300fadac44d6f14
+Source-MD5: 3fc808f7d25487fc72b5759df7419e02
PatchFile: libgettext8-shlibs.patch
-PatchFile-MD5: 0fc008bcbe67004c6f2bcbf5581ef1c3
+PatchFile-MD5: 0fa124a9e56f702eb9f817ebd10aae5f
PatchFile2: gettext-tools-tests.patch
-PatchFile2-MD5: 964de69b23cdfedc1691cf7825886af9
+PatchFile2-MD5: 13aadae12a9d31bd74e282759ee9d9ac
PatchScript: <<
patch -p1 < %{PatchFile}
patch -p1 < %{PatchFile2}
@@ -80,8 +80,8 @@
DocFiles: README* AUTHORS COPYING* NEWS THANKS ChangeLog*
InfoDocs: gettext.info
Shlibs: <<
- !%p/lib/libgettextlib-0.18.2.dylib
- !%p/lib/libgettextsrc-0.18.2.dylib
+ !%p/lib/libgettextlib-0.18.3.dylib
+ !%p/lib/libgettextsrc-0.18.3.dylib
<<
Description: GNU Internationalization utils (shared libs)
Index: libiconv.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/libiconv.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- libiconv.info 30 Mar 2013 00:12:13 -0000 1.11
+++ libiconv.info 25 Aug 2013 02:33:04 -0000 1.12
@@ -1,64 +1,57 @@
Package: libiconv
-Version: 1.12
-Revision: 6
+Version: 1.14
+Revision: 5
+Description: Character set conversion library
+License: LGPL
+Maintainer: Fink Core Group <fink-c...@lists.sourceforge.net>
+Depends: base-files
+BuildDepends: fink (>= 0.24.12)
+Essential: yes
#Source: mirror:sourceforge:fink/%n-%v.tar.gz
Source: mirror:gnu:libiconv/libiconv-%v.tar.gz
-Source-MD5: c2be282595751535a618ae0edeb8f648
-Source2: mirror:gnu:gettext/gettext-0.18.2.1.tar.gz
-#Source2: mirror:sourceforge:fink/gettext-0.18.2.1.tar.gz
-Source2-MD5: 034c8103b14654ebd300fadac44d6f14
-Source3: mirror:gnu:gperf/gperf-3.0.3.tar.gz
-Source3-MD5: cc20e58975a38075440423c8fb85fd00
+Source-MD5: e34509b1623cec449dfeb73d7ce9c6c6
+#Source2: mirror:gnu:gettext/gettext-0.18.3.1.tar.gz
+Source2: mirror:sourceforge:fink/gettext-0.18.3.1.tar.gz
+Source2-MD5: 3fc808f7d25487fc72b5759df7419e02
+Source3: mirror:gnu:gperf/gperf-3.0.4.tar.gz
+Source3-MD5: c1f1db32fb6598d6a93e6e88796a8632
PatchFile: %n.patch
-PatchFile-MD5: a96d5622ed197552b36c7eea1e5c6ccf
+PatchFile-MD5: 93f202f6f6e27a9707ad8a21fc15aef4
PatchScript: <<
- cd %b/..; patch -p0 < %{PatchFile}
- cd %b/../gettext-0.18.2.1/build-aux; perl -pi -e 's/.*chmod.*777.*$//g'
ltmain.sh
-<<
-Essential: yes
-Depends: base-files
-BuildDepends: fink (>= 0.24.12)
-Shlibs: <<
- %p/lib/libcharset.1.dylib 2.0.0 %n (>= 1.7-7)
- %p/lib/libiconv.2.dylib 7.0.0 %n (>= 1.11-1)
-<<
-DescPackaging: <<
- Shared libraries are in libiconv for backward compatibility, to avoid
- breaking dpkg during an update.
-
- In order to guarantee that the gettext header files are present when
- libiconv is built, we now compile gettext during the building of this
- package. (Previously, the complicated interaction between gettext and
- libiconv was handled during fink's bootstrap process, but not afterwards.)
-
- Previous versions by Christoph Pfisterer.
+ cd %b/..; patch -p0 < %{PatchFile}
<<
NoSetLDFLAGS: true
NoSetCPPFLAGS: true
+### gperf builds with g++
+GCC: 4.0
CompileScript: <<
#! /bin/sh -ex
-PATH=/bin:/sbin:/usr/bin:/usr/sbin
-export PATH
-
-# Make sure that we get the compiler wrapper on [redacted]
-case `uname -r` in
-1?.*) PATH=%p/var/lib/fink/path-prefix-10.6:$PATH ;;
-esac
-# and also on x86_64
-case "%m" in
-x86_64) PATH=%p/var/lib/fink/path-prefix-10.6:$PATH ;;
+osversion=`uname -r | cut -d. -f1`
+case "$osversion" in
+ 9) PATH_SUFFIX=g++-4.0
+ ;;
+ 10) PATH_SUFFIX=10.6
+ ;;
+ 1[123]) PATH_SUFFIX=clang
+ ;;
+ *) echo "System not supported";
+ exit 1
+ ;;
esac
+PATH=%p/var/lib/fink/path-prefix-$PATH_SUFFIX:/bin:/sbin:/usr/bin:/usr/sbin
+export PATH
### build gperf
-cd %b/../gperf-3.0.3
+cd %b/../gperf-3.0.4
./configure --prefix=%p
make
+make -j1 check || exit 2
### 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.2.1/gettext-runtime
+cd %b/../gettext-0.18.3.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' \
@@ -83,7 +76,7 @@
### now build iconv
cd %b/../libiconv-%v
-make -f Makefile.devel GPERF=%b/../gperf-3.0.3/src/gperf
+make -f Makefile.devel GPERF=%b/../gperf-3.0.4/src/gperf
am_cv_func_iconv="yes"
am_cv_proto_iconv=""
export am_cv_func_iconv am_cv_proto_iconv
@@ -102,36 +95,50 @@
rm -f %i/lib/charset.alias
<<
DocFiles: README* AUTHORS COPYING.LIB DESIGN NEWS NOTES THANKS
+Shlibs: <<
+ %p/lib/libcharset.1.dylib 2.0.0 %n (>= 1.7-7)
+ %p/lib/libiconv.2.dylib 8.0.0 %n (>= 1.14-1)
+<<
#
PostInstScript: <<
if [ -L %p/etc/alternatives/charset.alias ]; then
- update-alternatives --remove charset.alias %p/lib/charset.alias.libiconv
+ update-alternatives --remove charset.alias %p/lib/charset.alias.libiconv
fi
<<
#
SplitOff: <<
- Package: libiconv-bin
- Essential: true
- Depends: libiconv (= %v-%r)
- Replaces: libiconv (<= 1.7-6)
- Files: bin share/doc/libiconv/*.html share/man
- Description: Executables for libiconv package
- DocFiles: README* AUTHORS COPYING.LIB DESIGN NEWS NOTES THANKS
+ Package: libiconv-bin
+ Essential: true
+ Depends: libiconv (= %v-%r)
+ Replaces: libiconv (<= 1.7-6)
+ Files: bin share/doc/libiconv/*.html share/man
+ Description: Executables for libiconv package
+ DocFiles: README* AUTHORS COPYING.LIB DESIGN NEWS NOTES THANKS
<<
SplitOff2: <<
- Package: libiconv-dev
- Depends: libiconv (= %v-%r)
- Replaces: libiconv (<= 1.7-6)
- BuildDependsOnly: true
- Files: include lib/libcharset.dylib lib/libiconv.dylib lib/*.a lib/*.la
- Description: Developer files for libiconv package
- DocFiles: README* AUTHORS COPYING.LIB DESIGN NEWS NOTES THANKS
+ Package: libiconv-dev
+ Depends: libiconv (= %v-%r)
+ Replaces: libiconv (<= 1.7-6)
+ BuildDependsOnly: true
+ Files: include lib/libcharset.dylib lib/libiconv.dylib lib/*.a lib/*.la
+ Description: Developer files for libiconv package
+ DocFiles: README* AUTHORS COPYING.LIB DESIGN NEWS NOTES THANKS
<<
-Description: Character set conversion library
DescDetail: <<
GNU libiconv provides an iconv() implemententation for systems that lack
it, or whose implementation cannot convert from/to Unicode.
<<
+DescPackaging: <<
+ Shared libraries are in libiconv for backward compatibility, to avoid
+ breaking dpkg during an update.
+
+ In order to guarantee that the gettext header files are present when
+ libiconv is built, we now compile gettext during the building of this
+ package. (Previously, the complicated interaction between gettext and
+ libiconv was handled during fink's bootstrap process, but not afterwards.)
+
+ Previous versions by Christoph Pfisterer.
+<<
DescPort: <<
charset.alias is deleted because it is empty on Darwin anyway and
causes unnecessary conflicts between packages.
@@ -149,7 +156,14 @@
apple's isn't always compatible. Just omit iconv when building
gettext commands (only used locally while building libiconv) that
would link aginst libiconv.
+
+2013-08-22 Hanspeter Niederstrasser
+
+* Update to 1.14
+* Bump included gperf to latest 3.0.4
+* Bump internal gettext to latest 0.18.3.1
+* On 10.7+, modernize compiler wrapper
+* Don't build genaliases headers for systems that we will not even use.
+ Build is -jN safe afterwards.
<<
-License: LGPL
-Maintainer: Fink Core Group <fink-c...@lists.sourceforge.net>
Homepage: http://www.gnu.org/software/libiconv/
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
