Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv23946/main/finkinfo/base
Modified Files: Tag: pangocairo-branch daemonic.info fink-10.4.info fink-10.5.info libiconv.info libiconv.patch Log Message: merge from trunk Index: fink-10.5.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base/fink-10.5.info,v retrieving revision 1.2.2.5 retrieving revision 1.2.2.6 diff -u -d -r1.2.2.5 -r1.2.2.6 --- fink-10.5.info 10 Jan 2008 06:53:42 -0000 1.2.2.5 +++ fink-10.5.info 14 Feb 2008 14:07:16 -0000 1.2.2.6 @@ -1,7 +1,7 @@ Info4: << Package: fink -Version: 0.27.10 -Revision: 42 +Version: 0.28.0 +Revision: 41 Distribution: 10.5 Depends: base-files Suggests: << @@ -13,7 +13,7 @@ Replaces: gcc3.1 (= 1175-6) Essential: yes Source: mirror:custom:fink/%n-%v.tar.gz -Source-MD5: b0ae190daf14651e66a98101b43eabd4 +Source-MD5: 0d886dd3afb767b37372c94cfa6d496a NoSetPATH: true CompileScript: << make test PREFIX=%p @@ -70,4 +70,5 @@ nam-US: http://us.dl.sourceforge.net/sourceforge/ eur: http://eu.dl.sourceforge.net/sourceforge/ << + << Index: fink-10.4.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base/fink-10.4.info,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -u -d -r1.2.2.4 -r1.2.2.5 --- fink-10.4.info 10 Jan 2008 03:36:35 -0000 1.2.2.4 +++ fink-10.4.info 14 Feb 2008 14:07:16 -0000 1.2.2.5 @@ -1,5 +1,5 @@ Package: fink -Version: 0.27.10 +Version: 0.28.0 Revision: 31 Distribution: 10.4 Depends: base-files @@ -13,7 +13,7 @@ Replaces: gcc3.1 (= 1175-6) Essential: yes Source: mirror:custom:fink/%n-%v.tar.gz -Source-MD5: b0ae190daf14651e66a98101b43eabd4 +Source-MD5: 0d886dd3afb767b37372c94cfa6d496a NoSetPATH: true CompileScript: << make test PREFIX=%p Index: libiconv.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base/libiconv.info,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -d -r1.3.2.1 -r1.3.2.2 --- libiconv.info 13 Feb 2007 19:58:06 -0000 1.3.2.1 +++ libiconv.info 14 Feb 2008 14:07:16 -0000 1.3.2.2 @@ -1,16 +1,16 @@ Package: libiconv -Version: 1.11 -Revision: 11 +Version: 1.12 +Revision: 3 #Source: mirror:sourceforge:fink/%n-%v.tar.gz Source: mirror:gnu:libiconv/libiconv-%v.tar.gz -Source-MD5: b77a17e4a5a817100ad4b2613935055e +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 -Source3: mirror:gnu:gperf/gperf-3.0.2.tar.gz -Source3-MD5: 5359fae9929f9f7235c6601f4b6e8c89 +Source3: mirror:gnu:gperf/gperf-3.0.3.tar.gz +Source3-MD5: cc20e58975a38075440423c8fb85fd00 PatchFile: %n.patch -PatchFile-MD5: 451b2fc713d99c877923c308812e40dd +PatchFile-MD5: 26a2985e0f58100fd74756547394883d PatchScript: << cd %b/..; patch -p0 < %{PatchFile} cd %b/../gettext-0.14.5/build-aux; perl -pi -e 's/.*chmod.*777.*$//g' ltmain.sh @@ -35,11 +35,13 @@ << NoSetLDFLAGS: true NoSetCPPFLAGS: true +NoSetMAKEFLAGS: true +SetMAKEFLAGS: -j1 CompileScript: << #! /bin/sh -ex PATH=/bin:/sbin:/usr/bin:/usr/sbin export PATH -cd %b/../gperf-3.0.2 +cd %b/../gperf-3.0.3 ./configure --prefix=%p make cd %b/../gettext-0.14.5/gettext-runtime @@ -48,8 +50,12 @@ rm -rf %b/../_inst make install DESTDIR=%b/../_inst cd %b/../libiconv-%v -make -f Makefile.devel GPERF=%b/../gperf-3.0.2/src/gperf -gt_cv_func_gnugettext1_libintl="no" CPPFLAGS="-I%b/../_inst%p/include" LDFLAGS="-L%b/../_inst%p/lib" ./configure --prefix=%p --mandir='${prefix}/share/man' --enable-extra-encodings +make -f Makefile.devel GPERF=%b/../gperf-3.0.3/src/gperf +am_cv_func_iconv="yes" +am_cv_proto_iconv="" +export am_cv_func_iconv am_cv_proto_iconv +CPPFLAGS="-I%b/../_inst%p/include" LDFLAGS="-L%b/../_inst%p/lib" ./configure --prefix=%p --mandir='${prefix}/share/man' --enable-extra-encodings +find . -name Makefile | xargs perl -pi -e 's|[EMAIL PROTECTED]@|%b/../_inst%p/lib/libintl.a -Wl,-framework,CoreFoundation|g' make << InstallScript: << Index: libiconv.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base/libiconv.patch,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -d -r1.2.2.1 -r1.2.2.2 --- libiconv.patch 13 Feb 2007 19:58:06 -0000 1.2.2.1 +++ libiconv.patch 14 Feb 2008 14:07:16 -0000 1.2.2.2 @@ -32,9 +32,9 @@ #endif #ifndef STDIN_FILENO -diff -uNr libiconv-1.11/lib/aliases.gperf libiconv-1.11-new/lib/aliases.gperf ---- libiconv-1.11/lib/aliases.gperf 2006-05-18 08:45:17.000000000 -0400 -+++ libiconv-1.11-new/lib/aliases.gperf 2007-02-01 15:34:02.000000000 -0500 +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 @@ -21,6 +21,9 @@ US, ei_ascii CSASCII, ei_ascii @@ -45,9 +45,9 @@ UCS-2, ei_ucs2 ISO-10646-UCS-2, ei_ucs2 CSUNICODE, ei_ucs2 -diff -uNr libiconv-1.11/lib/converters.h libiconv-1.11-new/lib/converters.h ---- libiconv-1.11/lib/converters.h 2006-05-18 08:43:55.000000000 -0400 -+++ libiconv-1.11-new/lib/converters.h 2007-02-01 15:34:02.000000000 -0500 +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 @@ /* General multi-byte encodings */ #include "utf8.h" @@ -56,9 +56,9 @@ #include "ucs2be.h" #include "ucs2le.h" #include "ucs4.h" -diff -uNr libiconv-1.11/lib/encodings.def libiconv-1.11-new/lib/encodings.def ---- libiconv-1.11/lib/encodings.def 2006-05-18 08:43:55.000000000 -0400 -+++ libiconv-1.11-new/lib/encodings.def 2007-02-01 15:34:02.000000000 -0500 +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 */ @@ -79,9 +79,9 @@ DEFENCODING(( "UCS-2", /* glibc */ "ISO-10646-UCS-2", /* IANA */ "csUnicode", /* IANA */ -diff -uNr libiconv-1.11/lib/flags.h libiconv-1.11-new/lib/flags.h ---- libiconv-1.11/lib/flags.h 2006-05-18 08:45:30.000000000 -0400 -+++ libiconv-1.11-new/lib/flags.h 2007-02-01 15:34:02.000000000 -0500 +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 @@ -14,6 +14,7 @@ #define ei_ascii_oflags (0) @@ -90,10 +90,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 -uNr libiconv-1.11/lib/iconv.c libiconv-1.11-new/lib/iconv.c ---- libiconv-1.11/lib/iconv.c 2006-01-23 08:16:12.000000000 -0500 -+++ libiconv-1.11-new/lib/iconv.c 2007-02-01 15:34:02.000000000 -0500 -@@ -720,6 +720,29 @@ +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 @@ strong_alias (libiconv_open, iconv_open) strong_alias (libiconv, iconv) strong_alias (libiconv_close, iconv_close) @@ -123,9 +123,9 @@ #endif #endif -diff -uNr libiconv-1.11/lib/utf8mac.h libiconv-1.11-new/lib/utf8mac.h ---- libiconv-1.11/lib/utf8mac.h 1969-12-31 19:00:00.000000000 -0500 -+++ libiconv-1.11-new/lib/utf8mac.h 2007-02-01 17:05:04.000000000 -0500 +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 @@ -0,0 +1,1608 @@ +/* + * Copyright (C) 2003 Apple Computer, Inc. All rights reserved. @@ -1735,31 +1735,32 @@ + + return len; +} -diff -uNr libiconv-1.11/man/iconv.1 libiconv-1.11-new/man/iconv.1 ---- libiconv-1.11/man/iconv.1 2006-01-23 08:16:12.000000000 -0500 -+++ libiconv-1.11-new/man/iconv.1 2007-02-01 15:34:02.000000000 -0500 -@@ -102,4 +102,4 @@ - \fBiconv --list\fP - lists the supported encodings. +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 +@@ -104,5 +104,4 @@ + .SH "CONFORMING TO" + POSIX:2001 .SH "SEE ALSO" --.BR iconv_open "(3), " locale (7) +-.BR iconv_open (3), +-.BR locale (7) +.BR iconv_open (3) -diff -uNr libiconv-1.11/src/Makefile.in libiconv-1.11-new/src/Makefile.in ---- libiconv-1.11/src/Makefile.in 2006-07-14 09:19:07.000000000 -0400 -+++ libiconv-1.11-new/src/Makefile.in 2007-02-01 15:37:10.000000000 -0500 -@@ -96,7 +96,7 @@ +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 @@ if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi case "@host_os@" in \ - hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) [EMAIL PROTECTED]@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \ -- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) [EMAIL PROTECTED]@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \ -+ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) [EMAIL PROTECTED]@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ -o iconv;; \ + hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) [EMAIL PROTECTED]@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $([EMAIL PROTECTED]@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \ +- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) [EMAIL PROTECTED]@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $([EMAIL PROTECTED]@) -o iconv;; \ ++ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) [EMAIL PROTECTED]@ ../srclib/libicrt.a ../lib/libiconv.la @LIBINTL_STATIC@ $([EMAIL PROTECTED]@) -o iconv;; \ esac $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv -diff -uNr libiconv-1.11/src/iconv.c libiconv-1.11-new/src/iconv.c ---- libiconv-1.11/src/iconv.c 2006-07-04 09:30:23.000000000 -0400 -+++ libiconv-1.11-new/src/iconv.c 2007-02-01 15:34:02.000000000 -0500 -@@ -896,6 +896,10 @@ +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 @@ const char *option = argv[i] + 1; if (*option == '\0') usage(1); Index: daemonic.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base/daemonic.info,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -d -r1.2.2.1 -r1.2.2.2 --- daemonic.info 11 Dec 2007 17:35:44 -0000 1.2.2.1 +++ daemonic.info 14 Feb 2008 14:07:16 -0000 1.2.2.2 @@ -1,13 +1,14 @@ Package: daemonic Version: 20010902 -Revision: 3 +Revision: 4 Maintainer: Fink Core Group <[EMAIL PROTECTED]> -Depends: libxml2-bin, libxml2-shlibs, bash-completion +Depends: libxml2-bin, libxml2-shlibs BuildDepends: libiconv-dev, libxml2 +Recommends: bash-completion Source: mirror:sourceforge:%n/%n-%v.tar.gz Source-MD5: 20fde65b727578d721bc947d669de7b3 PatchScript: << -#!/bin/sh -e +#!/bin/sh -ex perl -pi -e 's/static void/void/g' parse.c cat >bash_completion <<EOF _daemonic_daemons() ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs