CVS commit: pkgsrc/textproc/mxml

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Thu Nov 14 12:10:04 UTC 2024

Modified Files:
        pkgsrc/textproc/mxml: distinfo
        pkgsrc/textproc/mxml/patches: patch-aa

Log Message:
mxml: try to fix build on darwin

The package tries to run mxmldoc-static on
OSX causing build problems, this is to create
a docset bundle but the docsetutil program
is not guarranteed to exist since it was
removed in XCode 9.3, so comment that section
out to fix the build problem.
Should fix PR pkg/58770 .


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/mxml/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/mxml/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/mxml/distinfo
diff -u pkgsrc/textproc/mxml/distinfo:1.8 pkgsrc/textproc/mxml/distinfo:1.9
--- pkgsrc/textproc/mxml/distinfo:1.8   Tue Oct 26 11:22:23 2021
+++ pkgsrc/textproc/mxml/distinfo       Thu Nov 14 12:10:03 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:22:23 nia Exp $
+$NetBSD: distinfo,v 1.9 2024/11/14 12:10:03 nros Exp $
 
 BLAKE2s (mxml-2.10.tar.gz) = 44a512f196be191bb8a678843db0eeada2e58b3c016f5a597a878c280c46136f
 SHA512 (mxml-2.10.tar.gz) = c3838611979c4228df476166e4e987fc1ff8f9b8bd30139066b475dcd99e25be81ecc5171235bc80b1c2291c9d78c9ceae9a1dfc928272a983740d6a67372f5c
 Size (mxml-2.10.tar.gz) = 265398 bytes
-SHA1 (patch-aa) = c728536a8813e455579a8aa816adcdb575063079
+SHA1 (patch-aa) = 076392b590b50b6a24c0b2caff4cb1f63499c840
 SHA1 (patch-configure) = 250eb883c8c6c44e223e31f55e669e74d3269888

Index: pkgsrc/textproc/mxml/patches/patch-aa
diff -u pkgsrc/textproc/mxml/patches/patch-aa:1.4 pkgsrc/textproc/mxml/patches/patch-aa:1.5
--- pkgsrc/textproc/mxml/patches/patch-aa:1.4   Tue Mar  8 13:50:46 2016
+++ pkgsrc/textproc/mxml/patches/patch-aa       Thu Nov 14 12:10:03 2024
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2016/03/08 13:50:46 nros Exp $
+$NetBSD: patch-aa,v 1.5 2024/11/14 12:10:03 nros Exp $
 * use BSD_INSTALL*
 * use libtool for everything
+* Don't create docsets on OSX
 --- Makefile.in.orig   2014-10-19 17:21:48.000000000 +0000
 +++ Makefile.in
 @@ -28,7 +28,7 @@ DSO          =       @DSO@
@@ -89,7 +90,7 @@ $NetBSD: patch-aa,v 1.4 2016/03/08 13:50
        @echo Testing library...
        ./testmxml test.xml temp1s.xml >temp1.xml
        ./testmxml temp1.xml temp2s.xml >temp2.xml
-@@ -384,10 +386,10 @@ testmxml.o:      mxml.h
+@@ -384,23 +386,10 @@ testmxml.o:      mxml.h
  # mxml.xml
  #
  
@@ -98,11 +99,24 @@ $NetBSD: patch-aa,v 1.4 2016/03/08 13:50
        echo Generating API documentation...
        $(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; \
+-              $(RM) org.minixml.atom; \
+-              xcrun 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 --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 \
-@@ -414,10 +416,10 @@ valgrind:        mxmldoc-static
+ 
+ valgrind:     mxmldoc-static
+       echo Doing dynamic code analysis using Valgrind...
+@@ -414,10 +403,10 @@ valgrind:        mxmldoc-static
  # doc/mxml.man
  #