[pkgsrc/trunk]: pkgsrc/mail/squirrelmail Obsolete squirrelmail-japanese and s...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/84d5147fcadb
branches:  trunk
changeset: 399741:84d5147fcadb
user:      taca <taca%pkgsrc.org@localhost>
date:      Tue Sep 29 13:30:54 2009 +0000

description:
Obsolete squirrelmail-japanese and squirrelmail-lite package options.

* Currently, squirrelmail package is brokwn when enable squirrelmail-japanese
  option and are/squirrelmail/functions/decode/iso_2022_jp.php was conflicted
  between squirrelmail and squirrelmail-decode package.
* squirrelmail-japanese isn't available for squirrelmail-1.4.20-RC2.

Bump PKGREVISION.

diffstat:

 mail/squirrelmail/Makefile   |   4 ++--
 mail/squirrelmail/PLIST      |   3 +--
 mail/squirrelmail/options.mk |  23 -----------------------
 3 files changed, 3 insertions(+), 27 deletions(-)

diffs (58 lines):

diff -r 2d102cdb379c -r 84d5147fcadb mail/squirrelmail/Makefile
--- a/mail/squirrelmail/Makefile        Tue Sep 29 12:34:19 2009 +0000
+++ b/mail/squirrelmail/Makefile        Tue Sep 29 13:30:54 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.108 2009/08/26 12:47:17 tron Exp $
+# $NetBSD: Makefile,v 1.109 2009/09/29 13:30:54 taca Exp $
 
 DISTNAME=      squirrelmail-1.4.20-RC2
 PKGNAME=       ${DISTNAME:S/-RC2/rc2/}
+PKGREVISION=   1
 CATEGORIES=    mail www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=  .tar.bz2
@@ -28,7 +29,6 @@
 BUILD_DEFS+=           VARBASE
 
 .include "../../mk/bsd.prefs.mk"
-.include "options.mk"
 
 PKG_SYSCONFSUBDIR?=    httpd
 MESSAGE_SUBST+=                PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
diff -r 2d102cdb379c -r 84d5147fcadb mail/squirrelmail/PLIST
--- a/mail/squirrelmail/PLIST   Tue Sep 29 12:34:19 2009 +0000
+++ b/mail/squirrelmail/PLIST   Tue Sep 29 13:30:54 2009 +0000
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2009/08/26 12:47:17 tron Exp $
-${PLIST.japanese}share/squirrelmail/functions/decode/iso_2022_jp.php
+@comment $NetBSD: PLIST,v 1.34 2009/09/29 13:30:54 taca Exp $
 man/man8/squirrelmail-conf.pl.8
 share/examples/squirrelmail/squirrelmail.conf
 share/squirrelmail/README
diff -r 2d102cdb379c -r 84d5147fcadb mail/squirrelmail/options.mk
--- a/mail/squirrelmail/options.mk      Tue Sep 29 12:34:19 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-# $NetBSD: options.mk,v 1.13 2009/05/22 08:50:19 taca Exp $
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.squirrelmail
-PKG_SUPPORTED_OPTIONS= squirrelmail-japanese squirrelmail-lite
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=           japanese
-.if !empty(PKG_OPTIONS:Msquirrelmail-japanese)
-PLIST.japanese=                yes
-PATCHFILES+=           squirrelmail-1.4.19-ja-20090522-patch.gz
-SITES.squirrelmail-1.4.19-ja-20090522-patch.gz= \
-                       http://www.yamaai-tech.com/~masato/Download/
-PATCH_DIST_STRIP.squirrelmail-1.4.19-ja-20090522-patch.gz=     -p1
-.endif
-
-.if !empty(PKG_OPTIONS:Msquirrelmail-lite)
-PATCHFILES+=           squirrelmail-1.4.18-lite-20090512-patch.bz2
-SITES.squirrelmail-1.4.18-lite-20090512-patch.bz2= \
-                       ftp://ftp.back-street.net/pub/squirrelmail/
-
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring
-.endif