- Fix the DOCSDIR and EXAMPLESDIR code. Now both can be

  set to non-standard values.
- Striping of binaries is no longer needed (it's done by install -s).
- Be less verbose.

PR:		58558
Submitted by:	Udo Schweigert <udo.schweigert@siemens.com> (maintainer)

4 files changed, 49 insertions, 8 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 2d302e58e05b..1b411e6a6327 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -92,6 +92,8 @@ MAN5=		mbox.5 muttrc.5
 post-patch::
 	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
 		${WRKSRC}/contrib/gpg.rc
+	@${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \
+		${WRKSRC}/contrib/Makefile.in
 
 .if defined(WITH_MUTT_XFACE)
 post-patch::
@@ -105,7 +107,7 @@ post-patch::
 # this should be done automagically by aclocal but ....
 # for now, this will have to do
 pre-build:
-	${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \
+	@${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \
 			-e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \
 			-e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \
 			-e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \
@@ -113,10 +115,16 @@ pre-build:
 
 .if !defined(NOPORTDOCS)
 post-build:
-	${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
-	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
-	printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
-		ed -s ${WRKSRC}/doc/mutt.man
+	@${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
+	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
+	@${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \
+		-e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
+		-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
+		${WRKSRC}/doc/mutt.man
+	@${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \
+		-e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
+		-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
+		${WRKSRC}/doc/muttrc.man
 .if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no"
 PLIST:=		${WRKDIR}/PLIST
 pre-install:
@@ -126,7 +134,6 @@ pre-install:
 .endif
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/mutt
 	${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/etc/Muttrc.dist
 .if !defined(NOPORTDOCS)
 	@${ECHO} "===>   Installing Mutt documentation"
diff --git a/mail/mutt/files/extra-patch-doc-ref b/mail/mutt/files/extra-patch-doc-ref
index ee044b188b0b..99222e0bceb0 100644
--- a/mail/mutt/files/extra-patch-doc-ref
+++ b/mail/mutt/files/extra-patch-doc-ref
@@ -6,7 +6,7 @@
  mail under unix operating systems, including support color terminals, MIME,
 -and a threaded sorting mode.
 +and a threaded sorting mode.  Details of how to use all of this is
-+available in \fI${PREFIX}/share/doc/mutt/\fP.
++available in \fI${DOCSDIR}\fP.
  .SH OPTIONS
  .IP "-a \fIfile\fP"
  Attach a file to your message using MIME.
diff --git a/mail/mutt/files/patch-doc-mutt.man b/mail/mutt/files/patch-doc-mutt.man
new file mode 100644
index 000000000000..46e086721a76
--- /dev/null
+++ b/mail/mutt/files/patch-doc-mutt.man
@@ -0,0 +1,34 @@
+--- doc/mutt.man.orig	Wed Jul 24 10:41:31 2002
++++ doc/mutt.man	Sun Oct 26 11:06:36 2003
+@@ -136,9 +136,9 @@
+ User's personal mapping between MIME types and file extensions.
+ .IP "/etc/mime.types"
+ System mapping between MIME types and file extensions.
+-.IP "/usr/local/bin/mutt_dotlock"
++.IP "${PREFIX}/bin/mutt_dotlock"
+ The privileged dotlocking program.
+-.IP "/usr/local/doc/mutt/manual.txt"
++.IP "${DOCSDIR}/manual.txt"
+ The Mutt manual.
+ .SH BUGS
+ .PP
+--- doc/muttrc.man	Sun Oct 26 11:09:09 2003
++++ doc/muttrc.man	Sun Oct 26 11:08:48 2003
+@@ -990,7 +972,7 @@
+ .B dotlock_program
+ .nf
+ Type: path
+-Default: \(lq/usr/local/bin/mutt_dotlock\(rq
++Default: \(lq${PREFIX}/bin/mutt_dotlock\(rq
+ .fi
+ .IP
+ Contains the path of the mutt_dotlock (8) binary to be used by
+@@ -3970,7 +3952,7 @@
+ instead of a raw socket. You may be able to use this to set up
+ preauthenticated connections to your IMAP/POP3 server. Example:
+ .IP
+-tunnel=\(rqssh -q mailhost.net /usr/local/libexec/imapd\(rq
++tunnel=\(rqssh -q mailhost.net ${PREFIX}/libexec/imapd\(rq
+ .IP
+ NOTE: For this example to work you must be able to log in to the remote
+ machine without having to enter a password.
diff --git a/mail/mutt/files/patch-examples b/mail/mutt/files/patch-examples
index 26db7d6c955f..2d24771033f7 100644
--- a/mail/mutt/files/patch-examples
+++ b/mail/mutt/files/patch-examples
@@ -4,7 +4,7 @@
  mandir = @mandir@
  srcdir = @srcdir@
  docdir = @docdir@
-+samplesdir = @prefix@/share/examples/mutt
++samplesdir = @samplesdir@
  top_srcdir = @top_srcdir@
  top_builddir = ..
  INSTALL = @INSTALL@