Attachment #121549 for bug #164560





PORTNAME=	mhonarc
PORTVERSION=	2.6.18
PORTREVISION=	1
CATEGORIES=	www mail
MASTER_SITES=	http://www.mhonarc.org/release/MHonArc/tar/ \
		http://www.oac.uci.edu/indiv/ehood/tar/
DISTNAME=	MHonArc-${PORTVERSION}

MAINTAINER=	kerndtr@kerndt.com
COMMENT=	WWW front end for mail archives

USE_BZIP2=	Yes

Line 0 Link Here

(-)files/patch-lib__mhamain.pl (+11 lines)
	1	--- ./lib/mhamain.pl.orig 2012-01-16 14:28:02.000000000 -0800
	2	+++ ./lib/mhamain.pl 2012-01-16 14:31:22.000000000 -0800
	3	@@ -1561,7 +1561,7 @@
	4	## Create Index2MsgId if not defined
	5	##
	6	sub defineIndex2MsgId {
	7	- if (!defined(%Index2MsgId)) {
	8	+ if (!(%Index2MsgId)) {
	9	foreach (keys %MsgId) {
	10	$Index2MsgId{$MsgId{$_}} = $_;
	11	}

Line 0 Link Here

(-)files/patch-lib__mhopt.pl (+11 lines)
	1	--- ./lib/mhopt.pl.orig 2012-01-16 14:32:41.000000000 -0800
	2	+++ ./lib/mhopt.pl 2012-01-16 14:33:10.000000000 -0800
	3	@@ -864,7 +864,7 @@
	4	##
	5	sub update_data_2_1_to_later {
	6	# we can preserve filter arguments
	7	- if (defined(%main::MIMEFiltersArgs)) {
	8	+ if (%main::MIMEFiltersArgs) {
	9	warn qq/ preserving MIMEARGS...\n/;
	10	%readmail::MIMEFiltersArgs = %main::MIMEFiltersArgs;
	11	$IsDefault{'MIMEARGS'} = 0;




--- ./lib/readmail.pl.orig	2012-01-16 14:33:30.000000000 -0800
+++ ./lib/readmail.pl	2012-01-16 14:35:37.000000000 -0800
@@ -117,9 +117,9 @@
 ##  set to true.
 
 %MIMEDecoders			= ()
-    unless defined(%MIMEDecoders);
+    unless (%MIMEDecoders);
 %MIMEDecodersSrc		= ()
-    unless defined(%MIMEDecodersSrc);
+    unless (%MIMEDecodersSrc);
 
 ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ##  %MIMECharSetConverters is the associative array for storing functions
@@ -153,9 +153,9 @@
 ##  string.
 
 %MIMECharSetConverters			= ()
-    unless defined(%MIMECharSetConverters);
+    unless (%MIMECharSetConverters);
 %MIMECharSetConvertersSrc		= ()
-    unless defined(%MIMECharSetConvertersSrc);
+    unless (%MIMECharSetConvertersSrc);
 
 ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ##  %MIMEFilters is the associative array for storing functions that
@@ -180,9 +180,9 @@
 ##  that all functions are defined before invoking MAILread_body.
 
 %MIMEFilters	= ()
-    unless defined(%MIMEFilters);
+    unless (%MIMEFilters);
 %MIMEFiltersSrc	= ()
-    unless defined(%MIMEFiltersSrc);
+    unless (%MIMEFiltersSrc);
 
 ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ##  %MIMEFiltersArgs is the associative array for storing any optional
@@ -196,7 +196,7 @@
 ##  listed for a function if both are applicable.
 
 %MIMEFiltersArgs	= ()
-    unless defined(%MIMEFiltersArgs);
+    unless (%MIMEFiltersArgs);
 
 ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ##  %MIMEExcs is the associative array listing which data types
@@ -206,7 +206,7 @@
 ##	Values => <should evaluate to a true expression>
 
 %MIMEExcs			= ()
-    unless defined(%MIMEExcs);
+    unless (%MIMEExcs);
 
 ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ##  %MIMEIncs is the associative array listing which data types
@@ -220,7 +220,7 @@
 ##  be used to only allow a well-defined set of content-types.
 
 %MIMEIncs			= ()
-    unless defined(%MIMEIncs);
+    unless (%MIMEIncs);
 
 ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ##  %MIMECharsetAliases is a mapping of charset names to charset names.
@@ -231,7 +231,7 @@
 ##	Values => real charset name
 ##
 %MIMECharsetAliases = ()
-    unless defined(%MIMECharsetAliases);
+    unless (%MIMECharsetAliases);
 
 ##---------------------------------------------------------------------------
 ##	Text entity-related variables

Return to bug 164560

Lines 7-18 Link Here

(-)Makefile (-1 / +2 lines)
7		7
8	PORTNAME= mhonarc	8	PORTNAME= mhonarc
9	PORTVERSION= 2.6.18	9	PORTVERSION= 2.6.18
		10	PORTREVISION= 1
10	CATEGORIES= www mail	11	CATEGORIES= www mail
11	MASTER_SITES= http://www.mhonarc.org/release/MHonArc/tar/ \	12	MASTER_SITES= http://www.mhonarc.org/release/MHonArc/tar/ \
12	http://www.oac.uci.edu/indiv/ehood/tar/	13	http://www.oac.uci.edu/indiv/ehood/tar/
13	DISTNAME= MHonArc-${PORTVERSION}	14	DISTNAME= MHonArc-${PORTVERSION}
14		15
15	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= kerndtr@kerndt.com
16	COMMENT= WWW front end for mail archives	17	COMMENT= WWW front end for mail archives
17		18
18	USE_BZIP2= Yes	19	USE_BZIP2= Yes

Line 0 Link Here

(-)files/patch-lib__readmail.pl (+74 lines)
		1	--- ./lib/readmail.pl.orig 2012-01-16 14:33:30.000000000 -0800
		2	+++ ./lib/readmail.pl 2012-01-16 14:35:37.000000000 -0800
		3	@@ -117,9 +117,9 @@
		4	## set to true.
		5
		6	%MIMEDecoders = ()
		7	- unless defined(%MIMEDecoders);
		8	+ unless (%MIMEDecoders);
		9	%MIMEDecodersSrc = ()
		10	- unless defined(%MIMEDecodersSrc);
		11	+ unless (%MIMEDecodersSrc);
		12
		13	## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
		14	## %MIMECharSetConverters is the associative array for storing functions
		15	@@ -153,9 +153,9 @@
		16	## string.
		17
		18	%MIMECharSetConverters = ()
		19	- unless defined(%MIMECharSetConverters);
		20	+ unless (%MIMECharSetConverters);
		21	%MIMECharSetConvertersSrc = ()
		22	- unless defined(%MIMECharSetConvertersSrc);
		23	+ unless (%MIMECharSetConvertersSrc);
		24
		25	## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
		26	## %MIMEFilters is the associative array for storing functions that
		27	@@ -180,9 +180,9 @@
		28	## that all functions are defined before invoking MAILread_body.
		29
		30	%MIMEFilters = ()
		31	- unless defined(%MIMEFilters);
		32	+ unless (%MIMEFilters);
		33	%MIMEFiltersSrc = ()
		34	- unless defined(%MIMEFiltersSrc);
		35	+ unless (%MIMEFiltersSrc);
		36
		37	## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
		38	## %MIMEFiltersArgs is the associative array for storing any optional
		39	@@ -196,7 +196,7 @@
		40	## listed for a function if both are applicable.
		41
		42	%MIMEFiltersArgs = ()
		43	- unless defined(%MIMEFiltersArgs);
		44	+ unless (%MIMEFiltersArgs);
		45
		46	## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
		47	## %MIMEExcs is the associative array listing which data types
		48	@@ -206,7 +206,7 @@
		49	## Values => <should evaluate to a true expression>
		50
		51	%MIMEExcs = ()
		52	- unless defined(%MIMEExcs);
		53	+ unless (%MIMEExcs);
		54
		55	## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
		56	## %MIMEIncs is the associative array listing which data types
		57	@@ -220,7 +220,7 @@
		58	## be used to only allow a well-defined set of content-types.
		59
		60	%MIMEIncs = ()
		61	- unless defined(%MIMEIncs);
		62	+ unless (%MIMEIncs);
		63
		64	## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
65	## %MIMECharsetAliases is a mapping of charset names to charset names.
66	@@ -231,7 +231,7 @@
67	## Values => real charset name
68	##
69	%MIMECharsetAliases = ()
70	- unless defined(%MIMECharsetAliases);
71	+ unless (%MIMECharsetAliases);
72
73	##---------------------------------------------------------------------------
74	## Text entity-related variables