Menu
▾
▴
experimental/dmrrsn libxml2-2.5.4-2.info,NONE,1.1 libxml2-2.5.4-2.patch,NONE,1.1
|
From: David R. M. <dm...@us...> - 2003-06-30 01:42:20
|
Update of /cvsroot/fink/experimental/dmrrsn
In directory sc8-pr-cvs1:/tmp/cvs-serv2483
Added Files:
libxml2-2.5.4-2.info libxml2-2.5.4-2.patch
Log Message:
experimental version
--- NEW FILE: libxml2-2.5.4-2.info ---
Package: libxml2
Version: 2.5.4
Revision: 2
Maintainer: Max Horn <ma...@qu...>
Depends: %N-shlibs (= %v-%r), %N-bin
BuildDepends: readline (>= 4.3-5)
Source: mirror:gnome:sources/%n/2.5/%n-%v.tar.bz2
Source-MD5: 8005f55dafe87c286536601f758ab29c
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1
NoSetLDFLAGS: true
ConfigureParams: --mandir='${prefix}/share/man' --with-iconv=%p --with-python=no
InstallScript: <<
make install prefix=%i
mkdir -p %i/etc/xml
mkdir -p %i/share/doc
mv %i/share/doc/%n-%v %i/share/doc/%n
# mv %i/share/doc/%n-python-%v %i/share/doc/%n-python
mkdir -p %i/sbin
install -c -m 755 update-xml-catalog %i/sbin/
install -c -m 755 update-sgml-catalog %i/sbin/
<<
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
Shlibs: %p/lib/libxml2.2.dylib 7.0.0 %n (>= 2.4.25-3)
DocFiles: Copyright README
<<
SplitOff2: <<
Package: %N-bin
Depends: %N-shlibs (= %v-%r), readline-shlibs (>= 4.3-5)
Replaces: libxml2 (<< 2.4.18-2)
Files: bin/xmlcatalog bin/xmllint sbin share/man/man1/xmlcatalog.1 share/man/man1/xmllint.1 etc/xml
DocFiles: Copyright README
PostInstScript: <<
case "$1" in
configure)
update-xml-catalog
update-sgml-catalog
;;
esac
<<
PostRmScript: <<
case "$1" in
abort-install|purge|remove)
rm -f %p/etc/xml/catalog
rm -f %p/etc/sgml/catalog
;;
esac
<<
<<
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: <<
libxml2 uses XML/SGML super catalog to know location of DTDs installed on
local system. They are managed by update-xml-catalog and update-sgml-catalog
script. Each package that provides DTDs should also provide configuration
file(s) for these script and call them within Pre/PostInstScript.
When update-xml-catalog is called, it reads every configuration file belongs
to %p/etc/xml/catalog.d/. Each line of them contain 3 fields, TYPE, ORIG and
REPLACE, correspond to arguments of `xmlcatalog --add'. See xmlcatalog(1) for
detail.
Also, update-sgml-catalog reads every configuration file belongs to %p/etc/
sgml/catalog.d/ when it is called. Each line of them contain only 1 field,
reference to other SGML catalog file.
Makefile.in is patched to not set LDFLAGS to avoid linking problems when an older
version of libxml2 is already installed while building.
Libtool gets patched to fix bundle (loadable module, .so file) building.
Previous versions by Christoph Pfisterer <ch...@us...>
<<
License: LGPL
Homepage: http://www.xmlsoft.org/
--- NEW FILE: libxml2-2.5.4-2.patch ---
diff -ruN libxml2-2.5.4/Makefile.in libxml2-2.5.4-patched/Makefile.in
--- libxml2-2.5.4/Makefile.in 2003-02-24 21:14:13.000000000 +0100
+++ libxml2-2.5.4-patched/Makefile.in 2003-02-25 17:37:41.000000000 +0100
@@ -283,7 +283,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 -ruN libxml2-2.5.4/catalog.c libxml2-2.5.4-patched/catalog.c
--- libxml2-2.5.4/catalog.c 2003-02-04 20:24:33.000000000 +0100
+++ libxml2-2.5.4-patched/catalog.c 2003-02-25 17:37:41.000000000 +0100
@@ -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 -ruN libxml2-2.5.4/configure libxml2-2.5.4-patched/configure
--- libxml2-2.5.4/configure 2003-02-24 21:13:17.000000000 +0100
+++ libxml2-2.5.4-patched/configure 2003-02-25 17:37:41.000000000 +0100
@@ -5519,7 +5519,7 @@
# 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='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
+ archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(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 -ruN libxml2-2.5.4/ltmain.sh libxml2-2.5.4-patched/ltmain.sh
--- libxml2-2.5.4/ltmain.sh 2003-02-24 21:12:56.000000000 +0100
+++ libxml2-2.5.4-patched/ltmain.sh 2003-02-25 17:37:41.000000000 +0100
@@ -1777,7 +1777,7 @@
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
+ need_relink=no
fi
if test -n "$old_archive_from_expsyms_cmds"; then
@@ -2952,6 +2952,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
save_ifs="$IFS"; IFS='~'
diff -ruN libxml2-2.5.4/update-sgml-catalog libxml2-2.5.4-patched/update-sgml-catalog
--- libxml2-2.5.4/update-sgml-catalog 1970-01-01 01:00:00.000000000 +0100
+++ libxml2-2.5.4-patched/update-sgml-catalog 2003-02-25 17:37:41.000000000 +0100
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+#
+# update-sgml-catalog
+# see DescPackaging field of libxml2 .info file for usage.
+#
+
+CATALOG=@PREFIX@/etc/sgml/catalog
+CATALOG_D=@PREFIX@/etc/sgml/catalog.d
+
+mkdir -p ${CATALOG_D}
+
+TMPFILE=`tempfile`
+
+if [ "`echo ${CATALOG_D}/*`" != "${CATALOG_D}/*" ]; then
+ cat ${CATALOG_D}/* | sed 's/#.*$//g' | {
+ while read cat; do
+ if [ -z "${cat}" ]; then
+ continue
+ fi
+ echo CATALOG ${cat} >>${TMPFILE}
+ done
+ }
+fi
+
+mv -f ${TMPFILE} ${CATALOG}
+chmod 0644 ${CATALOG}
+
+exit 0
diff -ruN libxml2-2.5.4/update-xml-catalog libxml2-2.5.4-patched/update-xml-catalog
--- libxml2-2.5.4/update-xml-catalog 1970-01-01 01:00:00.000000000 +0100
+++ libxml2-2.5.4-patched/update-xml-catalog 2003-02-25 17:37:41.000000000 +0100
@@ -0,0 +1,29 @@
+#!/bin/sh -e
+#
+# update-xml-catalog
+# see DescPackaging field of libxml2 .info file for usage.
+#
+
+CATALOG=@PREFIX@/etc/xml/catalog
+CATALOG_D=@PREFIX@/etc/xml/catalog.d
+
+mkdir -p ${CATALOG_D}
+
+TMPFILE=`tempfile`
+xmlcatalog --create >>${TMPFILE}
+
+if [ "`echo ${CATALOG_D}/*`" != "${CATALOG_D}/*" ]; then
+ cat ${CATALOG_D}/* | sed 's/#.*$//g' | {
+ while read type orig replace; do
+ if [ -z "${type}" -o -z "${orig}" -o -z "${replace}" ]; then
+ continue
+ fi
+ eval xmlcatalog --noout --add ${type} ${orig} ${replace} ${TMPFILE}
+ done
+ }
+fi
+
+mv -f ${TMPFILE} ${CATALOG}
+chmod 0644 ${CATALOG}
+
+exit 0
diff -ruN libxml2-2.5.4/xmlcatalog.c libxml2-2.5.4-patched/xmlcatalog.c
--- libxml2-2.5.4/xmlcatalog.c 2003-01-26 20:45:48.000000000 +0100
+++ libxml2-2.5.4-patched/xmlcatalog.c 2003-02-25 17:39:45.000000000 +0100
@@ -42,7 +42,7 @@
#ifdef LIBXML_CATALOG_ENABLED
#ifndef XML_SGML_DEFAULT_CATALOG
-#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog"
+#define XML_SGML_DEFAULT_CATALOG "@PREFIX@/etc/sgml/catalog"
#endif
/************************************************************************
diff -ruN libxml2-2.5.4/xmllint.c libxml2-2.5.4-patched/xmllint.c
--- libxml2-2.5.4/xmllint.c 2003-02-07 11:41:29.000000000 +0100
+++ libxml2-2.5.4-patched/xmllint.c 2003-02-25 17:39:16.000000000 +0100
@@ -89,7 +89,7 @@
#endif
#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
#ifdef LIBXML_DEBUG_ENABLED
|