update expat 1.95.6 to 1.95.8
diff -ruN expat.orig/CVS/Entries expat/CVS/Entries
--- expat.orig/CVS/Entries Fri Nov 11 02:12:56 2005
+++ expat/CVS/Entries Thu Nov 10 22:34:25 2005
@@ -1,3 +1,4 @@
-/Makefile/1.24/Sun Oct 30 00:10:42 2005//
/distinfo/1.4/Wed Jan 5 17:34:19 2005//
-D
+D/patches////
+D/pkg////
+/Makefile/1.24/Tue Nov 1 16:10:38 2005//
diff -ruN expat.orig/CVS/Entries.Log expat/CVS/Entries.Log
--- expat.orig/CVS/Entries.Log Fri Nov 11 02:12:57 2005
+++ expat/CVS/Entries.Log Wed Dec 31 21:00:00 1969
@@ -1,3 +0,0 @@
-A D/files////
-A D/patches////
-A D/pkg////
diff -ruN expat.orig/CVS/Root expat/CVS/Root
--- expat.orig/CVS/Root Fri Nov 11 02:12:56 2005
+++ expat/CVS/Root Wed Dec 31 21:00:00 1969
@@ -1 +0,0 @@
[EMAIL PROTECTED]:/cvs
diff -ruN expat.orig/Makefile expat/Makefile
--- expat.orig/Makefile Sat Oct 29 22:10:42 2005
+++ expat/Makefile Fri Nov 11 01:51:23 2005
@@ -3,7 +3,7 @@
COMMENT= "XML 1.0 parser written in C"
-DISTNAME= expat-1.95.6
+DISTNAME= expat-1.95.8
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=expat/}
diff -ruN expat.orig/distinfo expat/distinfo
--- expat.orig/distinfo Wed Jan 5 15:34:19 2005
+++ expat/distinfo Fri Nov 11 01:52:00 2005
@@ -1,4 +1,4 @@
-MD5 (expat-1.95.6.tar.gz) = ca78d94e83e9f077b5da2bfe28ba986a
-RMD160 (expat-1.95.6.tar.gz) = aa0ff4dc00729fc3f61161d7d5da175a5bab1426
-SHA1 (expat-1.95.6.tar.gz) = 1f062c91c6e51d3a91f9fdeacf202bb5b2b53d27
-SIZE (expat-1.95.6.tar.gz) = 291876
+MD5 (expat-1.95.8.tar.gz) = aff487543845a82fe262e6e2922b4c8e
+RMD160 (expat-1.95.8.tar.gz) = 1b3e5a50a28e2c8efb79188d4c3071318fe1d0dd
+SHA1 (expat-1.95.8.tar.gz) = 73cb8fc326d04c44ae0e3b3f797f0e6ba9c4121f
+SIZE (expat-1.95.8.tar.gz) = 318349
diff -ruN expat.orig/files/CVS/Entries expat/files/CVS/Entries
--- expat.orig/files/CVS/Entries Fri Nov 11 02:12:56 2005
+++ expat/files/CVS/Entries Wed Dec 31 21:00:00 1969
@@ -1 +0,0 @@
-D
diff -ruN expat.orig/files/CVS/Repository expat/files/CVS/Repository
--- expat.orig/files/CVS/Repository Fri Nov 11 02:12:56 2005
+++ expat/files/CVS/Repository Wed Dec 31 21:00:00 1969
@@ -1 +0,0 @@
-ports/textproc/expat/files
diff -ruN expat.orig/files/CVS/Root expat/files/CVS/Root
--- expat.orig/files/CVS/Root Fri Nov 11 02:12:56 2005
+++ expat/files/CVS/Root Wed Dec 31 21:00:00 1969
@@ -1 +0,0 @@
[EMAIL PROTECTED]:/cvs
diff -ruN expat.orig/patches/CVS/Root expat/patches/CVS/Root
--- expat.orig/patches/CVS/Root Fri Nov 11 02:12:56 2005
+++ expat/patches/CVS/Root Wed Dec 31 21:00:00 1969
@@ -1 +0,0 @@
[EMAIL PROTECTED]:/cvs
diff -ruN expat.orig/patches/patch-Makefile_in expat/patches/patch-Makefile_in
--- expat.orig/patches/patch-Makefile_in Sun Aug 4 22:14:29 2002
+++ expat/patches/patch-Makefile_in Fri Nov 11 02:03:48 2005
@@ -1,31 +1,30 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2002/08/05 01:14:29 brad Exp $
---- Makefile.in.orig Sun Aug 4 20:58:35 2002
-+++ Makefile.in Sun Aug 4 21:03:12 2002
-@@ -24,6 +24,8 @@ srcdir = @srcdir@
+--- Makefile.in.orig Fri Nov 11 02:00:15 2005
++++ Makefile.in Fri Nov 11 02:03:27 2005
+@@ -24,6 +24,8 @@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-+DESTDIR =
++DESTDIR =
+
prefix = @prefix@
exec_prefix = @exec_prefix@
-@@ -49,7 +51,7 @@ default: buildlib xmlwf/xmlwf
+@@ -49,7 +51,7 @@
buildlib: $(LIBRARY)
-all: $(LIBRARY) xmlwf/xmlwf examples/elements examples/outline
-+all: $(LIBRARY) xmlwf/xmlwf
++all: $(LIBRARY) xmlwf/xmlwf
clean:
cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
-@@ -69,22 +71,22 @@ check: tests/runtests
+@@ -73,22 +75,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)
+- $(INSTALL_DATA) $(MANFILE) $(man1dir)
+ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)
+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf
$(DESTDIR)$(bindir)/xmlwf
+ $(INSTALL_DATA) $(MANFILE) $(DESTDIR)$(mandir)
@@ -40,7 +39,7 @@
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
diff -ruN expat.orig/patches/patch-configure expat/patches/patch-configure
--- expat.orig/patches/patch-configure Sun Aug 4 22:14:29 2002
+++ expat/patches/patch-configure Fri Nov 11 01:59:37 2005
@@ -1,25 +1,24 @@
-$OpenBSD: patch-configure,v 1.3 2002/08/05 01:14:29 brad Exp $
---- configure.orig Sun Aug 4 21:03:45 2002
-+++ configure Sun Aug 4 21:05:03 2002
-@@ -5072,8 +5072,8 @@ else
+--- configure.orig Fri Nov 11 01:54:44 2005
++++ configure Fri Nov 11 01:59:00 2005
+@@ -5072,8 +5072,8 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test
"$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs
$linker_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs
$compiler_flags'
-+ hardcode_libdir_flag_spec='${wl}-R$libdir'
++ hardcode_libdir_flag_spec='${wl}-R$libdir'
export_dynamic_flag_spec='${wl}-E'
else
case "$host_os" in
-@@ -5082,8 +5082,8 @@ else
+@@ -5082,8 +5082,8 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs
$linker_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs
$compiler_flags'
-+ hardcode_libdir_flag_spec='${wl}-R$libdir'
++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs
$compiler_flags'
++ hardcode_libdir_flag_spec='${wl}-R$libdir'
;;
esac
fi
diff -ruN expat.orig/patches/patch-conftools_ltmain_sh
expat/patches/patch-conftools_ltmain_sh
--- expat.orig/patches/patch-conftools_ltmain_sh Sun Aug 4 22:14:29 2002
+++ expat/patches/patch-conftools_ltmain_sh Fri Nov 11 02:06:49 2005
@@ -1,7 +1,6 @@
-$OpenBSD: patch-conftools_ltmain_sh,v 1.4 2002/08/05 01:14:29 brad Exp $
---- conftools/ltmain.sh.orig Sun Aug 4 21:05:41 2002
-+++ conftools/ltmain.sh Sun Aug 4 21:06:04 2002
-@@ -1737,11 +1737,6 @@ compiler."
+--- conftools/ltmain.sh.orig Fri Nov 11 02:04:26 2005
++++ conftools/ltmain.sh Fri Nov 11 02:06:04 2005
+@@ -1737,11 +1737,6 @@
continue
fi
@@ -13,7 +12,7 @@
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names
-@@ -4446,40 +4441,6 @@ relink_command=\"$relink_command\""
+@@ -4446,40 +4441,6 @@
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0
diff -ruN expat.orig/patches/patch-lib_expat_h expat/patches/patch-lib_expat_h
--- expat.orig/patches/patch-lib_expat_h Tue Oct 21 20:02:18 2003
+++ expat/patches/patch-lib_expat_h Wed Dec 31 21:00:00 1969
@@ -1,63 +0,0 @@
-$OpenBSD: patch-lib_expat_h,v 1.1 2003/10/21 22:02:18 brad Exp $
---- lib/expat.h.orig 2003-01-16 17:03:42.000000000 -0500
-+++ lib/expat.h 2003-10-21 17:42:59.000000000 -0400
-@@ -57,6 +57,26 @@ typedef unsigned char XML_Bool;
- #define XML_TRUE ((XML_Bool) 1)
- #define XML_FALSE ((XML_Bool) 0)
-
-+/* The XML_Status enum gives the possible return values for several
-+ API functions. The preprocessor #defines are included so this
-+ stanza can be added to code that still needs to support older
-+ versions of Expat 1.95.x:
-+
-+ #ifndef XML_STATUS_OK
-+ #define XML_STATUS_OK 1
-+ #define XML_STATUS_ERROR 0
-+ #endif
-+
-+ Otherwise, the #define hackery is quite ugly and would have been
-+ dropped.
-+*/
-+enum XML_Status {
-+ XML_STATUS_ERROR = 0,
-+#define XML_STATUS_ERROR XML_STATUS_ERROR
-+ XML_STATUS_OK = 1
-+#define XML_STATUS_OK XML_STATUS_OK
-+};
-+
- enum XML_Error {
- XML_ERROR_NONE,
- XML_ERROR_NO_MEMORY,
-@@ -717,28 +737,11 @@ XML_GetIdAttributeIndex(XML_Parser parse
- detected. The last call to XML_Parse must have isFinal true; len
- may be zero for this call (or any other).
-
-- The XML_Status enum gives the possible return values for the
-- XML_Parse and XML_ParseBuffer functions. Though the return values
-- for these functions has always been described as a Boolean value,
-- the implementation, at least for the 1.95.x series, has always
-- returned exactly one of these values. The preprocessor #defines
-- are included so this stanza can be added to code that still needs
-- to support older versions of Expat 1.95.x:
--
-- #ifndef XML_STATUS_OK
-- #define XML_STATUS_OK 1
-- #define XML_STATUS_ERROR 0
-- #endif
--
-- Otherwise, the #define hackery is quite ugly and would have been dropped.
-+ Though the return values for these functions has always been
-+ described as a Boolean value, the implementation, at least for the
-+ 1.95.x series, has always returned exactly one of the XML_Status
-+ values.
- */
--enum XML_Status {
-- XML_STATUS_ERROR = 0,
--#define XML_STATUS_ERROR XML_STATUS_ERROR
-- XML_STATUS_OK = 1
--#define XML_STATUS_OK XML_STATUS_OK
--};
--
- XMLPARSEAPI(enum XML_Status)
- XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);
-
diff -ruN expat.orig/pkg/CVS/Root expat/pkg/CVS/Root
--- expat.orig/pkg/CVS/Root Fri Nov 11 02:12:57 2005
+++ expat/pkg/CVS/Root Wed Dec 31 21:00:00 1969
@@ -1 +0,0 @@
[EMAIL PROTECTED]:/cvs
diff -ruN expat.orig/pkg/PFRAG.shared expat/pkg/PFRAG.shared
--- expat.orig/pkg/PFRAG.shared Wed Sep 15 15:41:03 2004
+++ expat/pkg/PFRAG.shared Fri Nov 11 02:10:25 2005
@@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2004/09/15 18:41:03 espie Exp $
[EMAIL PROTECTED] lib/libexpat.so.4.0
[EMAIL PROTECTED] lib/libexpat.so.5.0
diff -ruN expat.orig/pkg/PLIST expat/pkg/PLIST
--- expat.orig/pkg/PLIST Wed Sep 15 15:41:03 2004
+++ expat/pkg/PLIST Fri Nov 11 02:10:25 2005
@@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST,v 1.6 2004/09/15 18:41:03 espie Exp $
bin/xmlwf
include/expat.h
+include/expat_external.h
lib/libexpat.a
lib/libexpat.la
[EMAIL PROTECTED] man/man1/xmlwf.1
share/doc/expat/
share/doc/expat/reference.html
share/doc/expat/style.css
