Attachment #78238 for bug #112548




#

PORTNAME=	squirrelmail
PORTVERSION=	1.4.10
CATEGORIES=	mail www
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
		all_locales-1.4.9-20070106${EXTRACT_SUFX}
DIST_SUBDIR=	${PORTNAME}

MAINTAINER=	simond@irrelevant.org

Lines 1-6 Link Here

(-)squirrelmail/distinfo (-6 / +6 lines)
1	MD5 (squirrelmail/squirrelmail-1.4.9a.tar.bz2) = 3adf66bfe2e816ba8375cf811d8ef3f6	1	MD5 (squirrelmail/squirrelmail-1.4.10.tar.bz2) = 6e3ab93e8c3854ba84a03df256ed0f7d
2	SHA256 (squirrelmail/squirrelmail-1.4.9a.tar.bz2) = 0a33ef186ff898017f788f5a6783d3303a879ea4e20ccfc6e124ad38d9954f95	2	SHA256 (squirrelmail/squirrelmail-1.4.10.tar.bz2) = d2328bebb3e863025d61222cbc40f4263dfdefcb22e500ed501462a05d7df4be
3	SIZE (squirrelmail/squirrelmail-1.4.9a.tar.bz2) = 481601	3	SIZE (squirrelmail/squirrelmail-1.4.10.tar.bz2) = 484389
4	MD5 (squirrelmail/all_locales-1.4.8-20060903.tar.bz2) = f8a042fd6b3ea68a3da49c3398224205	4	MD5 (squirrelmail/all_locales-1.4.9-20070106.tar.bz2) = eaa0e8835b8d7d451500aad907c22e24
5	SHA256 (squirrelmail/all_locales-1.4.8-20060903.tar.bz2) = 24fd4af596eb20fe0b0c1e42e45142ed048cea98b141e4e2c98b367fdc5d76e7	5	SHA256 (squirrelmail/all_locales-1.4.9-20070106.tar.bz2) = 04ad3e37042deb8c5668946c3364cd53d9c30b2486f24deee4d71c05fa584423
6	SIZE (squirrelmail/all_locales-1.4.8-20060903.tar.bz2) = 2668940	6	SIZE (squirrelmail/all_locales-1.4.9-20070106.tar.bz2) = 2699569




--- config/config_default.php.orig	Wed May  9 16:48:26 2007
+++ config/config_default.php	Wed May  9 16:49:20 2007
@@ -464,7 +464,7 @@
  *
  * @global string $data_dir
  */
-$data_dir = '/var/local/squirrelmail/data/';
+$data_dir = '/var/spool/squirrelmail/pref/';
 
 /**
  * Attachments directory
@@ -482,7 +482,7 @@
  *    + It should probably be another directory than data_dir.
  * @global string $attachment_dir
  */
-$attachment_dir = '/var/local/squirrelmail/attach/';
+$attachment_dir = '/var/spool/squirrelmail/attach/';
 
 /**

Return to bug 112548

Lines 6-17 Link Here

(-)squirrelmail/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= squirrelmail	8	PORTNAME= squirrelmail
9	PORTVERSION= 1.4.9a	9	PORTVERSION= 1.4.10
10	CATEGORIES= mail www	10	CATEGORIES= mail www
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
13	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \	13	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
14	all_locales-1.4.8-20060903${EXTRACT_SUFX}	14	all_locales-1.4.9-20070106${EXTRACT_SUFX}
15	DIST_SUBDIR= ${PORTNAME}	15	DIST_SUBDIR= ${PORTNAME}
16		16
17	MAINTAINER= simond@irrelevant.org	17	MAINTAINER= simond@irrelevant.org

Lines 1-19 Link Here

(-)squirrelmail/files/patch-config-config_default.php (-7 / +7 lines)
1	--- config/config_default.php.orig Wed Jun 2 10:49:41 2004	1	--- config/config_default.php.orig Wed May 9 16:48:26 2007
2	+++ config/config_default.php Wed Jun 2 10:50:21 2004	2	+++ config/config_default.php Wed May 9 16:49:20 2007
3	@@ -442,7 +442,7 @@	3	@@ -464,7 +464,7 @@
4	* $data_dir = SM_PATH . 'data/';	4	*
5	* @global string $data_dir	5	* @global string $data_dir
6	*/	6	*/
7	-$data_dir = SM_PATH . 'data/';	7	-$data_dir = '/var/local/squirrelmail/data/';
8	+$data_dir = '/var/spool/squirrelmail/pref/';	8	+$data_dir = '/var/spool/squirrelmail/pref/';
9		9
10	/**	10	/**
11	* Attachments directory	11	* Attachments directory
12	@@ -460,7 +460,7 @@	12	@@ -482,7 +482,7 @@
13	* + It should probably be another directory than data_dir.	13	* + It should probably be another directory than data_dir.
14	* @global string $attachment_dir	14	* @global string $attachment_dir
15	*/	15	*/
16	-$attachment_dir = $data_dir;	16	-$attachment_dir = '/var/local/squirrelmail/attach/';
17	+$attachment_dir = '/var/spool/squirrelmail/attach/';	17	+$attachment_dir = '/var/spool/squirrelmail/attach/';
18		18
19	/**	19	/**

Lines 427-432 Link Here

(-)squirrelmail/pkg-plist (+18 lines)
427	%%SQUIRRELDIR%%/locale/cs_CZ/LC_MESSAGES/squirrelmail.po	427	%%SQUIRRELDIR%%/locale/cs_CZ/LC_MESSAGES/squirrelmail.po
428	%%SQUIRRELDIR%%/locale/cs_CZ/LC_MESSAGES/vacation_local.mo	428	%%SQUIRRELDIR%%/locale/cs_CZ/LC_MESSAGES/vacation_local.mo
429	%%SQUIRRELDIR%%/locale/cs_CZ/LC_MESSAGES/vacation_local.po	429	%%SQUIRRELDIR%%/locale/cs_CZ/LC_MESSAGES/vacation_local.po
		430	%%SQUIRRELDIR%%/locale/cs_CZ/LC_MESSAGES/vkeyboard.po
		431	%%SQUIRRELDIR%%/locale/cs_CZ/LC_MESSAGES/vkeyboard.mo
430	%%SQUIRRELDIR%%/locale/cs_CZ/LC_MESSAGES/yelp.mo	432	%%SQUIRRELDIR%%/locale/cs_CZ/LC_MESSAGES/yelp.mo
431	%%SQUIRRELDIR%%/locale/cs_CZ/LC_MESSAGES/yelp.po	433	%%SQUIRRELDIR%%/locale/cs_CZ/LC_MESSAGES/yelp.po
432	%%SQUIRRELDIR%%/locale/cs_CZ/setup.php	434	%%SQUIRRELDIR%%/locale/cs_CZ/setup.php
Lines 505-510 Link Here
505	%%SQUIRRELDIR%%/locale/es_ES/LC_MESSAGES/squirrelmail.po	507	%%SQUIRRELDIR%%/locale/es_ES/LC_MESSAGES/squirrelmail.po
506	%%SQUIRRELDIR%%/locale/es_ES/LC_MESSAGES/unsafe_image_rules.mo	508	%%SQUIRRELDIR%%/locale/es_ES/LC_MESSAGES/unsafe_image_rules.mo
507	%%SQUIRRELDIR%%/locale/es_ES/LC_MESSAGES/unsafe_image_rules.po	509	%%SQUIRRELDIR%%/locale/es_ES/LC_MESSAGES/unsafe_image_rules.po
		510	%%SQUIRRELDIR%%/locale/es_ES/LC_MESSAGES/vkeyboard.po
		511	%%SQUIRRELDIR%%/locale/es_ES/LC_MESSAGES/vkeyboard.mo
508	%%SQUIRRELDIR%%/locale/es_ES/setup.php	512	%%SQUIRRELDIR%%/locale/es_ES/setup.php
509	%%SQUIRRELDIR%%/locale/et_EE/LC_MESSAGES/squirrelmail.mo	513	%%SQUIRRELDIR%%/locale/et_EE/LC_MESSAGES/squirrelmail.mo
510	%%SQUIRRELDIR%%/locale/et_EE/LC_MESSAGES/squirrelmail.po	514	%%SQUIRRELDIR%%/locale/et_EE/LC_MESSAGES/squirrelmail.po
Lines 549-554 Link Here
549	%%SQUIRRELDIR%%/locale/fr_FR/LC_MESSAGES/squirrelmail.po	553	%%SQUIRRELDIR%%/locale/fr_FR/LC_MESSAGES/squirrelmail.po
550	%%SQUIRRELDIR%%/locale/fr_FR/LC_MESSAGES/vacation_local.mo	554	%%SQUIRRELDIR%%/locale/fr_FR/LC_MESSAGES/vacation_local.mo
551	%%SQUIRRELDIR%%/locale/fr_FR/LC_MESSAGES/vacation_local.po	555	%%SQUIRRELDIR%%/locale/fr_FR/LC_MESSAGES/vacation_local.po
		556	%%SQUIRRELDIR%%/locale/fr_FR/LC_MESSAGES/vkeyboard.po
		557	%%SQUIRRELDIR%%/locale/fr_FR/LC_MESSAGES/vkeyboard.mo
552	%%SQUIRRELDIR%%/locale/fr_FR/LC_MESSAGES/yelp.mo	558	%%SQUIRRELDIR%%/locale/fr_FR/LC_MESSAGES/yelp.mo
553	%%SQUIRRELDIR%%/locale/fr_FR/LC_MESSAGES/yelp.po	559	%%SQUIRRELDIR%%/locale/fr_FR/LC_MESSAGES/yelp.po
554	%%SQUIRRELDIR%%/locale/fr_FR/setup.php	560	%%SQUIRRELDIR%%/locale/fr_FR/setup.php
Lines 680-685 Link Here
680	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/naguser.po	686	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/naguser.po
681	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/newuser_wiz.mo	687	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/newuser_wiz.mo
682	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/newuser_wiz.po	688	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/newuser_wiz.po
		689	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/proon.mo
		690	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/proon.po
683	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/qmailadmin_login.mo	691	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/qmailadmin_login.mo
684	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/qmailadmin_login.po	692	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/qmailadmin_login.po
685	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/reply_buttons.mo	693	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/reply_buttons.mo
Lines 710-715 Link Here
710	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/vacation_local.po	718	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/vacation_local.po
711	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/verify_reply_to.mo	719	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/verify_reply_to.mo
712	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/verify_reply_to.po	720	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/verify_reply_to.po
		721	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/vkeyboard.mo
		722	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/vkeyboard.po
713	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/web_search.mo	723	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/web_search.mo
714	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/web_search.po	724	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/web_search.po
715	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/yelp.mo	725	%%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/yelp.mo
Lines 731-736 Link Here
731	%%SQUIRRELDIR%%/locale/nl_NL/LC_MESSAGES/squirrelmail.po	741	%%SQUIRRELDIR%%/locale/nl_NL/LC_MESSAGES/squirrelmail.po
732	%%SQUIRRELDIR%%/locale/nl_NL/LC_MESSAGES/vacation_local.mo	742	%%SQUIRRELDIR%%/locale/nl_NL/LC_MESSAGES/vacation_local.mo
733	%%SQUIRRELDIR%%/locale/nl_NL/LC_MESSAGES/vacation_local.po	743	%%SQUIRRELDIR%%/locale/nl_NL/LC_MESSAGES/vacation_local.po
		744	%%SQUIRRELDIR%%/locale/nl_NL/LC_MESSAGES/vkeyboard.po
		745	%%SQUIRRELDIR%%/locale/nl_NL/LC_MESSAGES/vkeyboard.mo
734	%%SQUIRRELDIR%%/locale/nl_NL/setup.php	746	%%SQUIRRELDIR%%/locale/nl_NL/setup.php
735	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/abook_import_export.mo	747	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/abook_import_export.mo
736	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/abook_import_export.po	748	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/abook_import_export.po
Lines 810-815 Link Here
810	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/vacation_local.po	822	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/vacation_local.po
811	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/verify_reply_to.mo	823	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/verify_reply_to.mo
812	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/verify_reply_to.po	824	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/verify_reply_to.po
		825	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/vkeyboard.po
		826	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/vkeyboard.mo
813	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/web_search.mo	827	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/web_search.mo
814	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/web_search.po	828	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/web_search.po
815	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/yelp.mo	829	%%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/yelp.mo
Lines 826-831 Link Here
826	%%SQUIRRELDIR%%/locale/pt_BR/LC_MESSAGES/squirrelmail.po	840	%%SQUIRRELDIR%%/locale/pt_BR/LC_MESSAGES/squirrelmail.po
827	%%SQUIRRELDIR%%/locale/pt_BR/LC_MESSAGES/unsafe_image_rules.mo	841	%%SQUIRRELDIR%%/locale/pt_BR/LC_MESSAGES/unsafe_image_rules.mo
828	%%SQUIRRELDIR%%/locale/pt_BR/LC_MESSAGES/unsafe_image_rules.po	842	%%SQUIRRELDIR%%/locale/pt_BR/LC_MESSAGES/unsafe_image_rules.po
		843	%%SQUIRRELDIR%%/locale/pt_BR/LC_MESSAGES/vkeyboard.po
		844	%%SQUIRRELDIR%%/locale/pt_BR/LC_MESSAGES/vkeyboard.mo
829	%%SQUIRRELDIR%%/locale/pt_BR/setup.php	845	%%SQUIRRELDIR%%/locale/pt_BR/setup.php
830	%%SQUIRRELDIR%%/locale/pt_PT/LC_MESSAGES/askuserinfo.mo	846	%%SQUIRRELDIR%%/locale/pt_PT/LC_MESSAGES/askuserinfo.mo
831	%%SQUIRRELDIR%%/locale/pt_PT/LC_MESSAGES/askuserinfo.po	847	%%SQUIRRELDIR%%/locale/pt_PT/LC_MESSAGES/askuserinfo.po
Lines 969-974 Link Here
969	%%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/templates.po	985	%%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/templates.po
970	%%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/vacation_local.mo	986	%%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/vacation_local.mo
971	%%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/vacation_local.po	987	%%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/vacation_local.po
		988	%%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/vkeyboard.po
		989	%%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/vkeyboard.mo
972	%%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/web_search.mo	990	%%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/web_search.mo
973	%%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/web_search.po	991	%%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/web_search.po
974	%%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/yelp.mo	992	%%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/yelp.mo