Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20271/10.4-transitional/unstable/main/finkinfo/libs
Modified Files: gecko-sharp.info gtksourceview-sharp.info libgdiplus.info libgdiplus.patch Added Files: libicu32-dev.info libicu32-dev.patch Removed Files: libicu31-dev.info libicu31-dev.patch Log Message: mono 1.1.7 and friends Index: libgdiplus.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/libgdiplus.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libgdiplus.patch 27 Apr 2005 03:26:03 -0000 1.1 +++ libgdiplus.patch 6 Jun 2005 20:20:22 -0000 1.2 @@ -1,24 +1,86 @@ -diff -uNr libgdiplus-1.0/src/gdip_win32.h libgdiplus-1.0-new/src/gdip_win32.h ---- libgdiplus-1.0/src/gdip_win32.h Thu May 20 16:57:24 2004 -+++ libgdiplus-1.0-new/src/gdip_win32.h Wed Jun 30 15:29:02 2004 -@@ -137,7 +137,7 @@ +diff -uNr libgdiplus-1.1.7/cairo/configure libgdiplus-1.1.7-new/cairo/configure +--- libgdiplus-1.1.7/cairo/configure Tue May 3 14:44:58 2005 ++++ libgdiplus-1.1.7-new/cairo/configure Mon Jun 6 10:53:19 2005 +@@ -22369,7 +22369,7 @@ + enableval="$enable_glitz" + use_glitz=$enableval + else +- use_glitz=yes ++ use_glitz=no + fi; - #define BFT_BITMAP 0x4d42 + if test "x$use_glitz" = "xyes"; then +diff -uNr libgdiplus-1.1.7/configure libgdiplus-1.1.7-new/configure +--- libgdiplus-1.1.7/configure Tue May 3 14:44:36 2005 ++++ libgdiplus-1.1.7-new/configure Mon Jun 6 11:08:08 2005 +@@ -19633,7 +19633,7 @@ + _ACEOF --#ifdef __GNUC__ -+#if defined(__GNUC__) && !defined(__APPLE__) - # define __stdcall __attribute__((__stdcall__)) - #else - # define __stdcall -diff -uNr libgdiplus-1.0/src/tiffcodec.c libgdiplus-1.0-new/src/tiffcodec.c ---- libgdiplus-1.0/src/tiffcodec.c Tue Jun 29 11:12:44 2004 -+++ libgdiplus-1.0-new/src/tiffcodec.c Wed Jun 30 15:29:02 2004 -@@ -35,7 +35,7 @@ - #include <stdio.h> + else +- if pkg-config --exact-version 0.3.0 cairo; then ++ if pkg-config --atleast-version 0.3.0 cairo; then + echo Cairo installation OK + else + { { echo "$as_me:$LINENO: error: \"Did not find Cairo == 0.3.0\"" >&5 +@@ -20004,7 +20004,7 @@ + #define _REENTRANT 1 + _ACEOF - #ifdef HAVE_BYTESWAP_H --#include <byteswap.h> -+/* #include <byteswap.h> */ - #endif +- CFLAGS="-pthreads $CFLAGS" ++ CFLAGS="$CFLAGS" + ;; - #include "tiffcodec.h" + *-*-darwin*) +@@ -20014,7 +20014,7 @@ + _ACEOF + + CFLAGS="-no-cpp-precomp $CFLAGS" +- LDFLAGS="-flat_namespace -undefined suppress $LDFLAGS" ++ LDFLAGS="-Xlinker -framework -Xlinker ApplicationServices $LDFLAGS" + ;; + + *) +@@ -20037,7 +20037,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_save_CFLAGS=$CFLAGS +- CFLAGS="$CFLAGS -pthread" ++ CFLAGS="$CFLAGS" + + + ac_ext=c +@@ -20106,7 +20106,7 @@ + if test $myapp_cv_gcc_pthread = yes + then + myapp_threads="" +- CFLAGS="$CFLAGS -pthread" ++ CFLAGS="$CFLAGS" + else + echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 + echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 +@@ -21197,13 +21197,13 @@ + fi + + if test x$with_libungif != xno && test -z "$LIBUNGIF"; then +- echo "$as_me:$LINENO: checking for DGifOpenFileName in -lungif" >&5 +-echo $ECHO_N "checking for DGifOpenFileName in -lungif... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for DGifOpenFileName in -lgif" >&5 ++echo $ECHO_N "checking for DGifOpenFileName in -lgif... $ECHO_C" >&6 + if test "${ac_cv_lib_ungif_DGifOpenFileName+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lungif $LIBS" ++LIBS="-lgif $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -21400,7 +21400,7 @@ + + fi + if test $ac_cv_header_gif_lib_h = yes; then +- UNGIF='ungif'; LIBUNGIF='-lungif' ++ UNGIF='ungif'; LIBUNGIF='-lgif' + else + { echo "$as_me:$LINENO: WARNING: *** GIF loader will not be built (ungiflibrary not found) ***" >&5 + echo "$as_me: WARNING: *** GIF loader will not be built (ungiflibrary not found) ***" >&2;} Index: gtksourceview-sharp.info =================================================================== RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/gtksourceview-sharp.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gtksourceview-sharp.info 27 Apr 2005 03:26:02 -0000 1.1 +++ gtksourceview-sharp.info 6 Jun 2005 20:20:22 -0000 1.2 @@ -1,13 +1,12 @@ Package: gtksourceview-sharp -Version: 0.5 -Revision: 4 -Source: http://www.go-mono.org/archive/1.0/%n-%v.tar.gz -Source-MD5: b82e767e42a542e185a534048db3078d -#Patch: %n.patch +Version: 2.0 +Revision: 1 +Source: http://go-mono.com/sources/%n-%v/%n-%v-0.10.tar.gz +Source-MD5: 2179634b8931e6be849a1e1f82c834e3 DocFiles: AUTHORS COPYING* ChangeLog INSTALL NEWS README -Depends: gtk-sharp (>= 1.0-1), gtksourceview-shlibs (>= 1.0-1), mono (>= 1.0-1) +Depends: gtk-sharp2 (>= 1.9.3-1), gtksourceview-shlibs (>= 1.0-1), mono (>= 1.1.7-1) Suggests: monodoc -BuildDepends: gtk-sharp (>= 1.0-1), gtksourceview-dev (>= 1.0-1), mono-dev (>= 1.0-1), monodoc (>= 1.0-1) +BuildDepends: gtk-sharp2 (>= 1.9.3-1), gtksourceview-dev (>= 1.0-1), mono-dev (>= 1.1.7-1), monodoc (>= 1.0.6-1) Homepage: http://go-mono.com/ Maintainer: Benjamin Reed <[EMAIL PROTECTED]> Description: C# bindings for GTKSourceView @@ -17,16 +16,17 @@ SetLIBS: -L%p/lib NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 -ConfigureParams: --mandir=%p/share/man +ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking CompileScript: << -#!/bin/sh +#!/bin/sh -ex + export lt_cv_sys_max_cmd_len=65536 perl -pi.bak -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure ./configure %c - make GACUTIL_FLAGS='/package gtk-sharp /root $(DESTDIR)$(libdir)' + make << InstallScript: << - make install DESTDIR=%d GACUTIL_FLAGS='/package gtk-sharp /root $(DESTDIR)$(libdir)' + make install DESTDIR=%d << PostInstScript: << [ -x "%p/bin/monodoc" ] && [ -d "%p/lib/monodoc" ] && "%p/bin/monodoc" --make-index >/dev/null 2>&1 || : Index: libgdiplus.info =================================================================== RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/libgdiplus.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- libgdiplus.info 22 May 2005 22:05:32 -0000 1.2 +++ libgdiplus.info 6 Jun 2005 20:20:22 -0000 1.3 @@ -1,12 +1,12 @@ Package: libgdiplus -Version: 1.0.2 -Revision: 2 -Source: http://www.go-mono.org/archive/%v/%n-%v.tar.gz -Source-MD5: 2bc13fd2bbb29706178760d3b048cf34 +Version: 1.1.7 +Revision: 21 +Source: http://www.go-mono.org/sources/%n-1.1/%n-%v.tar.gz +Source-MD5: 458c2c4aec84ac1cccb15b6c31fa8f7a Patch: %n.patch DocFiles: AUTHORS COPYING* ChangeLog NEWS README -Depends: cairo-shlibs (>= 0.1.23-4), mono (>= %v-1) -BuildDepends: cairo (>= 0.1.23-4), gettext-dev, gettext-bin, gettext-tools, glib2-dev (>= 2.0.4-1), glib2 (>= 2.0.4-1), glitz (>= 0.1.5-1), libiconv-dev, libicu31-dev, libpixman1, mono-dev (>= %v-1), pkgconfig +Depends: cairo (>= 0.5.0-1), libgettext3-shlibs, glib2-shlibs (>= 2.2.1-4), libiconv, libjpeg-shlibs, libpixman1-shlibs (>= 0.1.5-1), libpng3-shlibs (>= 1.2.5-4), libtiff-shlibs, giflib-shlibs | libungif-shlibs, mono (>= %v-1) +BuildDepends: cairo (>= 0.5.0-1), libgettext3-dev, gettext-tools, glib2-dev (>= 2.0.4-1), glib2 (>= 2.0.4-1), glitz (>= 0.4.0-1), libiconv-dev, libicu32-dev, libjpeg, libpixman1 (>= 0.1.5-1), libpng3, libtiff, libungif | giflib, mono-dev (>= %v-1), pkgconfig Homepage: http://go-mono.com/ Maintainer: Benjamin Reed <[EMAIL PROTECTED]> Description: System.Drawing implementation for Mono @@ -14,11 +14,11 @@ SetCPPFLAGS: -I%p/include NoSETLDFLAGS: true SetLIBS: -L%p/lib -ConfigureParams: --mandir=%p/share/man +ConfigureParams: --mandir=%p/share/man --with-cairo=included --disable-dependency-tracking CompileScript: << -#!/bin/sh +#!/bin/sh -ex - perl -pi.bak -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure + export lt_cv_sys_max_cmd_len=65536 ./configure %c make << Index: gecko-sharp.info =================================================================== RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/gecko-sharp.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gecko-sharp.info 27 Apr 2005 03:26:02 -0000 1.1 +++ gecko-sharp.info 6 Jun 2005 20:20:22 -0000 1.2 @@ -1,11 +1,12 @@ Package: gecko-sharp -Version: 0.5 -Revision: 3 -Source: http://www.go-mono.org/archive/1.0/%n-%v.tar.gz -Source-MD5: 71e75186b2ee5c644d5dd1560ce27357 +Version: 2.0 +Revision: 1 +Source: http://go-mono.com/sources/%n-%v/%n-%v-0.10.tar.gz +Source-MD5: 7318f788ce157ef402bfef3a1a9cc7f9 DocFiles: AUTHORS COPYING* ChangeLog INSTALL LICENSE* NEWS README -Depends: gtk-sharp (>= 1.0-1), mono (>= 1.0-1) -BuildDepends: gtk-sharp (>= 1.0-1), mono-dev (>= 1.0-1) +Replaces: monodoc +Depends: gtk-sharp2 (>= 1.9.0-1), mono (>= 1.1.7-1), mozilla-shlibs (>= 1.7.5-1) +BuildDepends: glib2-dev (>= 2.4.6-7), glib2 (>= 2.4.6-7), gtk+2-dev (>= 2.4.9-8), gtk+2 (>= 2.4.9-8), gtk-sharp2 (>= 1.9.0-1), mono-dev (>= 1.1.7-1), monodoc, mozilla-dev (>= 1.7.5-1) Homepage: http://go-mono.com/ Maintainer: Benjamin Reed <[EMAIL PROTECTED]> Description: Mozilla browser C# bindings @@ -13,10 +14,11 @@ SetCPPFLAGS: -I%p/include NoSETLDFLAGS: true SetLIBS: -L%p/lib -ConfigureParams: --mandir=%p/share/man +ConfigureParams: --mandir=%p/share/man --with-mozilla-headers=%p/include/mozilla --with-mozilla-libs=%p/lib/mozilla --disable-dependency-tracking CompileScript: << -#!/bin/sh +#!/bin/sh -ex + export lt_cv_sys_max_cmd_len=65536 perl -pi.bak -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure ./configure %c make --- NEW FILE: libicu32-dev.patch --- diff -uNr ICU-6.2.4/icu-config ICU-6.2.4-patched/icu-config --- ICU-6.2.4/icu-config 1969-12-31 19:00:00.000000000 -0500 +++ ICU-6.2.4-patched/icu-config 2005-05-13 17:35:42.000000000 -0400 @@ -0,0 +1,659 @@ +#!/bin/sh +## -*-sh-*- +#set -x +# BEGIN of icu-config-top +#****************************************************************************** +# Copyright (C) 1999-2004, International Business Machines +# Corporation and others. All Rights Reserved. +#****************************************************************************** +# This script is designed to aid configuration of ICU. +# rpath links a library search path right into the binaries. + + +### END of icu-config-top + +## Zero out prefix. +execprefix= +prefix= + + +loaddefs() +{ + +# Following from /private/tmp/ICU-6.2.4-new/icuSources/config/mh-darwin +# Generated automatically from Makefile.inc.in by configure. +## -*-makefile-*- +#****************************************************************************** +# Copyright (C) 1999-2004, International Business Machines +# Corporation and others. All Rights Reserved. +#****************************************************************************** +# This Makefile.inc is designed to be included into projects which make use +# of the ICU. + +# CONTENTS OF THIS FILE +# 1). Base configuration information and linkage +# 2). Variables giving access to ICU tools +# 3). Host information +# 4). Compiler flags and settings +# 5). Data Packaging directives +# 6). Include of platform make fragment (mh-* file) + +################################################################## +# +# *1* base configuration information and linkage +# +################################################################## +# The PREFIX is the base of where ICU is installed. +# Inside this directory you should find bin, lib, include/unicode, +# etc. If ICU is not installed in this directory, you must change the +# following line. There should exist ${prefix}/include/unicode/utypes.h +# for example. +default_prefix="@FINKPREFIX@" +if [ "x${prefix}" = "x" ]; then prefix="$default_prefix"; fi +exec_prefix="/usr" +libdir="${exec_prefix}/lib" +libexecdir="${exec_prefix}/libexec" +bindir="${exec_prefix}/bin" +datadir="/usr/share" +sbindir="${exec_prefix}/sbin" + +# about the ICU version +VERSION="3.2" +UNICODE_VERSION="4.0.1" + +# The prefix for ICU libraries, normally 'icu' +ICUPREFIX="icu" +PACKAGE="icu" +LIBICU="lib${ICUPREFIX}" + +# Static library prefix and file extension +STATIC_PREFIX="s" +LIBSICU="lib${STATIC_PREFIX}${ICUPREFIX}" +A="a" + +# Suffix at the end of libraries. Usually empty. +ICULIBSUFFIX="" +# ICULIBSUFFIX_VERSION is non-empty if it is to contain a library +# version. For example, if it is 21, it means libraries are named +# libicuuc21.so for example. + +# rpath links a library search path right into the binaries. +## mh-files MUST NOT override RPATHLDFLAGS unless they provide +## equivalent '#SH#' lines for icu-config fixup +default_ENABLE_RPATH="NO" +if [ "x${ENABLE_RPATH}" = "x" ]; then ENABLE_RPATH="$default_ENABLE_RPATH"; fi +RPATHLDFLAGS="${LD_RPATH}${LD_RPATH_PRE}${libdir}" + +# icu-config version of above 'if': +case "$ENABLE_RPATH" in +[yY]*) + ENABLE_RPATH=YES + RPATHLDFLAGS="${LD_RPATH}${LD_RPATH_PRE}${libdir}" + ;; + +[nN]*) + ENABLE_RPATH=NO + RPATHLDFLAGS="" + ;; + +*) + echo $0: Unknown --enable-rpath value ${ENABLE_RPATH} 1>&2 + exit 3 + ;; +esac + +### To link your application with ICU: +# 1. use LDFLAGS, CFLAGS, etc from above +# 2. link with ${ICULIBS} +# 3. optionally, add one or more of: +# - ${ICULIBS_I18N} - i18n library, formatting, etc. +# - ${ICULIBS_LAYOUT} - ICU layout library. +# - ${ICULIBS_ICUIO} - ICU stdio equivalent library + +ICULIBS_COMMON="-licucore" +ICULIBS_DATA="-licucore" +ICULIBS_I18N="-licucore" +ICULIBS_TOOLUTIL="-licucore" +ICULIBS_CTESTFW="-licucore" +ICULIBS_ICUIO="-licucore" +ICULIBS_OBSOLETE="-licucore" +ICULIBS_LAYOUT="-licucore" +ICULIBS_LAYOUTEX="-licucore" +ICULIBS_BASE="" + +# for icu-config to test with +ICULIBS_COMMON_LIB_NAME="${LIBICU}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}" + +# ICULIBS is the set of libraries your application should link +# with usually. Many applications will want to add ${ICULIBS_I18N} as well. +ICULIBS="${ICULIBS_BASE} ${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} " + +################################################################## +# +# *2* access to ICU tools +# +################################################################## +# Environment variable to set a runtime search path +# (Overridden when necessary in -mh files) +LDLIBRARYPATH_ENVVAR="LD_LIBRARY_PATH" + +# Versioned target for a shared library +## FINAL_SO_TARGET = ${SO_TARGET}.${SO_TARGET_VERSION} +## MIDDLE_SO_TARGET = ${SO_TARGET}.${SO_TARGET_VERSION_MAJOR} + +# Access to important ICU tools. +# Use as follows: ${INVOKE} ${GENRB} arguments .. +INVOKE="${LDLIBRARYPATH_ENVVAR}=${libdir}:$$${LDLIBRARYPATH_ENVVAR} ${LEAK_CHECKER}" +GENCCODE="${sbindir}/genccode" +GENCMN="${sbindir}/gencmn" +GENRB="${bindir}/genrb" +PKGDATA="${bindir}/pkgdata" + +################################################################## +# +# *3* Information about the host +# +################################################################## + +# Information about the host that 'configure' was run on. +host="powerpc-apple-darwin8.0.0" +host_alias="powerpc-apple-darwin8.0.0" +host_cpu="powerpc" +host_vendor="apple" +host_os="darwin8.0.0" +# Our platform canonical name (as determined by configure) +# this is a #define value (i.e. U_XXXX or XXXX) +platform="U_DARWIN" + +################################################################## +# +# *4* compiler flags and misc. options +# +################################################################## +AIX_SHLIB="makeC++SharedLib_r" +AR="/usr/bin/ar" +CC="gcc" +CFLAGS="-DICU_DATA_DIR="\"/usr/share/icu/\"" -g -Os -fno-exceptions ${THREADSCFLAGS} " +CPP="gcc -E" +CPPFLAGS="${THREADSCPPFLAGS} ${LIBCPPFLAGS} -I${prefix}/include" +CXX="c++" +CXXFLAGS="-DICU_DATA_DIR="\"/usr/share/icu/\"" -g -Os -fno-exceptions -fno-rtti ${THREADSCXXFLAGS} " +DEFAULT_MODE="common" +DEFS="-DHAVE_CONFIG_H " +FFLAGS="" +INSTALL="/usr/bin/install -c" +INSTALL_DATA="${INSTALL} -m 644" +INSTALL_PROGRAM="${INSTALL}" +INSTALL_SCRIPT="${INSTALL_PROGRAM}" +LDFLAGS="${RPATHLDFLAGS}" +LIBS="-lpthread -lm " +LIB_M="" +LIB_VERSION="32.0" +LIB_VERSION_MAJOR="32" +MKINSTALLDIRS="${SHELL} ${pkgdatadir}/mkinstalldirs" +RANLIB="ranlib" +RMV="rm -rf" +SHELL="/bin/sh" +SHLIB_c="${CC} ${DEFS} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -shared" +SHLIB_cc="${CXX} ${DEFS} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -shared" +U_IS_BIG_ENDIAN="1" +includedir="${prefix}/include" +infodir="${prefix}/share/info" +ld_rpath_suf="" +localstatedir="${prefix}/var" +mandir="@FINKPREFIX@/man" +oldincludedir="/usr/include" +program_transform_name="s,x,x," +sharedstatedir="${prefix}/com" +sysconfdir="@FINKPREFIX@/etc" +INSTALL_L="${INSTALL_DATA}" + +################################################################## +# +# *5* packaging options and directories +# +################################################################## + +pkgdatadir="${datadir}/${PACKAGE}${ICULIBSUFFIX}/${VERSION}" +pkglibdir="${libdir}/${PACKAGE}${ICULIBSUFFIX}/${VERSION}" + +# The basename of the ICU data file (i.e. icudt21b ) +ICUDATA_NAME="icudt32b" + +# Defaults for pkgdata's mode and directories +# The default data dir changes depending on what packaging mode +# is being used +if [ "x$PKGDATA_MODE" = "x" ]; +then +PKGDATA_MODE="common" +fi + +case "$PKGDATA_MODE" in +common) +ICUDATA_DIR="${pkgdatadir}" +ICUPKGDATA_DIR="${ICUDATA_DIR}" +;; +dll) +ICUDATA_DIR="${pkgdatadir}" +ICUPKGDATA_DIR="${libdir}" +;; +*) +ICUDATA_DIR="${pkgdatadir}" +ICUPKGDATA_DIR="${ICUDATA_DIR}" +;; + +esac + +GENCCODE_ASSEMBLY="" + +################################################################## +# +# *6* Inclusion of platform make fragment (mh-* file) +# +################################################################## +# The mh- file ("make fragment") for the platform is included here. +# It may override the above settings. +# It is put last so that the mh-file can override anything. + +## -*-makefile-*- +## Darwin-specific setup (Darwin is the Mac OS X developer preview, successor +## to Rhapsody, aka Mac OS X Server) +## Copyright (c) 1999-2004, International Business Machines Corporation and +## others. All Rights Reserved. + +## Flags for position independent code +SHAREDLIBCFLAGS="-dynamic" +SHAREDLIBCXXFLAGS="-dynamic" +SHAREDLIBCPPFLAGS="" + +# Pad out the paths to the maximum possible length +LD_FLAGS="${LD_FLAGS} -headerpad_max_install_names" + +## Commands to generate dependency files +GEN_DEPS_c="${CC} -E -MMD ${DEFS} ${CPPFLAGS}" +GEN_DEPS_cc="${CXX} -E -MMD ${DEFS} ${CPPFLAGS}" + +## Commands to compile +COMPILE_c="${CC} ${DEFS} ${CPPFLAGS} ${CFLAGS} -fno-common -c" +COMPILE_cc="${CXX} ${DEFS} ${CPPFLAGS} ${CXXFLAGS} -fno-common -c" + +## Commands to make a shared library +SHLIB_c="${CC} -dynamiclib -dynamic ${CFLAGS} ${LDFLAGS}" +SHLIB_cc="${CXX} -dynamiclib -dynamic ${CXXFLAGS} ${LDFLAGS}" + +## Compiler switches to embed a library name and version information +## LD_SONAME = -Wl,-compatibility_version -Wl,${SO_TARGET_VERSION_MAJOR} -Wl,-current_version -Wl,${SO_TARGET_VERSION} -install_name ${notdir $(MIDDLE_SO_TARGET}) + +## Compiler switch to embed a runtime search path +LD_RPATH="" +LD_RPATH_PRE="" + +## Environment variable to set a runtime search path +LDLIBRARYPATH_ENVVAR="DYLD_LIBRARY_PATH" + +GENCCODE_ASSEMBLY="-a gcc-darwin" + +## Shared object suffix +SO="dylib" +## Non-shared intermediate object suffix +STATIC_O="ao" + +## Compilation rules + +## Dependency rules + +## Versioned libraries rules + +## End Darwin-specific setup +## -*-sh-*- +## BEGIN of icu-config-bottom. +## Copyright (c) 2002-2004, International Business Machines Corporation and +## others. All Rights Reserved. + +ICUUC_FILE=${libdir}/${ICULIBS_COMMON_LIB_NAME} + +# echo ENABLE RPATH $ENABLE_RPATH and RPATHLDFLAGS=${RPATH_LDFLAGS} +if [ "x$PKGDATA_MODE" = "x" ]; then + PKGDATA_MODE=dll +fi + +} + +## The actual code of icu-config goes here. + +ME=`basename $0` + +allflags() +{ + echo " --bindir Print binary directory path (bin)" + echo " --cc Print C compiler used [CC]" + echo " --cflags Print C compiler flags [CFLAGS]" + echo " --cflags-dynamic Print additional C flags for" + echo " building shared libraries." + echo " --cppflags Print C Preprocessor flags [CPPFLAGS]" + echo " --cppflags-dynamic Print additional C Preprocessor flags for" + echo " building shared libraries." + echo " --cppflags-searchpath Print only -I include directives (-Iinclude)" + echo " --cxx Print C++ compiler used [CXX]" + echo " --cxxflags Print C++ compiler flags [CXXFLAGS]" + echo " --cxxflags-dynamic Print additional C++ flags for" + echo " building shared libraries." + echo " --detect-prefix Attempt to detect prefix based on PATH" + echo " --exec-prefix Print prefix for executables (/bin)" + echo " --exists Return with 0 status if ICU exists else fail" + echo " --help, -?, --usage Print this message" + echo " --icudata Print shortname of ICU data file (icudt21l)" + echo " --icudata-install-dir Print path to install data to - use as --install option to pkgdata(1)" + echo " --icudata-mode Print default ICU pkgdata mode (dll) - use as --mode option to pkgdata(1)." + echo " --icudatadir Print path to packaged archive data. Can set as [ICU_DATA]" + echo " --invoke Print commands to invoke an ICU program" + echo " --invoke=<prog> Print commands to invoke an ICU program named <prog> (ex: genrb)" + echo " --ldflags Print -L search path and -l libraries to link with ICU [LDFLAGS]. This is for the data, uc (common), and i18n libraries only. " + echo " --ldflags-layout Print ICU layout engine link directive. Use in addition to --ldflags" + echo " --ldflags-libsonly Same as --ldflags, but only the -l directives" + echo " --ldflags-searchpath Print only -L (search path) directive" + echo " --ldflags-system Print only system libs ICU links with (-lpthread, -lm)" + echo " --ldflags-icuio Print ICU icuio link directive. Use in addition to --ldflags " + echo " --ldflags-obsolete Print ICU obsolete link directive. Use in addition to --ldflags. (requires icuapps/obsolete to be built and installed.) " + echo " --mandir Print manpage (man) path" + echo " --prefix Print PREFIX to icu install (/usr/local)" + echo " --prefix=XXX Set prefix to XXX for remainder of command" + echo " --sbindir Print system binary path (sbin) " + echo " --shared-datadir Print shared data (share) path. This is NOT the ICU data dir." + echo " --shlib-c Print the command to compile and build C shared libraries with ICU" + echo " --shlib-cc Print the command to compile and build C++ shared libraries with ICU" + echo " --sysconfdir Print system config (etc) path" + echo " --unicode-version Print version of Unicode data used in ICU ($UNICODE_VERSION)" + echo " --version Print ICU version ($VERSION)" + echo " --incfile Print path to Makefile.inc (for -O option of pkgdata)" +} + +## Print the normal usage message +shortusage() +{ + echo "usage: ${ME} " `allflags | cut -c-25 | sed -e 's%.*%[ & ]%'` +} + + +usage() +{ + echo "${ME}: icu-config: ICU configuration helper script" + echo + echo "The most commonly used options will be --cflags, --cxxflags, --cppflags, and --ldflags." + echo 'Example (in make): CPFLAGS=$(shell icu-config --cppflags)' + echo ' LDFLAGS=$(shell icu-config --ldflags)' + echo " (etc).." + echo + echo "Usage:" + allflags + + echo + echo " [Brackets] show MAKE variable equivalents, (parenthesis) show example output" + echo + echo "Copyright (c) 2002, International Business Machines Corporation and others. All Rights Reserved." +} + +## Check the sanity of current variables +sanity() +{ + if [ ! -f ${ICUUC_FILE} ]; + then + echo "### $ME: Can't find ${ICUUC_FILE} - ICU prefix is wrong." 1>&2 + echo "### Try the --prefix= or --exec-prefix= options " 1>&2 + echo "### or --detect-prefix" + echo "### $ME: Exitting." 1>&2 + exit 2 + fi +} + +## Main starts here. + +if [ $# -lt 1 ]; then + shortusage + exit 1 +fi + + +# Load our variables from autoconf +# ALWAYS load twice because of dependencies +loaddefs +loaddefs +sanity + +while [ $# -gt 0 ]; +do + arg="$1" + var=`echo $arg | sed -e 's/^[^=]*=//'` +# echo "### processing $arg" 1>&2 + case "$arg" in + + # undocumented. + --debug) + set -x + ;; + + --so) + echo $SO + ;; + + --bindir) + echo $bindir + ;; + + --libdir) + echo $libdir + ;; + + --exists) + sanity + ;; + + --sbindir) + echo $sbindir + ;; + + --invoke=*) + QUOT="'" + CMD="${var}" + + # If it's not a locally executable command (1st choice) then + # search for it in the ICU directories. + if [ ! -x ${CMD} ]; then + if [ -x ${bindir}/${var} ]; then + CMD="${bindir}/${var}" + fi + if [ -x ${sbindir}/${var} ]; then + CMD="${sbindir}/${var}" + fi + fi + + echo "env ${QUOT}${LDLIBRARYPATH_ENVVAR}=${libdir}:"'${'"${LDLIBRARYPATH_ENVVAR}"'}'${QUOT} ${CMD} + ;; + + --invoke) + QUOT="'" + echo "env ${QUOT}${LDLIBRARYPATH_ENVVAR}=${libdir}:"'${'"${LDLIBRARYPATH_ENVVAR}"'}'${QUOT} + ;; + + --cflags) + echo $CFLAGS + ;; + + --cc) + echo $CC + ;; + + --cxx) + echo $CXX + ;; + + --cxxflags) + echo $CXXFLAGS + ;; + + --cppflags) + # Don't echo the -I. - it's unneeded. + echo $CPPFLAGS | sed -e 's/-I. //' + ;; + + --cppflags-searchpath) + echo -I${prefix}/include + ;; + + --cppflags-dynamic) + echo $SHAREDLIBCPPFLAGS + ;; + + --cxxflags-dynamic) + echo $SHAREDLIBCXXFLAGS + ;; + + --cflags-dynamic) + echo $SHAREDLIBCFLAGS + ;; + + --ldflags-system) + echo $LIBS + ;; + + --ldflags) + echo $LDFLAGS $ICULIBS $LIBS +# $RPATH_LDFLAGS + ;; + + --ldflags-libsonly) + echo $ICULIBS_I18N $ICULIBS_COMMON $ICULIBS_DATA + ;; + + --ldflags-icuio) + echo $ICULIBS_ICUIO + ;; + + --ldflags-obsolete) + echo $ICULIBS_OBSOLETE + ;; + + --ldflags-toolutil) + echo $ICULIBS_TOOLUTIL + ;; + + --ldflags-layout) + echo $ICULIBS_LAYOUT $ICULIBS_LAYOUTEX + ;; + + --ldflags-searchpath) + echo -L${libdir} + ;; + + --detect-prefix) + HERE=`echo $0 | sed -e "s/$ME//g"` + if [ -f $HERE/../lib/${ICULIBS_COMMON_LIB_NAME} ]; then + prefix=$HERE/.. + echo "## Using --prefix=${prefix}" 1>&2 + fi + loaddefs + loaddefs + sanity + ;; + + --exec-prefix) + echo $exec_prefix + ;; + + --prefix) + echo $prefix + ;; + + --prefix=*) + prefix=$var + loaddefs + loaddefs + sanity + ;; + + --sysconfdir) + echo $sysconfdir + ;; + + --mandir) + echo $mandir + ;; + + --shared-datadir) + echo $datadir + ;; + + --incfile) + echo $pkglibdir/Makefile.inc + ;; + + --icudata) + echo $ICUDATA_NAME + ;; + + --icudata-mode) + echo $PKGDATA_MODE + ;; + + --icudata-install-dir) + echo $ICUPKGDATA_DIR + ;; + + --icudatadir) + echo $ICUDATA_DIR + ;; + + --shlib-c) + echo $SHLIB_c + ;; + + --shlib-cc) + echo $SHLIB_cc + ;; + + --version) + echo $VERSION + ;; + + --unicode-version) + echo $UNICODE_VERSION + ;; + + --help) + usage + exit 0 + ;; + + --usage) + usage + exit 0 + ;; + +# --enable-rpath=*) +# ENABLE_RPATH=$var +# loaddefs +# ;; + + -?) + usage + exit 0 + ;; + + *) + echo ${ME}: ERROR Unknown Option $arg 1>&2 + echo 1>&2 + shortusage 1>&2 + echo "### $ME: Exitting." 1>&2 + exit 1; + ;; + esac + shift +done + +# Check once before we quit (will check last used prefix) +sanity +## END of icu-config-bottom + +exit 0 + +# Rebuilt on Fri May 13 17:27:00 EDT 2005 diff -uNr ICU-6.2.4/icuSources/common/Makefile.in ICU-6.2.4-patched/icuSources/common/Makefile.in --- ICU-6.2.4/icuSources/common/Makefile.in 2004-11-24 13:53:40.000000000 -0500 +++ ICU-6.2.4-patched/icuSources/common/Makefile.in 2005-05-13 17:28:43.000000000 -0400 @@ -80,7 +80,7 @@ STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O)) -DEPS = $(OBJECTS:.o=.d) +DEPS = ## Header files to install HEADERS = unicode/*.h $(srcdir)/unicode/*.h diff -uNr ICU-6.2.4/icuSources/i18n/Makefile.in ICU-6.2.4-patched/icuSources/i18n/Makefile.in --- ICU-6.2.4/icuSources/i18n/Makefile.in 2004-11-24 13:54:34.000000000 -0500 +++ ICU-6.2.4-patched/icuSources/i18n/Makefile.in 2005-05-13 17:28:59.000000000 -0400 @@ -78,7 +78,7 @@ STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O)) -DEPS = $(OBJECTS:.o=.d) +DEPS = ## Header files to install HEADERS= $(srcdir)/unicode/*.h diff -uNr ICU-6.2.4/makefile ICU-6.2.4-patched/makefile --- ICU-6.2.4/makefile 2004-12-02 18:20:11.000000000 -0500 +++ ICU-6.2.4-patched/makefile 2005-05-13 17:29:53.000000000 -0400 @@ -88,7 +88,7 @@ ################################# CONFIG_FLAGS = --disable-renaming --disable-extras --disable-ustdio --disable-layout \ - --disable-samples --with-data-packaging=archive --prefix=/usr/local \ + --disable-samples --with-data-packaging=archive [EMAIL PROTECTED]@ \ --srcdir=$(SRCROOT)/icuSources ################################# @@ -117,8 +117,8 @@ ################################# datadir=/usr/share/icu/ -OPEN_SOURCE_VERSIONS_DIR=/usr/local/OpenSourceVersions/ -OPEN_SOURCE_LICENSES_DIR=/usr/local/OpenSourceLicenses/ [EMAIL PROTECTED]@/OpenSourceVersions/ [EMAIL PROTECTED]@/OpenSourceLicenses/ ICU_DATA_DIR= data/out B_DATA_FILE=icudt$(ICU_VERS)b.dat L_DATA_FILE=icudt$(ICU_VERS)l.dat @@ -141,24 +141,24 @@ CFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) -g -Os -fno-exceptions" \ CXXFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) -g -Os -fno-exceptions -fno-rtti" \ RC_ARCHS="$(RC_ARCHS)" \ - DYLD_LIBRARY_PATH="$(DSTROOT)/usr/local/lib" + DYLD_LIBRARY_PATH="$(DSTROOT)@FINKPREFIX@/lib" ENV_CONFIGURE= APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \ CFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -g -Os -fno-exceptions" \ CXXFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -g -Os -fno-exceptions -fno-rtti" \ RC_ARCHS="$(RC_ARCHS)" \ - DYLD_LIBRARY_PATH="$(DSTROOT)/usr/local/lib" + DYLD_LIBRARY_PATH="$(DSTROOT)@FINKPREFIX@/lib" ENV_DEBUG = APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \ CFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) -O0 -g -fno-exceptions" \ CXXFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) -O0 -g -fno-exceptions -fno-rtti" \ RC_ARCHS="$(RC_ARCHS)" \ - DYLD_LIBRARY_PATH="$(DSTROOT)/usr/local/lib" + DYLD_LIBRARY_PATH="$(DSTROOT)@FINKPREFIX@/lib" ENV_icu = ENV ENV_debug = ENV_DEBUG -ORDERFILE=/usr/local/lib/OrderFiles/libicucore.order [EMAIL PROTECTED]@/lib/OrderFiles/libicucore.order ifeq "$(shell test -f $(ORDERFILE) && echo YES )" "YES" SECTORDER_FLAGS=-sectorder __TEXT __text $(ORDERFILE) else --- libicu31-dev.patch DELETED --- --- NEW FILE: libicu32-dev.info --- Package: libicu32-dev Version: 3.20 Revision: 1 Source: http://www.opensource.apple.com/darwinsource/tarballs/other/ICU-6.2.4.tar.gz Source-MD5: 479d3f6de8d5817d70d9ff9f5c98615e PatchScript: sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p1 Conflicts: libicu28, libicu28-dev, libicu30, libicu30-dev, libicu31, libicu31-dev Replaces: libicu28, libicu28-dev, libicu30, libicu30-dev, libicu31, libicu31-dev Depends: macosx (>= 10.4-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 << License: BSD Description: Headers for Apple-supplied ICU libraries Maintainer: Benjamin Reed <[EMAIL PROTECTED]> Homepage: http://oss.software.ibm.com/icu/ DescDetail: << The International Components for Unicode (ICU) libraries provide robust and full-featured Unicode services on a wide variety of platforms. ICU supports the most current version of the Unicode standard, and they provide support for supplementary Unicode characters (needed for GB 18030 repertoire support). As computing environments become more heterogeneous, software portability becomes more important. ICU lets you produce the same results across all the various platforms you support, without sacrificing performance. It offers great flexibility to extend and customize the supplied services, which include: * Text: Unicode text handling, full character properties and character set conversions (500+ codepages) * Analysis: Unicode regular expressions; full Unicode sets; character, word and line boundaries * Comparison: Language sensitive collation and searching * Transformations: normalization, upper/lowercase, script transliterations (50+ pairs) * Locales: Comprehensive locale data (230+) and resource bundle architecture * Complex Text Layout: Arabic, Hebrew, Indic and Thai * Time: Multi-calendar and time zone * Formatting and Parsing: dates, times, numbers, currencies, messages and rule based Please note that this package is based on the ICU source provided by Apple, as the CoreFoundation kit contains the IBM libICU implementation. << --- libicu31-dev.info DELETED --- ------------------------------------------------------- This SF.Net email is sponsored by: NEC IT Guy Games. How far can you shotput a projector? How fast can you ride your desk chair down the office luge track? If you want to score the big prize, get to know the little guy. Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits