pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Remove traces of textproc/php-dom which is not needed ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc62cbd3c79f
branches:  trunk
changeset: 360670:fc62cbd3c79f
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Wed Apr 05 12:33:47 2017 +0000

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

diffstat:

 benchmarks/phoronix-test-suite/Makefile |   5 ++---
 finance/magento/Makefile                |   4 ++--
 mail/roundcube/Makefile                 |   4 ++--
 meta-pkgs/php56-extensions/Makefile     |   4 ++--
 meta-pkgs/php70-extensions/Makefile     |   4 ++--
 meta-pkgs/php71-extensions/Makefile     |   4 ++--
 mk/defaults/options.description         |   1 -
 net/php-baikal/Makefile                 |   4 ++--
 textproc/php-xsl/MESSAGE                |   6 ------
 textproc/php-xsl/Makefile               |  12 ++++--------
 www/contao35/Makefile                   |   4 ++--
 www/contao43/Makefile                   |   4 ++--
 www/drupal7/Makefile                    |   5 ++---
 www/drupal7/options.mk                  |  14 +++-----------
 www/fengoffice/Makefile                 |   4 ++--
 www/horde/Makefile                      |   5 ++---
 www/mediawiki/Makefile                  |   4 ++--
 www/moodle/Makefile                     |   4 ++--
 www/php-concrete5/MESSAGE               |   3 +--
 www/php-concrete5/Makefile              |   4 ++--
 www/php-nextcloud/MESSAGE               |   3 +--
 www/php-nextcloud/Makefile              |   4 ++--
 www/php-owncloud/MESSAGE                |   3 +--
 www/php-owncloud/Makefile               |   4 ++--
 www/php-tt-rss/MESSAGE                  |   3 +--
 www/php-tt-rss/Makefile                 |   4 ++--
 www/phraseanet/MESSAGE                  |   3 +--
 www/phraseanet/Makefile                 |   5 ++---
 28 files changed, 50 insertions(+), 78 deletions(-)

diffs (truncated from 575 to 300 lines):

diff -r 31f3d1703704 -r fc62cbd3c79f benchmarks/phoronix-test-suite/Makefile
--- a/benchmarks/phoronix-test-suite/Makefile   Wed Apr 05 12:29:34 2017 +0000
+++ b/benchmarks/phoronix-test-suite/Makefile   Wed Apr 05 12:33:47 2017 +0000
@@ -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 @@
 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 -r 31f3d1703704 -r fc62cbd3c79f finance/magento/Makefile
--- a/finance/magento/Makefile  Wed Apr 05 12:29:34 2017 +0000
+++ b/finance/magento/Makefile  Wed Apr 05 12:33:47 2017 +0000
@@ -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 @@
 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 -r 31f3d1703704 -r fc62cbd3c79f mail/roundcube/Makefile
--- a/mail/roundcube/Makefile   Wed Apr 05 12:29:34 2017 +0000
+++ b/mail/roundcube/Makefile   Wed Apr 05 12:33:47 2017 +0000
@@ -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@localhost
 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 -r 31f3d1703704 -r fc62cbd3c79f meta-pkgs/php56-extensions/Makefile
--- a/meta-pkgs/php56-extensions/Makefile       Wed Apr 05 12:29:34 2017 +0000
+++ b/meta-pkgs/php56-extensions/Makefile       Wed Apr 05 12:33:47 2017 +0000
@@ -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}-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 -r 31f3d1703704 -r fc62cbd3c79f meta-pkgs/php70-extensions/Makefile
--- a/meta-pkgs/php70-extensions/Makefile       Wed Apr 05 12:29:34 2017 +0000
+++ b/meta-pkgs/php70-extensions/Makefile       Wed Apr 05 12:33:47 2017 +0000
@@ -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}-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 -r 31f3d1703704 -r fc62cbd3c79f meta-pkgs/php71-extensions/Makefile
--- a/meta-pkgs/php71-extensions/Makefile       Wed Apr 05 12:29:34 2017 +0000
+++ b/meta-pkgs/php71-extensions/Makefile       Wed Apr 05 12:33:47 2017 +0000
@@ -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}-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 -r 31f3d1703704 -r fc62cbd3c79f mk/defaults/options.description
--- a/mk/defaults/options.description   Wed Apr 05 12:29:34 2017 +0000
+++ b/mk/defaults/options.description   Wed Apr 05 12:33:47 2017 +0000
@@ -135,7 +135,6 @@
 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 -r 31f3d1703704 -r fc62cbd3c79f net/php-baikal/Makefile
--- a/net/php-baikal/Makefile   Wed Apr 05 12:29:34 2017 +0000
+++ b/net/php-baikal/Makefile   Wed Apr 05 12:33:47 2017 +0000
@@ -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 @@
 
 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 -r 31f3d1703704 -r fc62cbd3c79f textproc/php-xsl/MESSAGE
--- a/textproc/php-xsl/MESSAGE  Wed Apr 05 12:29:34 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 31f3d1703704 -r fc62cbd3c79f textproc/php-xsl/Makefile
--- a/textproc/php-xsl/Makefile Wed Apr 05 12:29:34 2017 +0000
+++ b/textproc/php-xsl/Makefile Wed Apr 05 12:33:47 2017 +0000
@@ -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}
+USE_PHP_EXT_PATCHES=   yes
 
-# uses symbols from DOM extension, so add explicit depends
-DEPENDS+=              ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
-
-# 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 -r 31f3d1703704 -r fc62cbd3c79f www/contao35/Makefile
--- a/www/contao35/Makefile     Wed Apr 05 12:29:34 2017 +0000
+++ b/www/contao35/Makefile     Wed Apr 05 12:33:47 2017 +0000
@@ -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 @@
 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 -r 31f3d1703704 -r fc62cbd3c79f www/contao43/Makefile
--- a/www/contao43/Makefile     Wed Apr 05 12:29:34 2017 +0000
+++ b/www/contao43/Makefile     Wed Apr 05 12:33:47 2017 +0000
@@ -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 @@
 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 -r 31f3d1703704 -r fc62cbd3c79f www/drupal7/Makefile
--- a/www/drupal7/Makefile      Wed Apr 05 12:29:34 2017 +0000
+++ b/www/drupal7/Makefile      Wed Apr 05 12:33:47 2017 +0000
@@ -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 @@
 
 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 -r 31f3d1703704 -r fc62cbd3c79f www/drupal7/options.mk
--- a/www/drupal7/options.mk    Wed Apr 05 12:29:34 2017 +0000
+++ b/www/drupal7/options.mk    Wed Apr 05 12:33:47 2017 +0000
@@ -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 @@
 .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 -r 31f3d1703704 -r fc62cbd3c79f www/fengoffice/Makefile
--- a/www/fengoffice/Makefile   Wed Apr 05 12:29:34 2017 +0000
+++ b/www/fengoffice/Makefile   Wed Apr 05 12:33:47 2017 +0000
@@ -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



Home | Main Index | Thread Index | Old Index