From b21daaff573bb7e9780a599c1fda8aae3fcf87a0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 31 Mar 2017 05:14:20 +0200 Subject: mxml: update to 2.10 --- package/mxml/Makefile | 8 +- package/mxml/patches/patch-Makefile_in | 90 +- package/mxml/patches/patch-configure | 30 - package/mxml/patches/patch-doc_reference_html | 1638 ------------------------- package/mxml/patches/patch-mxmldoc_c | 11 - 5 files changed, 17 insertions(+), 1760 deletions(-) delete mode 100644 package/mxml/patches/patch-configure delete mode 100644 package/mxml/patches/patch-doc_reference_html delete mode 100644 package/mxml/patches/patch-mxmldoc_c (limited to 'package/mxml') diff --git a/package/mxml/Makefile b/package/mxml/Makefile index bba467df6..f2d772da3 100755 --- a/package/mxml/Makefile +++ b/package/mxml/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mxml -PKG_VERSION:= 2.6 +PKG_VERSION:= 2.10 PKG_RELEASE:= 1 -PKG_HASH:= b0d347da1a0d5a8c9e82f66087d55cfe499728dacae563740d7e733648c69795 +PKG_HASH:= 267ff58b64ddc767170d71dab0c729c06f45e1df9a9b6f75180b564f09767891 PKG_DESCR:= lightweight xml library PKG_SECTION:= libs/data -PKG_URL:= http://www.msweet.org/projects.php?Z3 -PKG_SITES:= http://www.msweet.org/files/project3/ +PKG_URL:= http://www.msweet.org/ +PKG_SITES:= https://github.com/michaelrsweet/mxml/releases/download/release-2.10/ PKG_LIBNAME:= libmxml PKG_OPTS:= dev diff --git a/package/mxml/patches/patch-Makefile_in b/package/mxml/patches/patch-Makefile_in index 5ed9231f1..ce6cdedca 100644 --- a/package/mxml/patches/patch-Makefile_in +++ b/package/mxml/patches/patch-Makefile_in @@ -1,7 +1,7 @@ ---- mxml-2.6.orig/Makefile.in 2008-12-06 05:20:38.000000000 +0100 -+++ mxml-2.6/Makefile.in 2011-05-10 13:06:25.000000000 +0200 +--- mxml-2.10.orig/Makefile.in 2014-10-19 19:21:48.000000000 +0200 ++++ mxml-2.10/Makefile.in 2017-03-30 19:52:58.195963935 +0200 @@ -88,7 +88,7 @@ PUBLIBOBJS = mxml-attr.o mxml-entity.o m - mxml-node.o mxml-search.o mxml-set.o + mxml-index.o mxml-node.o mxml-search.o mxml-set.o LIBOBJS = $(PUBLIBOBJS) mxml-private.o mxml-string.o OBJS = mxmldoc.o testmxml.o $(LIBOBJS) -TARGETS = $(LIBMXML) mxmldoc testmxml mxml.xml doc/mxml.man @@ -9,95 +9,31 @@ # -@@ -133,21 +133,21 @@ clang: +@@ -139,26 +139,13 @@ clang-changes: # Install everything... # -install: $(TARGETS) install-$(LIBMXML) install-libmxml.a -+install: $(TARGETS) install-$(LIBMXML) - $(INSTALL_DIR) $(BUILDROOT)$(bindir) -- $(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) +- echo Installing mxmldoc in $(BUILDROOT)$(bindir)... +- $(INSTALL_DIR) $(BUILDROOT)$(bindir) +- $(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) +- echo Installing documentation in $(BUILDROOT)$(docdir)... - $(INSTALL_DIR) $(BUILDROOT)$(docdir) - for file in $(DOCFILES); do \ - $(INSTALL_MAN) $$file $(BUILDROOT)$(docdir); \ - done -+ #$(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) -+ #$(INSTALL_DIR) $(BUILDROOT)$(docdir) -+ #for file in $(DOCFILES); do \ -+ # $(INSTALL_MAN) $$file $(BUILDROOT)$(docdir); \ -+ #done ++install: $(TARGETS) install-$(LIBMXML) + echo Installing header files in $(BUILDROOT)$(includedir)... $(INSTALL_DIR) $(BUILDROOT)$(includedir) $(INSTALL_DATA) mxml.h $(BUILDROOT)$(includedir) + echo Installing pkgconfig files in $(BUILDROOT)$(libdir)/pkgconfig... $(INSTALL_DIR) $(BUILDROOT)$(libdir)/pkgconfig $(INSTALL_DATA) mxml.pc $(BUILDROOT)$(libdir)/pkgconfig +- echo Installing man pages in $(BUILDROOT)$(mandir)... - $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man1 - $(INSTALL_MAN) doc/mxmldoc.man $(BUILDROOT)$(mandir)/man1/mxmldoc.1 - $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3 - $(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3 -+ #$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man1 -+ #$(INSTALL_MAN) doc/mxmldoc.man $(BUILDROOT)$(mandir)/man1/mxmldoc.1 -+ #$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3 -+ #$(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3 install-libmxml.a: - $(INSTALL_DIR) $(BUILDROOT)$(libdir) -@@ -294,7 +294,7 @@ mxmldoc: $(LIBMXML) mxmldoc.o - $(CC) -L. $(LDFLAGS) -o $@ mxmldoc.o -lmxml $(LIBS) - - mxmldoc-static: libmxml.a mxmldoc.o -- $(CC) $(LDFLAGS) -o $@ mxmldoc.o libmxml.a $(LIBS) -+ $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ mxmldoc.o libmxml.a $(LIBS) - - mxmldoc.o: mxml.h - -@@ -304,28 +304,7 @@ mxmldoc.o: mxml.h - # - - testmxml: libmxml.a testmxml.o -- $(CC) $(LDFLAGS) -o $@ testmxml.o libmxml.a $(LIBS) -- @echo Testing library... -- ./testmxml test.xml >temp1.xml 2>temp1s.xml -- ./testmxml temp1.xml >temp2.xml 2>temp2s.xml -- @if cmp temp1.xml temp2.xml; then \ -- echo Stdio file test passed!; \ -- $(RM) temp2.xml temp2s.xml; \ -- else \ -- echo Stdio file test failed!; \ -- fi -- @if cmp temp1.xml temp1s.xml; then \ -- echo String test passed!; \ -- $(RM) temp1.xml temp1s.xml; \ -- else \ -- echo String test failed!; \ -- fi -- @if cmp test.xml test.xmlfd; then \ -- echo File descriptor test passed!; \ -- $(RM) test.xmlfd; \ -- else \ -- echo File descriptor test failed!; \ -- fi -+ $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ testmxml.o libmxml.a $(LIBS) - - testmxml.o: mxml.h - -@@ -336,19 +315,7 @@ testmxml.o: mxml.h - - mxml.xml: mxmldoc-static mxml.h $(PUBLIBOBJS:.o=.c) - $(RM) mxml.xml -- ./mxmldoc-static --header doc/reference.heading mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html -- if test "x`uname`" = xDarwin; then \ -- ./mxmldoc-static --docset org.minixml.docset \ -- --docversion @VERSION@ --feedname minixml.org \ -- --feedurl http://www.minixml.org/org.minixml.atom \ -- --header doc/docset.header --intro doc/docset.intro \ -- --css doc/docset.css --title "Mini-XML API Reference" \ -- mxml.xml || exit 1; \ -- /Developer/usr/bin/docsetutil package --output org.minixml.xar \ -- --atom org.minixml.atom \ -- --download-url http://www.minixml.org/org.minixml.xar \ -- org.minixml.docset || exit 1; \ -- fi -+ #./mxmldoc-static --header doc/reference.heading mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html - - valgrind: mxmldoc-static - $(RM) valgrind.xml + echo Installing libmxml.a to $(BUILDROOT)$(libdir)... diff --git a/package/mxml/patches/patch-configure b/package/mxml/patches/patch-configure deleted file mode 100644 index 5c8b5da9f..000000000 --- a/package/mxml/patches/patch-configure +++ /dev/null @@ -1,30 +0,0 @@ ---- mxml-2.6.orig/configure 2009-04-18 19:05:52.000000000 +0200 -+++ mxml-2.6/configure 2011-05-10 12:55:05.000000000 +0200 -@@ -1778,8 +1778,8 @@ else - fi - - --uname=`uname` --uversion=`uname -r | sed -e '1,$s/[^0-9]//g'` -+uname=Linux -+uversion=2.6 - if test x$uname = xIRIX64; then - uname="IRIX" - fi -@@ -3479,15 +3479,7 @@ fi - - - --case "$uname" in -- Darwin* | *BSD*) -- ARFLAGS="-rcv" -- ;; -- *) -- ARFLAGS="crvs" -- ;; --esac -- -+ARFLAGS="crvs" - - - diff --git a/package/mxml/patches/patch-doc_reference_html b/package/mxml/patches/patch-doc_reference_html deleted file mode 100644 index 0fa8d3521..000000000 --- a/package/mxml/patches/patch-doc_reference_html +++ /dev/null @@ -1,1638 +0,0 @@ ---- mxml-2.6.orig/doc/reference.html 2009-03-19 06:38:52.000000000 +0100 -+++ mxml-2.6/doc/reference.html 2011-05-10 12:57:21.000000000 +0200 -@@ -1,1635 +0,0 @@ -- -- -- --Documentation -- -- -- -- --
--

CLibrary --Reference

-- --

Contents

--