7 files changed, 70 insertions, 39 deletions

diff --git a/print/muttprint/Makefile b/print/muttprint/Makefile
index 1c17d293f946..eaeba8c3ba6b 100644
--- a/print/muttprint/Makefile
+++ b/print/muttprint/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	muttprint
-PORTVERSION=	0.71
-PORTREVISION=	1
+PORTVERSION=	0.72a
 CATEGORIES?=	print mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	muttprint
@@ -24,16 +23,27 @@ RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
 		uncompface:${PORTSDIR}/mail/faces \
 		convert:${PORTSDIR}/graphics/ImageMagick \
 		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
+		${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \
 		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 .if defined(WITH_CUPS)
 RUN_DEPENDS+=	cupstestppd:${PORTSDIR}/print/cups-lpr \
 		espgs:${PORTSDIR}/print/cups-pstoraster
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500800
+LIB_DEPENDS+=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
+MAKE_ENV+=	CCFLAGS="-I${PREFIX}/include"
+PLIST_SUB+=	LANGINFO=""
+.else
+NO_BUILD=	yes
+PLIST_SUB+=	LANGINFO="@comment "
+.endif
+
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 USE_GMAKE=	yes
-ALL_TARGET=	nothing
 
 MAN1=		muttprint.1
 MANCOMPRESSED=	yes
@@ -79,4 +89,4 @@ post-patch:
 .endif
 	@${GZIP_CMD} ${WRKSRC}/doc/manpages/*/muttprint.1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/muttprint/distinfo b/print/muttprint/distinfo
index b82babacc910..8bb8635acfbd 100644
--- a/print/muttprint/distinfo
+++ b/print/muttprint/distinfo
@@ -1,2 +1,2 @@
-MD5 (muttprint-0.71.tar.gz) = 239c3fd51db6ebf7afc221a23c9a6a7b
-SIZE (muttprint-0.71.tar.gz) = 788837
+MD5 (muttprint-0.72a.tar.gz) = eda4de2a2777795ddb1a5b59f810bb29
+SIZE (muttprint-0.72a.tar.gz) = 864054
diff --git a/print/muttprint/files/patch-aa b/print/muttprint/files/patch-aa
index 15739ec90856..37bdf646b10d 100644
--- a/print/muttprint/files/patch-aa
+++ b/print/muttprint/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue May 27 19:37:30 2003
-+++ Makefile	Tue May 27 22:40:28 2003
+--- Makefile.orig	Fri Aug  1 13:58:29 2003
++++ Makefile	Sun May 23 17:32:32 2004
 @@ -7,35 +7,35 @@
  
  # Change this for local installation, 
@@ -46,8 +46,8 @@
 +#INSTALL = $(install) -m 0644 
  
  
- nothing:
-@@ -44,15 +44,17 @@
+ all:
+@@ -43,17 +43,17 @@
  
  install: 
  	mkdir -p $(docdir)/$(docdirname) $(bindir) $(sharedir)/muttprint/translations \
@@ -62,13 +62,14 @@
 +	$(MAKE) -C doc/manpages mandir=$(mandir) install
 +
 +install-with-doc: install
-+	mkdir -p $(docdir)/$(docdirname)
 +	${BSD_INSTALL_DATA} CHANGES COPYING INSTALL README* sample-muttprintrc-* \
  		$(docdir)/$(docdirname)
 -	$(INSTALL) `find pics -type f -print` $(sharedir)/muttprint/
 -	$(INSTALL) `find translations -type f -print` $(sharedir)/muttprint/translations
+ 	$(MAKE) -C langinfo bindir=$(bindir) install
  	$(MAKE) -C doc/manual docdir=$(docdir) docdirname=$(docdirname) install
 -	$(MAKE) -C doc/manpages mandir=$(mandir) install
+-
  
  uninstall:
- 	rm $(bindir)/muttprint
+ 	rm $(bindir)/muttprint*
diff --git a/print/muttprint/files/patch-ab b/print/muttprint/files/patch-ab
index cc915bf6b6ca..8bab2eee4dd1 100644
--- a/print/muttprint/files/patch-ab
+++ b/print/muttprint/files/patch-ab
@@ -1,10 +1,7 @@
-
-$FreeBSD$
-
---- muttprint.orig	Tue May 27 14:11:31 2003
-+++ muttprint	Wed Aug  6 12:28:31 2003
-@@ -79,13 +79,13 @@
- ######## 'private' Variablen für den Rest
+--- muttprint.orig	Wed Apr  7 19:27:31 2004
++++ muttprint	Sun May 23 17:37:08 2004
+@@ -92,13 +92,13 @@
+ ######## 'private' variables for the rest
  %Config = (
  	PRINTER			=> 	'',
 -	PRINT_COMMAND	=>	'lpr -P$PRINTER',
@@ -16,10 +13,10 @@ $FreeBSD$
  	FONT			=>	'Latex',
 -	PAPER			=>	'A4',
 +	PAPER			=>	'%%PAPERSIZE%%',
- 	DEBUG			=>	'1',
+ 	DEBUG			=>	'0',
  	REM_SIG			=>	'off',
  	REM_QUOTE		=>	'off',
-@@ -182,16 +182,16 @@
+@@ -196,16 +196,16 @@
  	}
  }
  
@@ -31,16 +28,16 @@ $FreeBSD$
  
  @print = readOpts ();
  
- if ($Config{'PENGUIN'} eq "on") {
+ if ($Config{PENGUIN} eq "on") {
  	my $sharedir = findCommonDir("share");
--	$Config{'PENGUIN'} = (-r "$sharedir/penguin.eps")
+-	$Config{PENGUIN} = (-r "$sharedir/penguin.eps")
 -			? "$sharedir/penguin.eps" 
-+	$Config{'PENGUIN'} = (-r "$sharedir/Beastie.eps")
++	$Config{PENGUIN} = (-r "$sharedir/Beastie.eps")
 +			? "$sharedir/Beastie.eps" 
  			: "off";
  }
  
-@@ -1671,7 +1671,7 @@
+@@ -1978,7 +1978,7 @@
  Options:
  
  PLEASE NOTICE: These options override the corresponding settings in 
diff --git a/print/muttprint/files/patch-langinfo::Makefile b/print/muttprint/files/patch-langinfo::Makefile
new file mode 100644
index 000000000000..9f0469bdf5cc
--- /dev/null
+++ b/print/muttprint/files/patch-langinfo::Makefile
@@ -0,0 +1,11 @@
+--- langinfo/Makefile.orig	Fri Aug  1 13:58:17 2003
++++ langinfo/Makefile	Sun May 23 19:17:48 2004
+@@ -18,7 +18,7 @@
+ rm = rm
+ 
+ 
+-all: muttprint-langinfo
++all: clean muttprint-langinfo
+ 
+ muttprint-langinfo: main.o muttprint-langinfo.o muttprint-langinfo.h
+ 	$(CC) $(CCFLAGS) -o muttprint-langinfo muttprint-langinfo.o main.o
diff --git a/print/muttprint/pkg-descr b/print/muttprint/pkg-descr
index 008f85c426df..1903de365301 100644
--- a/print/muttprint/pkg-descr
+++ b/print/muttprint/pkg-descr
@@ -6,5 +6,3 @@ Unix/Linux system.
 
 WWW: http://muttprint.sourceforge.net/
 
-- Oliver Braun
-obraun@informatik.unibw-muenchen.de
diff --git a/print/muttprint/pkg-plist b/print/muttprint/pkg-plist
index 9e66df6aec73..4496803a7237 100644
--- a/print/muttprint/pkg-plist
+++ b/print/muttprint/pkg-plist
@@ -1,47 +1,56 @@
 bin/muttprint
+%%LANGINFO%%bin/muttprint-langinfo
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.es
 %%PORTDOCS%%%%DOCSDIR%%/README.Gnus
 %%PORTDOCS%%%%DOCSDIR%%/README.Latex
+%%PORTDOCS%%%%DOCSDIR%%/README.es
 %%PORTDOCS%%%%DOCSDIR%%/README.translations
+%%PORTDOCS%%%%DOCSDIR%%/manual-de.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual-de/docbook.css
 %%PORTDOCS%%%%DOCSDIR%%/manual-de/muttprint.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-de/x15.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-de/x23.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-de/x196.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-de/x703.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-de.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual-de/x231.html
+%%PORTDOCS%%%%DOCSDIR%%/manual-de/x645.html
+%%PORTDOCS%%%%DOCSDIR%%/manual-de/x662.html
+%%PORTDOCS%%%%DOCSDIR%%/manual-en.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual-en/docbook.css
 %%PORTDOCS%%%%DOCSDIR%%/manual-en/muttprint.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-en/x15.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-en/x23.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-en/x195.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-en/x706.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-en.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual-en/x230.html
+%%PORTDOCS%%%%DOCSDIR%%/manual-en/x645.html
+%%PORTDOCS%%%%DOCSDIR%%/manual-en/x660.html
+%%PORTDOCS%%%%DOCSDIR%%/manual-es.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual-es/docbook.css
 %%PORTDOCS%%%%DOCSDIR%%/manual-es/muttprint.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-es/x15.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-es/x23.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-es/x191.html
+%%PORTDOCS%%%%DOCSDIR%%/manual-es/x23.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-es/x650.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-es.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual-it.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual-it/docbook.css
 %%PORTDOCS%%%%DOCSDIR%%/manual-it/muttprint.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-it/x15.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-it/x23.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-it/x194.html
+%%PORTDOCS%%%%DOCSDIR%%/manual-it/x23.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-it/x683.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-it.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual-sl.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual-sl/docbook.css
 %%PORTDOCS%%%%DOCSDIR%%/manual-sl/muttprint.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-sl/x15.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-sl/x195.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-sl/x23.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-sl/x700.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-sl.pdf
 %%PORTDOCS%%%%DOCSDIR%%/sample-muttprintrc-de
 %%PORTDOCS%%%%DOCSDIR%%/sample-muttprintrc-en
 %%PORTDOCS%%%%DOCSDIR%%/sample-muttprintrc-es
 %%PORTDOCS%%%%DOCSDIR%%/sample-muttprintrc-fr
 %%PORTDOCS%%%%DOCSDIR%%/sample-muttprintrc-it
+%%PORTDOCS%%%%DOCSDIR%%/sample-muttprintrc-nl
 %%PORTDOCS%%%%DOCSDIR%%/sample-muttprintrc-si
 share/muttprint/BabyTuX.eps
 share/muttprint/BabyTuX_color.eps
@@ -52,13 +61,18 @@ share/muttprint/Gentoo.eps
 share/muttprint/Gentoo_color.eps
 share/muttprint/README.pics
 share/muttprint/penguin.eps
+share/muttprint/translations/README
 share/muttprint/translations/translation-cs.pl
 share/muttprint/translations/translation-de.pl
 share/muttprint/translations/translation-es.pl
 share/muttprint/translations/translation-example.pl
+share/muttprint/translations/translation-fi.pl
 share/muttprint/translations/translation-fr.pl
+share/muttprint/translations/translation-hu.pl
 share/muttprint/translations/translation-it.pl
+share/muttprint/translations/translation-nl.pl
 share/muttprint/translations/translation-pl.pl
+share/muttprint/translations/translation-pt.pl
 share/muttprint/translations/translation-ru.pl
 share/muttprint/translations/translation-sl.pl
 share/muttprint/translations/translation-sv.pl