- silence perl warnings about "defined(%hash)" being deprecated

- doesn't need groff
- specify GPL version

ok jasper@, Christian Rueger (maintainer)
This commit is contained in:
pascal 2012-05-07 20:13:50 +00:00
parent fb4a988c0c
commit 64ac5e1b7d
6 changed files with 112 additions and 7 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.28 2011/01/13 09:53:50 jasper Exp $
# $OpenBSD: Makefile,v 1.29 2012/05/07 20:13:50 pascal Exp $
COMMENT= highly customizable e-mail to HTML converter
DISTNAME= MHonArc-2.6.18
PKGNAME= ${DISTNAME:L}
REVISION= 0
CATEGORIES= www mail
HOMEPAGE= http://www.mhonarc.org/
@ -14,7 +15,7 @@ MASTER_SITES= http://www.mhonarc.org/release/MHonArc/tar/ \
MAINTAINER= Christian Rueger <cr+openbsd@rueger-net.de>
# GPL
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -29,7 +30,6 @@ CONFIGURE_ARGS= PREFIX='$${${DESTDIRNAME}}${PREFIX}' \
INSTALLMAN3DIR='$${${DESTDIRNAME}}${PREFIX}/man/man3p'
ALL_TARGET= default
USE_GROFF = Yes
EXAMPLES= mha-preview mhasiteinit.pl mhonarc.vim *.mrc
EXTRAS= mha-mhedit/*

View File

@ -1,8 +1,9 @@
$OpenBSD: patch-examples_mha-preview,v 1.3 2011/01/13 09:53:50 jasper Exp $
$OpenBSD: patch-examples_mha-preview,v 1.4 2012/05/07 20:13:50 pascal Exp $
--- examples/mha-preview.orig Tue Jul 5 04:06:21 2005
+++ examples/mha-preview Sun Jan 9 17:21:01 2011
+++ examples/mha-preview Mon May 7 12:00:13 2012
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
##---------------------------------------------------------------------------##
## File:
## $Id: patch-examples_mha-preview,v 1.4 2012/05/07 20:13:50 pascal Exp $

View File

@ -1,7 +1,9 @@
$OpenBSD: patch-examples_mhasiteinit_pl,v 1.3 2011/01/13 09:53:50 jasper Exp $
$OpenBSD: patch-examples_mhasiteinit_pl,v 1.4 2012/05/07 20:13:50 pascal Exp $
--- examples/mhasiteinit.pl.orig Mon Jan 3 07:42:39 2011
+++ examples/mhasiteinit.pl Sun Jan 9 17:21:01 2011
+++ examples/mhasiteinit.pl Mon May 7 12:00:13 2012
@@ -1,4 +1,4 @@
-##---------------------------------------------------------------------------##
+#!/usr/bin/perl
## File:
## $Id: patch-examples_mhasiteinit_pl,v 1.4 2012/05/07 20:13:50 pascal Exp $
## Description:

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-lib_mhamain_pl,v 1.1 2012/05/07 20:13:50 pascal Exp $
defined(%hash) is deprecated
--- lib/mhamain.pl.orig Mon May 7 12:00:36 2012
+++ lib/mhamain.pl Mon May 7 12:01:44 2012
@@ -1561,7 +1561,7 @@ sub signal_catch {
## Create Index2MsgId if not defined
##
sub defineIndex2MsgId {
- if (!defined(%Index2MsgId)) {
+ if (!%Index2MsgId) {
foreach (keys %MsgId) {
$Index2MsgId{$MsgId{$_}} = $_;
}

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-lib_mhopt_pl,v 1.1 2012/05/07 20:13:50 pascal Exp $
defined(%hash) is deprecated
--- lib/mhopt.pl.orig Mon May 7 12:01:47 2012
+++ lib/mhopt.pl Mon May 7 12:02:00 2012
@@ -864,7 +864,7 @@ sub update_data_1_to_2 {
##
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;

View File

@ -0,0 +1,76 @@
$OpenBSD: patch-lib_readmail_pl,v 1.1 2012/05/07 20:13:50 pascal Exp $
defined(%hash) is deprecated
--- lib/readmail.pl.orig Mon May 7 12:02:06 2012
+++ lib/readmail.pl Mon May 7 12:04:04 2012
@@ -117,9 +117,9 @@ $DecodeHeader = 0;
## 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 @@ $DecodeHeader = 0;
## 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 @@ $DecodeHeader = 0;
## 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 @@ $DecodeHeader = 0;
## 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 @@ $DecodeHeader = 0;
## 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 @@ $DecodeHeader = 0;
## 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 @@ $DecodeHeader = 0;
## Values => real charset name
##
%MIMECharsetAliases = ()
- unless defined(%MIMECharsetAliases);
+ unless %MIMECharsetAliases;
##---------------------------------------------------------------------------
## Text entity-related variables