diff options
| author | manu <manu@pkgsrc.org> | 2016-09-30 14:21:23 +0000 |
|---|---|---|
| committer | manu <manu@pkgsrc.org> | 2016-09-30 14:21:23 +0000 |
| commit | cf8cf0ef447de847f789a6d7ef1a2734fd1d2079 (patch) | |
| tree | 816c2f9c9dc26fc8c2c30f8fcb432d847dfed6a5 /mail | |
| parent | 7509bf3ac5dbb7b852834cedb9149665934355e6 (diff) | |
| download | pkgsrc-cf8cf0ef447de847f789a6d7ef1a2734fd1d2079.tar.gz | |
Remove patch on a localy installed file that did not belong to the distribution
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/squirrelmail/Makefile | 4 | ||||
| -rw-r--r-- | mail/squirrelmail/distinfo | 3 | ||||
| -rw-r--r-- | mail/squirrelmail/patches/patch-plugins_gpg_gpg_decrypt_attach.php | 32 |
3 files changed, 3 insertions, 36 deletions
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile index 3ebada42fe2..d89ca7f1ba0 100644 --- a/mail/squirrelmail/Makefile +++ b/mail/squirrelmail/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.129 2016/09/27 12:11:11 manu Exp $ +# $NetBSD: Makefile,v 1.130 2016/09/30 14:21:23 manu Exp $ DISTNAME= squirrelmail-webmail-1.4.23pre14523 PKGNAME= ${DISTNAME:S/-webmail//} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_LOCAL} EXTRACT_SUFX= .tar.bz2 diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo index 04c0644951f..14553164bdb 100644 --- a/mail/squirrelmail/distinfo +++ b/mail/squirrelmail/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.65 2016/09/27 12:11:11 manu Exp $ +$NetBSD: distinfo,v 1.66 2016/09/30 14:21:23 manu Exp $ SHA1 (squirrelmail-webmail-1.4.23pre14523.tar.bz2) = bce5a25233d65cb2260770c4513f284d52084383 RMD160 (squirrelmail-webmail-1.4.23pre14523.tar.bz2) = 774395fe79ffc49d11df01c3e0ad054803e86a2d @@ -9,4 +9,3 @@ SHA1 (patch-ab) = 30bf68c730f20e817fbe81d18bc2a95899ee3fd0 SHA1 (patch-ai) = 1c08904ecf074ff3ba7e6042becc0f0771388b9f SHA1 (patch-ca) = d2e41316b8ecd97b49842eff548219e40e9b163a SHA1 (patch-plugins_administrator_defines.php) = d06f6a9efb6f096b96fa088f388037a7095357f7 -SHA1 (patch-plugins_gpg_gpg_decrypt_attach.php) = e8c845809cf9bb40758981a1a23be1ee0362cb4a diff --git a/mail/squirrelmail/patches/patch-plugins_gpg_gpg_decrypt_attach.php b/mail/squirrelmail/patches/patch-plugins_gpg_gpg_decrypt_attach.php deleted file mode 100644 index d7ac1047085..00000000000 --- a/mail/squirrelmail/patches/patch-plugins_gpg_gpg_decrypt_attach.php +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-plugins_gpg_gpg_decrypt_attach.php,v 1.1 2016/09/27 12:11:11 manu Exp $ - -PHP 5 compatibility fix, from Jean-Jacques Puig. - ---- plugins/gpg/gpg_decrypt_attach.php.orig -+++ plugins/gpg/gpg_decrypt_attach.php -@@ -181,15 +181,17 @@ - return $return; - } - --function scandir($dirstr) { -- // php.net/scandir (PHP5) -- $files = array(); -- $fh = opendir($dirstr); -- while (false !== ($filename = readdir($fh))) { -- array_push($files, $filename); -+if (!function_exists('scandir')) { -+ function scandir($dirstr) { -+ // php.net/scandir (PHP5) -+ $files = array(); -+ $fh = opendir($dirstr); -+ while (false !== ($filename = readdir($fh))) { -+ array_push($files, $filename); -+ } -+ closedir($fh); -+ return $files; - } -- closedir($fh); -- return $files; - } - - /** |