3 files changed, 12 insertions, 71 deletions

diff --git a/textproc/mxml/Makefile b/textproc/mxml/Makefile
index d171eca60a0d..21585876fc8b 100644
--- a/textproc/mxml/Makefile
+++ b/textproc/mxml/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	mxml
-PORTVERSION=	2.3
+PORTVERSION=	2.5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_EASYSW}
-MASTER_SITE_SUBDIR=	mxml/2.3
+MASTER_SITE_SUBDIR=	mxml/2.5
 
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Small XML parsing library
@@ -18,16 +18,21 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack
+CONFIGURE_ARGS=	--with-docdir=no
 
 MAN1=	mxmldoc.1
 MAN3=	mxml.3
 
-DOCS=	*
+PORTDOCS=	*
+
+PLIST_FILES=	bin/mxmldoc include/mxml.h \
+		lib/libmxml.a \
+		libdata/pkgconfig/mxml.pc
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${CP} -R ${DOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
+	@${CP} -R ${PORTDOCS:S,^,${WRKSRC}/doc,} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/mxml/distinfo b/textproc/mxml/distinfo
index 6488d54539f3..cac9e2e5b258 100644
--- a/textproc/mxml/distinfo
+++ b/textproc/mxml/distinfo
@@ -1,3 +1,3 @@
-MD5 (mxml-2.3.tar.gz) = 2b0d69c35ada70ba9982f15cb05d006b
-SHA256 (mxml-2.3.tar.gz) = 7385629d330d097a8099cfb00026a364debc6e794cc1c17d8820e769d5781deb
-SIZE (mxml-2.3.tar.gz) = 312173
+MD5 (mxml-2.5.tar.gz) = f706377fba630b39fa02fd63642b17e5
+SHA256 (mxml-2.5.tar.gz) = aef0541d0589be350c50c7fe5bc71a0eb1046d0f38f6b27348b63caa21aebc79
+SIZE (mxml-2.5.tar.gz) = 247768
diff --git a/textproc/mxml/pkg-plist b/textproc/mxml/pkg-plist
deleted file mode 100644
index 2a2b6de645e1..000000000000
--- a/textproc/mxml/pkg-plist
+++ /dev/null
@@ -1,64 +0,0 @@
-bin/mxmldoc
-include/mxml.h
-lib/libmxml.a
-libdata/pkgconfig/mxml.pc
-%%PORTDOCS%%%%DOCSDIR%%/0.gif
-%%PORTDOCS%%%%DOCSDIR%%/1.gif
-%%PORTDOCS%%%%DOCSDIR%%/2.gif
-%%PORTDOCS%%%%DOCSDIR%%/3.gif
-%%PORTDOCS%%%%DOCSDIR%%/4.gif
-%%PORTDOCS%%%%DOCSDIR%%/5.gif
-%%PORTDOCS%%%%DOCSDIR%%/6.gif
-%%PORTDOCS%%%%DOCSDIR%%/7.gif
-%%PORTDOCS%%%%DOCSDIR%%/8.gif
-%%PORTDOCS%%%%DOCSDIR%%/9.gif
-%%PORTDOCS%%%%DOCSDIR%%/A.gif
-%%PORTDOCS%%%%DOCSDIR%%/B.gif
-%%PORTDOCS%%%%DOCSDIR%%/C.gif
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/D.gif
-%%PORTDOCS%%%%DOCSDIR%%/E.gif
-%%PORTDOCS%%%%DOCSDIR%%/F.gif
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/advanced.html
-%%PORTDOCS%%%%DOCSDIR%%/basics.html
-%%PORTDOCS%%%%DOCSDIR%%/chapters.xcf.gz
-%%PORTDOCS%%%%DOCSDIR%%/hires/0.gif
-%%PORTDOCS%%%%DOCSDIR%%/hires/1.gif
-%%PORTDOCS%%%%DOCSDIR%%/hires/2.gif
-%%PORTDOCS%%%%DOCSDIR%%/hires/3.gif
-%%PORTDOCS%%%%DOCSDIR%%/hires/4.gif
-%%PORTDOCS%%%%DOCSDIR%%/hires/5.gif
-%%PORTDOCS%%%%DOCSDIR%%/hires/6.gif
-%%PORTDOCS%%%%DOCSDIR%%/hires/7.gif
-%%PORTDOCS%%%%DOCSDIR%%/hires/8.gif
-%%PORTDOCS%%%%DOCSDIR%%/hires/9.gif
-%%PORTDOCS%%%%DOCSDIR%%/hires/A.gif
-%%PORTDOCS%%%%DOCSDIR%%/hires/B.gif
-%%PORTDOCS%%%%DOCSDIR%%/hires/C.gif
-%%PORTDOCS%%%%DOCSDIR%%/hires/D.gif
-%%PORTDOCS%%%%DOCSDIR%%/hires/E.gif
-%%PORTDOCS%%%%DOCSDIR%%/hires/F.gif
-%%PORTDOCS%%%%DOCSDIR%%/hires/logo.gif
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/intro.man
-%%PORTDOCS%%%%DOCSDIR%%/license.html
-%%PORTDOCS%%%%DOCSDIR%%/logo.gif
-%%PORTDOCS%%%%DOCSDIR%%/logo.xcf.gz
-%%PORTDOCS%%%%DOCSDIR%%/makedocs.sh
-%%PORTDOCS%%%%DOCSDIR%%/mxml-cover.sla
-%%PORTDOCS%%%%DOCSDIR%%/mxml.book
-%%PORTDOCS%%%%DOCSDIR%%/mxml.html
-%%PORTDOCS%%%%DOCSDIR%%/mxml.man
-%%PORTDOCS%%%%DOCSDIR%%/mxmldoc.html
-%%PORTDOCS%%%%DOCSDIR%%/mxmldoc.man
-%%PORTDOCS%%%%DOCSDIR%%/mxmldoc.xsd
-%%PORTDOCS%%%%DOCSDIR%%/refapp.html
-%%PORTDOCS%%%%DOCSDIR%%/reference.html
-%%PORTDOCS%%%%DOCSDIR%%/relnotes.html
-%%PORTDOCS%%%%DOCSDIR%%/schema.html
-%%PORTDOCS%%%%DOCSDIR%%/title.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/hires
-%%PORTDOCS%%@dirrm %%DOCSDIR%%