Update of /cvsroot/fink/dists/10.2/unstable/main/finkinfo/libs
In directory usw-pr-cvs1:/tmp/cvs-serv7543
Added Files:
libxml2-2.4.23-5.info libxml2-2.4.23-5.patch
Removed Files:
libxml2-2.4.23-4.info libxml2-2.4.23-4.patch
Log Message:
Remove hardcoded sw. Need to increase rev since it sets an env var using it and the
build
probably would have worked.
--- NEW FILE: libxml2-2.4.23-5.info ---
Package: libxml2
Version: 2.4.23
Revision: 5
Maintainer: Max Horn <[EMAIL PROTECTED]>
Depends: %N-shlibs (= %v-%r), %N-bin
BuildDepends: python (>= 2.2.1-8), db3 (>= 3.3.11-8), readline (>= 4.3-5), gdbm, gmp,
expat, tcltk-dev
Source: mirror:gnome:sources/%n/2.4/%n-%v.tar.gz
Source-MD5: 93ea03bcb105a0ae2ecea4f4fbd5bade
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1
NoSetLDFLAGS: true
ConfigureParams: --mandir='${prefix}/share/man' --with-iconv=%p
InstallScript: <<
make install prefix=%i
mkdir -p %i/share/doc %i/etc/xml
mv %i/doc/%n-%v %i/share/doc/%n
rm -rf %i/doc
<<
DocFiles: AUTHORS Copyright NEWS README TODO
BuildDependsOnly: True
SplitOff: <<
Package: %N-shlibs
Replaces: libxml2 (<< 2.4.18-2)
Suggests: %N-bin
Files: lib/libxml2.%v.dylib lib/libxml2.2.dylib
DocFiles: Copyright README
<<
SplitOff2: <<
Package: %N-bin
Depends: %N-shlibs (= %v-%r)
Replaces: libxml2 (<< 2.4.18-2)
Files: bin/xmlcatalog bin/xmllint share/man/man1/xmlcatalog.1
share/man/man1/xmllint.1 etc/xml
DocFiles: Copyright README
PostInstScript: <<
if [ ! -f %p/etc/xmlcatalog ]; then
xmlcatalog --noout --create %p/etc/xml/catalog
fi
<<
PostRmScript: <<
if [ purge = "$1" ]; then
rm -f %p/etc/xml/catalog
fi
<<
<<
Description: XML parsing library, version 2
DescPort: <<
The Makefile is too stupid to link the executables against the right
copy of the library, so we help by setting LDFLAGS.
<<
DescPackaging: <<
Previous versions by Christoph Pfisterer <[EMAIL PROTECTED]>
<<
License: LGPL
Homepage: http://www.xmlsoft.org/
--- NEW FILE: libxml2-2.4.23-5.patch ---
diff -Naur libxml2-2.4.23.old/Makefile.in libxml2-2.4.23.new/Makefile.in
--- libxml2-2.4.23.old/Makefile.in Sun Jul 7 05:00:16 2002
+++ libxml2-2.4.23.new/Makefile.in Sun Jul 14 15:53:31 2002
@@ -263,7 +263,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I.
CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS =
LIBS = @LIBS@
libxml2_la_DEPENDENCIES =
@WITH_TRIO_SOURCES_FALSE@libxml2_la_OBJECTS = SAX.lo entities.lo \
diff -Naur libxml2-2.4.23.old/catalog.c libxml2-2.4.23.new/catalog.c
--- libxml2-2.4.23.old/catalog.c Tue Mar 19 04:37:54 2002
+++ libxml2-2.4.23.new/catalog.c Sun Jul 14 16:11:01 2002
@@ -56,10 +56,10 @@
#define XML_URN_PUBID "urn:publicid:"
#define XML_CATAL_BREAK ((xmlChar *) -1)
#ifndef XML_XML_DEFAULT_CATALOG
-#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
+#define XML_XML_DEFAULT_CATALOG "file://@PREFIX@/etc/xml/catalog"
#endif
#ifndef XML_SGML_DEFAULT_CATALOG
-#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog"
+#define XML_SGML_DEFAULT_CATALOG "file://@PREFIX@/etc/sgml/catalog"
#endif
static int xmlExpandCatalog(xmlCatalogPtr catal, const char *filename);
diff -Naur libxml2-2.4.23.old/configure libxml2-2.4.23.new/configure
--- libxml2-2.4.23.old/configure Sun Jul 7 05:00:18 2002
+++ libxml2-2.4.23.new/configure Sun Jul 14 15:53:31 2002
@@ -3780,11 +3780,11 @@
;;
darwin* | rhapsody*)
- allow_undefined_flag='-undefined suppress'
+ allow_undefined_flag='-flat_namespace -undefined suppress'
# FIXME: Relying on posixy $() will cause problems for
# cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes.
- archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib)
$allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname
$(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
+ archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib)
+$allow_undefined_flag -o $lib $libobjs $deplibs$linkopts $(test .$module != .yes &&
+echo -install_name $rpath/$soname $tmp_verstring)'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
diff -Naur libxml2-2.4.23.old/ltmain.sh libxml2-2.4.23.new/ltmain.sh
--- libxml2-2.4.23.old/ltmain.sh Sun Jul 7 05:00:15 2002
+++ libxml2-2.4.23.new/ltmain.sh Sun Jul 14 15:53:31 2002
@@ -2858,6 +2858,11 @@
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
eval cmds=\"$archive_expsym_cmds\"
else
+ if test "x$verstring" = "x0.0"; then
+ tmp_verstring=
+ else
+ tmp_verstring="$verstring"
+ fi
eval cmds=\"$archive_cmds\"
fi
IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
diff -Naur libxml2-2.4.23.old/xmlcatalog.c libxml2-2.4.23.new/xmlcatalog.c
--- libxml2-2.4.23.old/xmlcatalog.c Fri Mar 22 12:35:22 2002
+++ libxml2-2.4.23.new/xmlcatalog.c Sun Jul 14 16:11:06 2002
@@ -41,7 +41,7 @@
#ifdef LIBXML_CATALOG_ENABLED
-#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog"
+#define XML_SGML_DEFAULT_CATALOG "@PREFIX@/etc/sgml/catalog"
/************************************************************************
* *
diff -Naur libxml2-2.4.23.old/xmllint.c libxml2-2.4.23.new/xmllint.c
--- libxml2-2.4.23.old/xmllint.c Sun Jun 16 11:35:21 2002
+++ libxml2-2.4.23.new/xmllint.c Sun Jul 14 16:11:10 2002
@@ -1024,7 +1024,7 @@
#ifdef LIBXML_CATALOG_ENABLED
printf("\t--catalogs : use SGML catalogs from $SGML_CATALOG_FILES\n");
printf("\t otherwise XML Catalogs starting from \n");
- printf("\t file:///etc/xml/catalog are activated by default\n");
+ printf("\t file://@PREFIX@/etc/xml/catalog are activated by default\n");
printf("\t--nocatalogs: deactivate all catalogs\n");
#endif
printf("\t--auto : generate a small doc on the fly\n");
--- libxml2-2.4.23-4.info DELETED ---
--- libxml2-2.4.23-4.patch DELETED ---
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits