--- Makefile.orig	2012-01-17 06:01:21.000000000 -0800
+++ Makefile	2012-01-22 03:06:18.000000000 -0800
@@ -7,12 +7,13 @@
 
 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=	ports@FreeBSD.org
+MAINTAINER=	kerndtr@kerndt.com
 COMMENT=	WWW front end for mail archives
 
 USE_BZIP2=	Yes


--- ./lib/mhamain.pl.orig	2012-01-16 14:28:02.000000000 -0800
+++ ./lib/mhamain.pl	2012-01-16 14:31:22.000000000 -0800
@@ -1561,7 +1561,7 @@
 ##	Create Index2MsgId if not defined
 ##
 sub defineIndex2MsgId {
-    if (!defined(%Index2MsgId)) {
+    if (!(%Index2MsgId)) {
 	foreach (keys %MsgId) {
 	    $Index2MsgId{$MsgId{$_}} = $_;
 	}


--- ./lib/mhopt.pl.orig	2012-01-16 14:32:41.000000000 -0800
+++ ./lib/mhopt.pl	2012-01-16 14:33:10.000000000 -0800
@@ -864,7 +864,7 @@
 ##
 sub update_data_2_1_to_later {
     # we can preserve filter arguments
-    if (defined(%main::MIMEFiltersArgs)) {
+    if (%main::MIMEFiltersArgs) {
 	warn qq/         preserving MIMEARGS...\n/;
 	%readmail::MIMEFiltersArgs = %main::MIMEFiltersArgs;
 	$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