Update of /cvsroot/fink/fink/10.4
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23801
Modified Files:
ChangeLog bzip2.info bzip2.patch debianutils.info dpkg.info
dpkg.patch fink-mirrors.info gzip.info libiconv.info
libiconv.patch ncurses.info tar.info
Log Message:
sync with stable
Index: dpkg.patch
===================================================================
RCS file: /cvsroot/fink/fink/10.4/dpkg.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dpkg.patch 10 Jun 2007 06:03:27 -0000 1.3
+++ dpkg.patch 8 Mar 2009 02:08:30 -0000 1.4
@@ -659,6 +659,27 @@
+See \...@prefix@/share/doc/dpkg/THANKS.gz\fP for the list of people who have
contributed to \fBdpkg\fP .
.fi
+diff -urN dpkg-1.10.21.orig/main/enquiry.c dpkg-1.10.21/main/enquiry.c
+--- dpkg-1.10.21.orig/main/enquiry.c 2003-10-25 16:03:21.000000000 -0400
++++ dpkg-1.10.21/main/enquiry.c 2008-08-21 11:38:24.000000000 -0400
+@@ -402,7 +402,7 @@
+ FILE *ccpipe;
+ struct varbuf vb;
+ ptrdiff_t ll;
+- char *p, *q;
++ char *p;
+
+ if (*argv) badusage(_("--print-architecture does not take any argument"));
+
+@@ -445,7 +445,7 @@
+ default: internerr("unknown action in printarch");
+ }
+ if (!arch) {
+- *q= 0; arch= p;
++ arch= p;
+ fprintf(stderr, _("dpkg: warning, architecture `%s' not in remapping
table\n"),arch);
+ }
+ if (printf("%s\n",arch) == EOF) werr("stdout");
diff -urN dpkg-1.10.21.orig/main/help.c dpkg-1.10.21/main/help.c
--- dpkg-1.10.21.orig/main/help.c 2003-10-26 05:03:21.000000000 +0900
+++ dpkg-1.10.21/main/help.c 2005-03-18 22:13:37.000000000 +0900
Index: debianutils.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/debianutils.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- debianutils.info 14 Oct 2007 18:33:45 -0000 1.3
+++ debianutils.info 8 Mar 2009 02:08:28 -0000 1.4
@@ -3,6 +3,7 @@
Revision: 11
Essential: true
Maintainer: Fink Core Group <[email protected]>
+BuildDepends: fink (>= 0.24.12-1)
Depends: base-files
Conflicts: mktemp
Replaces: mktemp, tetex
@@ -10,7 +11,8 @@
Source: mirror:sourceforge:fink/%n_%v.tar.gz
Source-MD5: 232b5bc916a1e2af43fde890f840a304
SourceDirectory: %n-%v
-Patch: %n.patch
+PatchFile: %n.patch
+PatchFile-MD5: b08afef2d893e68a12fe2b3823c2a502
InstallScript: <<
#!/bin/sh -ev
INSTALL=install
Index: gzip.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/gzip.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gzip.info 11 Jan 2007 18:59:35 -0000 1.3
+++ gzip.info 8 Mar 2009 02:08:32 -0000 1.4
@@ -4,9 +4,14 @@
Source: mirror:sourceforge:fink/%n-%v.tar.gz
Source-MD5: 39053e044b18ecd0627f80fbe7cfeaad
Essential: yes
+BuildDepends: fink (>= 0.24.12-1)
Depends: base-files
-Patch: %n.patch
-PatchScript: mv -f INSTALL INSTALL.txt
+PatchFile: %n.patch
+PatchFile-MD5: 74b81d7ec67a369e4e782a16d6f65afc
+PatchScript: <<
+ %{default_script}
+ mv -f INSTALL INSTALL.txt
+<<
CompileScript: <<
./configure %c
make all G= ZCAT=zcat
@@ -23,7 +28,7 @@
<<
InfoDocs: gzip.info
DocFiles: README COPYING THANKS
-Description: The gzip file compressor
+Description: File-compression program
DescPort: <<
The file INSTALL clashes with the Makefile target install on
file-insensitive file systems. Fixed by renaming INSTALL to
Index: tar.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/tar.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tar.info 10 Jun 2007 06:03:27 -0000 1.4
+++ tar.info 8 Mar 2009 02:08:33 -0000 1.5
@@ -27,7 +27,7 @@
<<
InfoDocs: tar.info
#
-Description: GNU tar - tape archiver
+Description: Archiving program for files and tape
DescPackaging: <<
With the current fink dependency engine, essential packages may neither
depend nor builddepend on non-essential packages. Thus, to make sure
Index: libiconv.patch
===================================================================
RCS file: /cvsroot/fink/fink/10.4/libiconv.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libiconv.patch 14 Feb 2007 20:30:49 -0000 1.4
+++ libiconv.patch 8 Mar 2009 02:08:33 -0000 1.5
@@ -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) ico...@objext@
../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) ico...@objext@
../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
-+ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) ico...@objext@
../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ -o iconv;; \
+ hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) ico...@objext@
../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@
$(objects_r...@woe32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b
-Wl,$(libdir)"; fi` -o iconv;; \
+- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS)
ico...@objext@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@
$(objects_r...@woe32@) -o iconv;; \
++ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS)
ico...@objext@ ../srclib/libicrt.a ../lib/libiconv.la @LIBINTL_STATIC@
$(objects_r...@woe32@) -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: ncurses.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/ncurses.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ncurses.info 7 Feb 2009 05:03:30 -0000 1.5
+++ ncurses.info 8 Mar 2009 02:08:33 -0000 1.6
@@ -1,6 +1,6 @@
Package: ncurses
Version: 5.4-20041023
-Revision: 1010
+Revision: 1011
GCC: 4.0
Source: mirror:sourceforge:fink/ncurses-5.4.tar.gz
@@ -71,8 +71,8 @@
Package: libncurses5
Depends: libncurses5-shlibs (= %v-%r)
BuildDependsOnly: true
- Conflicts: ncurses-dev
- Replaces: ncurses-dev, ncurses (<= 5.3-20031018-2)
+ Conflicts: ncurses-dev, libncurses5-64bit
+ Replaces: ncurses-dev, ncurses (<= 5.3-20031018-2), libncurses5-64bit
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
DocFiles: README ANNOUNCE NEWS INSTALL TO-DO MANIFEST
Index: fink-mirrors.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/fink-mirrors.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fink-mirrors.info 20 Jan 2008 23:08:25 -0000 1.3
+++ fink-mirrors.info 8 Mar 2009 02:08:32 -0000 1.4
@@ -1,9 +1,9 @@
Package: fink-mirrors
-Version: 0.27.10.1
+Version: 0.28.6.1
Revision: 1
Essential: yes
Source: mirror:custom:fink/%n-%v.tar.gz
-Source-MD5: be4237662efb6a51048d6a4f6c84638c
+Source-MD5: 2694fc6a73800f802ea7fdf9b0dc4d88
Depends: fink (>= 0.17.3-1)
Replaces: fink (<< 0.17.2-1)
CompileScript: sed -e "s|@PREFIX@|%p|g" < postinstall.pl.in > postinstall.pl
@@ -20,9 +20,9 @@
Homepage: http://www.finkproject.org
CustomMirror: <<
- Primary: http://west.dl.sourceforge.net/sourceforge/
+ Primary: http://superb-west.dl.sourceforge.net/sourceforge/
Secondary: http://easynews.dl.sourceforge.net/sourceforge/
- nam-US: http://us.dl.sourceforge.net/sourceforge/
+ nam-US: http://superb-west.dl.sourceforge.net/sourceforge/
eur: http://eu.dl.sourceforge.net/sourceforge/
<<
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/10.4/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ChangeLog 9 Dec 2008 06:00:19 -0000 1.15
+++ ChangeLog 8 Mar 2009 02:08:25 -0000 1.16
@@ -1,3 +1,9 @@
+2009-03-07 Dave Morrison <[email protected]>
+
+ * bzip2.info, bzip2.patch, debianutils.info, dpkg.info, dpkg.patch,
+ * fink-mirrors.info, gzip.info, libiconv.info, libiconv.patch,
+ * ncurses.info, tar.info: sync with stable
+
2008-12-08 Peter O'Gorman <[email protected]>
* apt.info, apt.patch: g++-4.2 does not have <? and >? operators.
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/dpkg.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dpkg.info 9 Jul 2007 21:39:10 -0000 1.7
+++ dpkg.info 8 Mar 2009 02:08:30 -0000 1.8
@@ -1,6 +1,6 @@
Package: dpkg
Version: 1.10.21
-Revision: 1224
+Revision: 1226
GCC: 4.0
BuildDepends: fink (>= 0.24.12)
Depends: libgettext3-shlibs, libiconv (>= 1.11-1), gzip, tar,
libncurses5-shlibs (>= 5.4-20041023-1006)
@@ -12,10 +12,11 @@
Source2: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
Source2-MD5: e2f6581626a22a0de66dce1d81d00de3
PatchFile: %n.patch
-PatchFile-MD5: 49fc7cb90bb3ae0aa64c359044461699
+PatchFile-MD5: 5a4c81e659db6e3b0a20ded9cc8e75f8
PatchScript: <<
cd %b/..; sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p0
cd %b/../gettext-0.14.5/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*
<<
SetCFLAGS: -I%p/include
NoSetMAKEFLAGS: true
@@ -89,6 +90,11 @@
(Exit 1 is a non-fatal error for tar; exit 2 is fatal.) patch written by vasi
Fink's make-3.81-1 breaks compiling so use Apple's to be safe.
+
+The on-board getopt needs tweaking for darwin, but isn't needed at all
+because libSystem has what dpkg needs, so just scrap it.
+
+Remove un/misused variable in dpkg enquiry.c (solve bus error in
--architecture)
<<
#
PostInstScript: <<
Index: libiconv.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/libiconv.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- libiconv.info 9 Dec 2008 06:00:19 -0000 1.7
+++ libiconv.info 8 Mar 2009 02:08:33 -0000 1.8
@@ -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,6 +35,8 @@
<<
NoSetLDFLAGS: true
NoSetCPPFLAGS: true
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
CompileScript: <<
#! /bin/sh -ex
PATH=/bin:/sbin:/usr/bin:/usr/sbin
@@ -45,7 +47,7 @@
10.*) PATH=%p/var/lib/fink/path-prefix-10.6:$PATH ;;
esac
-cd %b/../gperf-3.0.2
+cd %b/../gperf-3.0.3
./configure --prefix=%p
make
cd %b/../gettext-0.14.5/gettext-runtime
@@ -54,8 +56,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|\...@libintl_static\@|%b/../_inst%p/lib/libintl.a
-Wl,-framework,CoreFoundation|g'
make
<<
InstallScript: <<
Index: bzip2.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/bzip2.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bzip2.info 14 Aug 2006 02:31:42 -0000 1.3
+++ bzip2.info 8 Mar 2009 02:08:27 -0000 1.4
@@ -1,14 +1,17 @@
Package: bzip2
-Version: 1.0.3
-Revision: 1
+Version: 1.0.5
+Revision: 2
Essential: yes
Depends: %N-shlibs (= %v-%r)
-BuildDepends: fink (>= 0.13.0)
+BuildDepends: fink (>= 0.24.12-1)
Maintainer: Fink Core Group <[email protected]>
-#Source: http://www.bzip.org/%v/%n-%v.tar.gz
-Source: mirror:sourceforge:fink/%n-%v.tar.gz
-Source-MD5: 8a716bebecb6e647d2e8a29ea5d8447f
-Patch: %n.patch
+Source: http://www.bzip.org/%v/%n-%v.tar.gz
+#Source: mirror:sourceforge:fink/%n-%v.tar.gz
+Source-MD5: 3c15a0c8d1d3ee1c46a1634d00617b1a
+PatchFile: %n.patch
+PatchFile-MD5: 6fe75509c38cc356dd7ddfea0cdcd413
+PatchScript: sed 's|@VERSION@|%v|g' < %{PatchFile} | patch -p1
+#Patch: %n.patch
CompileScript: make PREFIX=%p
InstallScript: make install PREFIX=%i
DocFiles: LICENSE README CHANGES manual*.html
@@ -40,6 +43,8 @@
DescPort: <<
Doesn't use autoconf, but comes with a useful Makefile. Anyway, the
patch modifies it to build a shared library instead of a static one.
+
+Adjust the Makefile so that can install to packaging temp-dir cleanly.
<<
License: OSI-Approved
Homepage: http://sources.redhat.com/bzip2/
Index: bzip2.patch
===================================================================
RCS file: /cvsroot/fink/fink/10.4/bzip2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bzip2.patch 22 Jun 2006 16:13:53 -0000 1.2
+++ bzip2.patch 8 Mar 2009 02:08:28 -0000 1.3
@@ -1,27 +1,26 @@
-diff -Nurd -x'*~' bzip2-1.0.3.orig/Makefile bzip2-1.0.3/Makefile
---- bzip2-1.0.3.orig/Makefile 2005-02-17 06:28:24.000000000 -0500
-+++ bzip2-1.0.3/Makefile 2005-11-14 16:16:10.000000000 -0500
-@@ -1,14 +1,17 @@
+diff -ru bzip2-1.0.5/Makefile bzip2-1.0.5-patched/Makefile
+--- bzip2-1.0.5/Makefile 2008-02-14 07:39:18.000000000 -0500
++++ bzip2-1.0.5-patched/Makefile 2008-06-11 19:28:40.000000000 -0400
+@@ -11,6 +11,9 @@
+ # This program is released under the terms of the license contained
+ # in the file LICENSE.
+ # ------------------------------------------------------------------
+# This Makefile builds a shared version of the library,
+# libbz2.1.0.2.dylib, with install_name .../libbz2.1.dylib,
+# on Darwin and Mac OS X.
SHELL=/bin/sh
- # To assist in cross-compiling
--CC=gcc
-+CC=cc
- AR=ar
- RANLIB=ranlib
+@@ -21,7 +24,7 @@
LDFLAGS=
BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-Wall -Winline -O -g $(BIGFILES)
-+CFLAGS=-fno-common -Wall -Winline -O -g $(BIGFILES)
+-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS=-fno-common -Wall -Winline -O2 -g $(BIGFILES)
# Where you want it installed when you do 'make install'
- PREFIX=/usr
-@@ -22,9 +25,9 @@
+ PREFIX=/usr/local
+@@ -35,9 +38,9 @@
decompress.o \
bzlib.o
@@ -33,15 +32,15 @@
$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
bzip2recover: bzip2recover.o
-@@ -39,15 +42,21 @@
+@@ -52,15 +55,21 @@
$(RANLIB) libbz2.a ; \
fi
+libbz2.dylib: $(OBJS)
+ rm -f libbz2.dylib libbz2.*.dylib
-+ $(CC) -dynamiclib -o libbz2.1.0.3.dylib $(OBJS) -install_name
$(PREFIX)/lib/libbz2.1.dylib -compatibility_version 1.0.1 -current_version 1.0.3
-+ ln -s libbz2.1.0.3.dylib libbz2.1.dylib
-+ ln -s libbz2.1.0.3.dylib libbz2.dylib
++ $(CC) -dynamiclib -o libb...@[email protected] $(OBJS) -install_name
$(PREFIX)/lib/libbz2.1.dylib -compatibility_version 1.0.1 -current_version
@VERSION@
++ ln -s libb...@[email protected] libbz2.1.dylib
++ ln -s libb...@[email protected] libbz2.dylib
+
check: test
test: bzip2
@@ -61,7 +60,7 @@
cmp sample1.bz2 sample1.rb2
cmp sample2.bz2 sample2.rb2
cmp sample3.bz2 sample3.rb2
-@@ -59,8 +68,9 @@
+@@ -72,8 +81,9 @@
install: bzip2 bzip2recover
if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
@@ -73,7 +72,7 @@
if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ;
fi
cp -f bzip2 $(PREFIX)/bin/bzip2
cp -f bzip2 $(PREFIX)/bin/bunzip2
-@@ -70,12 +80,14 @@
+@@ -83,33 +93,35 @@
chmod a+x $(PREFIX)/bin/bunzip2
chmod a+x $(PREFIX)/bin/bzcat
chmod a+x $(PREFIX)/bin/bzip2recover
@@ -85,16 +84,23 @@
chmod a+r $(PREFIX)/include/bzlib.h
- cp -f libbz2.a $(PREFIX)/lib
- chmod a+r $(PREFIX)/lib/libbz2.a
-+ cp -f libbz2.1.0.3.dylib $(PREFIX)/lib
-+ chmod a+r $(PREFIX)/lib/libbz2.1.0.3.dylib
-+ (cd $(PREFIX)/lib && rm -f libbz2.1.dylib && ln -s libbz2.1.0.3.dylib
libbz2.1.dylib)
-+ (cd $(PREFIX)/lib && rm -f libbz2.dylib && ln -s libbz2.1.0.3.dylib
libbz2.dylib)
++ cp -f libb...@[email protected] $(PREFIX)/lib
++ chmod a+r $(PREFIX)/lib/libb...@[email protected]
++ ln -s libb...@[email protected] $(PREFIX)/lib/libbz2.1.dylib
++ ln -s libb...@[email protected] $(PREFIX)/lib/libbz2.dylib
cp -f bzgrep $(PREFIX)/bin/bzgrep
- ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
- ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
-@@ -86,17 +98,17 @@
+- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
++ ln -s -f bzgrep $(PREFIX)/bin/bzegrep
++ ln -s -f bzgrep $(PREFIX)/bin/bzfgrep
+ chmod a+x $(PREFIX)/bin/bzgrep
+ cp -f bzmore $(PREFIX)/bin/bzmore
+- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
++ ln -s -f bzmore $(PREFIX)/bin/bzless
+ chmod a+x $(PREFIX)/bin/bzmore
cp -f bzdiff $(PREFIX)/bin/bzdiff
- ln $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
+- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
++ ln -s -f bzdiff $(PREFIX)/bin/bzcmp
chmod a+x $(PREFIX)/bin/bzdiff
- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
- chmod a+r $(PREFIX)/man/man1/bzgrep.1
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
