Ticket #1058: expat.diff

File expat.diff, 4.5 KB (added by blb@…, 21 years ago)

Patch to expat (whole directory)

  • Portfile

    diff -uNr expat.orig/Portfile expat/Portfile
    old new  
    22
    33PortSystem 1.0
    44name            expat
    5 version         1.95.6
     5version         1.95.7
    66categories      textproc
    77platforms       darwin
    88maintainers     blb@pobox.com
    99description     XML 1.0 parser written in C
    1010master_sites.mirror_subdir      expat
    1111master_sites    sourceforge
    12 checksums       md5 ca78d94e83e9f077b5da2bfe28ba986a
    13 patchfiles      patch-expat.h
     12checksums       md5 2ff59c2a5cbdd21a285c5f343e214fa9
     13patchfiles      patch-Makefile.in
    1414
    15 configure.args  --enable-static=no
     15configure.args  --disable-static --mandir=\\\${prefix}/share/man
    1616
    1717destroot.destdir prefix=${destroot}/${prefix}
     18
  • files/patch-Makefile.in

    diff -uNr expat.orig/files/patch-Makefile.in expat/files/patch-Makefile.in
    old new  
     1--- Makefile.in.orig    Wed Oct 15 22:51:11 2003
     2+++ Makefile.in Tue Oct 21 00:28:26 2003
     3@@ -30,7 +30,7 @@
     4 bindir = @bindir@
     5 libdir = @libdir@
     6 includedir = @includedir@
     7-mandir = ${prefix}/man/man1
     8+mandir = @mandir@
     9 
     10 top_builddir = .
     11 
     12@@ -73,9 +73,9 @@
     13        tests/runtests
     14 
     15 install: xmlwf/xmlwf installlib
     16-       $(mkinstalldirs) $(bindir) $(mandir)
     17+       $(mkinstalldirs) $(bindir) $(mandir) $(mandir)/man1
     18        $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf
     19-       $(INSTALL_DATA) $(MANFILE) $(mandir)
     20+       $(INSTALL_DATA) $(MANFILE) $(mandir)/man1
     21 
     22 installlib: $(LIBRARY) $(APIHEADER)
     23        $(mkinstalldirs) $(libdir) $(includedir)
     24@@ -84,7 +84,7 @@
     25 
     26 uninstall: uninstalllib
     27        $(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf
     28-       rm -f $(mandir)/xmlwf.1
     29+       rm -f $(mandir)/man1/xmlwf.1
     30 
     31 uninstalllib:
     32        $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY)
  • files/patch-expat.h

    diff -uNr expat.orig/files/patch-expat.h expat/files/patch-expat.h
    old new  
    1 --- lib/expat.h    Thu Jan 16 15:03:42 2003
    2 +++ lib/expat.h    Wed May 21 11:38:14 2003
    3 @@ -647,6 +647,32 @@
    4  /* Returns the last value set by XML_SetUserData or NULL. */
    5  #define XML_GetUserData(parser) (*(void **)(parser))
    6  
    7 +/* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
    8 +   detected.  The last call to XML_Parse must have isFinal true; len
    9 +   may be zero for this call (or any other).
    10 +
    11 +   The XML_Status enum gives the possible return values for the
    12 +   XML_Parse and XML_ParseBuffer functions.  Though the return values
    13 +   for these functions has always been described as a Boolean value,
    14 +   the implementation, at least for the 1.95.x series, has always
    15 +   returned exactly one of these values.  The preprocessor #defines
    16 +   are included so this stanza can be added to code that still needs
    17 +   to support older versions of Expat 1.95.x:
    18 +
    19 +   #ifndef XML_STATUS_OK
    20 +   #define XML_STATUS_OK    1
    21 +   #define XML_STATUS_ERROR 0
    22 +   #endif
    23 +
    24 +   Otherwise, the #define hackery is quite ugly and would have been dropped.
    25 +*/
    26 +enum XML_Status {
    27 +  XML_STATUS_ERROR = 0,     
    28 +#define XML_STATUS_ERROR XML_STATUS_ERROR
    29 +  XML_STATUS_OK = 1
    30 +#define XML_STATUS_OK XML_STATUS_OK
    31 +};
    32 +
    33  /* This is equivalent to supplying an encoding argument to
    34     XML_ParserCreate. On success XML_SetEncoding returns non-zero,
    35     zero otherwise.
    36 @@ -712,32 +738,6 @@
    37  */
    38  XMLPARSEAPI(int)
    39  XML_GetIdAttributeIndex(XML_Parser parser);
    40 -
    41 -/* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
    42 -   detected.  The last call to XML_Parse must have isFinal true; len
    43 -   may be zero for this call (or any other).
    44 -
    45 -   The XML_Status enum gives the possible return values for the
    46 -   XML_Parse and XML_ParseBuffer functions.  Though the return values
    47 -   for these functions has always been described as a Boolean value,
    48 -   the implementation, at least for the 1.95.x series, has always
    49 -   returned exactly one of these values.  The preprocessor #defines
    50 -   are included so this stanza can be added to code that still needs
    51 -   to support older versions of Expat 1.95.x:
    52 -
    53 -   #ifndef XML_STATUS_OK
    54 -   #define XML_STATUS_OK    1
    55 -   #define XML_STATUS_ERROR 0
    56 -   #endif
    57 -
    58 -   Otherwise, the #define hackery is quite ugly and would have been dropped.
    59 -*/
    60 -enum XML_Status {
    61 -  XML_STATUS_ERROR = 0,
    62 -#define XML_STATUS_ERROR XML_STATUS_ERROR
    63 -  XML_STATUS_OK = 1
    64 -#define XML_STATUS_OK XML_STATUS_OK
    65 -};
    66  
    67  XMLPARSEAPI(enum XML_Status)
    68  XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);
    69