--- Makefile (revision 409125) +++ Makefile (working copy) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= muttprint -PORTVERSION= 0.72d -PORTREVISION= 11 +PORTVERSION= 0.73 +PORTREVISION= 0 CATEGORIES?= print mail MASTER_SITES= SF/muttprint/muttprint/muttprint-${PORTVERSION} @@ -10,6 +10,8 @@ MAINTAINER?= guru@unixarea.de COMMENT?= Utility to print mail for most any mail client +BUILD_DEPENDS= docbook2pdf:${PORTSDIR}/textproc/docbook-utils + RUN_DEPENDS= psnup:${PORTSDIR}/print/psutils \ uncompface:${PORTSDIR}/mail/faces \ p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \ @@ -18,10 +20,13 @@ USES= perl5 gmake USE_TEX= latex dvipsk +USE_AUTOTOOLS= aclocal automake autoconf +AUTOMAKE_ARGS= --add-missing + 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 +45,6 @@ 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 +58,6 @@ 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 +71,5 @@ .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 --- distinfo (revision 409125) +++ distinfo (working copy) @@ -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 --- files/patch-Makefile (revision 409125) +++ files/patch-Makefile (nonexistent) @@ -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* --- files/patch-Makefile.am (nonexistent) +++ files/patch-Makefile.am (working copy) @@ -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 --- files/patch-configure.ac (nonexistent) +++ files/patch-configure.ac (working copy) @@ -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) --- files/patch-doc_manpages_Makefile (revision 409125) +++ files/patch-doc_manpages_Makefile (nonexistent) @@ -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 --- files/patch-doc_manpages_Makefile.am (nonexistent) +++ files/patch-doc_manpages_Makefile.am (working copy) @@ -0,0 +1,5 @@ +--- doc/manpages/Makefile.am.orig 2006-05-06 09:13:46.000000000 +0200 ++++ doc/manpages/Makefile.am 2016-02-17 11:37:15.385838000 +0100 +@@ -1 +1 @@ +-SUBDIRS = de en es it ++SUBDIRS = en --- files/patch-doc_manpages_en_muttprint.pod (nonexistent) +++ files/patch-doc_manpages_en_muttprint.pod (working copy) @@ -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 ++2000-03 Bernhard Walle + + + This is free software; see the source for copying conditions. --- files/patch-doc_manual_Makefile (revision 409125) +++ files/patch-doc_manual_Makefile (nonexistent) @@ -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 --- files/patch-doc_manual_Makefile.am (nonexistent) +++ files/patch-doc_manual_Makefile.am (working copy) @@ -0,0 +1,5 @@ +--- doc/manual/Makefile.am.orig 2006-05-06 09:13:46.000000000 +0200 ++++ doc/manual/Makefile.am 2016-02-17 15:23:33.643490000 +0100 +@@ -1 +1 @@ +-SUBDIRS = de en es it sl ++SUBDIRS = en --- files/patch-doc_manual_en_Makefile.am (nonexistent) +++ files/patch-doc_manual_en_Makefile.am (working copy) @@ -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 + --- files/patch-doc_manual_en_manual-en.sgml (nonexistent) +++ files/patch-doc_manual_en_manual-en.sgml (working copy) @@ -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 @@ + + 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 ++ + + + $ +@@ -1023,6 +1024,7 @@ + For this, you can assign the variable BACKGROUND + the value on. In the debug mode (see ) this option has no effect. ++ + + + Error messages --- files/patch-langinfo_Makefile (revision 409125) +++ files/patch-langinfo_Makefile (nonexistent) @@ -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 --- files/patch-muttprint (revision 409125) +++ files/patch-muttprint (working copy) @@ -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 --- files/patch-pics_Makefile.am (nonexistent) +++ files/patch-pics_Makefile.am (working copy) @@ -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 --- pkg-plist (revision 409125) +++ pkg-plist (working copy) @@ -1,40 +1,18 @@ bin/muttprint +bin/muttprint-langinfo man/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.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-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-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-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-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-en.ps +%%PORTDOCS%%%%DOCSDIR%%/manual-en.rtf %%PORTDOCS%%%%DOCSDIR%%/sample-muttprintrc-de %%PORTDOCS%%%%DOCSDIR%%/sample-muttprintrc-en %%PORTDOCS%%%%DOCSDIR%%/sample-muttprintrc-es @@ -42,27 +20,19 @@ %%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