diff --git a/dev-libs/mini-xml/mini_xml-2.11.recipe b/dev-libs/mini-xml/mini_xml-2.11.recipe new file mode 100644 index 000000000..1f02dcde1 --- /dev/null +++ b/dev-libs/mini-xml/mini_xml-2.11.recipe @@ -0,0 +1,72 @@ +SUMMARY="Minimum XML Library" +DESCRIPTION="Mini-XML is a small XML parsing library that you can \ +use to read XML and XML-like data files in your application without \ +requiring large non-standard libraries." +HOMEPAGE="http://www.minixml.org/index.php" +COPYRIGHT="2003-2014 Michael R Sweet" +LICENSE="GNU LGPL v2" +REVISION="1" +SOURCE_URI="https://github.com/michaelrsweet/mxml/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="7d3dfe661e50908fe41aef9b97ba6f7f158cab5208515c6be9f5bc9daf032329" +SOURCE_DIR="mxml-$portVersion" +PATCHES="mini_xml-$portVersion.patchset" + +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +libVersion="1.6" +libVersionCompat="$libVersion compat >= ${libVersion%.*}" + +PROVIDES=" + mini_xml$secondaryArchSuffix = $portVersion + cmd:mxmldoc$secondaryArchSuffix = $portVersion + lib:libmxml$secondaryArchSuffix = $libVersionCompat + " +REQUIRES=" + haiku$secondaryArchSuffix + " + +PROVIDES_devel=" + mini_xml${secondaryArchSuffix}_devel = $portVersion + devel:libmxml$secondaryArchSuffix = $libVersionCompat + " +REQUIRES_devel=" + mini_xml${secondaryArchSuffix}_devel == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " + +BUILD_PREREQUIRES=" + cmd:autoconf + cmd:gcc${secondaryArchSuffix} + cmd:libtoolize$secondaryArchSuffix + cmd:make + cmd:mkdepend + " + +defineDebugInfoPackage mini_xml$secondaryArchSuffix \ + "$libDir"/libmxml.so.$libVersion + +BUILD() +{ + libtoolize -fci + autoconf + runConfigure ./configure --enable-shared + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs \ + libmxml + packageEntries devel \ + $developDir +} + +TEST() +{ + make testmxml +} diff --git a/dev-libs/mini-xml/mini_xml-2.9.recipe b/dev-libs/mini-xml/mini_xml-2.9.recipe deleted file mode 100644 index 7d17963d3..000000000 --- a/dev-libs/mini-xml/mini_xml-2.9.recipe +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY="Minimum XML Library" -DESCRIPTION="Mini-XML is a small XML parsing library that you can \ -use to read XML and XML-like data files in your application without \ -requiring large non-standard libraries." -HOMEPAGE="http://www.minixml.org/index.php" -COPYRIGHT="2003-2014 Michael R Sweet" -LICENSE="GNU LGPL v2" -REVISION="3" -SOURCE_URI="http://www.msweet.org/files/project3/mxml-2.9.tar.gz" -CHECKSUM_SHA256="cded54653c584b24c4a78a7fa1b3b4377d49ac4f451ddf170ebbc8161d85ff92" -SOURCE_DIR="mxml-2.9" -PATCHES="mini_xml-2.9.patchset" - -ARCHITECTURES="!x86_gcc2 !x86 !x86_64" -SECONDARY_ARCHITECTURES="!x86_gcc2 !x86" - -PROVIDES=" - mini_xml$secondaryArchSuffix = $portVersion - lib:mxml$secondaryArchSuffix = $portVersion - " -#PROVIDES_devel=" -# mini_xml${secondaryArchSuffix}_devel >= $portVersion -# devel:mxml$secondaryArchSuffix >= $portVersion -# " - -REQUIRES=" - haiku$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -#REQUIRES_devel=" -# haiku${secondaryArchSuffix}_devel -# " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - " - -BUILD_PREREQUIRES=" - cmd:libtoolize$secondaryArchSuffix - cmd:make -# cmd:aclocal -# cmd:automake - cmd:autoconf - cmd:mkdepend - cmd:gcc${secondaryArchSuffix} - cmd:ld${secondaryArchSuffix} -" - -BUILD() -{ - libtoolize -fci - autoconf - runConfigure ./configure --enable-shared - sed -i "s|LIBS = -pthread|LIBS=|" $sourceDir/Makefile - make $jobArgs -} - -INSTALL() -{ - make install -# prepareInstalledDevelLibs \ -# libmxml -# packageEntries devel \ -# $developDir -} diff --git a/dev-libs/mini-xml/patches/mini_xml-2.11.patchset b/dev-libs/mini-xml/patches/mini_xml-2.11.patchset new file mode 100644 index 000000000..c420096ce --- /dev/null +++ b/dev-libs/mini-xml/patches/mini_xml-2.11.patchset @@ -0,0 +1,98 @@ +From e2a3c296c54c0bb22d2b60a87ed4e8f076a4a550 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Mon, 24 Sep 2018 08:31:32 +0200 +Subject: enable shared library + + +diff --git a/configure.ac b/configure.ac +index 47a0d41..c852d90 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -219,6 +219,14 @@ if test x$enable_shared != xno; then + LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)" + ;; + ++ haiku*) ++ AC_MSG_RESULT(yes) ++ LIBMXML="libmxml.so.1.6" ++ DSO="\$(CC)" ++ DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-R\$(libdir) -shared \$(OPTIM)" ++ LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)" ++ ;; ++ + darwin) + AC_MSG_RESULT(yes) + LIBMXML="libmxml.1.dylib" +-- +2.19.0 + + +From 4b0ecbc14207e24623889a371b5404654f02cc27 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Mon, 24 Sep 2018 08:27:13 +0200 +Subject: testmxml mxml.xml @MXML_EPUB@ break the build + + +diff --git a/Makefile.in b/Makefile.in +index eef14fe..03a203d 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -83,7 +83,7 @@ PUBLIBOBJS = mxml-attr.o mxml-entity.o mxml-file.o mxml-get.o \ + mxml-index.o mxml-node.o mxml-search.o mxml-set.o + LIBOBJS = $(PUBLIBOBJS) mxml-private.o mxml-string.o + OBJS = mmd.o mxmldoc.o testmxml.o zipc.o $(LIBOBJS) +-ALLTARGETS = $(LIBMXML) mxmldoc testmxml mxml.xml @MXML_EPUB@ ++ALLTARGETS = $(LIBMXML) mxmldoc + CROSSTARGETS = $(LIBMXML) mxmldoc + TARGETS = $(@TARGETS@) + +-- +2.19.0 + + +From f3651900fc703003e95d6dbb9d599bf13e3faaa1 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Mon, 24 Sep 2018 09:14:23 +0200 +Subject: import upstream patch + + +diff --git a/Makefile.in b/Makefile.in +index 03a203d..e720727 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -162,13 +162,13 @@ install: $(TARGETS) install-$(LIBMXML) install-libmxml.a + $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3 + $(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3 + +-install-libmxml.a: ++install-libmxml.a: libmxml.a + echo Installing libmxml.a to $(BUILDROOT)$(libdir)... + $(INSTALL_DIR) $(BUILDROOT)$(libdir) + $(INSTALL_LIB) libmxml.a $(BUILDROOT)$(libdir) + $(RANLIB) $(BUILDROOT)$(libdir)/libmxml.a + +-install-libmxml.so.1.6: ++install-libmxml.so.1.6: libmxml.so.1.6 + echo Installing libmxml.so to $(BUILDROOT)$(libdir)... + $(INSTALL_DIR) $(BUILDROOT)$(libdir) + $(INSTALL_LIB) libmxml.so.1.6 $(BUILDROOT)$(libdir) +@@ -177,14 +177,14 @@ install-libmxml.so.1.6: + $(RM) $(BUILDROOT)$(libdir)/libmxml.so.1 + $(LN) libmxml.so.1.6 $(BUILDROOT)$(libdir)/libmxml.so.1 + +-install-libmxml.sl.1: ++install-libmxml.sl.1: libmxml.sl.1 + echo Installing libmxml.sl to $(BUILDROOT)$(libdir)... + $(INSTALL_DIR) $(BUILDROOT)$(libdir) + $(INSTALL_LIB) libmxml.sl.1 $(BUILDROOT)$(libdir) + $(RM) $(BUILDROOT)$(libdir)/libmxml.so + $(LN) libmxml.sl.1 $(BUILDROOT)$(libdir)/libmxml.sl + +-install-libmxml.1.dylib: ++install-libmxml.1.dylib: libmxml.1.dylib + echo Installing libmxml.dylib to $(BUILDROOT)$(libdir)... + $(INSTALL_DIR) $(BUILDROOT)$(libdir) + $(INSTALL_LIB) libmxml.1.dylib $(BUILDROOT)$(libdir) +-- +2.19.0 + diff --git a/dev-libs/mini-xml/patches/mini_xml-2.9.patchset b/dev-libs/mini-xml/patches/mini_xml-2.9.patchset deleted file mode 100644 index dda6daa16..000000000 --- a/dev-libs/mini-xml/patches/mini_xml-2.9.patchset +++ /dev/null @@ -1,28 +0,0 @@ -From e15adf9b52db905f16349ecefa2785443d16fdfd Mon Sep 17 00:00:00 2001 -From: Derek Tse -Date: Sun, 18 Jan 2015 04:09:22 +0000 -Subject: Fixed configure - - -diff --git a/configure.in b/configure.in -index de1bf8b..7d3494d 100644 ---- a/configure.in -+++ b/configure.in -@@ -207,6 +207,14 @@ if test x$enable_shared != xno; then - DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-R\$(libdir) -shared \$(OPTIM)" - LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)" - ;; -+ -+ Haiku*) -+ AC_MSG_RESULT(yes) -+ LIBMXML="libmxml.so.1.5" -+ DSO="\$(CC)" -+ DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-R\$(libdir) -shared \$(OPTIM)" -+ LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)" -+ ;; - - Darwin*) - AC_MSG_RESULT(yes) --- -1.8.3.4 -