Update to 0.73.

This release was never formally announced on the website, but is available
for download. Matthias, the port maintainer, had to do a lot of adjustments
to get it to an actual buildable state that are reflected in the patches
added to files/.

PR:		207299
Submitted by:	Matthias Apitz <guru@unixarea.de> (maintainer)

23 files changed, 344 insertions, 220 deletions

diff --git a/print/muttprint/Makefile b/print/muttprint/Makefile
index 180bede8290a..2f8d906bc9f7 100644
--- a/print/muttprint/Makefile
+++ b/print/muttprint/Makefile
@@ -1,27 +1,31 @@
 # Created by: Oliver Braun <obraun@informatik.unibw-muenchen.de>
 # $FreeBSD$
 
-PORTNAME?=	muttprint
-PORTVERSION=	0.72d
-PORTREVISION=	11
-CATEGORIES?=	print mail
+PORTNAME=	muttprint
+PORTVERSION=	0.73
+CATEGORIES=	print mail
 MASTER_SITES=	SF/muttprint/muttprint/muttprint-${PORTVERSION}
 
-MAINTAINER?=	guru@unixarea.de
-COMMENT?=	Utility to print mail for most any mail client
+MAINTAINER=	guru@unixarea.de
+COMMENT=	Utility to print mail for most any mail client
 
+LICENSE=	GPLv2
+
+BUILD_DEPENDS=	docbook2pdf:${PORTSDIR}/textproc/docbook-utils \
+		docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml
 RUN_DEPENDS=	psnup:${PORTSDIR}/print/psutils \
 		uncompface:${PORTSDIR}/mail/faces \
 		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
 		p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv
 
-USES=		perl5 gmake
+GNU_CONFIGURE=	yes
+USES=		autoreconf gmake perl5
 USE_TEX=	latex dvipsk
 
 NO_BUILD=	yes
 REINPLACE_ARGS=	-i ""
 
-OPTIONS_DEFINE=		CUPS DOCS X11
+OPTIONS_DEFINE=		CUPS X11
 OPTIONS_DEFAULT=	X11
 X11_DESC=		graphics/ImageMagick[-nox11] dependency
 
@@ -40,10 +44,6 @@ PRINT_COMMAND=CUPS
 PRINT_COMMAND=lpr -P$$PRINTER
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
-INSTALL_TARGET=install-with-doc
-.endif
-
 .if ${PORT_OPTIONS:MX11}
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .else
@@ -57,15 +57,6 @@ pre-everything::
 
 post-patch:
 	@${RM} -f ${WRKSRC}/pics/*.orig
-	@${GUNZIP_CMD} ${WRKSRC}/doc/manpages/*/muttprint.1.gz
-	@${REINPLACE_CMD} -e 's|/usr/share/doc/packages|${PREFIX}/share/doc|g ; \
-		s|/usr/share|${PREFIX}/share|g ; \
-		s|/usr/bin|${PREFIX}/bin|g ; \
-		s|/etc|${PREFIX}/etc|g ; \
-		s|/usr/lib|${PREFIX}/lib|g' \
-			${WRKSRC}/doc/manpages/*/muttprint.1 \
-			${WRKSRC}/doc/manual/*/manual-*/*.html
-	@${REINPLACE_CMD} -e '/\.css/d' ${WRKSRC}/doc/manual/*/Makefile
 .if ${PAPERSIZE}==a4
 	@${REINPLACE_CMD} 's|%%PAPERSIZE%%|${PAPERSIZE:tu}|' \
 		${WRKSRC}/muttprint
@@ -79,6 +70,5 @@ post-patch:
 .if ${PORT_OPTIONS:MCUPS}
 	@${REINPLACE_CMD} 's|lpr $$CUPS_OPTIONS|${PREFIX}/bin/lpr $$CUPS_OPTIONS|' ${WRKSRC}/muttprint
 .endif
-	@${GZIP_CMD} ${WRKSRC}/doc/manpages/*/muttprint.1
 
 .include <bsd.port.mk>
diff --git a/print/muttprint/distinfo b/print/muttprint/distinfo
index 905df7432864..bb88dff790a5 100644
--- a/print/muttprint/distinfo
+++ b/print/muttprint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (muttprint-0.72d.tar.gz) = a2672950739c26c83777b6842e3500e145e8bcdd8552ec14e2d90ab4d43c2bc8
-SIZE (muttprint-0.72d.tar.gz) = 746660
+SHA256 (muttprint-0.73.tar.gz) = 7cabe6a0aa59849f84914a2da33320611a2fcf5896b94ff957cfade8a325deb6
+SIZE (muttprint-0.73.tar.gz) = 361268
diff --git a/print/muttprint/files/patch-Makefile b/print/muttprint/files/patch-Makefile
deleted file mode 100644
index 51711a2c170f..000000000000
--- a/print/muttprint/files/patch-Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
---- ./Makefile.orig	2005-05-16 14:14:09.000000000 +0300
-+++ ./Makefile	2009-04-21 20:35:11.000000000 +0300
-@@ -7,53 +7,53 @@
- 
- # Change this for local installation, 
- # e. g. /home/user or /usr/local
--prefix = /usr/local
-+#prefix = /usr/local
- 
- # Change this for some distributions (current setting
- # is OK for SuSE)
--docdir = /usr/share/doc/packages
-+docdir = $(DESTDIR)${PREFIX}/share/doc
- 
- # Change this to $(prefix)/man for older distributions
- # (current setting is correct according to LSB)
--mandir = $(prefix)/share/man
-+mandir = $(DESTDIR)${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
--libdir = $(prefix)/lib
--bindir = $(prefix)/bin
--sysconfdir = /etc
-+sharedir = $(DESTDIR)${PREFIX}/share
-+libdir = $(DESTDIR)${PREFIX}/lib
-+bindir = $(DESTDIR)${PREFIX}/bin
-+sysconfdir = $(DESTDIR)${PREFIX}/etc
- docdirname = muttprint
- 
- #####################################################
- #####################################################
- 
--install = install
--INSTALLBIN = $(install) -m 0755 
--INSTALL = $(install) -m 0644 
-+#install = install
-+#INSTALLBIN = $(install) -m 0755 
-+#INSTALL = $(install) -m 0644 
- 
- 
- all:
- 	$(MAKE) -C langinfo 
- 
- install: 
--	mkdir -p $(docdir)/$(docdirname) $(bindir) $(sharedir)/muttprint/translations \
--		$(mandir)/man1 $(mandir)/de/man1 $(mandir)/es/man1 \
--		$(mandir)/cs/man1 $(mandir)/it/man1 
--	$(INSTALLBIN) muttprint $(bindir)/
--	$(INSTALL) CHANGES COPYING INSTALL README* sample-muttprintrc-* \
-+	mkdir -p $(bindir) $(sharedir)/muttprint/translations $(mandir)/man1
-+	${BSD_INSTALL_SCRIPT} muttprint $(bindir)/
-+	${BSD_INSTALL_DATA} `find pics -type f -print` $(sharedir)/muttprint/
-+	${BSD_INSTALL_DATA} `find translations -type f -print` $(sharedir)/muttprint/translations
-+	$(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*
diff --git a/print/muttprint/files/patch-Makefile.am b/print/muttprint/files/patch-Makefile.am
new file mode 100644
index 000000000000..218281bad312
--- /dev/null
+++ b/print/muttprint/files/patch-Makefile.am
@@ -0,0 +1,15 @@
+--- Makefile.am.orig	2006-05-06 09:13:46.000000000 +0200
++++ Makefile.am	2016-02-18 08:45:16.859074000 +0100
+@@ -10,4 +10,11 @@
+ 		sample-muttprintrc-fr \
+ 		sample-muttprintrc-it \
+ 		sample-muttprintrc-nl \
+-		sample-muttprintrc-si
++		sample-muttprintrc-si \
++		CHANGES	\
++		COPYING	\
++		README	\
++		README.Gnus	\
++		README.Latex	\
++		README.es	\
++		README.translations
diff --git a/print/muttprint/files/patch-configure.ac b/print/muttprint/files/patch-configure.ac
new file mode 100644
index 000000000000..ac44d4f0a7a8
--- /dev/null
+++ b/print/muttprint/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2008-12-25 15:27:57.000000000 +0100
++++ configure.ac	2016-02-17 15:15:50.968708000 +0100
+@@ -4,7 +4,7 @@
+ dnl Information on the package
+ dnl Checks for programs
+ AC_PROG_CC
+-AC_CHECK_PROG([have_docbook], [db2pdf], [true])
++AC_CHECK_PROG([have_docbook], [docbook2pdf], [true])
+ AM_CONDITIONAL([DOCBOOK], test x$have_docbook = xtrue)
+ AC_CHECK_PROG([have_pod2man], [pod2man], [true])
+ AM_CONDITIONAL([POD2MAN], test x$have_pod2man = xtrue)
diff --git a/print/muttprint/files/patch-doc_manpages_Makefile b/print/muttprint/files/patch-doc_manpages_Makefile
deleted file mode 100644
index 550890d80055..000000000000
--- a/print/muttprint/files/patch-doc_manpages_Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
---- doc/manpages/Makefile.orig	Tue May 27 21:07:05 2003
-+++ doc/manpages/Makefile	Tue May 27 21:58:04 2003
-@@ -4,16 +4,6 @@
- 
- VERSION = 0.71
- POD2MAN = pod2man --section=1 --release=$(VERSION)
--prefix = /usr
--bindir = $(prefix)/bin
--tempdir = /tmp
--sysconfdir = /etc
--docdir = /usr/share/doc/packages
--docdirname = muttprint
--sharedir = $(prefix)/share
--libdir = $(prefix)/lib
--mandir = $(prefix)/share/man
--INSTALL = install -m 0644 
- gzip = gzip -f
- rm = rm
- 
-@@ -23,7 +13,7 @@
- TITLE_IT = "Breve manuale di Muttprint"
- 
- 
--all: german english spanish italian
-+all: english
- german: de/muttprint.1.gz
- english: en/muttprint.1.gz
- italian: it/muttprint.1.gz
-@@ -104,10 +94,7 @@
- ##install: de/muttprint.1.gz en/muttprint.1.gz es/muttprint.1.gz \
- ## 			it/muttprint.1.gz 
- install:
--	$(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/
-+	${BSD_INSTALL_MAN} en/muttprint.1.gz $(mandir)/man1/
- 
- uninstall:
- 	rm -f $(mandir)/man1/muttprint.1.gz
diff --git a/print/muttprint/files/patch-doc_manpages_de_muttprint.pod b/print/muttprint/files/patch-doc_manpages_de_muttprint.pod
new file mode 100644
index 000000000000..42524597c30c
--- /dev/null
+++ b/print/muttprint/files/patch-doc_manpages_de_muttprint.pod
@@ -0,0 +1,17 @@
+--- doc/manpages/de/muttprint.pod.orig	2006-05-06 09:13:46.000000000 +0200
++++ doc/manpages/de/muttprint.pod	2016-02-17 12:00:59.415601000 +0100
+@@ -1,3 +1,5 @@
++=encoding latin1
++
+ =head1 NAME
+ 
+ muttprint - schöner Ausdruck von Mails mit Mutt
+@@ -399,7 +401,7 @@
+ 
+ =head1 COPYRIGHT
+ 
+-© 2000-03 Bernhard Walle
++(c) 2000-03 Bernhard Walle
+ 
+ 
+ This is free software; see the source for  copying  conditions.
diff --git a/print/muttprint/files/patch-doc_manpages_en_muttprint.pod b/print/muttprint/files/patch-doc_manpages_en_muttprint.pod
new file mode 100644
index 000000000000..76206fc1db0f
--- /dev/null
+++ b/print/muttprint/files/patch-doc_manpages_en_muttprint.pod
@@ -0,0 +1,11 @@
+--- doc/manpages/en/muttprint.pod.orig	2006-05-06 09:13:46.000000000 +0200
++++ doc/manpages/en/muttprint.pod	2016-02-17 12:00:59.415601000 +0100
+@@ -397,7 +397,7 @@
+ 
+ =head1 COPYRIGHT
+ 
+-© 2000-03 Bernhard Walle
++(c) 2000-03 Bernhard Walle
+ 
+ 
+ This is free software; see the source for  copying  conditions.
diff --git a/print/muttprint/files/patch-doc_manpages_es_muttprint.pod b/print/muttprint/files/patch-doc_manpages_es_muttprint.pod
new file mode 100644
index 000000000000..82711afd462e
--- /dev/null
+++ b/print/muttprint/files/patch-doc_manpages_es_muttprint.pod
@@ -0,0 +1,8 @@
+--- doc/manpages/es/muttprint.pod.orig	2006-05-06 09:13:46.000000000 +0200
++++ doc/manpages/es/muttprint.pod	2016-02-20 09:55:36.922047000 +0100
+@@ -1,3 +1,5 @@
++=encoding latin1
++
+ =head1 NOMBRE
+ 
+ muttprint - impresión elegante de mensajes de correo con Mutt
diff --git a/print/muttprint/files/patch-doc_manpages_it_muttprint.pod b/print/muttprint/files/patch-doc_manpages_it_muttprint.pod
new file mode 100644
index 000000000000..36bdf803da26
--- /dev/null
+++ b/print/muttprint/files/patch-doc_manpages_it_muttprint.pod
@@ -0,0 +1,8 @@
+--- doc/manpages/it/muttprint.pod.orig	2006-05-06 09:13:46.000000000 +0200
++++ doc/manpages/it/muttprint.pod	2016-02-20 09:55:36.922047000 +0100
+@@ -1,3 +1,5 @@
++=encoding latin1
++
+ =head1 NOMBRE
+ 
+ muttprint - impresión elegante de mensajes de correo con Mutt
diff --git a/print/muttprint/files/patch-doc_manual_Makefile b/print/muttprint/files/patch-doc_manual_Makefile
deleted file mode 100644
index b612ea50d21a..000000000000
--- a/print/muttprint/files/patch-doc_manual_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- doc/manual/Makefile.orig	Tue Mar 18 16:30:54 2003
-+++ doc/manual/Makefile	Sat Apr 26 23:38:34 2003
-@@ -1,11 +1,7 @@
- #
- # This is the main makefile for documentation
- 
--prefix = /usr
--docdir = $(prefix)/share/doc/packages
--INSTALL = install -m 0644
--INSTALLDIR = install -d 
--MAKE = make
-+docdir = ${PREFIX}/share/doc
- 
- default: 
- 	$(MAKE) -C de
diff --git a/print/muttprint/files/patch-doc_manual_de_Makefile.am b/print/muttprint/files/patch-doc_manual_de_Makefile.am
new file mode 100644
index 000000000000..8fbf2e07964b
--- /dev/null
+++ b/print/muttprint/files/patch-doc_manual_de_Makefile.am
@@ -0,0 +1,33 @@
+--- doc/manual/de/Makefile.am.orig	2006-05-06 09:13:46.000000000 +0200
++++ doc/manual/de/Makefile.am	2016-02-20 09:09:37.829715000 +0100
+@@ -18,24 +18,24 @@
+ 	$(do_subst) < $(srcdir)/manual-de.sgml > manual-de-sed.sgml
+ 
+ manual-de.pdf : manual-de-sed.sgml
+-	db2pdf -s ../stylesheet.dsl manual-de-sed.sgml
++	docbook2pdf -d ../stylesheet.dsl manual-de-sed.sgml
+ 	mv manual-de-sed.pdf manual-de.pdf
+ 
+ manual-de.ps : manual-de-sed.sgml
+-	db2ps -s ../stylesheet.dsl manual-de-sed.sgml
++	docbook2ps -d ../stylesheet.dsl manual-de-sed.sgml
+ 	mv manual-de-sed.ps manual-de.ps
+ 
+ manual-de.dvi : manual-de-sed.sgml
+-	db2dvi -s ../stylesheet.dsl manual-de-sed.sgml
++	docbook2dvi -d ../stylesheet.dsl manual-de-sed.sgml
+ 	mv manual-de-sed.dvi manual-de.dvi
+ 
+ manual-de.rtf : manual-de-sed.sgml
+-	db2rtf -s ../stylesheet.dsl manual-de-sed.sgml
++	docbook2rtf -d ../stylesheet.dsl manual-de-sed.sgml
+ 	mv manual-de-sed.rtf manual-de.rtf
+ 
+ manual-de.html : manual-de-sed.sgml
+-	db2html -u -s ../stylesheet.dsl manual-de-sed.sgml
+-	mv manual-de-sed/manual-de-sed.html manual-de.html
++	docbook2html -u -d ../stylesheet.dsl manual-de-sed.sgml
++	mv manual-de-sed.html manual-de.html
+ 	rm -rf manual-de-sed
+ 	rm -rf manual-de-sed.junk
+ 
diff --git a/print/muttprint/files/patch-doc_manual_en_Makefile.am b/print/muttprint/files/patch-doc_manual_en_Makefile.am
new file mode 100644
index 000000000000..474b38e47765
--- /dev/null
+++ b/print/muttprint/files/patch-doc_manual_en_Makefile.am
@@ -0,0 +1,33 @@
+--- doc/manual/en/Makefile.am.orig	2006-05-06 09:13:46.000000000 +0200
++++ doc/manual/en/Makefile.am	2016-02-17 20:51:40.928061000 +0100
+@@ -18,24 +18,24 @@
+ 	$(do_subst) < $(srcdir)/manual-en.sgml > manual-en-sed.sgml
+ 
+ manual-en.pdf : manual-en-sed.sgml
+-	db2pdf -s ../stylesheet.dsl manual-en-sed.sgml
++	docbook2pdf -d ../stylesheet.dsl manual-en-sed.sgml
+ 	mv manual-en-sed.pdf manual-en.pdf
+ 
+ manual-en.ps : manual-en-sed.sgml
+-	db2ps -s ../stylesheet.dsl manual-en-sed.sgml
++	docbook2ps -d ../stylesheet.dsl manual-en-sed.sgml
+ 	mv manual-en-sed.ps manual-en.ps
+ 
+ manual-en.dvi : manual-en-sed.sgml
+-	db2dvi -s ../stylesheet.dsl manual-en-sed.sgml
++	docbook2dvi -d ../stylesheet.dsl manual-en-sed.sgml
+ 	mv manual-en-sed.dvi manual-en.dvi
+ 
+ manual-en.rtf : manual-en-sed.sgml
+-	db2rtf -s ../stylesheet.dsl manual-en-sed.sgml
++	docbook2rtf -d ../stylesheet.dsl manual-en-sed.sgml
+ 	mv manual-en-sed.rtf manual-en.rtf
+ 
+ manual-en.html : manual-en-sed.sgml
+-	db2html -u -s ../stylesheet.dsl manual-en-sed.sgml
+-	mv manual-en-sed/manual-en-sed.html manual-en.html
++	docbook2html -u manual-en-sed.sgml
++	mv manual-en-sed.html manual-en.html
+ 	rm -rf manual-en-sed
+ 	rm -rf manual-en-sed.junk
+ 
diff --git a/print/muttprint/files/patch-doc_manual_en_manual-en.sgml b/print/muttprint/files/patch-doc_manual_en_manual-en.sgml
new file mode 100644
index 000000000000..dd1c8e151d84
--- /dev/null
+++ b/print/muttprint/files/patch-doc_manual_en_manual-en.sgml
@@ -0,0 +1,18 @@
+--- doc/manual/en/manual-en.sgml.orig	2005-05-16 14:38:51.000000000 +0200
++++ doc/manual/en/manual-en.sgml	2016-02-17 20:39:53.059774000 +0100
+@@ -190,6 +190,7 @@
+ 
+ 			<para>As mentioned above, there must be a small C program compiled. If you use Perl
+ 				5.8 and/or Linux, you could skip this step. For this, just execute 
++			</para>
+ 
+ 			<para>
+ 				<prompt>$ </prompt>
+@@ -1023,6 +1024,7 @@
+ 			<para>For this, you can assign the variable <literal>BACKGROUND</literal>
+ 				the value <literal>on</literal>. In the debug mode (see <xref
+ 				linkend="debug">) this option has no effect.</para>
++		</sect3>
+ 		
+ 		<sect3 id="debug">
+ 			<title>Error messages</title>
diff --git a/print/muttprint/files/patch-doc_manual_es_Makefile.am b/print/muttprint/files/patch-doc_manual_es_Makefile.am
new file mode 100644
index 000000000000..b2d336d216a0
--- /dev/null
+++ b/print/muttprint/files/patch-doc_manual_es_Makefile.am
@@ -0,0 +1,33 @@
+--- doc/manual/es/Makefile.am.orig	2006-05-06 09:13:46.000000000 +0200
++++ doc/manual/es/Makefile.am	2016-02-17 20:51:40.928061000 +0100
+@@ -18,24 +18,24 @@
+ 	$(do_subst) < $(srcdir)/manual-es.sgml > manual-es-sed.sgml
+ 
+ manual-es.pdf : manual-es-sed.sgml
+-	db2pdf -s ../stylesheet.dsl manual-es-sed.sgml
++	docbook2pdf -d ../stylesheet.dsl manual-es-sed.sgml
+ 	mv manual-es-sed.pdf manual-es.pdf
+ 
+ manual-es.ps : manual-es-sed.sgml
+-	db2ps -s ../stylesheet.dsl manual-es-sed.sgml
++	docbook2ps -d ../stylesheet.dsl manual-es-sed.sgml
+ 	mv manual-es-sed.ps manual-es.ps
+ 
+ manual-es.dvi : manual-es-sed.sgml
+-	db2dvi -s ../stylesheet.dsl manual-es-sed.sgml
++	docbook2dvi -d ../stylesheet.dsl manual-es-sed.sgml
+ 	mv manual-es-sed.dvi manual-es.dvi
+ 
+ manual-es.rtf : manual-es-sed.sgml
+-	db2rtf -s ../stylesheet.dsl manual-es-sed.sgml
++	docbook2rtf -d ../stylesheet.dsl manual-es-sed.sgml
+ 	mv manual-es-sed.rtf manual-es.rtf
+ 
+ manual-es.html : manual-es-sed.sgml
+-	db2html -u -s ../stylesheet.dsl manual-es-sed.sgml
+-	mv manual-es-sed/manual-es-sed.html manual-es.html
++	docbook2html -u manual-es-sed.sgml
++	mv manual-es-sed.html manual-es.html
+ 	rm -rf manual-es-sed
+ 	rm -rf manual-es-sed.junk
+ 
diff --git a/print/muttprint/files/patch-doc_manual_it_Makefile.am b/print/muttprint/files/patch-doc_manual_it_Makefile.am
new file mode 100644
index 000000000000..8d019d42f9b2
--- /dev/null
+++ b/print/muttprint/files/patch-doc_manual_it_Makefile.am
@@ -0,0 +1,33 @@
+--- doc/manual/it/Makefile.am.orig	2006-05-06 09:13:46.000000000 +0200
++++ doc/manual/it/Makefile.am	2016-02-17 20:51:40.928061000 +0100
+@@ -18,24 +18,24 @@
+ 	$(do_subst) < $(srcdir)/manual-it.sgml > manual-it-sed.sgml
+ 
+ manual-it.pdf : manual-it-sed.sgml
+-	db2pdf -s ../stylesheet.dsl manual-it-sed.sgml
++	docbook2pdf -d ../stylesheet.dsl manual-it-sed.sgml
+ 	mv manual-it-sed.pdf manual-it.pdf
+ 
+ manual-it.ps : manual-it-sed.sgml
+-	db2ps -s ../stylesheet.dsl manual-it-sed.sgml
++	docbook2ps -d ../stylesheet.dsl manual-it-sed.sgml
+ 	mv manual-it-sed.ps manual-it.ps
+ 
+ manual-it.dvi : manual-it-sed.sgml
+-	db2dvi -s ../stylesheet.dsl manual-it-sed.sgml
++	docbook2dvi -d ../stylesheet.dsl manual-it-sed.sgml
+ 	mv manual-it-sed.dvi manual-it.dvi
+ 
+ manual-it.rtf : manual-it-sed.sgml
+-	db2rtf -s ../stylesheet.dsl manual-it-sed.sgml
++	docbook2rtf -d ../stylesheet.dsl manual-it-sed.sgml
+ 	mv manual-it-sed.rtf manual-it.rtf
+ 
+ manual-it.html : manual-it-sed.sgml
+-	db2html -u -s ../stylesheet.dsl manual-it-sed.sgml
+-	mv manual-it-sed/manual-it-sed.html manual-it.html
++	docbook2html -u manual-it-sed.sgml
++	mv manual-it-sed.html manual-it.html
+ 	rm -rf manual-it-sed
+ 	rm -rf manual-it-sed.junk
+ 
diff --git a/print/muttprint/files/patch-doc_manual_it_manual-it.sgml b/print/muttprint/files/patch-doc_manual_it_manual-it.sgml
new file mode 100644
index 000000000000..5345bc041e7c
--- /dev/null
+++ b/print/muttprint/files/patch-doc_manual_it_manual-it.sgml
@@ -0,0 +1,11 @@
+--- doc/manual/it/manual-it.sgml.orig	2005-05-16 14:38:51.000000000 +0200
++++ doc/manual/it/manual-it.sgml	2016-02-20 09:33:23.732880000 +0100
+@@ -1079,7 +1079,7 @@
+             <row>
+               <entry>ISO-8859-4</entry>
+               <entry><literal>latin4</literal></entry>
+-              <entry>Lingue Europa sud-orientale ed altre lingue/entry>
++              <entry>Lingue Europa sud-orientale ed altre lingue</entry>
+             </row>
+             <row>
+               <entry>ISO-8859-9</entry>
diff --git a/print/muttprint/files/patch-doc_manual_sl_Makefile.am b/print/muttprint/files/patch-doc_manual_sl_Makefile.am
new file mode 100644
index 000000000000..5244c679671e
--- /dev/null
+++ b/print/muttprint/files/patch-doc_manual_sl_Makefile.am
@@ -0,0 +1,33 @@
+--- doc/manual/sl/Makefile.am.orig	2006-05-06 09:13:46.000000000 +0200
++++ doc/manual/sl/Makefile.am	2016-02-17 20:51:40.928061000 +0100
+@@ -18,24 +18,24 @@
+ 	$(do_subst) < $(srcdir)/manual-sl.sgml > manual-sl-sed.sgml
+ 
+ manual-sl.pdf : manual-sl-sed.sgml
+-	db2pdf -s ../stylesheet.dsl manual-sl-sed.sgml
++	docbook2pdf -d ../stylesheet.dsl manual-sl-sed.sgml
+ 	mv manual-sl-sed.pdf manual-sl.pdf
+ 
+ manual-sl.ps : manual-sl-sed.sgml
+-	db2ps -s ../stylesheet.dsl manual-sl-sed.sgml
++	docbook2ps -d ../stylesheet.dsl manual-sl-sed.sgml
+ 	mv manual-sl-sed.ps manual-sl.ps
+ 
+ manual-sl.dvi : manual-sl-sed.sgml
+-	db2dvi -s ../stylesheet.dsl manual-sl-sed.sgml
++	docbook2dvi -d ../stylesheet.dsl manual-sl-sed.sgml
+ 	mv manual-sl-sed.dvi manual-sl.dvi
+ 
+ manual-sl.rtf : manual-sl-sed.sgml
+-	db2rtf -s ../stylesheet.dsl manual-sl-sed.sgml
++	docbook2rtf -d ../stylesheet.dsl manual-sl-sed.sgml
+ 	mv manual-sl-sed.rtf manual-sl.rtf
+ 
+ manual-sl.html : manual-sl-sed.sgml
+-	db2html -u -s ../stylesheet.dsl manual-sl-sed.sgml
+-	mv manual-sl-sed/manual-sl-sed.html manual-sl.html
++	docbook2html -u manual-sl-sed.sgml
++	mv manual-sl-sed.html manual-sl.html
+ 	rm -rf manual-sl-sed
+ 	rm -rf manual-sl-sed.junk
+ 
diff --git a/print/muttprint/files/patch-langinfo_Makefile b/print/muttprint/files/patch-langinfo_Makefile
deleted file mode 100644
index 9f0469bdf5cc..000000000000
--- a/print/muttprint/files/patch-langinfo_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/patch-muttprint b/print/muttprint/files/patch-muttprint
index 8bab2eee4dd1..bb64da9fbbec 100644
--- a/print/muttprint/files/patch-muttprint
+++ b/print/muttprint/files/patch-muttprint
@@ -1,6 +1,6 @@
---- muttprint.orig	Wed Apr  7 19:27:31 2004
-+++ muttprint	Sun May 23 17:37:08 2004
-@@ -92,13 +92,13 @@
+--- 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			=> 	'',
@@ -16,13 +16,13 @@
  	DEBUG			=>	'0',
  	REM_SIG			=>	'off',
  	REM_QUOTE		=>	'off',
-@@ -196,16 +196,16 @@
+@@ -211,16 +211,16 @@
  	}
  }
  
 -$Config{PAPER} = getPaperConfig ();
 -readConfig ("/etc/Muttprintrc", "$ENV{HOME}/.muttprintrc");
-+#$Config{PAPER} = getPaperConfig ();
++# $Config{PAPER} = getPaperConfig ();
 +readConfig ("%%PREFIX%%/etc/Muttprintrc", "$ENV{HOME}/.muttprintrc");
  
  
@@ -37,7 +37,7 @@
  			: "off";
  }
  
-@@ -1978,7 +1978,7 @@
+@@ -2027,7 +2027,7 @@
  Options:
  
  PLEASE NOTICE: These options override the corresponding settings in 
diff --git a/print/muttprint/files/patch-pics_Makefile.am b/print/muttprint/files/patch-pics_Makefile.am
new file mode 100644
index 000000000000..33b03a2b6509
--- /dev/null
+++ b/print/muttprint/files/patch-pics_Makefile.am
@@ -0,0 +1,20 @@
+--- pics/Makefile.am.orig	2006-05-06 09:13:46.000000000 +0200
++++ pics/Makefile.am	2016-02-17 11:28:07.681020000 +0100
+@@ -1,16 +1,3 @@
+ dist_pkgdata_DATA = \
+-		    BabyTuX_color.eps \
+-		    BabyTuX_color.png \
+-		    BabyTuX.eps \
+-		    BabyTuX.png \
+-		    Debian_color.eps \
+-		    Debian_color.png \
+-		    Debian.eps \
+-		    Debian.png \
+-		    Gentoo_color.eps \
+-		    Gentoo_color.png \
+-		    Gentoo.eps \
+-		    Gentoo.png \
+-		    penguin.eps \
+-		    penguin.jpg \
++		    Beastie.eps \
+ 		    README.pics
diff --git a/print/muttprint/pkg-descr b/print/muttprint/pkg-descr
index 1903de365301..b1e8349c43cc 100644
--- a/print/muttprint/pkg-descr
+++ b/print/muttprint/pkg-descr
@@ -5,4 +5,3 @@ It uses the typesetting system LaTeX, which is normally installed on a
 Unix/Linux system.
 
 WWW: http://muttprint.sourceforge.net/
-
diff --git a/print/muttprint/pkg-plist b/print/muttprint/pkg-plist
index daf79e34865d..0edcaef47d32 100644
--- a/print/muttprint/pkg-plist
+++ b/print/muttprint/pkg-plist
@@ -1,40 +1,41 @@
 bin/muttprint
+bin/muttprint-langinfo
 man/man1/muttprint.1.gz
+man/de/man1/muttprint.1.gz
+man/es/man1/muttprint.1.gz
+man/it/man1/muttprint.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.Gnus
 %%PORTDOCS%%%%DOCSDIR%%/README.Latex
 %%PORTDOCS%%%%DOCSDIR%%/README.es
 %%PORTDOCS%%%%DOCSDIR%%/README.translations
+%%PORTDOCS%%%%DOCSDIR%%/manual-de.dvi
+%%PORTDOCS%%%%DOCSDIR%%/manual-de.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-de.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual-de/index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-de/x23.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-de/x231.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-de/x647.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-de/x664.html
+%%PORTDOCS%%%%DOCSDIR%%/manual-de.ps
+%%PORTDOCS%%%%DOCSDIR%%/manual-de.rtf
+%%PORTDOCS%%%%DOCSDIR%%/manual-en.dvi
+%%PORTDOCS%%%%DOCSDIR%%/manual-en.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-en.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual-en/index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-en/x23.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-en/x230.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-en/x647.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-en/x662.html
+%%PORTDOCS%%%%DOCSDIR%%/manual-en.ps
+%%PORTDOCS%%%%DOCSDIR%%/manual-en.rtf
+%%PORTDOCS%%%%DOCSDIR%%/manual-es.dvi
+%%PORTDOCS%%%%DOCSDIR%%/manual-es.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-es.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual-es/index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-es/x191.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-es/x23.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-es/x650.html
+%%PORTDOCS%%%%DOCSDIR%%/manual-es.ps
+%%PORTDOCS%%%%DOCSDIR%%/manual-es.rtf
+%%PORTDOCS%%%%DOCSDIR%%/manual-it.dvi
+%%PORTDOCS%%%%DOCSDIR%%/manual-it.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-it.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual-it/index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-it/x194.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-it/x23.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-it/x683.html
+%%PORTDOCS%%%%DOCSDIR%%/manual-it.ps
+%%PORTDOCS%%%%DOCSDIR%%/manual-it.rtf
+%%PORTDOCS%%%%DOCSDIR%%/manual-sl.dvi
+%%PORTDOCS%%%%DOCSDIR%%/manual-sl.html
 %%PORTDOCS%%%%DOCSDIR%%/manual-sl.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual-sl/index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-sl/x195.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-sl/x23.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-sl/x700.html
+%%PORTDOCS%%%%DOCSDIR%%/manual-sl.ps
+%%PORTDOCS%%%%DOCSDIR%%/manual-sl.rtf
 %%PORTDOCS%%%%DOCSDIR%%/sample-muttprintrc-de
 %%PORTDOCS%%%%DOCSDIR%%/sample-muttprintrc-en
 %%PORTDOCS%%%%DOCSDIR%%/sample-muttprintrc-es
@@ -42,27 +43,19 @@ man/man1/muttprint.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/sample-muttprintrc-it
 %%PORTDOCS%%%%DOCSDIR%%/sample-muttprintrc-nl
 %%PORTDOCS%%%%DOCSDIR%%/sample-muttprintrc-si
-share/muttprint/BabyTuX.eps
-share/muttprint/BabyTuX_color.eps
-share/muttprint/Beastie.eps
-share/muttprint/Debian.eps
-share/muttprint/Debian_color.eps
-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
+%%DATADIR%%/Beastie.eps
+%%DATADIR%%/README.pics
+%%DATADIR%%/translations/translation-cs.pl
+%%DATADIR%%/translations/translation-de.pl
+%%DATADIR%%/translations/translation-es.pl
+%%DATADIR%%/translations/translation-example.pl
+%%DATADIR%%/translations/translation-fi.pl
+%%DATADIR%%/translations/translation-fr.pl
+%%DATADIR%%/translations/translation-hu.pl
+%%DATADIR%%/translations/translation-it.pl
+%%DATADIR%%/translations/translation-nl.pl
+%%DATADIR%%/translations/translation-pl.pl
+%%DATADIR%%/translations/translation-pt.pl
+%%DATADIR%%/translations/translation-ru.pl
+%%DATADIR%%/translations/translation-sl.pl
+%%DATADIR%%/translations/translation-sv.pl