Updated to 0.62a.

PR:		35066
Submitted by:	maintainer

7 files changed, 58 insertions, 36 deletions

diff --git a/print/muttprint/Makefile b/print/muttprint/Makefile
index 6996d4348fe6..b9415bc56da9 100644
--- a/print/muttprint/Makefile
+++ b/print/muttprint/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	muttprint
-PORTVERSION=	0.61
-PORTREVISION=	3
+PORTVERSION=	0.62a
 CATEGORIES=	print mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	muttprint
@@ -20,8 +19,9 @@ PAPERSIZE=	letter
 
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
 		psnup:${PORTSDIR}/print/psutils-${PAPERSIZE} \
-		uncompface:${PORTSDIR}/graphics/compface \
-		convert:${PORTSDIR}/graphics/ImageMagick
+		uncompface:${PORTSDIR}/mail/faces \
+		convert:${PORTSDIR}/graphics/ImageMagick \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
 
 MAN1=		muttprint.1
 MANCOMPRESSED=	yes
diff --git a/print/muttprint/distinfo b/print/muttprint/distinfo
index d6bb2a54f9b6..4f849a550e0c 100644
--- a/print/muttprint/distinfo
+++ b/print/muttprint/distinfo
@@ -1 +1 @@
-MD5 (muttprint-0.61.tar.gz) = d0d1150e85fd6321ecdba48c581d01ee
+MD5 (muttprint-0.62a.tar.gz) = 36f7280c9d157fa4890742b0e6f76f2e
diff --git a/print/muttprint/files/patch-aa b/print/muttprint/files/patch-aa
index 3554877d6d06..3feafcf95e08 100644
--- a/print/muttprint/files/patch-aa
+++ b/print/muttprint/files/patch-aa
@@ -1,15 +1,15 @@
---- Makefile.orig	Sat Nov 24 15:12:48 2001
-+++ Makefile	Fri Jan  4 19:36:34 2002
-@@ -7,21 +7,21 @@
+--- Makefile.orig	Sun Feb 17 23:47:21 2002
++++ Makefile	Sun Feb 17 23:51:49 2002
+@@ -7,26 +7,26 @@
  
  # Change this for local installation, 
  # e. g. /home/user or /usr/local
--prefix = /usr
-+# prefix = /usr
+-prefix = /usr/local
++#prefix = /usr/local
  
  # Change this for some distributions (current setting
  # is OK for SuSE)
--docdir = $(prefix)/share/doc/packages
+-docdir = /usr/share/doc/packages
 +docdir = ${PREFIX}/share/doc
  
  # Change this to $(prefix)/man for older distributions
@@ -17,6 +17,12 @@
 -mandir = $(prefix)/share/man
 +mandir = ${PREFIX}/man
  
+ #
+ # Muttprint needs GNU make. If you installed GNU make
+ # as `gmake', you have to change this
+-MAKE = make
++#MAKE = make
+ 
  # Change this three directories only if you're know
  # what you do
 -sharedir = $(prefix)/share
@@ -28,7 +34,7 @@
  
  #####################################################
  #####################################################
-@@ -30,23 +30,25 @@
+@@ -35,23 +35,25 @@
  INSTALLBIN = $(install) -m 0755 
  INSTALL = $(install) -m 0644 
  
@@ -47,18 +53,18 @@
 -	$(INSTALLBIN) muttprint $(bindir)/
 -	$(INSTALL) CHANGES COPYING INSTALL README* sample-muttprintrc-* \
 -		$(docdir)/muttprint/
--	$(INSTALL) pics/* $(sharedir)/muttprint/
--	$(INSTALL) translations/* $(libdir)/muttprint/
--	make -C doc/manual docdir=$(docdir) install
--	make -C doc/manpages mandir=$(mandir) install
+-	$(INSTALL) `find pics -type f -print` $(sharedir)/muttprint/
+-	$(INSTALL) `find translations -type f -print` $(libdir)/muttprint/
+-	$(MAKE) -C doc/manual docdir=$(docdir) install
+-	$(MAKE) -C doc/manpages mandir=$(mandir) install
 +	${BSD_INSTALL_SCRIPT} muttprint $(bindir)/
-+	${BSD_INSTALL_DATA} pics/* $(sharedir)/muttprint/
-+	${BSD_INSTALL_DATA} translations/* $(libdir)/muttprint/
++	${BSD_INSTALL_DATA} `find pics -type f -print` $(sharedir)/muttprint/
++	${BSD_INSTALL_DATA} `find translations -type f -print` $(libdir)/muttprint/
 +
 +install-with-doc: install
 +	mkdir -p $(docdir)/muttprint
 +	${BSD_INSTALL_DATA} CHANGES COPYING INSTALL README* \
-+	        sample-muttprintrc-* $(docdir)/muttprint/
++		sample-muttprintrc-* $(docdir)/muttprint/
 +	${MAKE} -C doc/manual docdir=$(docdir) install
 +	${MAKE} -C doc/manpages mandir=$(mandir) install
  
diff --git a/print/muttprint/files/patch-ab b/print/muttprint/files/patch-ab
index 60ab2a789c8c..be12a145b0ff 100644
--- a/print/muttprint/files/patch-ab
+++ b/print/muttprint/files/patch-ab
@@ -1,5 +1,5 @@
---- muttprint.orig	Sat Dec 15 08:49:39 2001
-+++ muttprint	Tue Feb 12 22:45:53 2002
+--- muttprint.orig	Sun Feb 17 23:53:01 2002
++++ muttprint	Mon Feb 18 00:00:39 2002
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl
 +#!/usr/bin/perl -w
@@ -15,7 +15,7 @@
  # Deklaration nach Perl-5.005-Art
  use vars qw($VERSION %String $LPack $charset);
  use sigtrap qw(die INT QUIT);
-@@ -158,8 +158,8 @@
+@@ -185,8 +185,8 @@
  
  if ($Config{'PENGUIN'} eq "on") {
  	$Config{'PENGUIN'} = 
@@ -25,4 +25,4 @@
 +			? "$share_dir/Beastie.eps" : "off";
  }
  
- 
+ ReadConfig ($Config{RCFILE});
diff --git a/print/muttprint/files/patch-ac b/print/muttprint/files/patch-ac
index 73be851b2dca..ce3ee46fecec 100644
--- a/print/muttprint/files/patch-ac
+++ b/print/muttprint/files/patch-ac
@@ -1,5 +1,5 @@
---- doc/manual/Makefile.orig	Fri Jan  4 15:06:22 2002
-+++ doc/manual/Makefile	Fri Jan  4 15:07:23 2002
+--- doc/manual/Makefile.orig	Mon Feb 18 00:01:26 2002
++++ doc/manual/Makefile	Mon Feb 18 00:02:48 2002
 @@ -1,40 +1,37 @@
  #
  # This is the main makefile for documentation
diff --git a/print/muttprint/files/patch-ad b/print/muttprint/files/patch-ad
index c98819b45eb1..0dd765ff4843 100644
--- a/print/muttprint/files/patch-ad
+++ b/print/muttprint/files/patch-ad
@@ -1,5 +1,16 @@
---- doc/manpages/Makefile.orig	Mon Oct 22 17:39:34 2001
-+++ doc/manpages/Makefile	Fri Jan  4 19:29:01 2002
+--- doc/manpages/Makefile.orig	Mon Feb 18 00:03:28 2002
++++ doc/manpages/Makefile	Mon Feb 18 00:06:49 2002
+@@ -4,8 +4,8 @@
+ 
+ VERSION = 0.62
+ POD2MAN = pod2man --section=1 --release=$(VERSION)
+-prefix = /usr
+-mandir = $(prefix)/share/man
++#prefix = /usr
++mandir = ${PREFIX}/man
+ INSTALL = install -m 0644 
+ gzip = gzip -f
+ 
 @@ -16,7 +16,7 @@
  TITLE_CS = "Krátký manuál Muttprintu"
  
@@ -9,15 +20,18 @@
  german: de/muttprint.1.gz
  english: en/muttprint.1.gz
  italian: it/muttprint.1.gz
-@@ -51,11 +51,11 @@
+@@ -49,13 +49,12 @@
+ 	$(POD2MAN) --center=$(TITLE_CS) cs/muttprint.pod cs/muttprint.1
+ 	$(gzip) cs/muttprint.1
  
- install: de/muttprint.1.gz en/muttprint.1.gz es/muttprint.1.gz \
-  			it/muttprint.1.gz cs/muttprint.1.gz
+-install: de/muttprint.1.gz en/muttprint.1.gz es/muttprint.1.gz \
+- 			it/muttprint.1.gz cs/muttprint.1.gz
 -	$(INSTALL) en/muttprint.1.gz $(mandir)/man1/
 -	$(INSTALL) de/muttprint.1.gz $(mandir)/de/man1/
 -	$(INSTALL) es/muttprint.1.gz $(mandir)/es/man1/
 -	$(INSTALL) it/muttprint.1.gz $(mandir)/it/man1/
 -	$(INSTALL) cs/muttprint.1.gz $(mandir)/cs/man1/
++install: en/muttprint.1.gz
 +	${BSD_INSTALL_MAN} en/muttprint.1.gz $(mandir)/man1/
 +#	$(INSTALL) de/muttprint.1.gz $(mandir)/de/man1/
 +#	$(INSTALL) es/muttprint.1.gz $(mandir)/es/man1/
diff --git a/print/muttprint/pkg-plist b/print/muttprint/pkg-plist
index 46c1e89528c2..04f5283685d8 100644
--- a/print/muttprint/pkg-plist
+++ b/print/muttprint/pkg-plist
@@ -4,18 +4,19 @@ bin/muttprint
 %%PORTDOCS%%share/doc/muttprint/INSTALL
 %%PORTDOCS%%share/doc/muttprint/README
 %%PORTDOCS%%share/doc/muttprint/README.Gnus
+%%PORTDOCS%%share/doc/muttprint/README.Latex
 %%PORTDOCS%%share/doc/muttprint/README.translations
 %%PORTDOCS%%share/doc/muttprint/manual-de/muttprint.html
 %%PORTDOCS%%share/doc/muttprint/manual-de/x15.html
 %%PORTDOCS%%share/doc/muttprint/manual-de/x23.html
-%%PORTDOCS%%share/doc/muttprint/manual-de/x167.html
-%%PORTDOCS%%share/doc/muttprint/manual-de/x475.html
+%%PORTDOCS%%share/doc/muttprint/manual-de/x192.html
+%%PORTDOCS%%share/doc/muttprint/manual-de/x623.html
 %%PORTDOCS%%share/doc/muttprint/manual-de.pdf
 %%PORTDOCS%%share/doc/muttprint/manual-en/muttprint.html
 %%PORTDOCS%%share/doc/muttprint/manual-en/x15.html
 %%PORTDOCS%%share/doc/muttprint/manual-en/x23.html
-%%PORTDOCS%%share/doc/muttprint/manual-en/x166.html
-%%PORTDOCS%%share/doc/muttprint/manual-en/x472.html
+%%PORTDOCS%%share/doc/muttprint/manual-en/x191.html
+%%PORTDOCS%%share/doc/muttprint/manual-en/x622.html
 %%PORTDOCS%%share/doc/muttprint/manual-en.pdf
 %%PORTDOCS%%share/doc/muttprint/manual-es/muttprint.html
 %%PORTDOCS%%share/doc/muttprint/manual-es/x15.html
@@ -26,12 +27,13 @@ bin/muttprint
 %%PORTDOCS%%share/doc/muttprint/manual-it/muttprint.html
 %%PORTDOCS%%share/doc/muttprint/manual-it/x15.html
 %%PORTDOCS%%share/doc/muttprint/manual-it/x23.html
-%%PORTDOCS%%share/doc/muttprint/manual-it/x166.html
-%%PORTDOCS%%share/doc/muttprint/manual-it/x466.html
+%%PORTDOCS%%share/doc/muttprint/manual-it/x191.html
+%%PORTDOCS%%share/doc/muttprint/manual-it/x617.html
 %%PORTDOCS%%share/doc/muttprint/manual-it.pdf
 %%PORTDOCS%%share/doc/muttprint/sample-muttprintrc-de
 %%PORTDOCS%%share/doc/muttprint/sample-muttprintrc-en
 %%PORTDOCS%%share/doc/muttprint/sample-muttprintrc-es
+%%PORTDOCS%%share/doc/muttprint/sample-muttprintrc-fr
 %%PORTDOCS%%share/doc/muttprint/sample-muttprintrc-it
 share/muttprint/BabyTuX.eps
 share/muttprint/BabyTuX.png