Update of /cvsroot/fink/fink/10.4 In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv434
Modified Files: ChangeLog apt.info apt.patch base-files.info bzip2.info debianutils.info fink-mirrors.info gzip.info libgettext3-shlibs.info libiconv.info ncurses.info tar.info unzip.info Added Files: unzip-10.4.info Log Message: sync with stable Index: debianutils.info =================================================================== RCS file: /cvsroot/fink/fink/10.4/debianutils.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- debianutils.info 8 Mar 2009 02:08:28 -0000 1.4 +++ debianutils.info 24 Oct 2010 01:16:23 -0000 1.5 @@ -16,10 +16,10 @@ InstallScript: << #!/bin/sh -ev INSTALL=install - INSTALL_FILE="$INSTALL -p -o root -g admin -m 644" - INSTALL_PROGRAM="$INSTALL -p -o root -g admin -m 755" - INSTALL_SCRIPT="$INSTALL -p -o root -g admin -m 755" - INSTALL_DIR="$INSTALL -p -d -o root -g admin -m 755" + 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 \ Index: unzip.info =================================================================== RCS file: /cvsroot/fink/fink/10.4/unzip.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- unzip.info 17 Feb 2007 21:24:19 -0000 1.3 +++ unzip.info 24 Oct 2010 01:16:23 -0000 1.4 @@ -1,22 +1,17 @@ Package: unzip -Version: 5.52 -Revision: 12 +Version: 6.0 +Revision: 1 +Distribution: 10.5, 10.6 Maintainer: Fink Core Group <fink-c...@lists.sourceforge.net> License: BSD Essential: yes #CustomMirror: << -#nam-US: http://uiarchive.uiuc.edu/mirrors/ftp/ftp.info-zip.org/pub/infozip/src/ -#nam-US: ftp://uiarchive.cso.uiuc.edu/pub/ftp/ftp.info-zip.org/pub/infozip/src/ -#eur-UK: http://www.mirror.ac.uk/sites/ftp.info-zip.org/pub/infozip/src/ -#eur-PL: ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/ -#eur-CH: http://sunsite.cnlab-switch.ch/ftp/mirror/infozip/src/ -#eur-CH: ftp://sunsite.cnlab-switch.ch/mirror/infozip/src/ #Primary: ftp://ftp.info-zip.org/pub/infozip/src/ #<< -#Source: mirror:custom:%n552.tar.gz -Source: mirror:sourceforge:fink/%n552.tar.gz -Source-MD5: 9d23919999d6eac9217d1f41472034a9 -SourceDirectory: %n-%v +#Source: mirror:custom:%n60.tgz +Source: mirror:sourceforge:fink/%n60.tgz +Source-MD5: 62b490407489521db863b523a7f86375 +SourceDirectory: %n60 BuildDepends: fink (>= 0.24.12) DocFiles: BUGS INSTALL LICENSE README ToDo WHERE Homepage: http://www.info-zip.org/pub/infozip/UnZip.html @@ -29,7 +24,7 @@ This utility is necessary to install several packages in a pure Darwin installation, as Darwin does not come with zip/unzip. << -CompileScript: make -f unix/Makefile macosx +CompileScript: make -f unix/Makefile macosx D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 InstallScript: make -f unix/Makefile install BINDIR=%i/bin MANDIR=%i/share/man/man1 Suggests: zip Index: gzip.info =================================================================== RCS file: /cvsroot/fink/fink/10.4/gzip.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- gzip.info 8 Mar 2009 02:08:32 -0000 1.4 +++ gzip.info 24 Oct 2010 01:16:23 -0000 1.5 @@ -1,51 +1,34 @@ Package: gzip -Version: 1.2.4a -Revision: 6 +Version: 1.4 +Revision: 2 Source: mirror:sourceforge:fink/%n-%v.tar.gz -Source-MD5: 39053e044b18ecd0627f80fbe7cfeaad +#Source: mirror:gnu:%n/%n-%v.tar.gz +Source-MD5: e381b8506210c794278f5527cba0e765 Essential: yes BuildDepends: fink (>= 0.24.12-1) Depends: base-files -PatchFile: %n.patch -PatchFile-MD5: 74b81d7ec67a369e4e782a16d6f65afc -PatchScript: << - %{default_script} - mv -f INSTALL INSTALL.txt -<< +ConfigureParams: --infodir=%p/share/info --mandir=%p/share/man CompileScript: << - ./configure %c - make all G= ZCAT=zcat + gzip_cv_assembler=no ./configure %c + make all << InstallScript: << - make -j1 install G= ZCAT=zcat prefix=%i - mkdir -p %i/share - mv %i/man %i/share/ - mv %i/info %i/share/ + make -j1 install DESTDIR=%d ln -s zcat %i/bin/gzcat ln -s zcat.1 %i/share/man/man1/gzcat.1 - ln -s zmore %i/bin/zless - ln -s zmore.1 %i/share/man/man1/zless.1 << InfoDocs: gzip.info -DocFiles: README COPYING THANKS +DocFiles: AUTHORS COPYING ChangeLog NEWS README THANKS TODO Description: File-compression program DescPort: << -The file INSTALL clashes with the Makefile target install on -file-insensitive file systems. Fixed by renaming INSTALL to -INSTALL.txt. << DescPackaging: << -Needs some tweaking to put documentation in <prefix>/share. - -The configure script tries to be adaptive with gzcat and the like, we -force the Makefile to do the right thing regardless. - -The patch file fixes a security hole with long file names. - We also add some alternate names for the commands. Previous versions by Christoph Pfisterer. << License: GPL -Homepage: http://www.gzip.org/ +#Homepage: http://www.gzip.org/ +#Homepage: http://savannah.gnu.org/projects/gzip/ +Homepage: http://www.gnu.org/software/gzip/ Maintainer: Fink Core Group <fink-c...@lists.sourceforge.net> Index: tar.info =================================================================== RCS file: /cvsroot/fink/fink/10.4/tar.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- tar.info 8 Mar 2009 02:08:33 -0000 1.5 +++ tar.info 24 Oct 2010 01:16:23 -0000 1.6 @@ -1,17 +1,25 @@ Package: tar -Version: 1.16.1 +Version: 1.23 Revision: 1 Essential: yes +# libgettext8-shlibs isn't Essential yet so we have to stick with 3. Depends: libgettext3-shlibs, libiconv, gzip, bzip2, base-files -Source: mirror:sourceforge:fink/%n-%v.tar.gz -#Source: gnu -Source-MD5: 8ecfdd38740aadb8e17129e70803589a -ConfigureParams: --program-transform-name=s/tar/gtar/ --infodir=%p/share/info --libexecdir=%p/lib +Source: mirror:sourceforge:fink/%n-%v.tar.bz2 +#Source: mirror:gnu:%n/%n-%v.tar.bz2 +Source-MD5: 41e2ca4b924ec7860e51b43ad06cdb7e +ConfigureParams: --program-transform-name=s/tar/gtar/ --infodir=%p/share/info --libexecdir=%p/lib --disable-dependency-tracking CompileScript: << %p/bin/fink -y install libgettext3-dev libiconv-dev ./configure %c make << +InfoTest: << + TestScript: << + # Fix bug in test 91 (fails when built as root). + perl -pi -e 's/(^AT_CHECK.*$)/$&\nAT_UNPRIVILEGED_PREREQ/' tests/remfiles01.at + make check || exit 2 + << +<< InstallScript: << make install DESTDIR=%d cd %i/lib ; rm -rf charset.alias; cd ..; @@ -36,6 +44,9 @@ the compile script. Note that since the corresponding essential packages are dependencies of this one, they should already have been built, so 'fink install' should merely make sure they are in place. + + Due to the need to run 'fink install' within CompileScript, tar can't + be built with --build-as-nobody. Previous versions by Christoph Pfisterer. << Index: ncurses.info =================================================================== RCS file: /cvsroot/fink/fink/10.4/ncurses.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ncurses.info 8 Mar 2009 02:08:33 -0000 1.6 +++ ncurses.info 24 Oct 2010 01:16:23 -0000 1.7 @@ -1,40 +1,26 @@ Package: ncurses -Version: 5.4-20041023 -Revision: 1011 +Version: 5.7-20100227 +Revision: 2 GCC: 4.0 -Source: mirror:sourceforge:fink/ncurses-5.4.tar.gz -Source-MD5: 069c8880072060373290a4fefff43520 -Source2: mirror:sourceforge:fink/ncurses-5.4-20040711-patch.sh.bz2 -Source2-MD5: 5cb04a825432ad968ef4e1ab6094353b -Source2ExtractDir: ncurses-5.4 -Source3: mirror:sourceforge:fink/ncurses-5.4-20041023.patch.bz2 -Source3-MD5: 2cacb921a11287fedda5db7de4d331a6 -Source3ExtractDir: ncurses-5.4 -PatchScript: << - #!/bin/sh -ev - bunzip2 ncurses-5.4-20040711-patch.sh.bz2 - chmod +x ncurses-5.4-20040711-patch.sh - ./ncurses-5.4-20040711-patch.sh - echo "***********************************************************************" - bunzip2 -c ncurses-%v.patch.bz2 | patch -p1 - perl -p -i -e 's|tic\$suffix|tic\$suffix -x|;' misc/run_tic* - echo "***********************************************************************" -<< +#Source: ftp://invisible-island.net/ncurses/current/ncurses-%v.tgz +Source: mirror:sourceforge:fink/ncurses-%v.tgz +Source-MD5: 6e4a321d5b55e75644b7389ac1e214dc BuildDepends: fink (>= 0.13.0) Depends: libncurses5-shlibs (>= %v-%r) Replaces: libncurses5 (<< 5.4-20041023-4) Essential: true -ConfigureParams: --without-ada --with-shared --with-debug --enable-termcap --mandir=%p/share/man --with-terminfo-dirs="%p/share/terminfo:/usr/share/terminfo" --with-default-terminfo-dir="%p/share/terminfo" --enable-no-padding --enable-sigwinch --enable-tcap-names --enable-hard-tabs --enable-overwrite +#Need to remove these entries to avoid failure on case sensitive file systems +PatchScript: perl -pi -e "s/hp70092a\|//; s/hp2621a\|//; s/2621a\|//" misc/terminfo.src +ConfigureParams: --without-ada --without-pkg-config --with-shared --with-debug --enable-termcap --mandir=%p/share/man --with-terminfo-dirs="%p/share/terminfo:/usr/share/terminfo" --with-default-terminfo-dir="%p/share/terminfo" --enable-no-padding --enable-sigwinch --enable-tcap-names --enable-hard-tabs --enable-overwrite --disable-mixed-case NoSetCFLAGS: true NoSetLDFLAGS: true -SetLDFLAGS: -Wl,-search_paths_first -#NoSetCPPFLAGS: true +NoSetCPPFLAGS: true NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 CompileScript: << #!/bin/sh -ev - ./configure %c --libdir=%p/lib/ncurses + ./configure %c --libdir=%p/lib/ncurses cf_cv_typeof_chtype=long make << InstallScript: << @@ -72,30 +58,31 @@ Depends: libncurses5-shlibs (= %v-%r) BuildDependsOnly: true Conflicts: ncurses-dev, libncurses5-64bit - Replaces: ncurses-dev, ncurses (<= 5.3-20031018-2), libncurses5-64bit + Replaces: ncurses-dev, ncurses (<= 5.3-20031018-2), libncurses5-64bit, ncurses (<= 5.7-20100227-1) Provides: libncurses5-dev - Files: lib/ncurses include lib/libcurses.dylib lib/libform.dylib lib/libmenu.dylib lib/libncurses.dylib lib/libpanel.dylib lib/libtermcap.dylib + Files: bin/ncurses5-config lib/ncurses include lib/libcurses.dylib lib/libform.dylib lib/libmenu.dylib lib/libncurses.dylib lib/libpanel.dylib lib/libtermcap.dylib DocFiles: README ANNOUNCE NEWS INSTALL TO-DO MANIFEST Description: Full-screen ascii drawing library << -DocFiles: README ANNOUNCE NEWS INSTALL TO-DO MANIFEST tack/README:README.tack tack/COPYING:COPYING.tack +DocFiles: README ANNOUNCE NEWS INSTALL TO-DO MANIFEST Description: Executable files for libncurses5 DescPort: << More changes by Chris Zubrzycki to be more compatable with apple's lib -udates to the (sometimes) monthly releases of ncurses (in patch form) -ncurses-5.4-20040711-patch.sh.bz2 is a roll-up patch script, that updates a vanilla source to the date specified. -ncurses-5.4-20041023.patch.bz2 is a patch created by catting all the updates to the rollup into a single file. -grab all the patches from ftp://invisible-island.net/ncurses/5.4 except the one the same date -as the rollup patch script, gunzip ncurses-5.4*.gz; cat ncurses-5.4*patch >> big.patch -to get to the current patch level. - The --enable-overwrite flag creates the libcurses.dylib symlink. + +Must pass cf_cv_typeof_chtype=long to configure to maintain ABI +compatability for 64-bit library. Otherwise chtype is unsigned long +in 5.4 but unsigned int in 5.7. + +Added patchscript to avoid failure on case sensitive file systems. << DescPackaging: << First revision by David Ross. Previous versions by Christoph Pfisterer. All the hard work in this version done by Chris Zubrzycki. +Updated to 5.7 by Daniel Johnson. << License: OSI-Approved Maintainer: Fink Core Group <fink-c...@lists.sourceforge.net> Index: libgettext3-shlibs.info =================================================================== RCS file: /cvsroot/fink/fink/10.4/libgettext3-shlibs.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- libgettext3-shlibs.info 14 Oct 2007 18:33:45 -0000 1.5 +++ libgettext3-shlibs.info 24 Oct 2010 01:16:23 -0000 1.6 @@ -1,6 +1,6 @@ Package: libgettext3-shlibs Version: 0.14.5 -Revision: 2 +Revision: 4 #Source: mirror:gnu:gettext/gettext-%v.tar.gz Source: mirror:sourceforge:fink/gettext-%v.tar.gz Source-MD5: e2f6581626a22a0de66dce1d81d00de3 @@ -14,7 +14,6 @@ Depends: libiconv, libiconv-bin, base-files BuildDepends: libiconv-dev, fink (>= 0.24.12) Conflicts: libgettext3 -BuildConflicts: ccache-default, distcc-default Replaces: gettext-bin (<< 0.14-1), libgettext3 NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 @@ -29,13 +28,13 @@ Splitoff: << Package: libgettext3-dev - Conflicts: gettext-dev - Replaces: gettext-dev + Conflicts: gettext-dev, libgettext8-dev + Replaces: gettext-dev, libgettext8-dev Suggests: gettext-doc - Depends: %N (= %v-%r), gettext-bin (>= 0.14-1) + Depends: %N (= %v-%r), gettext-bin (>= %v-%r) BuildDependsOnly: true DocFiles: README* AUTHORS gettext-runtime/BUGS COPYING* NEWS THANKS ChangeLog* - Description: GNU Internationalization utilities (Development Files) + Description: GNU Internationalization utils (Development Files) Files: include lib/*.a lib/*.la lib/libintl.dylib lib/libasprintf.dylib << @@ -44,7 +43,7 @@ Depends: %N (>= %v-%r) Replaces: gettext-tools (<< 0.14.5-1), libgettext3-shlibs (<< 0.14.5-1) DocFiles: README* AUTHORS gettext-runtime/BUGS COPYING* NEWS THANKS ChangeLog* - Description: GNU Internationalization utilities + Description: GNU Internationalization utils Files: bin share/gettext share/info share/locale share/man InfoDocs: autosprintf.info << @@ -52,13 +51,13 @@ Splitoff3: << Package: gettext-doc DocFiles: README* AUTHORS gettext-runtime/BUGS COPYING* NEWS THANKS ChangeLog* - Description: GNU Internationalization utilities (Documentation) + Description: GNU Internationalization utils (Documentation) Files: share/doc/gettext share/doc/libasprintf << DescDetail: << The gettext packages provides some of the i18n and l10n support used by - many GNU programs but missing from the Darwin C library. + many GNU programs, but which is missing from the Darwin C library. << DescPort: << Index: ChangeLog =================================================================== RCS file: /cvsroot/fink/fink/10.4/ChangeLog,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- ChangeLog 26 Aug 2009 08:41:18 -0000 1.31 +++ ChangeLog 24 Oct 2010 01:16:23 -0000 1.32 @@ -1,3 +1,10 @@ +2010-10-23 Dave Morrison <d...@finkproject.org> + + * apt.info, apt.patch, base-files.info, bzip2.info, debianutils.info, + * fink-mirrors.info, gzip.info, libgettext3-shlibs.info, + * libiconv.info, ncurses.info, tar.info, unzip.info, unzip-10.4.info: + sync with stable + 2009-08-26 Dave Morrison <d...@finkproject.org> * apt.info, apt.patch, fink-mirrors.info: sync with stable Index: apt.info =================================================================== RCS file: /cvsroot/fink/fink/10.4/apt.info,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- apt.info 26 Aug 2009 08:41:18 -0000 1.10 +++ apt.info 24 Oct 2010 01:16:23 -0000 1.11 @@ -1,6 +1,6 @@ Package: apt Version: 0.5.4 -Revision: 1057 +Revision: 1058 GCC: 4.0 BuildDepends: fink (>= 0.24.12) Depends: %N-shlibs (= %v-%r) @@ -8,7 +8,7 @@ Source-MD5: 274fb64e2e67318b4c9c94599785c37d SourceDirectory: %n-%v PatchFile: %n.patch -PatchFile-MD5: 918f4b0a4170277ea8f095eebc631ced +PatchFile-MD5: df6c8dfea788fb82752784b30ee70150 PatchScript: << sed -e 's|@PREFIX@|%p|g' -e 's|@DIST@|10.3|g' < %{PatchFile} | patch -p1 sh patch_flush @@ -154,6 +154,9 @@ Don't seg-fault if *Packages file isn't readable (or other malformed data). Upstream patch to fix upstream Bug #120311 + + Raise cachesize limit. See: + http://permalink.gmane.org/gmane.os.apple.fink.core/2025 << License: GPL Maintainer: Fink Core Group <fink-c...@lists.sourceforge.net> Index: fink-mirrors.info =================================================================== RCS file: /cvsroot/fink/fink/10.4/fink-mirrors.info,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- fink-mirrors.info 16 Nov 2009 00:27:50 -0000 1.7 +++ fink-mirrors.info 24 Oct 2010 01:16:23 -0000 1.8 @@ -1,9 +1,9 @@ Package: fink-mirrors -Version: 0.29.10.1 +Version: 0.29.14.1 Revision: 1 Essential: yes Source: mirror:custom:fink/%n-%v.tar.gz -Source-MD5: 60db0ebf2aee224c2b9126413a380816 +Source-MD5: 3088840ef7723db1b6acb5066b5dd531 Depends: fink (>= 0.17.3-1) Replaces: fink (<< 0.17.2-1) CompileScript: sed -e "s|@PREFIX@|%p|g" < postinstall.pl.in > postinstall.pl --- NEW FILE: unzip-10.4.info --- Package: unzip Version: 5.52 Revision: 12 Distribution: 10.4 Maintainer: Fink Core Group <fink-c...@lists.sourceforge.net> License: BSD Essential: yes #CustomMirror: << #nam-US: http://uiarchive.uiuc.edu/mirrors/ftp/ftp.info-zip.org/pub/infozip/src/ #nam-US: ftp://uiarchive.cso.uiuc.edu/pub/ftp/ftp.info-zip.org/pub/infozip/src/ #eur-UK: http://www.mirror.ac.uk/sites/ftp.info-zip.org/pub/infozip/src/ #eur-PL: ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/ #eur-CH: http://sunsite.cnlab-switch.ch/ftp/mirror/infozip/src/ #eur-CH: ftp://sunsite.cnlab-switch.ch/mirror/infozip/src/ #Primary: ftp://ftp.info-zip.org/pub/infozip/src/ #<< #Source: mirror:custom:%n552.tar.gz Source: mirror:sourceforge:fink/%n552.tar.gz Source-MD5: 9d23919999d6eac9217d1f41472034a9 SourceDirectory: %n-%v BuildDepends: fink (>= 0.24.12) DocFiles: BUGS INSTALL LICENSE README ToDo WHERE Homepage: http://www.info-zip.org/pub/infozip/UnZip.html Description: Decompression compatible with pkunzip DescDetail: << Zip is different from gzip in that it allows packing multiple files into a single archive (without the assistance of tar). It is compatible with pkzip, pkunzip, and other Windows zip utilities. This utility is necessary to install several packages in a pure Darwin installation, as Darwin does not come with zip/unzip. << CompileScript: make -f unix/Makefile macosx InstallScript: make -f unix/Makefile install BINDIR=%i/bin MANDIR=%i/share/man/man1 Suggests: zip # prevent 'struct direntry' name conflict PatchFile: %n.patch PatchFile-MD5: a7476ebe93118a849634d80f47e25478 Index: bzip2.info =================================================================== RCS file: /cvsroot/fink/fink/10.4/bzip2.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- bzip2.info 8 Mar 2009 02:08:27 -0000 1.4 +++ bzip2.info 24 Oct 2010 01:16:23 -0000 1.5 @@ -1,13 +1,13 @@ Package: bzip2 -Version: 1.0.5 -Revision: 2 +Version: 1.0.6 +Revision: 1 Essential: yes Depends: %N-shlibs (= %v-%r) BuildDepends: fink (>= 0.24.12-1) Maintainer: Fink Core Group <fink-c...@lists.sourceforge.net> Source: http://www.bzip.org/%v/%n-%v.tar.gz #Source: mirror:sourceforge:fink/%n-%v.tar.gz -Source-MD5: 3c15a0c8d1d3ee1c46a1634d00617b1a +Source-MD5: 00b516f4704d4a7cb50a1d97e6e8e15b PatchFile: %n.patch PatchFile-MD5: 6fe75509c38cc356dd7ddfea0cdcd413 PatchScript: sed 's|@VERSION@|%v|g' < %{PatchFile} | patch -p1 Index: base-files.info =================================================================== RCS file: /cvsroot/fink/fink/10.4/base-files.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- base-files.info 21 Mar 2009 03:50:00 -0000 1.3 +++ base-files.info 24 Oct 2010 01:16:23 -0000 1.4 @@ -1,9 +1,9 @@ Package: base-files -Version: 1.9.10 +Version: 1.9.11 Revision: 1 Source: mirror:custom:fink/%n-%v.tar.gz Essential: yes -Source-MD5: d76da6ccda6e180487f1888823178178 +Source-MD5: d26b188be1c67a6b2683fb1543b2ccd5 CompileScript: ./setup.sh %p InstallScript: ./install.sh %i # Index: apt.patch =================================================================== RCS file: /cvsroot/fink/fink/10.4/apt.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- apt.patch 26 Aug 2009 08:41:18 -0000 1.5 +++ apt.patch 24 Oct 2010 01:16:23 -0000 1.6 @@ -407,6 +407,18 @@ Sys = 0; string Label = Cnf.Find("Apt::System",""); if (Label.empty() == false) +diff -Nurd -x'*~' apt-0.5.4.orig/apt-pkg/pkgcachegen.cc apt-0.5.4/apt-pkg/pkgcachegen.cc +--- apt-0.5.4.orig/apt-pkg/pkgcachegen.cc 2001-07-01 18:28:24.000000000 -0400 ++++ apt-0.5.4/apt-pkg/pkgcachegen.cc 2009-12-06 13:58:16.000000000 -0500 +@@ -597,7 +597,7 @@ + bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, + MMap **OutMap,bool AllowMem) + { +- unsigned long MapSize = _config->FindI("APT::Cache-Limit",6*1024*1024); ++ unsigned long MapSize = _config->FindI("APT::Cache-Limit",60*1024*1024); + + vector<pkgIndexFile *> Files(List.begin(),List.end()); + unsigned long EndOfSource = Files.size(); diff -urN apt-0.5.4.orig/apt-pkg/policy.cc apt-0.5.4/apt-pkg/policy.cc --- apt-0.5.4.orig/apt-pkg/policy.cc 2001-05-28 08:40:56.000000000 +0900 +++ apt-0.5.4/apt-pkg/policy.cc 2005-03-08 13:00:38.000000000 +0900 Index: libiconv.info =================================================================== RCS file: /cvsroot/fink/fink/10.4/libiconv.info,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- libiconv.info 17 Apr 2009 21:44:20 -0000 1.9 +++ libiconv.info 24 Oct 2010 01:16:23 -0000 1.10 @@ -1,6 +1,6 @@ Package: libiconv Version: 1.12 -Revision: 3 +Revision: 4 #Source: mirror:sourceforge:fink/%n-%v.tar.gz Source: mirror:gnu:libiconv/libiconv-%v.tar.gz Source-MD5: c2be282595751535a618ae0edeb8f648 @@ -44,7 +44,7 @@ # Make sure that we get the compiler wrapper on [redacted] case `uname -r` in -10.*) PATH=%p/var/lib/fink/path-prefix-10.6:$PATH ;; +1?.*) PATH=%p/var/lib/fink/path-prefix-10.6:$PATH ;; esac # and also on x86_64 case "%m" in @@ -55,7 +55,7 @@ ./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" ./configure --prefix=%p --infodir='${prefix}/share/info' --mandir='${prefix}/share/man' --with-included-gettext --disable-csharp --disable-rpath --disable-shared +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 make rm -rf %b/../_inst make install DESTDIR=%b/../_inst @@ -116,6 +116,13 @@ 2007-02-01 Benjamin Reed <rangerr...@fink.sourceforge.net> * updated to 1.11 * included apple's patches to add UTF-8-MAC charset support + +2010-06-10 Daniel Macks <dma...@netspace.org> + +* Make sure build doesn't see already-installed libiconv-dev. But + apple's isn't always compatible. Just omit iconv when building + gettext commands (only used locally while building libiconv) that + would link aginst libiconv. << License: LGPL Maintainer: Fink Core Group <fink-c...@lists.sourceforge.net> ------------------------------------------------------------------------------ Nokia and AT&T present the 2010 Calling All Innovators-North America contest Create new apps & games for the Nokia N8 for consumers in U.S. and Canada $10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store http://p.sf.net/sfu/nokia-dev2dev _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs