Attachment 183209 Details for Bug 219778 – upgrade patch

[patch] upgrade patch

NM.diff (text/plain), 5.97 KB, created by Larry Rosenman on 2017-06-04 15:44:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Larry Rosenman

Created: 2017-06-04 15:44:12 UTC

Size: 5.97 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 442563)
>+++ Makefile	(working copy)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	neomutt
>-PORTVERSION=	20170428
>-PORTREVISION=	1
>+PORTVERSION=	20170602
> DISTVERSIONPREFIX=	${PORTNAME}-
> CATEGORIES=	mail
> 
>@@ -43,15 +42,8 @@
> CONFIGURE_ARGS=	--disable-dependency-tracking \
> 		--with-docdir="${DOCSDIR}" \
> 		--with-ssl="${OPENSSLBASE}" \
>-		--enable-imap \
>-		--enable-smtp \
>-		--enable-pop \
>-		--enable-nntp \
>-		--enable-compressed \
>-		--enable-sidebar \
> 		--disable-fcntl \
> 		--enable-locales-fix \
>-		--enable-external-dotlock \
> 		${ICONV_CONFIGURE_ARGS}
> 
> # Header cache
>@@ -80,7 +72,9 @@
> SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
> SASL_CONFIGURE_ON=	--with-sasl
> 
>-GPGME_LIB_DEPENDS=	libgpgme.so:security/gpgme
>+GPGME_LIB_DEPENDS=	libgpgme.so:security/gpgme \
>+			libassuan.so:security/libassuan \
>+			libgpg-error.so:security/libgpg-error
> GPGME_CONFIGURE_ENABLE=	gpgme
> 
> NOTMUCH_LIB_DEPENDS=	libnotmuch.so:mail/notmuch
>Index: distinfo
>===================================================================
>--- distinfo	(revision 442563)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1493540125
>-SHA256 (neomutt-neomutt-neomutt-20170428_GH0.tar.gz) = c6100c6afb120b6eb2810e9acae6512fc4851ebd7fe711c5bc40b3ee29c0d306
>-SIZE (neomutt-neomutt-neomutt-20170428_GH0.tar.gz) = 2733684
>+TIMESTAMP = 1496587726
>+SHA256 (neomutt-neomutt-neomutt-20170602_GH0.tar.gz) = 53762f867a8a6213ebbc65199058d476347467340bff6b56816de1b6d09ff0cf
>+SIZE (neomutt-neomutt-neomutt-20170602_GH0.tar.gz) = 2637472
>Index: files/patch-doc_Makefile.am
>===================================================================
>--- files/patch-doc_Makefile.am	(nonexistent)
>+++ files/patch-doc_Makefile.am	(working copy)
>@@ -0,0 +1,11 @@
>+--- doc/Makefile.am.orig	2017-06-04 15:16:18 UTC
>++++ doc/Makefile.am
>+@@ -41,7 +41,7 @@ HTML_DOCFILES = manual.html index.html $(CHUNKED_DOCFI
>+ 
>+ BUILT_DISTFILES = manual.txt $(HTML_DOCFILES)
>+ 
>+-srcdir_DOCFILES = PGP-Notes.txt devel-notes.txt smime-notes.txt
>++srcdir_DOCFILES = PGP-Notes.txt smime-notes.txt
>+ 
>+ topsrcdir_DOCFILES = COPYRIGHT LICENSE.md INSTALL ChangeLog ChangeLog.neomutt	\
>+ 	README.SSL README.md
>
>Property changes on: files/patch-doc_Makefile.am
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 442563)
>+++ pkg-plist	(working copy)
>@@ -1,11 +1,9 @@
> bin/mutt
>-bin/mutt_dotlock
> bin/pgpewrap
> bin/pgpring
> bin/smime_keys
> @sample etc/Muttrc.dist etc/Muttrc
> man/man1/mutt.1.gz
>-man/man1/mutt_dotlock.1.gz
> man/man1/pgpewrap.1.gz
> man/man1/pgpring.1.gz
> man/man1/smime_keys.1.gz
>@@ -42,23 +40,21 @@
> %%NLS%%share/locale/uk/LC_MESSAGES/mutt.mo
> %%NLS%%share/locale/zh_CN/LC_MESSAGES/mutt.mo
> %%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo
>+%%PORTDOCS%%%%DOCSDIR%%/README.md
>+%%PORTDOCS%%%%DOCSDIR%%/hcache-bench/README.md
>+%%PORTDOCS%%%%DOCSDIR%%/hcache-bench/muttrc
>+%%PORTDOCS%%%%DOCSDIR%%/hcache-bench/neomutt-hcache-bench.sh
>+%%PORTDOCS%%%%DOCSDIR%%/lua/test_lua-api_runner.muttrc
>+%%PORTDOCS%%%%DOCSDIR%%/lua/test_lua-api_spec.lua
> %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
> %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
> %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.neomutt
> %%PORTDOCS%%%%DOCSDIR%%/INSTALL
> %%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
>-%%PORTDOCS%%%%DOCSDIR%%/NEWS
> %%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.txt
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/README.SECURITY
> %%PORTDOCS%%%%DOCSDIR%%/README.SSL
>-%%PORTDOCS%%%%DOCSDIR%%/README.neomutt
>-%%PORTDOCS%%%%DOCSDIR%%/README.notmuch
>-%%PORTDOCS%%%%DOCSDIR%%/TODO
> %%PORTDOCS%%%%DOCSDIR%%/advancedusage.html
>-%%PORTDOCS%%%%DOCSDIR%%/applying-patches.txt
> %%PORTDOCS%%%%DOCSDIR%%/configuration.html
>-%%PORTDOCS%%%%DOCSDIR%%/devel-notes.txt
> %%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html
> %%PORTDOCS%%%%DOCSDIR%%/index.html
> %%PORTDOCS%%%%DOCSDIR%%/intro.html
>@@ -77,35 +73,12 @@
> %%PORTDOCS%%%%DOCSDIR%%/manual.txt
> %%PORTDOCS%%%%DOCSDIR%%/mimesupport.html
> %%PORTDOCS%%%%DOCSDIR%%/miscellany.html
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.attach-headers-color
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.compress
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.cond-date
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.encrypt-to-self
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.forgotten-attachment
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.ifdef
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.index-color
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.initials
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.keywords
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.limit-current-thread
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.nested-if
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.new-mail
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.nntp
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.notmuch
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.progress
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.quasi-delete
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.reply-with-xorig
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.sidebar
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.skip-quoted
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.status-color
>-%%PORTDOCS%%%%DOCSDIR%%/muttrc.timeout
> %%PORTDOCS%%%%DOCSDIR%%/neomutt-syntax.vim
> %%PORTDOCS%%%%DOCSDIR%%/optionalfeatures.html
>-%%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt
> %%PORTDOCS%%%%DOCSDIR%%/reference.html
> %%PORTDOCS%%%%DOCSDIR%%/samples/Mush.rc
> %%PORTDOCS%%%%DOCSDIR%%/samples/Pine.rc
> %%PORTDOCS%%%%DOCSDIR%%/samples/Tin.rc
>-%%PORTDOCS%%%%DOCSDIR%%/samples/ca-bundle.crt
> %%PORTDOCS%%%%DOCSDIR%%/samples/colors.default
> %%PORTDOCS%%%%DOCSDIR%%/samples/colors.linux
> %%PORTDOCS%%%%DOCSDIR%%/samples/gpg.rc
>@@ -127,7 +100,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6-cjk.rc
> %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6.rc
> %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.7.rc
>-%%PORTDOCS%%%%DOCSDIR%%/samples/mutt_xtitle
> %%PORTDOCS%%%%DOCSDIR%%/samples/pgp2.rc
> %%PORTDOCS%%%%DOCSDIR%%/samples/pgp5.rc
> %%PORTDOCS%%%%DOCSDIR%%/samples/pgp6.rc

Flags:

koobs: maintainer-approval? (bapt)

Actions: View | Diff

Attachments on bug 219778: 183209