Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16048/main/finkinfo/libs
Modified Files:
libicu32-dev.info libicu32-dev.patch libicu36-dev.info
libicu36-dev.patch
Log Message:
fix some issues in the icu packages, also fix beecrypt to use libicu on 10.5+
and explicitly not on 10.4
Index: libicu32-dev.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libicu32-dev.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libicu32-dev.patch 8 Sep 2008 18:08:06 -0000 1.3
+++ libicu32-dev.patch 11 Feb 2009 14:46:53 -0000 1.4
@@ -1,6 +1,6 @@
-diff -uNr ICU-6.2.16/icu-config ICU-6.2.16-patched/icu-config
---- ICU-6.2.16/icu-config 1969-12-31 19:00:00.000000000 -0500
-+++ ICU-6.2.16-patched/icu-config 2007-11-14 00:22:20.000000000 -0500
+diff -Nurd ICU-6.2.22/icu-config ICU-6.2.22-new/icu-config
+--- ICU-6.2.22/icu-config 1969-12-31 19:00:00.000000000 -0500
++++ ICU-6.2.22-new/icu-config 2009-02-11 08:19:09.000000000 -0500
@@ -0,0 +1,659 @@
+#!/bin/sh
+## -*-sh-*-
@@ -661,9 +661,9 @@
+exit 0
+
+# Rebuilt on Fri May 13 17:27:00 EDT 2005
-diff -uNr ICU-6.2.16/icuSources/common/Makefile.in
ICU-6.2.16-patched/icuSources/common/Makefile.in
---- ICU-6.2.16/icuSources/common/Makefile.in 2004-11-24 13:53:40.000000000
-0500
-+++ ICU-6.2.16-patched/icuSources/common/Makefile.in 2007-11-14
00:22:20.000000000 -0500
+diff -Nurd ICU-6.2.22/icuSources/common/Makefile.in
ICU-6.2.22-new/icuSources/common/Makefile.in
+--- ICU-6.2.22/icuSources/common/Makefile.in 2004-11-24 13:53:40.000000000
-0500
++++ ICU-6.2.22-new/icuSources/common/Makefile.in 2009-02-11
08:19:09.000000000 -0500
@@ -80,7 +80,7 @@
STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O))
@@ -673,30 +673,36 @@
## Header files to install
HEADERS = unicode/*.h $(srcdir)/unicode/*.h
-diff -uNr ICU-6.2.16/icuSources/config/mh-darwin
ICU-6.2.16-patched/icuSources/config/mh-darwin
---- ICU-6.2.16/icuSources/config/mh-darwin 2004-06-25 20:49:22.000000000
-0400
-+++ ICU-6.2.16-patched/icuSources/config/mh-darwin 2007-11-14
00:22:20.000000000 -0500
-@@ -58,7 +58,7 @@
- @echo "generating dependency information for $<"
- @$(GEN_DEPS.c) $< > /dev/null
- @mv $@ $...@~
-- @echo -n "$@ " > $@
-+ #...@echo -n "$@ " > $@
- @cat < $...@~ >> $@
- @-rm $...@~
+diff -Nurd ICU-6.2.22/icuSources/config/mh-darwin
ICU-6.2.22-new/icuSources/config/mh-darwin
+--- ICU-6.2.22/icuSources/config/mh-darwin 2004-06-25 20:49:22.000000000
-0400
++++ ICU-6.2.22-new/icuSources/config/mh-darwin 2009-02-11 08:28:19.000000000
-0500
+@@ -53,23 +53,6 @@
+ $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
-@@ -66,7 +66,7 @@
- @echo "generating dependency information for $<"
- @$(GEN_DEPS.cc) $< >/dev/null
- @mv $@ $...@~
+
+-## Dependency rules
+-%.d : $(srcdir)/%.c
+- @echo "generating dependency information for $<"
+- @$(GEN_DEPS.c) $< > /dev/null
+- @mv $@ $...@~
- @echo -n "$@ " > $@
-+ #...@echo -n "$@ " > $@
- @cat < $...@~ >> $@
- @-rm $...@~
+- @cat < $...@~ >> $@
+- @-rm $...@~
+-
+-%.d : $(srcdir)/%.cpp
+- @echo "generating dependency information for $<"
+- @$(GEN_DEPS.cc) $< >/dev/null
+- @mv $@ $...@~
+- @echo -n "$@ " > $@
+- @cat < $...@~ >> $@
+- @-rm $...@~
+-
+ ## Versioned libraries rules
-diff -uNr ICU-6.2.16/icuSources/i18n/Makefile.in
ICU-6.2.16-patched/icuSources/i18n/Makefile.in
---- ICU-6.2.16/icuSources/i18n/Makefile.in 2004-11-24 13:54:34.000000000
-0500
-+++ ICU-6.2.16-patched/icuSources/i18n/Makefile.in 2007-11-14
00:22:20.000000000 -0500
+ %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
+diff -Nurd ICU-6.2.22/icuSources/i18n/Makefile.in
ICU-6.2.22-new/icuSources/i18n/Makefile.in
+--- ICU-6.2.22/icuSources/i18n/Makefile.in 2004-11-24 13:54:34.000000000
-0500
++++ ICU-6.2.22-new/icuSources/i18n/Makefile.in 2009-02-11 08:19:09.000000000
-0500
@@ -78,7 +78,7 @@
STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O))
@@ -706,9 +712,9 @@
## Header files to install
HEADERS= $(srcdir)/unicode/*.h
-diff -uNr ICU-6.2.16/makefile ICU-6.2.16-patched/makefile
---- ICU-6.2.16/makefile 2005-10-06 18:56:50.000000000 -0400
-+++ ICU-6.2.16-patched/makefile 2007-11-14 00:24:07.000000000 -0500
+diff -Nurd ICU-6.2.22/makefile ICU-6.2.22-new/makefile
+--- ICU-6.2.22/makefile 2005-10-06 18:56:50.000000000 -0400
++++ ICU-6.2.22-new/makefile 2009-02-11 08:19:09.000000000 -0500
@@ -88,7 +88,7 @@
#################################
Index: libicu36-dev.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libicu36-dev.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libicu36-dev.info 19 Jan 2009 00:57:38 -0000 1.5
+++ libicu36-dev.info 11 Feb 2009 14:46:53 -0000 1.6
@@ -1,13 +1,13 @@
Package: libicu36-dev
Version: 3.6.0
-Revision: 4
+Revision: 5
Distribution: 10.5, 10.6
-Source:
http://www.opensource.apple.com/darwinsource/tarballs/other/ICU-8.11.tar.gz
-Source-MD5: 8a67e6d41e011fb405ccc762f7a17524
+Source:
http://www.opensource.apple.com/darwinsource/tarballs/other/ICU-8.11.2.tar.gz
+Source-MD5: 7165e3ad0f1566f25891c68d2e6dbdb9
PatchFile: %n.patch
-PatchFile-MD5: 73596377d29ccbd85fbf13ebd3fbca8a
+PatchFile-MD5: d9dc550219e45caa94b884824165d833
PatchScript: sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
Conflicts: libicu28, libicu28-dev, libicu30, libicu30-dev, libicu31,
libicu31-dev, libicu32-dev
@@ -25,7 +25,7 @@
InstallScript: <<
#!/bin/sh -ex
- make \
+ make -j1 \
DESTDIR="%d" \
DSTROOT="%d" \
SRCROOT=`pwd` \
@@ -37,7 +37,7 @@
<<
License: BSD
Description: Headers for Apple-supplied ICU libraries
-Maintainer: Benjamin Reed <libicu31-...@fink.racoonfink.com>
+Maintainer: Benjamin Reed <libicu36-...@fink.racoonfink.com>
Homepage: http://oss.software.ibm.com/icu/
DescDetail: <<
The International Components for Unicode (ICU) libraries provide robust
Index: libicu36-dev.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libicu36-dev.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libicu36-dev.patch 11 Sep 2008 18:53:43 -0000 1.4
+++ libicu36-dev.patch 11 Feb 2009 14:46:54 -0000 1.5
@@ -1,6 +1,6 @@
-diff -Nurd ICU-8.11/icu-config ICU-8.11-new/icu-config
---- ICU-8.11/icu-config 1969-12-31 19:00:00.000000000 -0500
-+++ ICU-8.11-new/icu-config 2008-09-11 14:50:22.000000000 -0400
+diff -Nurd ICU-8.11.2/icu-config ICU-8.11.2-new/icu-config
+--- ICU-8.11.2/icu-config 1969-12-31 19:00:00.000000000 -0500
++++ ICU-8.11.2-new/icu-config 2009-02-11 08:49:24.000000000 -0500
@@ -0,0 +1,673 @@
+#!/bin/sh
+## -*-sh-*-
@@ -128,12 +128,12 @@
+ICULIBS_COMMON="-l${ICUPREFIX}${ICULIBSUFFIX}core${ICULIBSUFFIX_VERSION}"
+ICULIBS_DATA=""
+ICULIBS_I18N=""
-+ICULIBS_TOOLUTIL="-l${ICUPREFIX}tu${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
-+ICULIBS_CTESTFW="-l${ICUPREFIX}ctestfw${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
-+ICULIBS_ICUIO="-l${ICUPREFIX}io${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
-+ICULIBS_OBSOLETE="-l${ICUPREFIX}obsolete${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
-+ICULIBS_LAYOUT="-l${ICUPREFIX}le${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
-+ICULIBS_LAYOUTEX="-l${ICUPREFIX}lx${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
++ICULIBS_TOOLUTIL="-l${ICUPREFIX}core${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
++ICULIBS_CTESTFW="-l${ICUPREFIX}core${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
++ICULIBS_ICUIO="-l${ICUPREFIX}core${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
++ICULIBS_OBSOLETE="-l${ICUPREFIX}core${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
++ICULIBS_LAYOUT="-l${ICUPREFIX}core${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
++ICULIBS_LAYOUTEX="-l${ICUPREFIX}core${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+ICULIBS_BASE="${LIBS} -L${libdir}"
+
+# for icu-config to test with
@@ -675,9 +675,9 @@
+exit 0
+
+# Rebuilt on Wed Nov 14 00:18:55 EST 2007
-diff -Nurd ICU-8.11/icuSources/common/Makefile.in
ICU-8.11-new/icuSources/common/Makefile.in
---- ICU-8.11/icuSources/common/Makefile.in 2006-08-31 19:02:47.000000000
-0400
-+++ ICU-8.11-new/icuSources/common/Makefile.in 2008-09-11 14:50:08.000000000
-0400
+diff -Nurd ICU-8.11.2/icuSources/common/Makefile.in
ICU-8.11.2-new/icuSources/common/Makefile.in
+--- ICU-8.11.2/icuSources/common/Makefile.in 2006-08-31 19:02:47.000000000
-0400
++++ ICU-8.11.2-new/icuSources/common/Makefile.in 2009-02-11
08:41:08.000000000 -0500
@@ -90,7 +90,7 @@
STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O))
@@ -687,9 +687,35 @@
-include Makefile.local
-diff -Nurd ICU-8.11/icuSources/i18n/Makefile.in
ICU-8.11-new/icuSources/i18n/Makefile.in
---- ICU-8.11/icuSources/i18n/Makefile.in 2006-08-31 19:04:52.000000000
-0400
-+++ ICU-8.11-new/icuSources/i18n/Makefile.in 2008-09-11 14:50:08.000000000
-0400
+diff -Nurd ICU-8.11.2/icuSources/config/mh-darwin
ICU-8.11.2-new/icuSources/config/mh-darwin
+--- ICU-8.11.2/icuSources/config/mh-darwin 2006-08-31 19:03:15.000000000
-0400
++++ ICU-8.11.2-new/icuSources/config/mh-darwin 2009-02-11 08:42:02.000000000
-0500
+@@ -53,22 +53,6 @@
+ $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
+
+
+-## Dependency rules
+-%.d : $(srcdir)/%.c
+- @echo "generating dependency information for $<"
+- @$(GEN_DEPS.c) $< > /dev/null
+- @mv $@ $...@~
+- @printf "%s" "$@ " > $@
+- @cat < $...@~ >> $@
+- @-rm $...@~
+-
+-%.d : $(srcdir)/%.cpp
+- @echo "generating dependency information for $<"
+- @$(GEN_DEPS.cc) $< >/dev/null
+- @mv $@ $...@~
+- @printf "%s" "$@ " > $@
+- @cat < $...@~ >> $@
+- @-rm $...@~
+
+ ## Versioned libraries rules
+
+diff -Nurd ICU-8.11.2/icuSources/i18n/Makefile.in
ICU-8.11.2-new/icuSources/i18n/Makefile.in
+--- ICU-8.11.2/icuSources/i18n/Makefile.in 2006-08-31 19:04:52.000000000
-0400
++++ ICU-8.11.2-new/icuSources/i18n/Makefile.in 2009-02-11 08:41:08.000000000
-0500
@@ -83,7 +83,7 @@
STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O))
@@ -699,9 +725,9 @@
-include Makefile.local
-diff -Nurd ICU-8.11/makefile ICU-8.11-new/makefile
---- ICU-8.11/makefile 2007-08-17 19:21:40.000000000 -0400
-+++ ICU-8.11-new/makefile 2008-09-11 14:50:08.000000000 -0400
+diff -Nurd ICU-8.11.2/makefile ICU-8.11.2-new/makefile
+--- ICU-8.11.2/makefile 2007-08-17 19:21:40.000000000 -0400
++++ ICU-8.11.2-new/makefile 2009-02-11 08:41:08.000000000 -0500
@@ -206,8 +206,8 @@
#################################
Index: libicu32-dev.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libicu32-dev.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libicu32-dev.info 8 Sep 2008 18:08:05 -0000 1.4
+++ libicu32-dev.info 11 Feb 2009 14:46:53 -0000 1.5
@@ -1,12 +1,12 @@
Package: libicu32-dev
Version: 3.20
-Revision: 5
+Revision: 6
Distribution: 10.4
-Source:
http://www.opensource.apple.com/darwinsource/tarballs/other/ICU-6.2.16.tar.gz
-Source-MD5: c598a1abced25a672e6c3e2eac315a38
+Source:
http://www.opensource.apple.com/darwinsource/tarballs/other/ICU-6.2.22.tar.gz
+Source-MD5: 55406726089980b1f91b1c30a1ef2a1d
PatchFile: %n.patch
-PatchFile-MD5: 5b95bb3fe2f6610ed2f31e5861b33e2c
+PatchFile-MD5: eb6ee67a07c43c0ef6983e01d5c330ba
PatchScript: sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
Conflicts: libicu28, libicu28-dev, libicu30, libicu30-dev, libicu31,
libicu31-dev, libicu36-dev
@@ -14,20 +14,19 @@
BuildDepends: fink (>= 0.24.12-1)
Depends: macosx (>= 10.4-1)
-Recommends: macosx (>= 10.4.10-1)
+Recommends: macosx (>= 10.4.11-1)
BuildDependsOnly: true
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
-
CompileScript: true
InstallScript: <<
#!/bin/sh -ex
- make DESTDIR="%d" DSTROOT="%d" SRCROOT=`pwd` installhdrs
- install -d -m 755 %i/bin
- install -c -m 755 icu-config %i/bin/
- install -d -m 755 %i/share/doc/%N
+ mkdir -p build/io
+ touch build/io/ustream.d
+ make -j1 EXTRA_HDRS=io DESTDIR="%d" DSTROOT="%d" SRCROOT=`pwd`
installhdrs
+ install -d -m 755 %i/bin
+ install -c -m 755 icu-config %i/bin/
+ install -d -m 755 %i/share/doc/%N
<<
License: BSD
Description: Headers for Apple-supplied ICU libraries
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
