diff --git a/devel/pear-PhpDocumentor/Makefile b/devel/pear-PhpDocumentor/Makefile
index c6d88ac12c0d..961bc44c6171 100644
--- a/devel/pear-PhpDocumentor/Makefile
+++ b/devel/pear-PhpDocumentor/Makefile
@@ -1,26 +1,24 @@
 # Created by: Gerrit Beine (<gerrit.beine@gmx.de>)
 
 PORTNAME=	PhpDocumentor
 PORTVERSION=	1.4.4
 CATEGORIES=	devel www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Provides automatic documenting of php-api from the source
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear@${PHP_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-CONFLICTS=	pear-PHPDoc-[0-9]*
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		pear
+
+NO_ARCH=	yes
+
+CONFLICTS_INSTALL=	pear-PHPDoc
+
 OPTIONS_DEFINE=	XML_BEAUTIFIER
 XML_BEAUTIFIER_DESC=	XML_Beautifier support
 
-XML_BEAUTIFIER_RUN_DEPENDS=	${PEARDIR}/XML/Beautifier.php:textproc/pear-XML_Beautifier@${PHP_FLAVOR}
-
-post-extract:
-.for dir in ${DUMMYDIRS}
-	${TOUCH} ${WRKSRC}/${dir}/.peardummy
-.endfor
+XML_BEAUTIFIER_RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}XML_Beautifier>=1.1:textproc/pear-XML_Beautifier@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/pear-PhpDocumentor/pkg-descr b/devel/pear-PhpDocumentor/pkg-descr
index 6dce8bd36304..eb7238bc8389 100644
--- a/devel/pear-PhpDocumentor/pkg-descr
+++ b/devel/pear-PhpDocumentor/pkg-descr
@@ -1,8 +1,8 @@
 The phpDocumentor tool is a standalone auto-documentor similar to JavaDoc
 written in PHP. It differs from PHPDoc in that it is MUCH faster, parses a much
 wider range of php files, and comes with many customizations including 11 HTML
 templates, Windows help file CHM output, PDF output, and XML DocBook peardoc2
-output for use with documenting PEAR. In addition, it can do PHPXref source
-code highlighting and linking.
+output for use with documenting PEAR. In addition, it can do PHPXref source code
+highlighting and linking.
 
 WWW: https://pear.php.net/package/PhpDocumentor