Remove traces of textproc/php-dom which is not needed anymore, now that dom is built into PHP. Bump resp. PKGREVISION.

28 files changed, 50 insertions, 78 deletions

diff --git a/benchmarks/phoronix-test-suite/Makefile b/benchmarks/phoronix-test-suite/Makefile
index 582e011ef88..45b08d22ab5 100644
--- a/benchmarks/phoronix-test-suite/Makefile
+++ b/benchmarks/phoronix-test-suite/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2013/04/01 06:13:12 sbd Exp $
+# $NetBSD: Makefile,v 1.8 2017/04/05 12:33:48 fhajny Exp $
 #
 
 DISTNAME=	phoronix-test-suite-${PTS_VERSION}
 PTS_VERSION=	3.4.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.phoronix-test-suite.com/releases/
 
@@ -13,7 +13,6 @@ COMMENT=	Phoronix Benchmarking Suite
 LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	${PHP_PKG_PREFIX}-curl>=5.2:../../www/php-curl
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.2:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.2:../../graphics/php-gd
 DEPENDS+=	${PHP_PKG_PREFIX}-json>=5.2:../../textproc/php-json
 DEPENDS+=	${PHP_PKG_PREFIX}-pcntl>=5.2:../../devel/php-pcntl
diff --git a/finance/magento/Makefile b/finance/magento/Makefile
index 16ea087abe3..95747007c73 100644
--- a/finance/magento/Makefile
+++ b/finance/magento/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2016/09/11 17:03:26 taca Exp $
+# $NetBSD: Makefile,v 1.9 2017/04/05 12:33:47 fhajny Exp $
 
 DISTNAME=	magento-1.9.2.2
+PKGREVISION=	1
 CATEGORIES=	www finance
 # Upstream temporarily removed the option to download directly
 MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/magento/
@@ -17,7 +18,6 @@ PATCHFILES=	# none sofar
 EXTRACT_DIR=	${WRKDIR}/magento
 
 DEPENDS+=	${PHP_PKG_PREFIX}-curl-[0-9]*:../../www/php-curl
-DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-gd-[0-9]*:../../graphics/php-gd
 DEPENDS+=	${PHP_PKG_PREFIX}-iconv-[0-9]*:../../converters/php-iconv
 DEPENDS+=	${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index d006342639a..38813dfb57c 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.86 2016/12/05 16:13:51 taca Exp $
+# $NetBSD: Makefile,v 1.87 2017/04/05 12:33:48 fhajny Exp $
 
 DISTNAME=	roundcubemail-${RC_VERS}
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME:S/mail-/-/}
+PKGREVISION=	1
 
 MAINTAINER=	taca@NetBSD.org
 COMMENT=	Browser-based multilingual IMAP client
 LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=${PHP_BASE_VERS}:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-exif>=${PHP_BASE_VERS}:../../graphics/php-exif
 DEPENDS+=	${PHP_PKG_PREFIX}-intl>=${PHP_BASE_VERS}:../../textproc/php-intl
 DEPENDS+=	${PHP_PKG_PREFIX}-json>=${PHP_BASE_VERS}:../../textproc/php-json
diff --git a/meta-pkgs/php56-extensions/Makefile b/meta-pkgs/php56-extensions/Makefile
index fd5e1493ce5..babf6ac836a 100644
--- a/meta-pkgs/php56-extensions/Makefile
+++ b/meta-pkgs/php56-extensions/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2015/11/29 08:53:26 taca Exp $
+# $NetBSD: Makefile,v 1.7 2017/04/05 12:33:48 fhajny Exp $
 
 DISTNAME=	${PHP_PKG_PREFIX}-extensions-${PHP_VERSION}
+PKGREVISION=	1
 CATEGORIES=	meta-pkgs www
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -18,7 +19,6 @@ DEPENDS+=	${PHP_PKG_PREFIX}-bz2>=${PHP_VERSION}<${NEXT_VERS}:../../archivers/php
 DEPENDS+=	${PHP_PKG_PREFIX}-calendar>=${PHP_VERSION}<${NEXT_VERS}:../../time/php-calendar
 DEPENDS+=	${PHP_PKG_PREFIX}-curl>=${PHP_VERSION}<${NEXT_VERS}:../../www/php-curl
 DEPENDS+=	${PHP_PKG_PREFIX}-dba>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-dba
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=${PHP_VERSION}<${NEXT_VERS}:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-enchant>=${PHP_VERSION}:../../textproc/php-enchant
 DEPENDS+=	${PHP_PKG_PREFIX}-exif>=${PHP_VERSION}<${NEXT_VERS}:../../graphics/php-exif
 DEPENDS+=	${PHP_PKG_PREFIX}-ftp>=${PHP_VERSION}<${NEXT_VERS}:../../net/php-ftp
diff --git a/meta-pkgs/php70-extensions/Makefile b/meta-pkgs/php70-extensions/Makefile
index 1bf26ab4475..af9b952697f 100644
--- a/meta-pkgs/php70-extensions/Makefile
+++ b/meta-pkgs/php70-extensions/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2015/12/06 15:21:49 taca Exp $
+# $NetBSD: Makefile,v 1.2 2017/04/05 12:33:48 fhajny Exp $
 
 DISTNAME=	${PHP_PKG_PREFIX}-extensions-${PHP_VERSION}
+PKGREVISION=	1
 CATEGORIES=	meta-pkgs www
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -18,7 +19,6 @@ DEPENDS+=	${PHP_PKG_PREFIX}-bz2>=${PHP_VERSION}<${NEXT_VERS}:../../archivers/php
 DEPENDS+=	${PHP_PKG_PREFIX}-calendar>=${PHP_VERSION}<${NEXT_VERS}:../../time/php-calendar
 DEPENDS+=	${PHP_PKG_PREFIX}-curl>=${PHP_VERSION}<${NEXT_VERS}:../../www/php-curl
 DEPENDS+=	${PHP_PKG_PREFIX}-dba>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-dba
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=${PHP_VERSION}<${NEXT_VERS}:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-enchant>=${PHP_VERSION}:../../textproc/php-enchant
 DEPENDS+=	${PHP_PKG_PREFIX}-exif>=${PHP_VERSION}<${NEXT_VERS}:../../graphics/php-exif
 DEPENDS+=	${PHP_PKG_PREFIX}-ftp>=${PHP_VERSION}<${NEXT_VERS}:../../net/php-ftp
diff --git a/meta-pkgs/php71-extensions/Makefile b/meta-pkgs/php71-extensions/Makefile
index 207b34d2d9f..2329fddd312 100644
--- a/meta-pkgs/php71-extensions/Makefile
+++ b/meta-pkgs/php71-extensions/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2017/03/12 13:46:16 taca Exp $
+# $NetBSD: Makefile,v 1.2 2017/04/05 12:33:48 fhajny Exp $
 
 DISTNAME=	${PHP_PKG_PREFIX}-extensions-${PHP_VERSION}
+PKGREVISION=	1
 CATEGORIES=	meta-pkgs www
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -18,7 +19,6 @@ DEPENDS+=	${PHP_PKG_PREFIX}-bz2>=${PHP_VERSION}<${NEXT_VERS}:../../archivers/php
 DEPENDS+=	${PHP_PKG_PREFIX}-calendar>=${PHP_VERSION}<${NEXT_VERS}:../../time/php-calendar
 DEPENDS+=	${PHP_PKG_PREFIX}-curl>=${PHP_VERSION}<${NEXT_VERS}:../../www/php-curl
 DEPENDS+=	${PHP_PKG_PREFIX}-dba>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-dba
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=${PHP_VERSION}<${NEXT_VERS}:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-enchant>=${PHP_VERSION}:../../textproc/php-enchant
 DEPENDS+=	${PHP_PKG_PREFIX}-exif>=${PHP_VERSION}<${NEXT_VERS}:../../graphics/php-exif
 DEPENDS+=	${PHP_PKG_PREFIX}-ftp>=${PHP_VERSION}<${NEXT_VERS}:../../net/php-ftp
diff --git a/mk/defaults/options.description b/mk/defaults/options.description
index c8d5d1d2ceb..2dc0dcee4cb 100644
--- a/mk/defaults/options.description
+++ b/mk/defaults/options.description
@@ -135,7 +135,6 @@ doc			Include the documentation.
 doxygen			Include doxygen based document.
 drac			Enable DRAC support.
 dri			Enable Direct Rendering support.
-drupal-xmlservices	Enable XML-based services.
 dspam-preferences-extension	Enable preferences extension.
 dspam-verbose-debug	Enable verbose debugging support.
 dspam-virtualusers	Enable support for virtual users.
diff --git a/net/php-baikal/Makefile b/net/php-baikal/Makefile
index efd29eda081..075eb75abfb 100644
--- a/net/php-baikal/Makefile
+++ b/net/php-baikal/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2016/08/22 14:22:30 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2017/04/05 12:33:48 fhajny Exp $
 
 DISTNAME=	baikal-0.4.6
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=fruux/}
 GITHUB_RELEASE=	${PKGVERSION_NOREV}
@@ -15,7 +16,6 @@ LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	${PHP_PKG_PREFIX}-pdo>=5.3.1:../../databases/php-pdo
 DEPENDS+=	${PHP_PKG_PREFIX}-pdo_sqlite>=5.3.1:../../databases/php-pdo_sqlite
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.3.1:../../textproc/php-dom
 
 WRKSRC=		${WRKDIR}/baikal
 
diff --git a/textproc/php-xsl/MESSAGE b/textproc/php-xsl/MESSAGE
deleted file mode 100644
index 9eb110fbd24..00000000000
--- a/textproc/php-xsl/MESSAGE
+++ /dev/null
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2016/07/17 15:51:37 jdolecek Exp $
-
-This module requires that the dom extension is also enabled.
-
-===========================================================================
diff --git a/textproc/php-xsl/Makefile b/textproc/php-xsl/Makefile
index 143c3964914..37eb1fe3a18 100644
--- a/textproc/php-xsl/Makefile
+++ b/textproc/php-xsl/Makefile
@@ -1,19 +1,15 @@
-# $NetBSD: Makefile,v 1.9 2015/03/20 16:33:28 taca Exp $
+# $NetBSD: Makefile,v 1.10 2017/04/05 12:33:48 fhajny Exp $
 
 MODNAME=		xsl
+PKGREVISION=		1
 CATEGORIES+=		textproc
 COMMENT=		PHP extension for XSLT functions
 
 CONFLICTS=	php-xsl-[0-9]*
 
-CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.libxslt}
-
-# uses symbols from DOM extension, so add explicit depends
-DEPENDS+=		${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
+USE_PHP_EXT_PATCHES=	yes
 
-# build uses includes of the DOM extension, so need to extract that too
-EXTRACT_ELEMENTS=	${DISTNAME}/ext/${MODNAME} ${DISTNAME}/ext/dom
-WRKSRC=			${WRKDIR}/${DISTNAME}/ext/${MODNAME}
+CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.libxslt}
 
 .include "../../lang/php/ext.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
diff --git a/www/contao35/Makefile b/www/contao35/Makefile
index 9cfbd5cb346..f391498777c 100644
--- a/www/contao35/Makefile
+++ b/www/contao35/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2017/03/21 02:37:42 taca Exp $
+# $NetBSD: Makefile,v 1.28 2017/04/05 12:33:48 fhajny Exp $
 #
 
 DISTNAME=	contao-${CT_PKGVER}
 PKGNAME=	${PHP_PKG_PREFIX}-contao${CT_VER}-${CT_PKGVER}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=contao/}
 GITHUB_PROJECT=	core
@@ -13,7 +14,6 @@ HOMEPAGE=	https://contao.org/
 COMMENT=	Contao Open Source CMS ${CT_VERSION}
 LICENSE=	gnu-lgpl-v3
 
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.4.0:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.4.0:../../graphics/php-gd
 DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.4.0:../../converters/php-mbstring
 DEPENDS+=	${PHP_PKG_PREFIX}-mysqli>=5.4.0:../../databases/php-mysqli
diff --git a/www/contao43/Makefile b/www/contao43/Makefile
index 37d0ff95843..47299bf0f33 100644
--- a/www/contao43/Makefile
+++ b/www/contao43/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2017/03/24 03:43:24 taca Exp $
+# $NetBSD: Makefile,v 1.10 2017/04/05 12:33:48 fhajny Exp $
 #
 
 DISTNAME=	contao-${CT_PKGVER}
 PKGNAME=	${PHP_PKG_PREFIX}-contao${CT_VER}-${CT_VERSION}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=contao/}
 GITHUB_PROJECT=	standard-edition
@@ -13,7 +14,6 @@ HOMEPAGE=	https://contao.org/
 COMMENT=	Contao Open Source CMS ${CT_VERSION}
 LICENSE=	gnu-lgpl-v3
 
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.4.0:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.4.0:../../graphics/php-gd
 DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.4.0:../../converters/php-mbstring
 DEPENDS+=	${PHP_PKG_PREFIX}-mysqli>=5.4.0:../../databases/php-mysqli
diff --git a/www/drupal7/Makefile b/www/drupal7/Makefile
index 8fa8be4065d..bcb2a01e819 100644
--- a/www/drupal7/Makefile
+++ b/www/drupal7/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2017/03/12 07:20:51 maya Exp $
+# $NetBSD: Makefile,v 1.44 2017/04/05 12:33:48 fhajny Exp $
 
 DISTNAME=	drupal-7.52
-PKGREVISION=	1
+PKGREVISION=	2
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.drupal.org/files/projects/
@@ -13,7 +13,6 @@ LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.4.0:../../graphics/php-gd
 DEPENDS+=	${PHP_PKG_PREFIX}-json>=5.4.0:../../textproc/php-json
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.4.0:../../textproc/php-dom
 
 NO_BUILD=	YES
 DRUPAL=		share/drupal
diff --git a/www/drupal7/options.mk b/www/drupal7/options.mk
index 8f7ee30e8b3..c6f6b77857c 100644
--- a/www/drupal7/options.mk
+++ b/www/drupal7/options.mk
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.3 2012/12/20 12:45:58 taca Exp $
+# $NetBSD: options.mk,v 1.4 2017/04/05 12:33:48 fhajny Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.drupal
 
 PKG_OPTIONS_REQUIRED_GROUPS=	db
 PKG_OPTIONS_GROUP.db=		mysql pgsql sqlite
 
-PKG_SUPPORTED_OPTIONS=	drupal-xmlservices apache unicode
-PKG_SUGGESTED_OPTIONS=	mysql drupal-xmlservices apache
+PKG_SUPPORTED_OPTIONS=	apache unicode
+PKG_SUGGESTED_OPTIONS=	mysql apache
 
 .include "../../mk/bsd.options.mk"
 
@@ -28,14 +28,6 @@ DEPENDS+=	${PHP_PKG_PREFIX}-pdo_sqlite>=5.2.7:../../databases/php-pdo_sqlite
 .endif
 
 ###
-### Enable XML-based services such as the Blogger API, Jabber and RSS
-### syndication.
-###
-.if !empty(PKG_OPTIONS:Mdrupal-xmlservices)
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.2.7:../../textproc/php-dom
-.endif
-
-###
 ### Support for unicode
 ###
 .if !empty(PKG_OPTIONS:Municode)
diff --git a/www/fengoffice/Makefile b/www/fengoffice/Makefile
index 66332de4ca5..791f48c3e9c 100644
--- a/www/fengoffice/Makefile
+++ b/www/fengoffice/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2016/09/11 17:03:28 taca Exp $
+# $NetBSD: Makefile,v 1.38 2017/04/05 12:33:48 fhajny Exp $
 #
 
 DISTNAME=	fengoffice_3.2.2.1
 PKGNAME=	${DISTNAME:S/_/-/:C/.rc$/rc1/}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opengoo/}
 EXTRACT_SUFX=	.zip
@@ -18,7 +19,6 @@ DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=5.1.0:../../databases/php-mysql
 DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.1.0:../../converters/php-mbstring
 DEPENDS+=	${PHP_PKG_PREFIX}-zip>=5.1.0:../../archivers/php-zip
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.1.0:../../graphics/php-gd
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.1.0:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-imap>=5.1.0:../../mail/php-imap
 
 PHP_VERSIONS_ACCEPTED=	56
diff --git a/www/horde/Makefile b/www/horde/Makefile
index 9ea3fb29f6f..03245c33570 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2017/03/12 07:20:52 maya Exp $
+# $NetBSD: Makefile,v 1.81 2017/04/05 12:33:49 fhajny Exp $
 
 DISTNAME=	horde-3.3.13
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.horde.org/pub/horde/
 MASTER_SITES+=	ftp://ftp.horde.org/pub/horde/
@@ -23,7 +23,6 @@ DEPENDS+=	${PHP_PKG_PREFIX}-pear-Log-[0-9]*:../../sysutils/pear-Log
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Mail_Mime-[0-9]*:../../mail/pear-Mail_Mime
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-DB-[0-9]*:../../databases/pear-DB
 DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php
-DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-zlib>=4.3.3:../../archivers/php-zlib
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Console_Table-[0-9]*:../../textproc/pear-Console_Table
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-File_Find-[0-9]*:../../textproc/pear-File_Find
diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile
index 6ef5d59abdd..d47c743eb82 100644
--- a/www/mediawiki/Makefile
+++ b/www/mediawiki/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2016/12/03 03:06:50 wen Exp $
+# $NetBSD: Makefile,v 1.63 2017/04/05 12:33:49 fhajny Exp $
 
 DISTNAME=	mediawiki-${VER}.${PVER}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://releases.wikimedia.org/mediawiki/${VER}/
 
@@ -9,7 +10,6 @@ HOMEPAGE=	http://www.mediawiki.org/
 COMMENT=	Free software wiki package originally written for Wikipedia
 LICENSE=	gnu-gpl-v2
 
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.5.9:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.5.9:../../graphics/php-gd
 DEPENDS+=	${PHP_PKG_PREFIX}-intl>=5.5.9:../../textproc/php-intl
 DEPENDS+=	${PHP_PKG_PREFIX}-json>=5.5.9:../../textproc/php-json
diff --git a/www/moodle/Makefile b/www/moodle/Makefile
index 46759d6c771..abd4378cb5c 100644
--- a/www/moodle/Makefile
+++ b/www/moodle/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2017/03/15 14:00:03 wen Exp $
+# $NetBSD: Makefile,v 1.55 2017/04/05 12:33:49 fhajny Exp $
 
 DISTNAME=	moodle-3.2.2
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=moodle/}
 EXTRACT_SUFX=	.tgz
@@ -15,7 +16,6 @@ DEPENDS+=	${PHP_PKG_PREFIX}-iconv>=5.4.4:../../converters/php-iconv
 DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.4.4:../../converters/php-mbstring
 DEPENDS+=	${PHP_PKG_PREFIX}-curl>=5.4.4:../../www/php-curl
 DEPENDS+=	${PHP_PKG_PREFIX}-xmlrpc>=5.4.4:../../net/php-xmlrpc
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.4.4:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-soap>=5.4.4:../../net/php-soap
 DEPENDS+=	${PHP_PKG_PREFIX}-json>=5.4.4:../../textproc/php-json
 DEPENDS+=	${PHP_PKG_PREFIX}-intl>=5.4.4:../../textproc/php-intl
diff --git a/www/php-concrete5/MESSAGE b/www/php-concrete5/MESSAGE
index efb96f0a3e4..1d051bcd6cd 100644
--- a/www/php-concrete5/MESSAGE
+++ b/www/php-concrete5/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.7 2015/05/31 02:16:11 ryoon Exp $
+$NetBSD: MESSAGE,v 1.8 2017/04/05 12:33:49 fhajny Exp $
 
 To use concrete5 with nginx, you will need to perform the following steps.
 
@@ -43,7 +43,6 @@ To use concrete5 with nginx, you will need to perform the following steps.
 7. Be sure to have the following lines in ${PREFIX}/etc/php.ini.
 
 	extension=gd.so
-	extension=dom.so
 	extension=pdo.so
 	extension=pdo_mysql.so
 	extension=iconv.so
diff --git a/www/php-concrete5/Makefile b/www/php-concrete5/Makefile
index 306319e46c2..b22e6fbd014 100644
--- a/www/php-concrete5/Makefile
+++ b/www/php-concrete5/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2016/12/23 23:02:13 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2017/04/05 12:33:49 fhajny Exp $
 #
 
 DISTNAME=	concrete5.7.5.6
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME:S/concrete5/concrete5-5/}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.concrete5.org/download_file/-/view/85780/
 EXTRACT_SUFX=	.zip
@@ -13,7 +14,6 @@ COMMENT=	Open sourece Content Management System
 LICENSE=	mit
 
 DEPENDS+=	${PHP_PKG_PREFIX}-pdo_mysql>=5.3.3:../../databases/php-pdo_mysql
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.3.3:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.3.3:../../graphics/php-gd
 DEPENDS+=	${PHP_PKG_PREFIX}-curl>=5.3.3:../../www/php-curl
 DEPENDS+=	${PHP_PKG_PREFIX}-mcrypt>=5.3.3:../../security/php-mcrypt
diff --git a/www/php-nextcloud/MESSAGE b/www/php-nextcloud/MESSAGE
index b3c30baa69f..397fcf050a7 100644
--- a/www/php-nextcloud/MESSAGE
+++ b/www/php-nextcloud/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2017/01/12 15:07:38 ryoon Exp $
+$NetBSD: MESSAGE,v 1.2 2017/04/05 12:33:49 fhajny Exp $
 
 To use Nextcloud, you will need to perform the following steps.
 
@@ -88,7 +88,6 @@ server {
 6. Be sure to have the following lines in ${PREFIX}/etc/php.ini.
 
 	extension=curl.so
-	extension=dom.so
 	extension=gd.so
 	extension=iconv.so
 	extension=json.so
diff --git a/www/php-nextcloud/Makefile b/www/php-nextcloud/Makefile
index caeef3b8fd2..e5e4b35c1a1 100644
--- a/www/php-nextcloud/Makefile
+++ b/www/php-nextcloud/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2017/03/16 00:01:54 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2017/04/05 12:33:49 fhajny Exp $
 #
 
 DISTNAME=	nextcloud-11.0.2
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://download.nextcloud.com/server/releases/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +13,6 @@ HOMEPAGE=	https://nextcloud.com/
 COMMENT=	File sharing web service server
 LICENSE=	gnu-agpl-v3
 
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.4.0:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.4.0:../../graphics/php-gd
 DEPENDS+=	${PHP_PKG_PREFIX}-iconv>=5.4.0:../../converters/php-iconv
 DEPENDS+=	${PHP_PKG_PREFIX}-json>=5.4.0:../../textproc/php-json
diff --git a/www/php-owncloud/MESSAGE b/www/php-owncloud/MESSAGE
index 316628ea84d..833ab5848f4 100644
--- a/www/php-owncloud/MESSAGE
+++ b/www/php-owncloud/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.19 2015/09/27 19:42:57 bouyer Exp $
+$NetBSD: MESSAGE,v 1.20 2017/04/05 12:33:49 fhajny Exp $
 
 To use ownCloud, you will need to perform the following steps.
 
@@ -88,7 +88,6 @@ server {
 6. Be sure to have the following lines in ${PREFIX}/etc/php.ini.
 
 	extension=curl.so
-	extension=dom.so
 	extension=gd.so
 	extension=iconv.so
 	extension=json.so
diff --git a/www/php-owncloud/Makefile b/www/php-owncloud/Makefile
index 4f8d49a14b8..113b87d4315 100644
--- a/www/php-owncloud/Makefile
+++ b/www/php-owncloud/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.62 2017/03/26 00:47:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.63 2017/04/05 12:33:49 fhajny Exp $
 #
 
 DISTNAME=	owncloud-9.1.4
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.owncloud.org/community/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +13,6 @@ HOMEPAGE=	http://owncloud.org/
 COMMENT=	Web services under your control
 LICENSE=	gnu-agpl-v3
 
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.4.0:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.4.0:../../graphics/php-gd
 DEPENDS+=	${PHP_PKG_PREFIX}-iconv>=5.4.0:../../converters/php-iconv
 DEPENDS+=	${PHP_PKG_PREFIX}-json>=5.4.0:../../textproc/php-json
diff --git a/www/php-tt-rss/MESSAGE b/www/php-tt-rss/MESSAGE
index 02c74b7401e..9da319c9bed 100644
--- a/www/php-tt-rss/MESSAGE
+++ b/www/php-tt-rss/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2014/06/29 15:23:47 ryoon Exp $
+$NetBSD: MESSAGE,v 1.6 2017/04/05 12:33:49 fhajny Exp $
 
 To use php-tt-rss with nginx 1.6 and php 5.4, you will need to perform
 the following steps.
@@ -49,7 +49,6 @@ the following steps.
 
 9. Be sure to have the following lines in ${PREFIX}/etc/php.ini.
 
-	extension=dom.so
 	extension=iconv.so
 	extension=json.so
 	extension=mbstring.so
diff --git a/www/php-tt-rss/Makefile b/www/php-tt-rss/Makefile
index 72d0c970447..fe89bc4016d 100644
--- a/www/php-tt-rss/Makefile
+++ b/www/php-tt-rss/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2014/06/29 15:23:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2017/04/05 12:33:49 fhajny Exp $
 
 TTRVER=		1.12
 DISTNAME=	Tiny-Tiny-RSS-${TTRVER}
 PKGNAME=	${PHP_PKG_PREFIX}-tt-rss-${TTRVER}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	-http://github.com/gothfox/Tiny-Tiny-RSS/archive/${TTRVER}.tar.gz
 
@@ -13,7 +14,6 @@ LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	${PHP_PKG_PREFIX}-mbstring-[0-9]*:../../converters/php-mbstring
 DEPENDS+=	${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
-DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-iconv-[0-9]*:../../converters/php-iconv
 
 .include "options.mk"
diff --git a/www/phraseanet/MESSAGE b/www/phraseanet/MESSAGE
index 22732d355a8..7f756b234bd 100644
--- a/www/phraseanet/MESSAGE
+++ b/www/phraseanet/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2014/01/02 15:44:10 jperkin Exp $
+$NetBSD: MESSAGE,v 1.4 2017/04/05 12:33:49 fhajny Exp $
 
 You will need to make Phraseanet accessible through your HTTP server.
 If you are running Apache then you may add the following lines to httpd.conf:
@@ -15,7 +15,6 @@ You will also need to enable the following modules in ${PKG_SYSCONFDIR}/php.ini
   extension=phrasea2.so
   extension=mbstring.so
   extension=gettext.so
-  extension=dom.so
   extension=exif.so
   extension=fileinfo.so
   extension=ftp.so
diff --git a/www/phraseanet/Makefile b/www/phraseanet/Makefile
index fd70e89a89b..cf4883f5055 100644
--- a/www/phraseanet/Makefile
+++ b/www/phraseanet/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2017/03/12 07:20:52 maya Exp $
+# $NetBSD: Makefile,v 1.20 2017/04/05 12:33:49 fhajny Exp $
 #
 
 .include "../../www/phraseanet/Makefile.common"
 PKGNAME=	phraseanet-${VERS}
-PKGREVISION=	6
+PKGREVISION=	7
 
 USE_TOOLS+=	pax
 
@@ -17,7 +17,6 @@ DEPENDS+=	${PHP_PKG_PREFIX}-apc-[0-9]*:../../www/php-apc
 .endif
 DEPENDS+=	${PHP_PKG_PREFIX}-mbstring-[0-9]*:../../converters/php-mbstring
 DEPENDS+=	${PHP_PKG_PREFIX}-gettext-[0-9]*:../../devel/php-gettext
-DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-exif-[0-9]*:../../graphics/php-exif
 DEPENDS+=	${PHP_PKG_PREFIX}-ftp-[0-9]*:../../net/php-ftp
 DEPENDS+=	${PHP_PKG_PREFIX}-curl-[0-9]*:../../www/php-curl