Index: head/print/muttprint/Makefile
===================================================================
--- head/print/muttprint/Makefile	(revision 468671)
+++ head/print/muttprint/Makefile	(revision 468672)
@@ -1,74 +1,74 @@
 # Created by: Oliver Braun <obraun@informatik.unibw-muenchen.de>
 # $FreeBSD$
 
 PORTNAME=	muttprint
 PORTVERSION=	0.73
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print mail
 MASTER_SITES=	SF/muttprint/muttprint/muttprint-${PORTVERSION}
 
 MAINTAINER=	guru@unixarea.de
 COMMENT=	Utility to print mail for most any mail client
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	docbook2pdf:textproc/docbook-utils \
 		docbook-sgml>0:textproc/docbook-sgml
 RUN_DEPENDS=	psnup:print/psutils \
 		uncompface:mail/faces \
 		p5-TimeDate>=0:devel/p5-TimeDate \
 		p5-Text-Iconv>=0:converters/p5-Text-Iconv
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf gmake perl5
 USE_TEX=	latex dvipsk
 
 NO_BUILD=	yes
 REINPLACE_ARGS=	-i ""
 
 OPTIONS_DEFINE=		CUPS X11
 OPTIONS_DEFAULT=	X11
 X11_DESC=		graphics/ImageMagick[-nox11] dependency
 
 CUPS_RUN_DEPENDS=	lpr-cups:print/cups
 
 .if !defined(PAPERSIZE)
 PAPERSIZE=	letter
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCUPS}
 PRINT_COMMAND=CUPS
 .else
 PRINT_COMMAND=lpr -P$$PRINTER
 .endif
 
 .if ${PORT_OPTIONS:MX11}
 RUN_DEPENDS+=	convert:graphics/ImageMagick
 .else
 RUN_DEPENDS+=	convert:graphics/ImageMagick-nox11
 .endif
 
 pre-everything::
 	@${ECHO}
 	@${ECHO} Set PAPERSIZE=a4 if you need that paper size.
 	@${ECHO}
 
 post-patch:
 	@${RM} ${WRKSRC}/pics/*.orig
 .if ${PAPERSIZE}==a4
 	@${REINPLACE_CMD} 's|%%PAPERSIZE%%|${PAPERSIZE:tu}|' \
 		${WRKSRC}/muttprint
 .else
 	@${REINPLACE_CMD} 's|%%PAPERSIZE%%|${PAPERSIZE}|' \
 		${WRKSRC}/muttprint
 .endif
 	@${REINPLACE_CMD} 's|%%PRINT_COMMAND%%|${PRINT_COMMAND}| ; \
 		s|%%PREFIX%%|${PREFIX}|' \
 		${WRKSRC}/muttprint
 .if ${PORT_OPTIONS:MCUPS}
 	@${REINPLACE_CMD} 's|lpr $$CUPS_OPTIONS|${PREFIX}/bin/lpr $$CUPS_OPTIONS|' ${WRKSRC}/muttprint
 .endif
 
 .include <bsd.port.mk>
Index: head/print/muttprint/files/patch-muttprint
===================================================================
--- head/print/muttprint/files/patch-muttprint	(revision 468671)
+++ head/print/muttprint/files/patch-muttprint	(revision 468672)
@@ -1,48 +1,57 @@
 --- muttprint.orig	2008-12-26 01:33:36.000000000 +0100
 +++ muttprint	2016-02-17 12:27:58.437344000 +0100
 @@ -105,13 +105,13 @@
  ######## 'private' variables for the rest
  %Config = (
  	PRINTER			=> 	'',
 -	PRINT_COMMAND	=>	'lpr -P$PRINTER',
 +	PRINT_COMMAND	=>	'%%PRINT_COMMAND%%',
  	PENGUIN			=>	'on',
  	DUPLEX			=>	'off',
  	SPEED			=>	'30',
  	PAPERSAVE		=>	'off',
  	FONT			=>	'Latex',
 -	PAPER			=>	'A4',
 +	PAPER			=>	'%%PAPERSIZE%%',
  	DEBUG			=>	'0',
  	REM_SIG			=>	'off',
  	REM_QUOTE		=>	'off',
 @@ -211,16 +211,16 @@
  	}
  }
  
 -$Config{PAPER} = getPaperConfig ();
 -readConfig ("/etc/Muttprintrc", "$ENV{HOME}/.muttprintrc");
 +# $Config{PAPER} = getPaperConfig ();
 +readConfig ("%%PREFIX%%/etc/Muttprintrc", "$ENV{HOME}/.muttprintrc");
  
  
  @print = readOpts ();
  
  if ($Config{PENGUIN} eq "on") {
  	my $sharedir = findCommonDir("share");
 -	$Config{PENGUIN} = (-r "$sharedir/penguin.eps")
 -			? "$sharedir/penguin.eps" 
 +	$Config{PENGUIN} = (-r "$sharedir/Beastie.eps")
 +			? "$sharedir/Beastie.eps" 
  			: "off";
  }
  
+@@ -1633,7 +1633,7 @@ sub getNumberOfPages ($) {
+ 	open (AUX, "$auxfile") or fatalError "Could not open $auxfile:\n$!";
+ 	
+ 	while (<AUX>) {
+-		($numberOfPages) = /\\newlabel{LastPage}{{}{(\d+)}}/;
++		($numberOfPages) = /\\newlabel\{LastPage\}\{\{\}\{(\d+)\}\}/;
+ 	}
+ 	
+ 	close AUX or fatalError "Could not close $auxfile:\n$!";
 @@ -2027,7 +2027,7 @@
  Options:
  
  PLEASE NOTICE: These options override the corresponding settings in 
 -~/.muttprintrc and /etc/Muttprintrc.
 +~/.muttprintrc and %%PREFIX%%/etc/Muttprintrc.
  
  -h, --help
         This help.