From fa77d7939f85279402663a7826b98969969e380f Mon Sep 17 00:00:00 2001
From: taca <taca@pkgsrc.org>
Date: Tue, 17 Feb 2015 03:52:31 +0000
Subject: Remove patch-installer_check.php and add dependency to php-exif since
 roundcube use php-exif if available and comment in patch-installer_check.php
 was wrong.

Bump PKGREVISION.
---
 mail/roundcube/Makefile                          |  5 +++--
 mail/roundcube/distinfo                          |  4 +---
 mail/roundcube/patches/patch-installer_check.php | 14 --------------
 3 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 mail/roundcube/patches/patch-installer_check.php

(limited to 'mail/roundcube')

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 91ec1bec8f7..29ab84c2b31 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2015/02/16 15:33:32 adam Exp $
+# $NetBSD: Makefile,v 1.68 2015/02/17 03:52:31 taca Exp $
 
 DISTNAME=	roundcubemail-1.1.0
-PKGNAME=	${DISTNAME:S/mail-/-/}
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
 
@@ -13,6 +13,7 @@ LICENSE=	gnu-gpl-v3
 DEPENDS+=	${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
 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-exim
 DEPENDS+=	${PHP_PKG_PREFIX}-intl>=${PHP_BASE_VERS}:../../textproc/php-intl
 DEPENDS+=	${PHP_PKG_PREFIX}-json>=${PHP_BASE_VERS}:../../textproc/php-json
 DEPENDS+=	${PHP_PKG_PREFIX}-mcrypt>=${PHP_BASE_VERS}:../../security/php-mcrypt
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index a61bf87a9ff..b921e461c6f 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.40 2015/02/16 15:33:32 adam Exp $
+$NetBSD: distinfo,v 1.41 2015/02/17 03:52:31 taca Exp $
 
 SHA1 (roundcubemail-1.1.0.tar.gz) = 22e994db05a743ab49d47f1092b79f04ddb6dffd
 RMD160 (roundcubemail-1.1.0.tar.gz) = 2c41c6b6fac878dace1862d2fc6e3baa0513c000
 Size (roundcubemail-1.1.0.tar.gz) = 3181473 bytes
 SHA1 (patch-ac) = 235116580665d5d58edc218c063b41171a2d9227
 SHA1 (patch-af) = 1f95a7005569207469563aa37ff48da0383b7668
-SHA1 (patch-installer_check.php) = 4f514926c16c46c9d5a678f123fb090d2038f0a0
-SHA1 (patch-program_include_rcmail__install.php) = af3532b03db2497cf00fc971aea2b124a0a69088
diff --git a/mail/roundcube/patches/patch-installer_check.php b/mail/roundcube/patches/patch-installer_check.php
deleted file mode 100644
index e6dfba4f3c5..00000000000
--- a/mail/roundcube/patches/patch-installer_check.php
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-installer_check.php,v 1.2 2015/02/16 15:33:32 adam Exp $
-
-Roundcube dosen't use php-exif.
-
---- installer/check.php.orig	2015-02-08 13:48:55.000000000 +0000
-+++ installer/check.php
-@@ -24,7 +24,6 @@ $optional_php_exts = array(
-     'OpenSSL'   => 'openssl',
-     'Mcrypt'    => 'mcrypt',
-     'Intl'      => 'intl',
--    'Exif'      => 'exif',
-     'LDAP'      => 'ldap',
- );
- 
-- 
cgit v1.2.3