ports/96671: mail/mutt-ng: Update 20051110 -> 20060501; take maintainership
Shaun Amott
shaun at inerd.com
Tue May 2 17:00:30 UTC 2006
>Number: 96671
>Category: ports
>Synopsis: mail/mutt-ng: Update 20051110 -> 20060501; take maintainership
>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: Tue May 02 17:00:28 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Shaun Amott
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
>Environment:
>Description:
- Update to 20060501 snapshot
- Add distfile mirror
- HTML docs not generated: we don't need lynx any more
- portlint(1)
- Take maintainership
Tinderbox tested on: 5.x (sparc64)
Manually tested on: 7.x (i386)
>How-To-Repeat:
>Fix:
--- mutt-ng.diff begins here ---
diff -urN mutt-ng.orig/Makefile mutt-ng/Makefile
--- mutt-ng.orig/Makefile Tue Apr 25 23:14:50 2006
+++ mutt-ng/Makefile Tue May 2 15:53:20 2006
@@ -6,18 +6,17 @@
#
PORTNAME= mutt-ng
-PORTVERSION= 20051110
-PORTREVISION= 1
+PORTVERSION= 20060501
CATEGORIES= mail
-MASTER_SITES= http://nion.modprobe.de/mutt-ng/snapshots/
+MASTER_SITES= http://nion.modprobe.de/mutt-ng/snapshots/ \
+ http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
DISTNAME= muttng-${PORTVERSION}
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= shaun at inerd.com
COMMENT= A fork of the mutt with the goal to incorporate all the patches
GNU_CONFIGURE= yes
USE_OPENSSL= yes
-USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-fcntl --sysconfdir=${PREFIX}/etc \
@@ -30,7 +29,7 @@
USE_ICONV= yes
PLIST_SUB+= NLS=""
.if defined(WITHOUT_MUTT_ICONV)
-BROKEN= "The WITHOUT_MUTT_ICONV knob of the mutt port only works if WITHOUT_NLS is also given"
+BROKEN= The WITHOUT_MUTT_ICONV knob of the mutt port only works if WITHOUT_NLS is also given
.endif
.elif !defined(WITHOUT_MUTT_ICONV)
USE_ICONV= yes
@@ -42,10 +41,6 @@
CONFIGURE_ARGS+= --disable-iconv
.endif
-.if !defined(NOPORTDOCS)
-BUILD_DEPENDS+= lynx:${PORTSDIR}/www/lynx
-.endif
-
OPTIONS= POP "Enable pop3 support" on \
IMAP "Enable imap support" on \
NNTP "Enable nntp support" off \
@@ -65,7 +60,7 @@
.include <bsd.port.pre.mk>
.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
-WITH_MUTT_IMAP_HEADER_CACHE= yes
+WITH_MUTT_IMAP_HEADER_CACHE= yes
.endif
.if defined (WITH_POP)
@@ -119,12 +114,12 @@
LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
CONFIGURE_ARGS+= --with-curses=${LOCALBASE}
.elif defined(WITH_SLANG) && defined(WITH_NCURSES_PORT)
-BROKEN= "You may not specify both WITH_SLANG and WITH_NCURSES options"
+BROKEN= You may not specify both WITH_SLANG and WITH_NCURSES options
.endif
.if defined(WITH_SASL2) || defined(WITH_MUTT_CYRUS_SASL2)
.if !defined(WITH_POP) && !defined(WITH_IMAP)
-BROKEN= "SASL2 only is useful for imap or pop"
+BROKEN= SASL2 only is useful for imap or pop
.endif
LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
CONFIGURE_ARGS+= --with-sasl2=${LOCALBASE}
@@ -173,10 +168,6 @@
@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}
@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
${DOCSDIR}
- @${FIND} ${DOCSDIR}/html ! -type d | ${SED} -e 's,${PREFIX}/,,' \
- >> ${TMPPLIST}
- @${ECHO} "@dirrm share/doc/mutt-ng/html" >> ${TMPPLIST}
- @${ECHO} "@dirrm ${DOCSDIR:S,${PREFIX},,}" >> ${TMPPLIST}
.endif
.include <bsd.port.post.mk>
diff -urN mutt-ng.orig/distinfo mutt-ng/distinfo
--- mutt-ng.orig/distinfo Tue Apr 25 23:14:50 2006
+++ mutt-ng/distinfo Tue May 2 02:57:31 2006
@@ -1,3 +1,3 @@
-MD5 (muttng-20051110.tar.gz) = 21594b8fe6f654fc38907a47ce22b779
-SHA256 (muttng-20051110.tar.gz) = 8a22f01bbfd68f781da9c3fabb6f9ca65a60c29e6059490b9fc0efd969931657
-SIZE (muttng-20051110.tar.gz) = 2732141
+MD5 (muttng-20060501.tar.gz) = 8b6752e9aebfd8ea78ea99036c760af2
+SHA256 (muttng-20060501.tar.gz) = 0499233085745ecd29a889ff235f7d57ab8c75644ab12efc04e7d4ff101752be
+SIZE (muttng-20060501.tar.gz) = 2734082
diff -urN mutt-ng.orig/files/patch-doc_Makefile.in mutt-ng/files/patch-doc_Makefile.in
--- mutt-ng.orig/files/patch-doc_Makefile.in Thu Jan 1 01:00:00 1970
+++ mutt-ng/files/patch-doc_Makefile.in Tue May 2 15:44:39 2006
@@ -0,0 +1,55 @@
+--- doc/Makefile.in.orig Tue Mar 14 10:36:31 2006
++++ doc/Makefile.in Tue May 2 15:43:59 2006
+@@ -89,11 +89,11 @@
+ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
+ done
+ -$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
+- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
+- -cd html; for file in *.html ; do \
+- $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
+- done
+- -$(INSTALL) -m 644 muttng.css $(DESTDIR)$(docdir)/html || true
++# $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
++# -cd html; for file in *.html ; do \
++# $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
++# done
++# -$(INSTALL) -m 644 muttng.css $(DESTDIR)$(docdir)/html || true
+
+ uninstall:
+ for f in muttng.1 mutt_dotlock.1 fleang.1 muttng-flea.1 muttngbug.1 ; do \
+@@ -113,12 +113,12 @@
+ @HTMLCLEAN_CMD@ $@ || true
+
+ manual-chunked stamp-doc-chunked: $(srcdir)/chunk.xsl manual.xml
+- test -d html || mkdir html
+- -xsltproc --nonet --stringparam html.stylesheet muttng.css -o html/ $^
+- touch stamp-doc-chunked
+- cd html; for file in *.html ; do \
+- @HTMLCLEAN_CMD@ $$file || true ; \
+- done
++# test -d html || mkdir html
++# -xsltproc --nonet --stringparam html.stylesheet muttng.css -o html/ $^
++# touch stamp-doc-chunked
++# cd html; for file in *.html ; do \
++# @HTMLCLEAN_CMD@ $$file || true ; \
++# done
+
+ manual.pdf: stamp-doc-tex
+ -if test -f manual.tex; then pdfjadetex manual.tex; fi
+@@ -182,11 +182,11 @@
+ ln $$file $(distdir) 2> /dev/null \
+ || cp -p $$file $(distdir) ; \
+ done
+- mkdir $(distdir)/html
+- cd html; for file in *.html ; do \
+- ln $$file ../$(distdir)/html 2> /dev/null \
+- || cp -p $$file ../$(distdir)/html ; \
+- done
++# mkdir $(distdir)/html
++# cd html; for file in *.html ; do \
++# ln $$file ../$(distdir)/html 2> /dev/null \
++# || cp -p $$file ../$(distdir)/html ; \
++# done
+
+ ../makedoc$(EXEEXT): $(top_srcdir)/makedoc.c
+ (cd .. && $(MAKE) makedoc$(EXEEXT))
diff -urN mutt-ng.orig/pkg-plist mutt-ng/pkg-plist
--- mutt-ng.orig/pkg-plist Mon Aug 1 10:40:31 2005
+++ mutt-ng/pkg-plist Tue May 2 04:22:06 2006
@@ -89,3 +89,4 @@
%%NLS%%share/locale/zh_TW/LC_MESSAGES/muttng.mo
@dirrm %%EXAMPLESDIR%%/iconv
@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- mutt-ng.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list