Sun May 17 14:33:22 2009 UTC ()
Pullup ticket #2772 - requested by taca
squirrelmail: Re-add Japanese language option

Revisions pulled up:
- mail/squirrelmail/Makefile		1.104-1.105
- mail/squirrelmail/distinfo		1.52
- mail/squirrelmail/options.mk		1.11
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Thu May 14 14:24:50 UTC 2009

Modified Files:
	pkgsrc/mail/squirrelmail: Makefile

Log Message:
Since iso_2022_jp.php isn't included in squirrelmail distribution,
remove extra pre-configure processing.
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Fri May 15 13:01:00 UTC 2009

Modified Files:
	pkgsrc/mail/squirrelmail: Makefile distinfo options.mk

Log Message:
Enable squirrelmail-japanese option with Japanese patch:
squirrelmail-1.4.16-ja-20081013-patch.

Bump PKGREVISION.


(tron)
diff -r1.101.4.1 -r1.101.4.2 pkgsrc/mail/squirrelmail/Makefile
diff -r1.50.4.1 -r1.50.4.2 pkgsrc/mail/squirrelmail/distinfo
diff -r1.9.4.1 -r1.9.4.2 pkgsrc/mail/squirrelmail/options.mk
cvs diff -r1.101.4.1 -r1.101.4.2 pkgsrc/mail/squirrelmail/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/squirrelmail/Makefile 2009/05/14 09:08:59 1.101.4.1
+++ pkgsrc/mail/squirrelmail/Makefile 2009/05/17 14:33:22 1.101.4.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.101.4.1 2009/05/14 09:08:59 tron Exp $ 1# $NetBSD: Makefile,v 1.101.4.2 2009/05/17 14:33:22 tron Exp $
2 2
3DISTNAME= squirrelmail-1.4.18 3DISTNAME= squirrelmail-1.4.18
4#PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= mail www 5CATEGORIES= mail www
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= martti@NetBSD.org 9MAINTAINER= martti@NetBSD.org
10HOMEPAGE= http://www.squirrelmail.org/ 10HOMEPAGE= http://www.squirrelmail.org/
11COMMENT= PHP webmail package 11COMMENT= PHP webmail package
12#LICENSE= gnu-gpl-v2 12#LICENSE= gnu-gpl-v2
13 13
14CONFLICTS= sq-attachment-handlers-[0-9]* 14CONFLICTS= sq-attachment-handlers-[0-9]*
15CONFLICTS+= sq-squirrelspell-[0-9]* 15CONFLICTS+= sq-squirrelspell-[0-9]*
16CONFLICTS+= ja-squirrelspell-[0-9]* 16CONFLICTS+= ja-squirrelspell-[0-9]*
17CONFLICTS+= ja-squirrelmail-[0-9]* 17CONFLICTS+= ja-squirrelmail-[0-9]*
@@ -65,29 +65,26 @@ SUBST_SED.paths+= -e 's,@SMDIR@,${SMDIR} @@ -65,29 +65,26 @@ SUBST_SED.paths+= -e 's,@SMDIR@,${SMDIR}
65SUBST_STAGE.paths= post-patch 65SUBST_STAGE.paths= post-patch
66 66
67INSTALLATION_DIRS= ${PKGMANDIR}/man8 67INSTALLATION_DIRS= ${PKGMANDIR}/man8
68INSTALLATION_DIRS+= share/examples/squirrelmail 68INSTALLATION_DIRS+= share/examples/squirrelmail
69INSTALLATION_DIRS+= share/squirrelmail 69INSTALLATION_DIRS+= share/squirrelmail
70 70
71post-extract: 71post-extract:
72 cp ${FILESDIR}/squirrelmail.conf.dist \ 72 cp ${FILESDIR}/squirrelmail.conf.dist \
73 ${WRKDIR}/squirrelmail.conf.dist 73 ${WRKDIR}/squirrelmail.conf.dist
74 74
75pre-configure: 75pre-configure:
76 find ${WRKSRC} \( -name '*.orig*' -o -name '.cvsignore' \) \ 76 find ${WRKSRC} \( -name '*.orig*' -o -name '.cvsignore' \) \
77 -exec rm -f {} \; 77 -exec rm -f {} \;
78# currently, we use iso_2022_jp.php in squirrelmail-decode package. 
79# 
80 rm -f ${WRKSRC}/functions/decode/iso_2022_jp.php 
81 78
82do-install: 79do-install:
83 ${INSTALL_DATA} ${WRKDIR}/squirrelmail.conf.dist ${EGDIR}/squirrelmail.conf 80 ${INSTALL_DATA} ${WRKDIR}/squirrelmail.conf.dist ${EGDIR}/squirrelmail.conf
84 cp -R ${WRKSRC}/* ${SMDIR} 81 cp -R ${WRKSRC}/* ${SMDIR}
85 chown -R ${SHAREOWN}:${SHAREGRP} ${SMDIR} 82 chown -R ${SHAREOWN}:${SHAREGRP} ${SMDIR}
86 find ${SMDIR} -type d -exec chmod ${PKGDIRMODE} {} \; 83 find ${SMDIR} -type d -exec chmod ${PKGDIRMODE} {} \;
87 find ${SMDIR} -type f -exec chmod ${SHAREMODE} {} \; 84 find ${SMDIR} -type f -exec chmod ${SHAREMODE} {} \;
88 chmod a+x ${SMDIR}/config/conf.pl 85 chmod a+x ${SMDIR}/config/conf.pl
89 ${INSTALL_DATA} ${WRKSRC}/data/index.php ${USER_PREFS_DIR}/ 86 ${INSTALL_DATA} ${WRKSRC}/data/index.php ${USER_PREFS_DIR}/
90 ${INSTALL_DATA} ${WRKSRC}/data/.htaccess ${USER_PREFS_DIR}/ 87 ${INSTALL_DATA} ${WRKSRC}/data/.htaccess ${USER_PREFS_DIR}/
91 mv ${PREFIX}/share/squirrelmail/contrib/conf.pl.8 \ 88 mv ${PREFIX}/share/squirrelmail/contrib/conf.pl.8 \
92 ${PREFIX}/${PKGMANDIR}/man8/squirrelmail-conf.pl.8 89 ${PREFIX}/${PKGMANDIR}/man8/squirrelmail-conf.pl.8
93 90
cvs diff -r1.50.4.1 -r1.50.4.2 pkgsrc/mail/squirrelmail/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/squirrelmail/distinfo 2009/05/14 09:08:59 1.50.4.1
+++ pkgsrc/mail/squirrelmail/distinfo 2009/05/17 14:33:22 1.50.4.2
@@ -1,9 +1,12 @@ @@ -1,9 +1,12 @@
1$NetBSD: distinfo,v 1.50.4.1 2009/05/14 09:08:59 tron Exp $ 1$NetBSD: distinfo,v 1.50.4.2 2009/05/17 14:33:22 tron Exp $
2 2
 3SHA1 (squirrelmail-1.4.18-ja-20090515-patch.gz) = 2872450d9f9129268e913844d93d1e1d6a234c7d
 4RMD160 (squirrelmail-1.4.18-ja-20090515-patch.gz) = 11963f2c2122ba7a7975218b58b7ff3184f5baf3
 5Size (squirrelmail-1.4.18-ja-20090515-patch.gz) = 7647 bytes
3SHA1 (squirrelmail-1.4.18-lite-20090512-patch.bz2) = f7d47c237636922cf7d81249018b023d2914bf1e 6SHA1 (squirrelmail-1.4.18-lite-20090512-patch.bz2) = f7d47c237636922cf7d81249018b023d2914bf1e
4RMD160 (squirrelmail-1.4.18-lite-20090512-patch.bz2) = 3f379c0ba2fd5d3b4296a1ca051ee9b5d890e878 7RMD160 (squirrelmail-1.4.18-lite-20090512-patch.bz2) = 3f379c0ba2fd5d3b4296a1ca051ee9b5d890e878
5Size (squirrelmail-1.4.18-lite-20090512-patch.bz2) = 1793 bytes 8Size (squirrelmail-1.4.18-lite-20090512-patch.bz2) = 1793 bytes
6SHA1 (squirrelmail-1.4.18.tar.bz2) = 18872d8ad72f3415672344318901beb9d4d8a860 9SHA1 (squirrelmail-1.4.18.tar.bz2) = 18872d8ad72f3415672344318901beb9d4d8a860
7RMD160 (squirrelmail-1.4.18.tar.bz2) = 292d0f4123a8e8db84d9ff766a440848f1684b4b 10RMD160 (squirrelmail-1.4.18.tar.bz2) = 292d0f4123a8e8db84d9ff766a440848f1684b4b
8Size (squirrelmail-1.4.18.tar.bz2) = 509216 bytes 11Size (squirrelmail-1.4.18.tar.bz2) = 509216 bytes
9SHA1 (patch-aa) = 4c5556c804c1b728eec87322272abb06edcfcc2a 12SHA1 (patch-aa) = 4c5556c804c1b728eec87322272abb06edcfcc2a
cvs diff -r1.9.4.1 -r1.9.4.2 pkgsrc/mail/squirrelmail/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/squirrelmail/Attic/options.mk 2009/05/14 09:08:59 1.9.4.1
+++ pkgsrc/mail/squirrelmail/Attic/options.mk 2009/05/17 14:33:22 1.9.4.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: options.mk,v 1.9.4.1 2009/05/14 09:08:59 tron Exp $ 1# $NetBSD: options.mk,v 1.9.4.2 2009/05/17 14:33:22 tron Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.squirrelmail 3PKG_OPTIONS_VAR= PKG_OPTIONS.squirrelmail
4PKG_SUPPORTED_OPTIONS= squirrelmail-japanese squirrelmail-lite 4PKG_SUPPORTED_OPTIONS= squirrelmail-japanese squirrelmail-lite
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8#.if !empty(PKG_OPTIONS:Msquirrelmail-japanese) 8.if !empty(PKG_OPTIONS:Msquirrelmail-japanese)
9#PATCHFILES+= squirrelmail-1.4.16-ja-20081013-patch.gz 9PATCHFILES+= squirrelmail-1.4.18-ja-20090515-patch.gz
10#SITES.squirrelmail-1.4.16-ja-20081013-patch.gz= \ 10SITES.squirrelmail-1.4.18-ja-20090515-patch.gz= \
11# http://www.yamaai-tech.com/~masato/Download/ 11 http://www.yamaai-tech.com/~masato/Download/
12#PATCH_DIST_STRIP.squirrelmail-1.4.16-ja-20081013-patch.gz= -p1 12PATCH_DIST_STRIP.squirrelmail-1.4.18-ja-20090515-patch.gz= -p1
13#.endif 13.endif
14 14
15.if !empty(PKG_OPTIONS:Msquirrelmail-lite) 15.if !empty(PKG_OPTIONS:Msquirrelmail-lite)
16PATCHFILES+= squirrelmail-1.4.18-lite-20090512-patch.bz2 16PATCHFILES+= squirrelmail-1.4.18-lite-20090512-patch.bz2
17SITES.squirrelmail-1.4.18-lite-20090512-patch.bz2= \ 17SITES.squirrelmail-1.4.18-lite-20090512-patch.bz2= \
18 ftp://ftp.back-street.net/pub/squirrelmail/ 18 ftp://ftp.back-street.net/pub/squirrelmail/
19 19
20DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring 20DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring
21.endif 21.endif