From 6f35f24ce0a31e55c3aa3094042575c0ff0b4731 Mon Sep 17 00:00:00 2001 From: bernd Date: Mon, 20 Mar 2006 10:11:02 +0000 Subject: [PATCH] Update to expat-2.0.0. test & ok steven@ "go ahead, now is the time" espie@ --- textproc/expat/Makefile | 16 ++--- textproc/expat/distinfo | 8 +-- textproc/expat/patches/patch-Makefile_in | 75 +++++++++++------------- textproc/expat/patches/patch-configure | 46 +++++++-------- textproc/expat/patches/patch-lib_expat_h | 63 -------------------- textproc/expat/pkg/PLIST | 3 +- 6 files changed, 70 insertions(+), 141 deletions(-) delete mode 100644 textproc/expat/patches/patch-lib_expat_h diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile index 2c325792584..5a4bfca3bd4 100644 --- a/textproc/expat/Makefile +++ b/textproc/expat/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.27 2006/01/07 10:17:12 steven Exp $ +# $OpenBSD: Makefile,v 1.28 2006/03/20 10:11:02 bernd Exp $ # $FreeBSD: Makefile,v 1.2 1999/08/31 02:09:14 peter Exp $ COMMENT= "XML 1.0 parser written in C" -DISTNAME= expat-1.95.6 -PKGNAME= ${DISTNAME}p1 -SHARED_LIBS= expat 4.0 +DISTNAME= expat-2.0.0 +SHARED_LIBS= expat 6.0 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=expat/} @@ -18,20 +17,21 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c +USE_LIBTOOL= Yes +SEPARATE_BUILD= simple CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -NO_REGRESS=Yes MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/conftools -MAKE_FLAGS= VSNFLAG='-version-info ${LIBexpat_VERSION:S/./:/}:0' DOC=${PREFIX}/share/doc/expat EXAMPLES=${PREFIX}/share/examples/expat -SEPARATE_BUILD=simple post-install: ${INSTALL_DATA_DIR} ${DOC} ${EXAMPLES} ${INSTALL_DATA} ${WRKDIST}/doc/{reference.html,style.css,valid-xhtml10.png} ${DOC} ${INSTALL_DATA} ${WRKDIST}/examples/{elements.c,outline.c} ${EXAMPLES} -USE_LIBTOOL=Yes +pre-regress: + @cp ${WRKSRC}/lib/expat*.h ${WRKSRC}/tests + .include diff --git a/textproc/expat/distinfo b/textproc/expat/distinfo index 58fe6eba473..c4838aaceea 100644 --- a/textproc/expat/distinfo +++ b/textproc/expat/distinfo @@ -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-2.0.0.tar.gz) = d945df7f1c0868c5c73cf66ba9596f3f +RMD160 (expat-2.0.0.tar.gz) = f52ccab26950d0148c3e8b644d7c9021734de318 +SHA1 (expat-2.0.0.tar.gz) = 9ff011a75a1f5b60145c4afdec520442cb398d93 +SIZE (expat-2.0.0.tar.gz) = 450860 diff --git a/textproc/expat/patches/patch-Makefile_in b/textproc/expat/patches/patch-Makefile_in index 15e56451325..de1d7196011 100644 --- a/textproc/expat/patches/patch-Makefile_in +++ b/textproc/expat/patches/patch-Makefile_in @@ -1,16 +1,17 @@ -$OpenBSD: patch-Makefile_in,v 1.4 2005/12/25 16:08:25 steven Exp $ ---- Makefile.in.orig Fri Jan 24 17:21:46 2003 -+++ Makefile.in Sun Dec 25 01:31:05 2005 -@@ -24,6 +24,8 @@ srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ +$OpenBSD: patch-Makefile_in,v 1.5 2006/03/20 10:11:02 bernd Exp $ +--- Makefile.in.orig Thu Feb 10 16:52:02 2005 ++++ Makefile.in Sat Jan 21 16:32:37 2006 +@@ -44,15 +44,15 @@ MANFILE = $(srcdir)/doc/xmlwf.1 + APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h + LIBRARY = libexpat.la -+DESTDIR = -+ - prefix = @prefix@ - exec_prefix = @exec_prefix@ +-ifndef INSTALL_ROOT ++.ifndef INSTALL_ROOT + INSTALL_ROOT=$(DESTDIR) +-endif ++.endif -@@ -49,7 +51,7 @@ default: buildlib xmlwf/xmlwf + default: buildlib xmlwf/xmlwf buildlib: $(LIBRARY) @@ -19,36 +20,30 @@ $OpenBSD: patch-Makefile_in,v 1.4 2005/12/25 16:08:25 steven Exp $ clean: cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs -@@ -73,22 +75,22 @@ check: tests/runtests - tests/runtests +@@ -157,10 +157,10 @@ tests/chardata.o: tests/chardata.c tests + tests/minicheck.o: tests/minicheck.c tests/minicheck.h + tests/runtests.o: tests/runtests.c tests/chardata.h + tests/runtests: tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY) +- $(LINK_EXE) $^ ++ $(LINK_EXE) $? + tests/runtestspp.o: tests/runtestspp.cpp tests/runtests.c tests/chardata.h + tests/runtestspp: tests/runtestspp.o tests/chardata.o tests/minicheck.o $(LIBRARY) +- $(LINK_CXX_EXE) $^ ++ $(LINK_CXX_EXE) $? - 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) + tests/xmlts.zip: + wget --output-document=tests/xmlts.zip \ +@@ -172,10 +172,12 @@ tests/XML-Test-Suite: tests/xmlts.zip + run-xmltest: xmlwf/xmlwf tests/XML-Test-Suite + tests/xmltest.sh - 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) +-.SUFFIXES: .c .lo .o ++.SUFFIXES: .c .cpp .lo .o - 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 + .c.o: + $(COMPILE) -o $@ -c $< ++.cpp.o: ++ $(CXXCOMPILE) -o $@ -c $< + .c.lo: + $(LTCOMPILE) -o $@ -c $< - 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 --git a/textproc/expat/patches/patch-configure b/textproc/expat/patches/patch-configure index 545ede8e527..c05f21a56c8 100644 --- a/textproc/expat/patches/patch-configure +++ b/textproc/expat/patches/patch-configure @@ -1,25 +1,21 @@ -$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 - 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' - export_dynamic_flag_spec='${wl}-E' - else - case "$host_os" in -@@ -5082,8 +5082,8 @@ else - 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' - ;; - esac - fi +$OpenBSD: patch-configure,v 1.4 2006/03/20 10:11:02 bernd Exp $ +--- configure.orig Sat Jan 21 15:48:13 2006 ++++ configure Sat Jan 21 15:47:55 2006 +@@ -7551,7 +7551,7 @@ if test -z "$aix_libpath"; then aix_libp + 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 $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ hardcode_libdir_flag_spec='${wl}-R$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in +@@ -7561,7 +7561,7 @@ if test -z "$aix_libpath"; then aix_libp + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ hardcode_libdir_flag_spec='${wl}-R$libdir' + ;; + esac + fi diff --git a/textproc/expat/patches/patch-lib_expat_h b/textproc/expat/patches/patch-lib_expat_h deleted file mode 100644 index 888e65b6810..00000000000 --- a/textproc/expat/patches/patch-lib_expat_h +++ /dev/null @@ -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 --git a/textproc/expat/pkg/PLIST b/textproc/expat/pkg/PLIST index 44924fc2610..42b8a4c3835 100644 --- a/textproc/expat/pkg/PLIST +++ b/textproc/expat/pkg/PLIST @@ -1,6 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.6 2004/09/15 18:41:03 espie Exp $ +@comment $OpenBSD: PLIST,v 1.7 2006/03/20 10:11:03 bernd Exp $ bin/xmlwf include/expat.h +include/expat_external.h lib/libexpat.a lib/libexpat.la @man man/man1/xmlwf.1