Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/base
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv15879
Modified Files:
bzip2.info bzip2.patch libiconv.info tar.info
Added Files:
libiconv.patch
Log Message:
latest version to stable
Index: bzip2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/base/bzip2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bzip2.info 27 Apr 2005 03:33:43 -0000 1.1
+++ bzip2.info 22 Jun 2006 16:07:12 -0000 1.2
@@ -1,12 +1,13 @@
Package: bzip2
-Version: 1.0.2
-Revision: 12
+Version: 1.0.3
+Revision: 1
Essential: yes
Depends: %N-shlibs (= %v-%r)
BuildDepends: fink (>= 0.13.0), fink-prebinding
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: ee76864958d568677f03db8afad92beb
+Source-MD5: 8a716bebecb6e647d2e8a29ea5d8447f
Patch: %n.patch
CompileScript: make PREFIX=%p
InstallScript: make install PREFIX=%i
Index: libiconv.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/base/libiconv.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libiconv.info 27 Apr 2005 03:33:43 -0000 1.1
+++ libiconv.info 22 Jun 2006 16:07:12 -0000 1.2
@@ -1,27 +1,53 @@
Package: libiconv
-Version: 1.9.1
-Revision: 11
+Version: 1.10
+Revision: 6
Source: mirror:sourceforge:fink/%n-%v.tar.gz
-Source-MD5: 0c99a05e0c3c153bac1c960f78711155
+#Source: mirror:gnu:libiconv/libiconv-%v.tar.gz
+Source-MD5: 0d621d541e28ff053d8bbcf7215de3a4
+Source2: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
+#Source2: mirror:gnu:gettext/gettext-0.14.5.tar.gz
+Source2-MD5: e2f6581626a22a0de66dce1d81d00de3
+PatchScript: <<
+ cd %b/../gettext-0.14.5/build-aux; perl -pi -e 's/.*chmod.*777.*$//g'
ltmain.sh
+<<
+Patch: %n.patch
Essential: yes
Depends: base-files
BuildDepends: fink (>= 0.13.0), fink-prebinding
Shlibs: <<
%p/lib/libcharset.1.dylib 2.0.0 %n (>= 1.7-7)
- %p/lib/libiconv.2.dylib 5.0.0 %n (>= 1.9.1-1)
+ %p/lib/libiconv.2.dylib 6.0.0 %n (>= 1.10-5)
<<
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.
<<
NoSetLDFLAGS: true
-SetLIBS: -L%p/lib
-ConfigureParams: --mandir=%p/share/man
+NoSetCPPFLAGS: true
+CompileScript: <<
+#! /bin/sh -ex
+PATH=/bin:/sbin:/usr/bin:/usr/sbin
+export PATH
+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
+make
+rm -rf %b/../_inst
+make install DESTDIR=%b/../_inst
+cd %b/../libiconv-%v
+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
+<<
InstallScript: <<
mkdir -p %i/share/man %i/share/doc/%n
-make install prefix=%i mandir=%i/share/man docdir=%i/share/doc/%n
+make install prefix=%i docdir=%i/share/doc/%n
+perl -pi -e "s,^dependency_libs=.*,dependency_libs=' -L%p/lib',"
%i/lib/libcharset.la %i/lib/libiconv.la
rm -rf %i/doc
rm -f %i/lib/charset.alias
<<
@@ -59,6 +85,9 @@
DescPort: <<
charset.alias is deleted because it is empty on Darwin anyway and
causes unnecessary conflicts between packages.
+
+We patch around a recent change in the upstream Makefile which defeats
+our build system.
<<
License: LGPL
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
Index: bzip2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/base/bzip2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bzip2.patch 27 Apr 2005 03:33:43 -0000 1.1
+++ bzip2.patch 22 Jun 2006 16:07:12 -0000 1.2
@@ -1,7 +1,7 @@
-diff -ru bzip2-1.0.2/Makefile bzip2-1.0.2-patched/Makefile
---- bzip2-1.0.2/Makefile Sat Jan 26 00:34:53 2002
-+++ bzip2-1.0.2-patched/Makefile Sun Mar 31 00:15:27 2002
-@@ -1,15 +1,18 @@
+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 @@
+# 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.
@@ -15,14 +15,13 @@
RANLIB=ranlib
LDFLAGS=
- # Suitably paranoid flags to avoid bugs in gcc-2.7
BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce
$(BIGFILES)
-+CFLAGS=-fno-common -Wall -Winline -O2 -fomit-frame-pointer
-fno-strength-reduce $(BIGFILES)
+-CFLAGS=-Wall -Winline -O -g $(BIGFILES)
++CFLAGS=-fno-common -Wall -Winline -O -g $(BIGFILES)
# Where you want it installed when you do 'make install'
PREFIX=/usr
-@@ -23,32 +26,29 @@
+@@ -22,9 +25,9 @@
decompress.o \
bzlib.o
@@ -34,22 +33,16 @@
$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
bzip2recover: bzip2recover.o
- $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
+@@ -39,15 +42,21 @@
+ $(RANLIB) libbz2.a ; \
+ fi
--libbz2.a: $(OBJS)
-- rm -f libbz2.a
-- $(AR) cq libbz2.a $(OBJS)
-- @if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \
-- -f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \
-- echo $(RANLIB) libbz2.a ; \
-- $(RANLIB) libbz2.a ; \
-- fi
+libbz2.dylib: $(OBJS)
+ rm -f libbz2.dylib libbz2.*.dylib
-+ $(CC) -dynamiclib -o libbz2.1.0.2.dylib $(OBJS) -install_name
$(PREFIX)/lib/libbz2.1.dylib -compatibility_version 1.0.1 -current_version 1.0.2
-+ ln -s libbz2.1.0.2.dylib libbz2.1.dylib
-+ ln -s libbz2.1.0.2.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
++
check: test
test: bzip2
@cat words1
@@ -68,7 +61,7 @@
cmp sample1.bz2 sample1.rb2
cmp sample2.bz2 sample2.rb2
cmp sample3.bz2 sample3.rb2
-@@ -60,8 +60,9 @@
+@@ -59,8 +68,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
@@ -80,7 +73,7 @@
if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ;
fi
cp -f bzip2 $(PREFIX)/bin/bzip2
cp -f bzip2 $(PREFIX)/bin/bunzip2
-@@ -71,12 +72,14 @@
+@@ -70,12 +80,14 @@
chmod a+x $(PREFIX)/bin/bunzip2
chmod a+x $(PREFIX)/bin/bzcat
chmod a+x $(PREFIX)/bin/bzip2recover
@@ -92,14 +85,14 @@
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.2.dylib $(PREFIX)/lib
-+ chmod a+rx $(PREFIX)/lib/libbz2.1.0.2.dylib
-+ (cd $(PREFIX)/lib && rm -f libbz2.1.dylib && ln -s libbz2.1.0.2.dylib
libbz2.1.dylib)
-+ (cd $(PREFIX)/lib && rm -f libbz2.dylib && ln -s libbz2.1.0.2.dylib
libbz2.dylib)
++ 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 bzgrep $(PREFIX)/bin/bzgrep
ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
-@@ -87,18 +90,18 @@
+@@ -86,17 +98,17 @@
cp -f bzdiff $(PREFIX)/bin/bzdiff
ln $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
chmod a+x $(PREFIX)/bin/bzdiff
@@ -120,10 +113,9 @@
+ echo ".so man1/bzmore.1" > $(PREFIX)/share/man/man1/bzless.1
+ echo ".so man1/bzdiff.1" > $(PREFIX)/share/man/man1/bzcmp.1
- distclean: clean
clean:
- rm -f *.o libbz2.a bzip2 bzip2recover \
-+ rm -f *.o libbz2.dylib bzip2 bzip2recover \
++ rm -f *.o libbz2.a libbz2*.dylib bzip2 bzip2recover \
sample1.rb2 sample2.rb2 sample3.rb2 \
sample1.tst sample2.tst sample3.tst
Index: tar.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/base/tar.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tar.info 28 Nov 2005 20:52:44 -0000 1.3
+++ tar.info 22 Jun 2006 16:07:12 -0000 1.4
@@ -1,16 +1,17 @@
Package: tar
-Version: 1.14
-Revision: 2
+Version: 1.15.1
+Revision: 13
Essential: yes
-Depends: gettext, gzip, bzip2, base-files
-BuildDepends: gettext-dev
+Depends: gettext, libiconv, gzip, bzip2, base-files
+BuildDepends: gettext-dev, libiconv-dev
Source: mirror:sourceforge:fink/%n-%v.tar.gz
-Source-MD5: 3094544702b1affa32d969f0b6459663
+Source-MD5: d87021366fe6488e9dc398fcdcb6ed7d
UpdateConfigGuess: true
ConfigureParams: --program-transform-name=s/tar/gtar/ --infodir=%p/share/info
--libexecdir=%p/lib
InstallScript: <<
make install DESTDIR=%d
- cd %i/bin ; ln -s gtar tar ; ln -s gtar gnutar
+cd %i/lib ; rm -rf charset.alias; cd ..;
+cd %i/bin ; ln -s gtar tar ; ln -s gtar gnutar
<<
DocFiles: README* COPYING AUTHORS NEWS THANKS
#
--- NEW FILE: libiconv.patch ---
diff -ruN libiconv-1.10/src/Makefile.in libiconv-1.10-patched/src/Makefile.in
--- libiconv-1.10/src/Makefile.in 2005-06-09 12:04:50.000000000 -0700
+++ libiconv-1.10-patched/src/Makefile.in 2005-09-02 09:16:02.000000000
-0700
@@ -92,7 +92,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;; \
esac
$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv
$(DESTDIR)$(bindir)/iconv
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
