- Update to 2.7

- Add custom LICENSE MXML
- Add USE_LDCONFIG to include new shared library
- Switch to OPTIONSng
- Change DOCS installing hierarchy from ${DOCSDIR}/doc/ to ${DOCSDIR}/
- Remove unnecessary patch (have been merged into upstream)
- Replace TAB with space in pkg-descr WWW: line

PR:		ports/175315
Submitted by:	Po-Chien Lin <linpc@cs.nctu.edu.tw>
Approved by:	swills (mentor)

5 files changed, 17 insertions, 22 deletions

diff --git a/textproc/mxml/Makefile b/textproc/mxml/Makefile
index ccc0a00d626f..7cbe4e84016e 100644
--- a/textproc/mxml/Makefile
+++ b/textproc/mxml/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	mxml
-# Date created:		2007-10-12
-# Whom:			Martin Wilke <miwi@FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mxml
-PORTVERSION=	2.6
+PORTVERSION=	2.7
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_EASYSW}
 MASTER_SITE_SUBDIR=	mxml/${PORTVERSION}
@@ -14,12 +10,18 @@ MASTER_SITE_SUBDIR=	mxml/${PORTVERSION}
 MAINTAINER=	hsmtkk@gmail.com
 COMMENT=	Small XML parsing library
 
+LICENSE=	MXML
+LICENSE_NAME=	Mini-XML License
+LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack
 CONFIGURE_ARGS=	--with-docdir=no
 MAKE_JOBS_SAFE=	yes
+USE_LDCONFIG=	yes
 
 MAN1=	mxmldoc.1
 MAN3=	mxml.3
@@ -28,12 +30,15 @@ PORTDOCS=	*
 
 PLIST_FILES=	bin/mxmldoc include/mxml.h \
 		lib/libmxml.a \
+		lib/libmxml.so lib/libmxml.so.1 lib/libmxml.so.1.5 \
 		libdata/pkgconfig/mxml.pc
 
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	@${CP} -R ${PORTDOCS:S,^,${WRKSRC}/doc,} ${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/mxml/distinfo b/textproc/mxml/distinfo
index c03b32886a31..5ce8e5503956 100644
--- a/textproc/mxml/distinfo
+++ b/textproc/mxml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mxml-2.6.tar.gz) = b0d347da1a0d5a8c9e82f66087d55cfe499728dacae563740d7e733648c69795
-SIZE (mxml-2.6.tar.gz) = 254455
+SHA256 (mxml-2.7.tar.gz) = a77200ee4c1e1cf2eb531595ec17ce31805760699d260915496c39d3388eb803
+SIZE (mxml-2.7.tar.gz) = 262027
diff --git a/textproc/mxml/files/patch-libtool22 b/textproc/mxml/files/patch-libtool22
index d71df8100ed9..02dd0d5faa90 100644
--- a/textproc/mxml/files/patch-libtool22
+++ b/textproc/mxml/files/patch-libtool22
@@ -1,6 +1,6 @@
 --- Makefile.in.orig	2009-07-14 23:48:58.000000000 -0500
 +++ Makefile.in	2009-07-14 23:49:34.000000000 -0500
-@@ -59,10 +59,10 @@
+@@ -57,10 +57,10 @@
  # Install commands...
  #
  
diff --git a/textproc/mxml/files/patch-mxmldoc.c b/textproc/mxml/files/patch-mxmldoc.c
deleted file mode 100644
index 0cba27ae3403..000000000000
--- a/textproc/mxml/files/patch-mxmldoc.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- mxmldoc.c.orig	2009-07-25 13:08:26.603202123 +0900
-+++ mxmldoc.c	2009-07-25 13:08:37.818332350 +0900
-@@ -57,7 +57,6 @@
- #ifndef WIN32
- #  include <dirent.h>
- #  include <unistd.h>
--#  include <spawn.h>
- #  include <sys/wait.h>
- extern char **environ;
- #endif /* !WIN32 */
diff --git a/textproc/mxml/pkg-descr b/textproc/mxml/pkg-descr
index b0adcbe82ed3..9a079d91f06c 100644
--- a/textproc/mxml/pkg-descr
+++ b/textproc/mxml/pkg-descr
@@ -2,4 +2,4 @@ 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.
 
-WWW:	http://www.minixml.org/
+WWW: http://www.minixml.org/