Update of /cvsroot/fink/dists/10.2/stable/main/finkinfo/libs
In directory usw-pr-cvs1:/tmp/cvs-serv14939
Added Files:
expat-1.95.4-2.info expat-1.95.4-2.patch libxml2-2.4.25-3.info
libxml2-2.4.25-3.patch
Log Message:
moved to stable based on positive feedback
--- NEW FILE: expat-1.95.4-2.info ---
Package: expat
Version: 1.95.4
Revision: 2
Patch: %f.patch
Depends: %N-shlibs (= %v-%r)
Source: mirror:sourceforge:expat/%n-%v.tar.gz
Source-MD5: 1407e8c550b19a389e640e714fc39fae
SetCPPFlags: -no-cpp-precomp
ConfigureParams: --mandir=%p/share/man
CompileScript: <<
./configure %c
make
<<
InstallScript: make install DESTDIR=%d
DocFiles: <<
COPYING MANIFEST README doc/reference.html doc/style.css
examples/elements.c examples/outline.c
<<
SplitOff: <<
Package: %N-shlibs
Replaces: %N (<= 1.95.1-2)
Files: lib/libexpat.*.dylib
Shlibs: %p/lib/libexpat.0.dylib %n (>= %v-%r)
DocFiles: COPYING Changes MANIFEST README doc/reference.html doc/style.css
examples/elements.c examples/outline.c
<<
Description: C library for parsing XML
DescDetail: <<
This is expat, a C library for parsing XML, written by James Clark.
Expat is a stream-oriented XML parser. This means that you register
handlers with the parser before starting the parse. These handlers
are called when the parser discovers the associated structures in the
document being parsed. A start tag is an example of the kind of
structures for which you may register handlers.
<<
DescPort: <<
Makefile.in edited to add appropriate --mandir and DESTDIR hooks
I have tried using the check tool to verify that the library works
Unfortunately due to errors (possibly in bash), the following output results
tests/runtests: error: ~/desktop/downloads/expat-1.95.4/tests
/Users/jeremy/desktop/downloads/expat-1.95.4/tests/.libs/runtests does not exist
This script is just a wrapper for runtests.
See the libtool documentation for more information.
However, running
bash-2.05b$ ./tests/runtests
results in the following output:
Running suite(s): basic
100%: Checks: 21, Failures: 0, Errors: 0
<<
License: BSD
Homepage: http://expat.sf.net
Maintainer: Jeremy Erwin <[EMAIL PROTECTED]>
--- NEW FILE: expat-1.95.4-2.patch ---
diff -ru expat-1.95.4/Makefile.in expat-new/Makefile.in
--- expat-1.95.4/Makefile.in Thu Jul 11 14:54:42 2002
+++ expat-new/Makefile.in Fri Aug 23 21:51:08 2002
@@ -30,7 +30,7 @@
bindir = @bindir@
libdir = @libdir@
includedir = @includedir@
-mandir = ${prefix}/man/man1
+mandir = ${prefix}/share/man/man1
top_builddir = .
@@ -69,22 +69,22 @@
tests/runtests
install: xmlwf/xmlwf installlib
- $(mkinstalldirs) $(bindir) $(mandir)
- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf
- $(INSTALL_DATA) $(MANFILE) $(mandir)
+ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)
+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf
+$(DESTDIR)$(bindir)/xmlwf
+ $(INSTALL_DATA) $(MANFILE) $(DESTDIR)$(mandir)
installlib: $(LIBRARY) $(APIHEADER)
- $(mkinstalldirs) $(libdir) $(includedir)
- $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY)
- $(INSTALL_DATA) $(APIHEADER) $(includedir)
+ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+ $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
+ $(INSTALL_DATA) $(APIHEADER) $(DESTDIR)$(includedir)
uninstall: uninstalllib
- $(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf
- rm -f $(mandir)/xmlwf.1
+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bindir)/xmlwf
+ rm -f $(DESTDIR)$(mandir)/xmlwf.1
uninstalllib:
- $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY)
- rm -f $(includedir)/$(APIHEADER)
+ $(LIBTOOL) --mode=uninstall rm -f $DESTDIR)$(libdir)/$(LIBRARY)
+ rm -f $(DESTDIR)$(includedir)/$(APIHEADER)
# for VPATH builds (invoked by configure)
mkdir-init:
diff -ru expat-1.95.4/conftools/ltmain.sh expat-new/conftools/ltmain.sh
--- expat-1.95.4/conftools/ltmain.sh Fri Jul 12 14:23:01 2002
+++ expat-new/conftools/ltmain.sh Fri Aug 23 22:01:03 2002
@@ -2894,6 +2894,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='~'
Only in expat-new/conftools: ltmain.sh~
--- NEW FILE: libxml2-2.4.25-3.info ---
Package: libxml2
Version: 2.4.25
Revision: 3
Maintainer: Max Horn <[EMAIL PROTECTED]>
Depends: %N-shlibs (= %v-%r), %N-bin
BuildDepends: readline (>= 4.3-5)
Source: mirror:gnome:sources/%n/2.4/%n-%v.tar.bz2
Source-MD5: 1783360685323bd2a7d185a456c605bd
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
Shlibs: %p/lib/libxml2.2.dylib %n (>= %v-%r)
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 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.25-3.patch ---
diff -ru libxml2-2.4.25/Makefile.in libxml2-2.4.25-patched/Makefile.in
--- libxml2-2.4.25/Makefile.in 2002-09-26 20:17:41.000000000 +0200
+++ libxml2-2.4.25-patched/Makefile.in 2002-10-07 16:59:46.000000000 +0200
@@ -268,7 +268,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 -ru libxml2-2.4.25/catalog.c libxml2-2.4.25-patched/catalog.c
--- libxml2-2.4.25/catalog.c 2002-03-18 20:37:54.000000000 +0100
+++ libxml2-2.4.25-patched/catalog.c 2002-10-07 16:59:46.000000000 +0200
@@ -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 -ru libxml2-2.4.25/configure libxml2-2.4.25-patched/configure
--- libxml2-2.4.25/configure 2002-09-26 20:17:42.000000000 +0200
+++ libxml2-2.4.25-patched/configure 2002-10-07 16:59:46.000000000 +0200
@@ -3782,11 +3782,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 -ru libxml2-2.4.25/ltmain.sh libxml2-2.4.25-patched/ltmain.sh
--- libxml2-2.4.25/ltmain.sh 2002-09-26 20:17:38.000000000 +0200
+++ libxml2-2.4.25-patched/ltmain.sh 2002-10-07 16:59:47.000000000 +0200
@@ -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 -ru libxml2-2.4.25/xmlcatalog.c libxml2-2.4.25-patched/xmlcatalog.c
--- libxml2-2.4.25/xmlcatalog.c 2002-03-22 04:35:22.000000000 +0100
+++ libxml2-2.4.25-patched/xmlcatalog.c 2002-10-07 16:59:47.000000000 +0200
@@ -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 -ru libxml2-2.4.25/xmllint.c libxml2-2.4.25-patched/xmllint.c
--- libxml2-2.4.25/xmllint.c 2002-09-25 04:35:22.000000000 +0200
+++ libxml2-2.4.25-patched/xmllint.c 2002-10-07 16:59:47.000000000 +0200
@@ -1075,7 +1075,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");
-------------------------------------------------------
This sf.net email is sponsored by: Influence the future
of Java(TM) technology. Join the Java Community
Process(SM) (JCP(SM)) program now.
http://ads.sourceforge.net/cgi-bin/redirect.pl?sunm0004en
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
