Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29704

Modified Files:
        expat.info expat.patch 
Log Message:
New version from trackers (submissions #1030477).


Index: expat.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/expat.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- expat.info  29 Dec 2003 13:53:08 -0000      1.4
+++ expat.info  29 Sep 2004 07:24:49 -0000      1.5
@@ -1,13 +1,13 @@
 Package: expat
-Version: 1.95.7
+Version: 1.95.8
 Revision: 1
 Patch: %n.patch
 Depends: %N-shlibs (= %v-%r)
 BuildDependsOnly: true
 Source: mirror:sourceforge:expat/%n-%v.tar.gz
-Source-MD5: 2ff59c2a5cbdd21a285c5f343e214fa9 
+Source-MD5: aff487543845a82fe262e6e2922b4c8e
 SetCPPFlags: -no-cpp-precomp
-NoSetLDFLAGS: true
+NoSetLDFLAGS: false 
 ConfigureParams: --mandir=%p/share/man
 InstallScript: make install DESTDIR=%d
 DocFiles: <<
@@ -18,7 +18,7 @@
  Package: %N-shlibs
  Replaces: %N (<= 1.95.1-2)
  Files: lib/libexpat.*.dylib
- Shlibs: %p/lib/libexpat.0.dylib 5.0.0 %n (>= 1.95.5-1)
+ Shlibs: %p/lib/libexpat.0.dylib 6.0.0 %n (>= 1.95.7-1)
  DocFiles: COPYING Changes MANIFEST README doc/reference.html doc/style.css 
examples/elements.c examples/outline.c
 <<
 Description: C library for parsing XML
@@ -31,7 +31,6 @@
  structures for which you may register handlers.
 <<
 DescPort: <<
- undefined XMLCALL. cdecl is not supported by darwin, AFAIK. 
  placed hooks in Makefile for --mandir, and $DESTDIR
 <<
 License: BSD

Index: expat.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/expat.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- expat.patch 29 Dec 2003 13:49:47 -0000      1.2
+++ expat.patch 29 Sep 2004 07:24:53 -0000      1.3
@@ -1,25 +1,16 @@
-diff -urN expat-1.95.7/Makefile.in expat-new/Makefile.in
---- expat-1.95.7/Makefile.in   Thu Oct 16 00:51:11 2003
-+++ expat-new/Makefile.in      Fri Dec 12 00:45:17 2003
-@@ -30,7 +30,7 @@
- bindir = @bindir@
- libdir = @libdir@
- includedir = @includedir@
--mandir = ${prefix}/man/man1
-+mandir = @mandir@/man1
- 
- top_builddir = .
- 
+diff -urN expat-1.95.8/Makefile.in expat-new/Makefile.in
+--- expat-1.95.8/Makefile.in   Fri May  7 16:00:48 2004
++++ expat-new/Makefile.in      Sat Sep 18 17:42:43 2004
 @@ -73,22 +73,22 @@
        tests/runtests
  
  install: xmlwf/xmlwf installlib
--      $(mkinstalldirs) $(bindir) $(mandir)
+-      $(mkinstalldirs) $(bindir) $(man1dir)
 -      $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf
--      $(INSTALL_DATA) $(MANFILE) $(mandir)
-+      $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)
+-      $(INSTALL_DATA) $(MANFILE) $(man1dir)
++      $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
 +      $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf 
$(DESTDIR)$(bindir)/xmlwf
-+      $(INSTALL_DATA) $(MANFILE) $(DESTDIR)$(mandir)
++      $(INSTALL_DATA) $(MANFILE) $(DESTDIR)$(man1dir)
  
  installlib: $(LIBRARY) $(APIHEADER)
 -      $(mkinstalldirs) $(libdir) $(includedir)
@@ -31,9 +22,9 @@
  
  uninstall: uninstalllib
 -      $(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf
--      rm -f $(mandir)/xmlwf.1
+-      rm -f $(man1dir)/xmlwf.1
 +      $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bindir)/xmlwf
-+      rm -f $(DESTDIR)$(mandir)/xmlwf.1
++      rm -f $(DESTDIR)$(man1dir)/xmlwf.1
  
  uninstalllib:
 -      $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY)
@@ -48,22 +39,7 @@
  LTFLAGS = --silent
  
 -COMPILE = $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) $(INCLUDES)
-+COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
++COMPILE = $(CC) $(DEFS) $(CPPFLAGS) $(INCLUDES) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
  LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) 
-rpath $(libdir) $(LDFLAGS) -o $@
  LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@
-diff -urN expat-1.95.7/lib/expat.h expat-new/lib/expat.h
---- expat-1.95.7/lib/expat.h   Thu Oct 16 00:20:54 2003
-+++ expat-new/lib/expat.h      Fri Dec 12 00:19:35 2003
-@@ -45,8 +45,10 @@
- #ifndef XMLCALL
- #if defined(XML_USE_MSC_EXTENSIONS)
- #define XMLCALL __cdecl
--#elif defined(__GNUC__)
-+#elif defined(__GNUC__) && !(__APPLE__)
- #define XMLCALL __attribute__((cdecl))
-+#elif defined(__APPLE__)
-+#define XMLCALL 
- #else
- /* For any platform which uses this definition and supports more than
-    one calling convention, we need to extend this definition to



-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to