2 files changed, 27 insertions, 73 deletions

diff --git a/devel/pear-XML_Util/Makefile b/devel/pear-XML_Util/Makefile
index 0c6d4b63308f..d801d2bcf903 100644
--- a/devel/pear-XML_Util/Makefile
+++ b/devel/pear-XML_Util/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	XML_Util
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	devel www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,24 +16,34 @@ COMMENT=	PEAR XML utility class
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-TESTDIR=	${PEARDIR}/tests/${PORTNAME}
+CATEGORY=	XML
+FILES=		Util.php
+EXAMPLES=	example.php
+DOCS=		blank.html classtrees_XML_Util.html elementindex.html \
+		elementindex_XML_Util.html errors.html index.html li_XML_Util.html \
+		packages.html todolist.html media/banner.css media/stylesheet.css \
+		media/images/blank.png media/images/Class.png \
+		media/images/class_folder.png media/images/Constant.png \
+		media/images/Constructor.png media/images/Destructor.png \
+		media/images/file.png media/images/folder.png media/images/Function.png \
+		media/images/function_folder.png media/images/Global.png \
+		media/images/I.png media/images/Index.png media/images/L.png \
+		media/images/Lminus.png media/images/Lplus.png media/images/Method.png \
+		media/images/next_button.png media/images/next_button_disabled.png \
+		media/images/package.png media/images/package_folder.png \
+		media/images/T.png media/images/Page.png media/images/previous_button.png \
+		media/images/previous_button_disabled.png media/images/PrivateClass.png \
+		media/images/PrivateMethod.png media/images/PrivateVariable.png \
+		media/images/Tminus.png media/images/Tplus.png media/images/tutorial.png \
+		media/images/tutorial_folder.png media/images/up_button.png \
+		media/images/Variable.png XML_Util/XML_Util.html \
+		XML_Util/_Util_XML_XML_Util_php.html
+_DOCSDIR=	apidoc
 
-do-install:
-	@${MKDIR} ${PEARDIR}/XML
-	@${CP} -p ${WRKSRC}/Util.php ${PEARDIR}/XML
-	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/XML/Util.php
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${CP} -Rp ${WRKSRC}/apidoc/* ${DOCSDIR}
-	@${MKDIR} ${TESTDIR}
-	@${CP} -Rp ${WRKSRC}/examples/* ${TESTDIR}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TESTDIR}
-	@${ECHO_MSG} "===> Examples installed in ${TESTDIR}."
+do-install-tests-msg: .USE
 	@${ECHO_MSG} "     (These tests require PHPUnit - see"
 	@${ECHO_MSG} "     <http://pear.php.net/package-info.php?package=PHPUnit>;;)."
-.endif
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/devel/pear-XML_Util/pkg-plist b/devel/pear-XML_Util/pkg-plist
deleted file mode 100644
index f11f026f8805..000000000000
--- a/devel/pear-XML_Util/pkg-plist
+++ /dev/null
@@ -1,57 +0,0 @@
-%%PEARDIR%%/XML/Util.php
-%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%PEARDIR%%/tests/XML_Util/example.php
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/elementindex_XML_Util.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/blank.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/errors.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/packages.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/classtrees_XML_Util.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/index.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/todolist.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/elementindex.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/li_XML_Util.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/XML_Util/XML_Util.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/XML_Util/_Util_XML_XML_Util_php.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/banner.css
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/stylesheet.css
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Class.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Constant.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Constructor.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Destructor.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Function.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Global.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/I.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Index.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/L.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Lminus.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Lplus.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Method.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Page.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/PrivateClass.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/PrivateMethod.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/PrivateVariable.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/T.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Tminus.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Tplus.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Variable.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/blank.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/class_folder.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/file.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/folder.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/function_folder.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/next_button.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/next_button_disabled.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/package.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/package_folder.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/previous_button.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/previous_button_disabled.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/tutorial.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/tutorial_folder.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/up_button.png
-@dirrm %%PEARDIR%%/XML
-@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/XML_Util/media/images
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/XML_Util/media
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/XML_Util/XML_Util
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/XML_Util
-%%PORTDOCS%%@dirrm %%PEARDIR%%/tests/XML_Util