From udo.schweigert@siemens.com  Mon Mar 24 01:21:24 2003
Return-Path: <udo.schweigert@siemens.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5D19337B401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 Mar 2003 01:21:24 -0800 (PST)
Received: from david.siemens.de (david.siemens.de [192.35.17.14])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EA63F43F93
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 Mar 2003 01:21:22 -0800 (PST)
	(envelope-from udo.schweigert@siemens.com)
Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14])
	by david.siemens.de (8.11.6/8.11.6) with ESMTP id h2O9LLt16330
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 Mar 2003 10:21:21 +0100 (MET)
Received: from mars.cert.siemens.de (ust.mchp.siemens.de [139.23.201.17])
	by mail1.siemens.de (8.11.6/8.11.6) with ESMTP id h2O9LLA17212
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 Mar 2003 10:21:21 +0100 (MET)
Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [139.23.202.134])
	by mars.cert.siemens.de (8.12.8/8.12.6/$SiemensCERT: mail/cert.mc,v 1.42 2003/02/21 12:06:56 ust Exp $) with ESMTP id h2O9LKWa060270
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 Mar 2003 10:21:20 +0100 (CET)
	(envelope-from ust@alaska.cert.siemens.de)
Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [127.0.0.1])
	by alaska.cert.siemens.de (8.12.8/8.12.8/$Ust: hosts/alaska/mail/config.mc,v 1.15 2002/12/31 15:32:17 ust Exp $) with ESMTP id h2O9LKOY074932
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 Mar 2003 10:21:20 +0100 (CET)
	(envelope-from ust@alaska.cert.siemens.de)
Received: (from ust@localhost)
	by alaska.cert.siemens.de (8.12.8/8.12.8/$Ust: hosts/alaska/mail/submit.mc,v 1.4 2002/12/31 15:32:17 ust Exp $) id h2O9LKmd072211;
	Mon, 24 Mar 2003 10:21:20 +0100 (CET)
	(envelope-from ust)
Message-Id: <200303240921.h2O9LKmd072211@alaska.cert.siemens.de>
Date: Mon, 24 Mar 2003 10:21:20 +0100 (CET)
From: Udo Schweigert <udo.schweigert@siemens.com>
Reply-To: Udo Schweigert <udo.schweigert@siemens.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: maintainer-update of mail/mutt_devel
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         50235
>Category:       ports
>Synopsis:       maintainer-update of mail/mutt_devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 24 01:30:13 PST 2003
>Closed-Date:    Mon Mar 24 17:27:24 PST 2003
>Last-Modified:  Mon Mar 24 17:27:24 PST 2003
>Originator:     Udo Schweigert
>Release:        FreeBSD 4.8-RC i386
>Organization:
>Environment:
System: FreeBSD alaska.cert.siemens.de 4.8-RC FreeBSD 4.8-RC #52: Fri Mar 21 19:26:10 CET 2003 ust@alaska.cert.siemens.de:/usr/obj/work/src/RELENG_4/sys/alaska i386


>Description:

Maintainer update of mail/mutt-devel:

	- Don't strip the mutt binary again, it's done by install -s 
	  (Fixes ports/50227)

	- Fix the pkg-plist if NOPORTDOCS and some of the other knobs are
	  defined.

Committer: Please also close ports/50227. Thanks.

>How-To-Repeat:
>Fix:

diff -ru  /usr/ports/mail/mutt-devel/Makefile ./Makefile
--- /usr/ports/mail/mutt-devel/Makefile	Mon Mar 24 06:35:03 2003
+++ ./Makefile	Mon Mar 24 08:32:36 2003
@@ -314,7 +314,6 @@
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/generate-plist > ${PLIST}
 
 post-install:
-	@strip ${PREFIX}/bin/mutt
 .if !defined(NOPORTDOCS)
 	@${ECHO} "===>   Installing Mutt documentation"
 	@${MKDIR} ${PREFIX}/share/doc/mutt && \
diff -ru  /usr/ports/mail/mutt-devel/scripts/generate-plist ./scripts/generate-plist
--- /usr/ports/mail/mutt-devel/scripts/generate-plist	Sat Mar 22 06:36:56 2003
+++ ./scripts/generate-plist	Mon Mar 24 08:32:36 2003
@@ -59,7 +59,7 @@
 EOF
 
 if [ "$MUTT_PORTDOCS" = "yes" ]; then
-cat >> $tmp_first <<EOF
+  cat >> $tmp_first <<EOF
 share/doc/mutt/ABOUT-NLS
 share/doc/mutt/COPYRIGHT
 share/doc/mutt/ChangeLog
@@ -111,51 +111,48 @@
 share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
 share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
 EOF
-fi
 
-if [ "$MUTT_NNTP" = "yes" ]; then
-echo "share/doc/mutt/ChangeLog.nntp" >> $tmp_first
-fi
-if [ "$MUTT_SGML" = "yes" ]; then
-echo "share/doc/mutt/manual.latin1" >> $tmp_first
-echo "share/doc/mutt/manual.ps" >> $tmp_first
-fi
-
-if [ "$MUTT_HTML" = "yes" ]; then
-  html=366
-  if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then
-    html=$(($html + 5))
-  fi
   if [ "$MUTT_NNTP" = "yes" ]; then
-    html=$(($html + 22))
-  fi
-  if [ "$MUTT_QUOTE_PATCH" = "yes" ]; then
-    html=$(($html + 2))
-  fi
-  if [ "$MUTT_EDIT_THREADS" = "yes" ]; then
-    html=$(($html + 3))
+    echo "share/doc/mutt/ChangeLog.nntp" >> $tmp_first
   fi
-  if [ "$MUTT_SIGNATURE_MENU" = "yes" ]; then
-    html=$(($html + 1))
+  if [ "$MUTT_SGML" = "yes" ]; then
+    echo "share/doc/mutt/manual.latin1" >> $tmp_first
+    echo "share/doc/mutt/manual.ps" >> $tmp_first
   fi
-  if [ "$MUTT_IFDEF_PATCH" = "yes" ]; then
-    html=$(($html + 1))
-  fi
-  if [ "$MUTT_PGP_PATCH" = "yes" ]; then
-    html=$(($html + 2))
-  fi
-  echo "share/doc/mutt/html/manual.html" >> $tmp_first
-  echo "share/doc/mutt/html/manual_toc.html" >> $tmp_first 
-  i=1
-  while [ $i -le $html ]; do
-    echo "share/doc/mutt/html/manual$i.html" >> $tmp_first 
-    i=$(($i + 1))
-  done
-  echo "@dirrm share/doc/mutt/html" >> $tmp_last
-fi
 
-if [ "$MUTT_PORTDOCS" = "yes" ]; then
-cat >> $tmp_last <<EOF
+  if [ "$MUTT_HTML" = "yes" ]; then
+    html=366
+    if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then
+      html=$(($html + 5))
+    fi
+    if [ "$MUTT_NNTP" = "yes" ]; then
+      html=$(($html + 22))
+    fi
+    if [ "$MUTT_QUOTE_PATCH" = "yes" ]; then
+      html=$(($html + 2))
+    fi
+    if [ "$MUTT_EDIT_THREADS" = "yes" ]; then
+      html=$(($html + 3))
+    fi
+    if [ "$MUTT_SIGNATURE_MENU" = "yes" ]; then
+      html=$(($html + 1))
+    fi
+    if [ "$MUTT_IFDEF_PATCH" = "yes" ]; then
+      html=$(($html + 1))
+    fi
+    if [ "$MUTT_PGP_PATCH" = "yes" ]; then
+      html=$(($html + 2))
+    fi
+    echo "share/doc/mutt/html/manual.html" >> $tmp_first
+    echo "share/doc/mutt/html/manual_toc.html" >> $tmp_first 
+    i=1
+    while [ $i -le $html ]; do
+      echo "share/doc/mutt/html/manual$i.html" >> $tmp_first 
+      i=$(($i + 1))
+    done
+    echo "@dirrm share/doc/mutt/html" >> $tmp_last
+  fi
+  cat >> $tmp_last <<EOF
 @dirrm share/doc/mutt/samples/iconv
 @dirrm share/doc/mutt/samples
 @dirrm share/doc/mutt
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: naddy 
State-Changed-When: Mon Mar 24 17:27:05 PST 2003 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=50235 
>Unformatted:
