head	1.5;
access;
symbols
	pkgsrc-2026Q1:1.5.0.12
	pkgsrc-2026Q1-base:1.5
	pkgsrc-2025Q4:1.5.0.10
	pkgsrc-2025Q4-base:1.5
	pkgsrc-2025Q3:1.5.0.8
	pkgsrc-2025Q3-base:1.5
	pkgsrc-2025Q2:1.5.0.6
	pkgsrc-2025Q2-base:1.5
	pkgsrc-2025Q1:1.5.0.4
	pkgsrc-2025Q1-base:1.5
	pkgsrc-2024Q4:1.5.0.2
	pkgsrc-2024Q4-base:1.5
	pkgsrc-2024Q3:1.4.0.70
	pkgsrc-2024Q3-base:1.4
	pkgsrc-2024Q2:1.4.0.68
	pkgsrc-2024Q2-base:1.4
	pkgsrc-2024Q1:1.4.0.66
	pkgsrc-2024Q1-base:1.4
	pkgsrc-2023Q4:1.4.0.64
	pkgsrc-2023Q4-base:1.4
	pkgsrc-2023Q3:1.4.0.62
	pkgsrc-2023Q3-base:1.4
	pkgsrc-2023Q2:1.4.0.60
	pkgsrc-2023Q2-base:1.4
	pkgsrc-2023Q1:1.4.0.58
	pkgsrc-2023Q1-base:1.4
	pkgsrc-2022Q4:1.4.0.56
	pkgsrc-2022Q4-base:1.4
	pkgsrc-2022Q3:1.4.0.54
	pkgsrc-2022Q3-base:1.4
	pkgsrc-2022Q2:1.4.0.52
	pkgsrc-2022Q2-base:1.4
	pkgsrc-2022Q1:1.4.0.50
	pkgsrc-2022Q1-base:1.4
	pkgsrc-2021Q4:1.4.0.48
	pkgsrc-2021Q4-base:1.4
	pkgsrc-2021Q3:1.4.0.46
	pkgsrc-2021Q3-base:1.4
	pkgsrc-2021Q2:1.4.0.44
	pkgsrc-2021Q2-base:1.4
	pkgsrc-2021Q1:1.4.0.42
	pkgsrc-2021Q1-base:1.4
	pkgsrc-2020Q4:1.4.0.40
	pkgsrc-2020Q4-base:1.4
	pkgsrc-2020Q3:1.4.0.38
	pkgsrc-2020Q3-base:1.4
	pkgsrc-2020Q2:1.4.0.34
	pkgsrc-2020Q2-base:1.4
	pkgsrc-2020Q1:1.4.0.14
	pkgsrc-2020Q1-base:1.4
	pkgsrc-2019Q4:1.4.0.36
	pkgsrc-2019Q4-base:1.4
	pkgsrc-2019Q3:1.4.0.32
	pkgsrc-2019Q3-base:1.4
	pkgsrc-2019Q2:1.4.0.30
	pkgsrc-2019Q2-base:1.4
	pkgsrc-2019Q1:1.4.0.28
	pkgsrc-2019Q1-base:1.4
	pkgsrc-2018Q4:1.4.0.26
	pkgsrc-2018Q4-base:1.4
	pkgsrc-2018Q3:1.4.0.24
	pkgsrc-2018Q3-base:1.4
	pkgsrc-2018Q2:1.4.0.22
	pkgsrc-2018Q2-base:1.4
	pkgsrc-2018Q1:1.4.0.20
	pkgsrc-2018Q1-base:1.4
	pkgsrc-2017Q4:1.4.0.18
	pkgsrc-2017Q4-base:1.4
	pkgsrc-2017Q3:1.4.0.16
	pkgsrc-2017Q3-base:1.4
	pkgsrc-2017Q2:1.4.0.12
	pkgsrc-2017Q2-base:1.4
	pkgsrc-2017Q1:1.4.0.10
	pkgsrc-2017Q1-base:1.4
	pkgsrc-2016Q4:1.4.0.8
	pkgsrc-2016Q4-base:1.4
	pkgsrc-2016Q3:1.4.0.6
	pkgsrc-2016Q3-base:1.4
	pkgsrc-2016Q2:1.4.0.4
	pkgsrc-2016Q2-base:1.4
	pkgsrc-2016Q1:1.4.0.2
	pkgsrc-2016Q1-base:1.4
	pkgsrc-2015Q4:1.3.0.50
	pkgsrc-2015Q4-base:1.3
	pkgsrc-2015Q3:1.3.0.48
	pkgsrc-2015Q3-base:1.3
	pkgsrc-2015Q2:1.3.0.46
	pkgsrc-2015Q2-base:1.3
	pkgsrc-2015Q1:1.3.0.44
	pkgsrc-2015Q1-base:1.3
	pkgsrc-2014Q4:1.3.0.42
	pkgsrc-2014Q4-base:1.3
	pkgsrc-2014Q3:1.3.0.40
	pkgsrc-2014Q3-base:1.3
	pkgsrc-2014Q2:1.3.0.38
	pkgsrc-2014Q2-base:1.3
	pkgsrc-2014Q1:1.3.0.36
	pkgsrc-2014Q1-base:1.3
	pkgsrc-2013Q4:1.3.0.34
	pkgsrc-2013Q4-base:1.3
	pkgsrc-2013Q3:1.3.0.32
	pkgsrc-2013Q3-base:1.3
	pkgsrc-2013Q2:1.3.0.30
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2013Q1:1.3.0.28
	pkgsrc-2013Q1-base:1.3
	pkgsrc-2012Q4:1.3.0.26
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2012Q3:1.3.0.24
	pkgsrc-2012Q3-base:1.3
	pkgsrc-2012Q2:1.3.0.22
	pkgsrc-2012Q2-base:1.3
	pkgsrc-2012Q1:1.3.0.20
	pkgsrc-2012Q1-base:1.3
	pkgsrc-2011Q4:1.3.0.18
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q3:1.3.0.16
	pkgsrc-2011Q3-base:1.3
	pkgsrc-2011Q2:1.3.0.14
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2011Q1:1.3.0.12
	pkgsrc-2011Q1-base:1.3
	pkgsrc-2010Q4:1.3.0.10
	pkgsrc-2010Q4-base:1.3
	pkgsrc-2010Q3:1.3.0.8
	pkgsrc-2010Q3-base:1.3
	pkgsrc-2010Q2:1.3.0.6
	pkgsrc-2010Q2-base:1.3
	pkgsrc-2010Q1:1.3.0.4
	pkgsrc-2010Q1-base:1.3
	pkgsrc-2009Q4:1.3.0.2
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2009Q3:1.1.1.1.0.20
	pkgsrc-2009Q3-base:1.1.1.1
	pkgsrc-2009Q2:1.1.1.1.0.18
	pkgsrc-2009Q2-base:1.1.1.1
	pkgsrc-2009Q1:1.1.1.1.0.16
	pkgsrc-2009Q1-base:1.1.1.1
	pkgsrc-2008Q4:1.1.1.1.0.14
	pkgsrc-2008Q4-base:1.1.1.1
	pkgsrc-2008Q3:1.1.1.1.0.12
	pkgsrc-2008Q3-base:1.1.1.1
	cube-native-xorg:1.1.1.1.0.10
	cube-native-xorg-base:1.1.1.1
	pkgsrc-2008Q2:1.1.1.1.0.8
	pkgsrc-2008Q2-base:1.1.1.1
	cwrapper:1.1.1.1.0.6
	pkgsrc-2008Q1:1.1.1.1.0.4
	pkgsrc-2008Q1-base:1.1.1.1
	pkgsrc-2007Q4:1.1.1.1.0.2
	pkgsrc-2007Q4-base:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.5
date	2024.11.14.12.10.03;	author nros;	state Exp;
branches;
next	1.4;
commitid	hoyA43C5iKEKQBxF;

1.4
date	2016.03.08.13.50.46;	author nros;	state Exp;
branches;
next	1.3;
commitid	JIbpcaHyk1MLoQXy;

1.3
date	2009.11.25.23.31.58;	author joerg;	state Exp;
branches;
next	1.2;

1.2
date	2009.11.15.13.58.20;	author drochner;	state Exp;
branches;
next	1.1;

1.1
date	2007.10.12.17.30.04;	author drochner;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2007.10.12.17.30.04;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.5
log
@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 .
@
text
@$NetBSD: patch-aa,v 1.4 2016/03/08 13:50:46 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@@
 DSOFLAGS	=	@@DSOFLAGS@@
 LDFLAGS		=	$(OPTIM) $(ARCHFLAGS) @@LDFLAGS@@
 INSTALL		=	@@INSTALL@@
-LIBMXML		=	@@LIBMXML@@
+LIBMXML		=	libmxml.la
 LIBS		=	@@LIBS@@ @@PTHREAD_LIBS@@
 LN		=	@@LN@@ -s
 MKDIR		=	@@MKDIR@@
@@@@ -57,10 +57,10 @@@@ BUILDROOT	=	$(DSTROOT)
 # Install commands...
 #
 
-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755 -s
+INSTALL_BIN	=	$(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM)
 INSTALL_DATA	=	$(INSTALL) -m 644
 INSTALL_DIR	=	$(INSTALL) -d
-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755
+INSTALL_LIB	=	$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB)
 INSTALL_MAN	=	$(INSTALL) -m 644
 INSTALL_SCRIPT	=	$(INSTALL) -m 755
 
@@@@ -139,7 +139,7 @@@@ clang-changes:
 # Install everything...
 #
 
-install:	$(TARGETS) install-$(LIBMXML) install-libmxml.a
+install:	$(TARGETS) install-$(LIBMXML) 
 	echo Installing mxmldoc in $(BUILDROOT)$(bindir)...
 	$(INSTALL_DIR) $(BUILDROOT)$(bindir)
 	$(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir)
@@@@ -160,11 +160,10 @@@@ install:	$(TARGETS) install-$(LIBMXML) i
 	$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3
 	$(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3
 
-install-libmxml.a:
-	echo Installing libmxml.a to $(BUILDROOT)$(libdir)...
+install-libmxml.la:
+	echo Installing libmxml.la to $(BUILDROOT)$(libdir)...
 	$(INSTALL_DIR) $(BUILDROOT)$(libdir)
-	$(INSTALL_LIB) libmxml.a $(BUILDROOT)$(libdir)
-	$(RANLIB) $(BUILDROOT)$(libdir)/libmxml.a
+	$(INSTALL_LIB) libmxml.la $(BUILDROOT)$(libdir)
 
 install-libmxml.so.1.5:
 	echo Installing libmxml.so to $(BUILDROOT)$(libdir)...
@@@@ -281,11 +280,14 @@@@ sloc:
 # libmxml.a
 #
 
-libmxml.a:	$(LIBOBJS)
+libmxml.la:	$(LIBOBJS:.o=.lo)
 	echo Creating $@@...
-	$(RM) $@@
-	$(AR) $(ARFLAGS) $@@ $(LIBOBJS)
-	$(RANLIB) $@@
+	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} ${LIBOBJS:.o=.lo} \
+		-o libmxml.la -rpath ${PREFIX}/lib -version-info 1:5
+
+.SUFFIXES: .lo
+.c.lo:
+	${LIBTOOL} --mode=compile ${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
 $(LIBOBJS):	mxml.h
 mxml-entity.o mxml-file.o mxml-private.o: mxml-private.h
@@@@ -335,7 +337,7 @@@@ libmxml.1.dylib:	$(LIBOBJS)
 
 mxmldoc:	$(LIBMXML) mxmldoc.o
 	echo Linking $@@...
-	$(CC) -L. $(LDFLAGS) -o $@@ mxmldoc.o -lmxml $(LIBS)
+	${LIBTOOL} --mode=link $(CC) -L. $(LDFLAGS) -o $@@ mxmldoc.o libmxml.la $(LIBS)
 
 mxmldoc-static:	libmxml.a mxmldoc.o
 	echo Linking $@@...
@@@@ -348,9 +350,9 @@@@ mxmldoc.o:	mxml.h
 # testmxml
 #
 
-testmxml:	libmxml.a testmxml.o
+testmxml:	libmxml.la testmxml.o
 	echo Linking $@@...
-	$(CC) $(LDFLAGS) -o $@@ testmxml.o libmxml.a $(LIBS)
+	${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -o $@@ testmxml.o libmxml.la $(LIBS)
 	@@echo Testing library...
 	./testmxml test.xml temp1s.xml >temp1.xml
 	./testmxml temp1.xml temp2s.xml >temp2.xml
@@@@ -384,23 +386,10 @@@@ testmxml.o:	mxml.h
 # mxml.xml
 #
 
-mxml.xml:	mxmldoc-static mxml.h $(PUBLIBOBJS:.o=.c)
+mxml.xml:	mxmldoc mxml.h $(PUBLIBOBJS:.o=.c)
 	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
 
 valgrind:	mxmldoc-static
 	echo Doing dynamic code analysis using Valgrind...
@@@@ -414,10 +403,10 @@@@ valgrind:	mxmldoc-static
 # doc/mxml.man
 #
 
-doc/mxml.man: mxmldoc-static mxml.xml
+doc/mxml.man: mxmldoc mxml.xml
 	echo "Generating mxml(3) man page..."
 	$(RM) doc/mxml.man
-	./mxmldoc-static --man mxml --title "Mini-XML API" \
+	./mxmldoc --man mxml --title "Mini-XML API" \
 		--intro doc/intro.man --footer doc/footer.man \
 		mxml.xml >doc/mxml.man
 
@


1.4
log
@Update mxml to version 2.9.

Changelog:

CHANGES IN Mini-XML 2.9

	- mxmlLoad* did not correctly load value nodes with MXML_NO_CALLBACK
	  or MXML_TEXT_CALLBACK (Bug #502)


CHANGES IN Mini-XML 2.8

	- Now call docsetutil using xcrun on OS X (Bug #458)
	- mxmldoc did not escape special HTML characters inside @@code foo@@
	  comments.
	- Fixed a memory leak in mxmlElementDeleteAttr (Bug #452)
	- Added MXML_MAJOR/MINOR_VERSION definitions to mxml.h (Bug $461)
	- Fixed a bug reading UTF-16 characters from a file (Bug #454)
	- Fixed a memory leak when loading invalid XML (Bug #496)
	- Fixed an XML fragment loading problem (Bug #494)


CHANGES IN Mini-XML 2.7

	- Added 64-bit configurations to the VC++ project files (STR #129)
	- Fixed conformance of mxmldoc's HTML and CSS output.
	- Added data accessor ("get") functions and made the mxml_node_t and
	  mxml_index_t structures private but still available in the Mini-XML
	  header to preserve source compatibility (STR #118)
	- Updated the source headers to reference the Mini-XML license and its
	  exceptions to the LGPL2 (STR #108)
	- Fixed a memory leak when loading a badly-formed XML file (STR #121)
      	- Added a new mxmlFindPath() function to find the value node of a
	  named element (STR #110)
	- Building a static version of the library did not work on Windows
	  (STR #112)
	- The shared library did not include a destructor for the thread-
	  specific data key on UNIX-based operating systems (STR #103)
	- mxmlLoad* did not error out on XML with multiple root nodes (STR #101)
	- Fixed an issue with the _mxml_vstrdupf function (STR #107)
	- mxmlSave* no longer write all siblings of the passed node, just that
	  node and its children (STR #109)
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.3 2009/11/25 23:31:58 joerg Exp $
d4 1
d93 1
a93 1
@@@@ -384,10 +386,10 @@@@ testmxml.o:	mxml.h
d102 13
d116 4
a119 4
 	if test "x`uname`" = xDarwin; then \
 		./mxmldoc-static --docset org.minixml.docset \
 			--docversion @@VERSION@@ --feedname minixml.org \
@@@@ -414,10 +416,10 @@@@ valgrind:	mxmldoc-static
@


1.3
log
@Call libtool always with --mode. Honour the strip settings of pkgsrc.
@
text
@d1 4
a4 3
$NetBSD$

--- Makefile.in.orig	2008-12-06 05:20:38.000000000 +0100
d6 1
a6 1
@@@@ -30,7 +30,7 @@@@ DSO		=	@@DSO@@
d15 1
a15 1
@@@@ -59,10 +59,10 @@@@ BUILDROOT	=	$(DSTROOT)
d28 1
a28 1
@@@@ -133,7 +133,7 @@@@ clang:
d33 2
a34 1
+install:	$(TARGETS) install-$(LIBMXML)
d36 2
a37 3
 	$(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) 
 	$(INSTALL_DIR) $(BUILDROOT)$(docdir)
@@@@ -149,10 +149,9 @@@@ install:	$(TARGETS) install-$(LIBMXML) i
d42 1
d44 1
d50 3
a52 3
 install-libmxml.so.1.4:
 	$(INSTALL_DIR) $(BUILDROOT)$(libdir)
@@@@ -242,10 +241,13 @@@@ config.h:	configure config.h.in
d57 2
a61 1
+libmxml.la:	$(LIBOBJS:.o=.lo)
d63 1
a63 1
+	  -o libmxml.la -rpath ${PREFIX}/lib -version-info 1:4
d71 1
a71 2
@@@@ -291,7 +293,7 @@@@ libmxml.1.dylib:	$(LIBOBJS)
 #
d74 1
d79 2
a80 2
 	$(CC) $(LDFLAGS) -o $@@ mxmldoc.o libmxml.a $(LIBS)
@@@@ -303,8 +305,8 @@@@ mxmldoc.o:	mxml.h
d85 2
a87 1
+testmxml:	libmxml.la testmxml.o
d90 3
a92 3
 	./testmxml test.xml >temp1.xml 2>temp1s.xml
 	./testmxml temp1.xml >temp2.xml 2>temp2s.xml
@@@@ -334,9 +336,9 @@@@ testmxml.o:	mxml.h
d98 1
d105 1
a105 1
@@@@ -361,9 +363,9 @@@@ valgrind:	mxmldoc-static
d111 1
@


1.2
log
@update to 2.6
changes:
-adds support for the apos character entity
-adds per-thread global settings
-adds many new mxmldoc features
-bugfixes
@
text
@d14 13
@


1.1
log
@Initial revision
@
text
@d3 1
a3 1
--- Makefile.in.orig	2007-04-27 02:49:03.000000000 +0200
d5 1
a5 1
@@@@ -29,7 +29,7 @@@@ DSO		=	@@DSO@@
d7 1
a7 1
 LDFLAGS		=	$(OPTIM) @@LDFLAGS@@
d11 1
d14 1
a14 2
 OPTIM		=	@@OPTIM@@
@@@@ -119,7 +119,7 @@@@ distclean:	clean
d23 1
a23 1
@@@@ -135,10 +135,9 @@@@ install:	$(TARGETS) install-$(LIBMXML) i
d34 1
a34 1
 install-libmxml.so.1.3:
d36 1
a36 1
@@@@ -228,10 +227,13 @@@@ config.h:	configure config.h.in
d46 1
a46 1
+	  -o libmxml.la -rpath ${PREFIX}/lib -version-info 1:3
d53 2
a54 2
 
@@@@ -276,7 +278,7 @@@@ libmxml.1.dylib:	$(LIBOBJS)
d58 2
a59 2
-	$(CC) -L. $(LDFLAGS) -o $@@ mxmldoc.o -lmxml
+	${LIBTOOL} --mode=link $(CC) -L. $(LDFLAGS) -o $@@ mxmldoc.o libmxml.la
d62 2
a63 2
 	$(CC) $(LDFLAGS) -o $@@ mxmldoc.o libmxml.a
@@@@ -288,8 +290,8 @@@@ mxmldoc.o:	mxml.h
d68 1
a68 1
-	$(CC) $(LDFLAGS) -o $@@ testmxml.o libmxml.a
d70 1
a70 1
+	${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -o $@@ testmxml.o libmxml.la
d74 1
a74 1
@@@@ -319,9 +321,9 @@@@ testmxml.o:	mxml.h
d81 6
a86 6
-	./mxmldoc-static mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html
+	./mxmldoc mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html
 
 valgrind:	mxmldoc-static
 	$(RM) valgrind.xml
@@@@ -334,9 +336,9 @@@@ valgrind:	mxmldoc-static
d95 2
a96 2
 		--intro doc/intro.man mxml.xml >doc/mxml.man
 
@


1.1.1.1
log
@import mxml-2.3, another XML parsing library
@
text
@@