ports/124550: maintainer-update of mail/mutt-devel

[Udo Schweigert]

>Number:         124550
>Category:       ports
>Synopsis:       maintainer-update of mail/mutt-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 13 11:00:08 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Udo Schweigert
>Release:        FreeBSD 6.3-STABLE i386
>Organization:
>Environment:

>Description:

Maintainer update of mail/mutt-devel:

	- Add WITH_MUTT_DEBUG knob (as requested by the community).
	- Update the sidebar patch.
	- Fix the text version of the manual.
	- Remove superfluous entries from distinfo.

>How-To-Repeat:
>Fix:

diff -ru  /usr/ports/mail/mutt-devel/Makefile ./Makefile
--- /usr/ports/mail/mutt-devel/Makefile	2008-06-07 06:11:30.000000000 +0200
+++ ./Makefile	2008-06-13 11:33:50.000000000 +0200
@@ -107,6 +107,9 @@
 # If you want to enable the internal SMTP relay support define:
 #  WITH_MUTT_SMTP
 #
+# If you want to enable debugging capabilities define:
+#  WITH_MUTT_DEBUG
+#
 
 PORTNAME=	mutt-devel
 PORTVERSION=	1.5.18
@@ -400,6 +403,9 @@
 .else
 CONFIGURE_ARGS+=	--disable-smtp
 .endif
+.if defined(WITH_MUTT_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
 
 PATCH_DIST_STRIP=	-p1
 
@@ -442,7 +448,7 @@
 PATCHFILES+=	p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
 .endif
 .if defined(WITH_MUTT_SIDEBAR_PATCH)
-SIDEBAR_PATCH=	patch-1.5.18.sidebar.20080517.txt
+SIDEBAR_PATCH=	patch-1.5.18.sidebar.20080611.txt
 DISTFILES+=	${SIDEBAR_PATCH}:tchan
 XML_NEEDED=	yes
 pre-patch::
diff -ru  /usr/ports/mail/mutt-devel/distinfo ./distinfo
--- /usr/ports/mail/mutt-devel/distinfo	2008-05-22 06:09:21.000000000 +0200
+++ ./distinfo	2008-06-13 11:33:50.000000000 +0200
@@ -16,12 +16,9 @@
 MD5 (mutt/patch-1.5.18.vvv.quote.gz) = 67c3582b272d71612bef6216f028d960
 SHA256 (mutt/patch-1.5.18.vvv.quote.gz) = 9f77848a63e6775a88e84901b9fcad743985f481b5f7a9249df5603d871277a0
 SIZE (mutt/patch-1.5.18.vvv.quote.gz) = 1736
-MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
-SHA256 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = ec9511b86a595f9b4f1f96b05d9e9e12e997bc62b0a0f2b5a36e2817dee61406
-SIZE (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 6405
 MD5 (mutt/mutt-1.5.16.vc.greeting) = 4bd9beeb74d075e4418e86e8ed887aa0
 SHA256 (mutt/mutt-1.5.16.vc.greeting) = cf05aeab5f1813864aa72b68f59a579c46dacf2fbd8e5fd064b920012320b986
 SIZE (mutt/mutt-1.5.16.vc.greeting) = 4526
-MD5 (mutt/patch-1.5.18.sidebar.20080517.txt) = 93baec963e44d05a9fb39112eb4a0d7e
-SHA256 (mutt/patch-1.5.18.sidebar.20080517.txt) = a46e4842eb44cf268ccf50281348564524ebe22f42a25d27d23ac347c5093add
-SIZE (mutt/patch-1.5.18.sidebar.20080517.txt) = 51974
+MD5 (mutt/patch-1.5.18.sidebar.20080611.txt) = 0f6565cecfc7fd72eaf33756abbc3088
+SHA256 (mutt/patch-1.5.18.sidebar.20080611.txt) = a94bc11072dbfe9a4a7d5a761105bf40a496bb2706e9940978de7b64d1555fa7
+SIZE (mutt/patch-1.5.18.sidebar.20080611.txt) = 52201
diff -ru  /usr/ports/mail/mutt-devel/files/patch-02 ./files/patch-02
--- /usr/ports/mail/mutt-devel/files/patch-02	2008-05-22 06:09:21.000000000 +0200
+++ ./files/patch-02	2008-06-13 12:23:22.000000000 +0200
@@ -1,6 +1,6 @@
 --- doc/Makefile.am.orig	2008-01-30 05:26:50.000000000 +0100
-+++ doc/Makefile.am	2008-05-19 19:24:02.000000000 +0200
-@@ -45,7 +45,7 @@
++++ doc/Makefile.am	2008-06-13 12:18:37.000000000 +0200
+@@ -45,7 +46,7 @@
  
  all: makedoc-all
  
@@ -9,7 +9,7 @@
  
  install-data-local: makedoc-all instdoc
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -67,9 +67,6 @@
+@@ -67,9 +68,6 @@
  		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
  	done
  	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
@@ -19,7 +19,7 @@
  	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
  	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
  		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
-@@ -100,10 +97,8 @@
+@@ -100,10 +98,7 @@
  
  check:
  manual.txt: manual.html db-cleanup.xsl
@@ -27,8 +27,7 @@
 -	-lynx -dump -nolist -with_backspaces manual-txt.html > $@ || \
 -	w3m -dump manual-txt.html > $@ || \
 -	elinks -dump -no-numbering -no-references manual-txt.html > $@
-+	-xsltproc --nonet -o manual-txt.out $(srcdir)/db-cleanup.xsl manual.html || cp manual.html manual-txt.out
-+	-lynx -dump -nolist -with_backspaces manual-txt.out > $@
++	-lynx -dump -nolist -with_backspaces manual.html > $@
  
  Muttrc: stamp-doc-rc
  
>Release-Note:
>Audit-Trail:
>Unformatted: