* Upgrade to 0.63a.

* Fix paths in manpage and html documentation.

4 files changed, 46 insertions, 26 deletions

diff --git a/print/muttprint/Makefile b/print/muttprint/Makefile
index f34589c33b82..969c5dcc7d26 100644
--- a/print/muttprint/Makefile
+++ b/print/muttprint/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	muttprint
-PORTVERSION=	0.63
+PORTVERSION=	0.63a
 CATEGORIES=	print mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	muttprint
@@ -23,15 +23,28 @@ RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
 		convert:${PORTSDIR}/graphics/ImageMagick \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
 
-MAN1=		muttprint.1
-MANCOMPRESSED=	yes
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
 USE_GMAKE=	yes
+ALL_TARGET=	nothing
 
-post-patch:
-	-${RM} -f ${WRKSRC}/pics/*.orig
+MAN1=		muttprint.1
+MANCOMPRESSED=	yes
 
 .if !defined(NOPORTDOCS)
 INSTALL_TARGET=install-with-doc
 .endif
 
+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
+	@${GZIP_CMD} ${WRKSRC}/doc/manpages/*/muttprint.1
+
 .include <bsd.port.mk>
diff --git a/print/muttprint/distinfo b/print/muttprint/distinfo
index 62f6a6fadcd4..b42a6e57b803 100644
--- a/print/muttprint/distinfo
+++ b/print/muttprint/distinfo
@@ -1 +1 @@
-MD5 (muttprint-0.63.tar.gz) = a9e3fe74aa6ccf370823fa8a9540c36c
+MD5 (muttprint-0.63a.tar.gz) = 4455972e21a5f1d2af6a43bbffdaf6be
diff --git a/print/muttprint/files/patch-aa b/print/muttprint/files/patch-aa
index 3feafcf95e08..515a6a35ffcc 100644
--- a/print/muttprint/files/patch-aa
+++ b/print/muttprint/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun Feb 17 23:47:21 2002
-+++ Makefile	Sun Feb 17 23:51:49 2002
-@@ -7,26 +7,26 @@
+--- Makefile.orig	Tue Sep 10 20:01:54 2002
++++ Makefile	Wed Sep 11 23:06:32 2002
+@@ -7,27 +7,27 @@
  
  # Change this for local installation, 
  # e. g. /home/user or /usr/local
@@ -28,20 +28,15 @@
 -sharedir = $(prefix)/share
 -libdir = $(prefix)/lib
 -bindir = $(prefix)/bin
+-sysconfdir = /etc
 +sharedir = ${PREFIX}/share
 +libdir = ${PREFIX}/lib
 +bindir = ${PREFIX}/bin
++sysconfdir = ${PREFIX}/etc
  
  #####################################################
  #####################################################
-@@ -35,23 +35,25 @@
- INSTALLBIN = $(install) -m 0755 
- INSTALL = $(install) -m 0644 
- 
-+all:
- 
- nothing:
- 	@echo "Nothing to do. Run \"make install\" to install Muttprint."
+@@ -42,17 +42,18 @@
  
  
  install: 
diff --git a/print/muttprint/files/patch-ad b/print/muttprint/files/patch-ad
index 9ce201929871..673f4ea6a5b6 100644
--- a/print/muttprint/files/patch-ad
+++ b/print/muttprint/files/patch-ad
@@ -1,17 +1,29 @@
---- doc/manpages/Makefile.orig	Sat Feb 23 23:17:56 2002
-+++ doc/manpages/Makefile	Sat Feb 23 23:19:15 2002
-@@ -4,8 +4,8 @@
+--- doc/manpages/Makefile.orig	Wed Sep 11 10:40:24 2002
++++ doc/manpages/Makefile	Wed Sep 11 20:32:04 2002
+@@ -4,14 +4,14 @@
  
- VERSION = 0.62
+ VERSION = 0.63a
  POD2MAN = pod2man --section=1 --release=$(VERSION)
 -prefix = /usr
+-bindir = $(prefix)/bin
+-tempdir = /tmp
+-sysconfdir = /etc
+-docdir = /usr/share/doc/packages
+-sharedir = $(prefix)/share
+-libdir = $(prefix)/lib
 -mandir = $(prefix)/share/man
 +#prefix = /usr
-+mandir = ${PREFIX}/man
++#bindir = $(prefix)/bin
++#tempdir = /tmp
++#sysconfdir = /etc
++#docdir = /usr/share/doc/packages
++#sharedir = $(prefix)/share
++#libdir = $(prefix)/lib
++#mandir = $(prefix)/share/man
  INSTALL = install -m 0644 
  gzip = gzip -f
  
-@@ -16,7 +16,7 @@
+@@ -22,7 +22,7 @@
  TITLE_CS = "Krátký manuál Muttprintu"
  
  
@@ -20,9 +32,9 @@
  german: de/muttprint.1.gz
  english: en/muttprint.1.gz
  italian: it/muttprint.1.gz
-@@ -49,13 +49,12 @@
- 	$(POD2MAN) --center=$(TITLE_CS) cs/muttprint.pod cs/muttprint.1
- 	$(gzip) cs/muttprint.1
+@@ -111,13 +111,12 @@
+ 
+ ########################### GENERAL ###################################
  
 -install: de/muttprint.1.gz en/muttprint.1.gz es/muttprint.1.gz \
 - 			it/muttprint.1.gz cs/muttprint.1.gz