Switch the mutt port to using the 20160827 NeoMutt sources based on 1.7.0.
Most of the flavours are now integrated in the main package.
This commit is contained in:
sthen
parent
aa823a61b1
commit
074df9c1b3
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.344 2016/08/19 22:47:55 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.345 2016/09/01 17:33:40 sthen Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += abook
|
||||
@ -96,9 +96,6 @@
|
||||
SUBDIR += msmtp
|
||||
SUBDIR += mu
|
||||
SUBDIR += mutt
|
||||
SUBDIR += mutt,compressed,sidebar
|
||||
SUBDIR += mutt,compressed,sidebar,sasl
|
||||
SUBDIR += mutt,compressed,sidebar,sasl,slang
|
||||
SUBDIR += mutt,gpgme
|
||||
SUBDIR += mutt,sasl
|
||||
SUBDIR += mutt,slang
|
||||
|
||||
@ -1,8 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.80 2016/08/19 22:47:55 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.81 2016/09/01 17:33:40 sthen Exp $
|
||||
|
||||
COMMENT= tty-based e-mail client
|
||||
|
||||
DISTNAME= mutt-1.6.2
|
||||
D= 20160827
|
||||
DISTNAME= neomutt-$D
|
||||
PKGNAME= mutt-1.7.0.20160827
|
||||
EPOCH= 1
|
||||
|
||||
CATEGORIES= mail
|
||||
@ -16,11 +18,7 @@ PERMIT_PACKAGE_CDROM= Yes
|
||||
# uses pledge()
|
||||
WANTLIB+= c crypto iconv idn intl qdbm ssl z
|
||||
|
||||
MASTER_SITES= http://ftp.mutt.org/pub/mutt/ \
|
||||
https://bitbucket.org/mutt/mutt/downloads/ \
|
||||
ftp://ftp.mutt.org/pub/mutt/
|
||||
MASTER_SITES1= http://lunar-linux.org/~tchan/mutt/
|
||||
MASTER_SITES2= http://spacehopper.org/mutt/
|
||||
MASTER_SITES= https://github.com/neomutt/neomutt/releases/download/neomutt-$D/
|
||||
DIST_SUBDIR= mutt
|
||||
PATCH_DIST_STRIP= -p1
|
||||
|
||||
@ -30,7 +28,7 @@ LIB_DEPENDS= databases/qdbm \
|
||||
BUILD_DEPENDS+= textproc/docbook-xsl \
|
||||
www/lynx
|
||||
|
||||
FLAVORS= compressed gpgme sasl sidebar slang
|
||||
FLAVORS= gpgme sasl slang
|
||||
FLAVOR?=
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
@ -40,12 +38,16 @@ SUBST_VARS= FLAVOR_COMMA
|
||||
|
||||
CONFIGURE_ARGS+= --enable-external_dotlock \
|
||||
--disable-fcntl \
|
||||
--enable-compressed \
|
||||
--enable-flock \
|
||||
--enable-hcache \
|
||||
--disable-notmuch \
|
||||
--enable-sidebar \
|
||||
--with-idn \
|
||||
--enable-imap \
|
||||
--enable-pop \
|
||||
--enable-smtp \
|
||||
--enable-nntp \
|
||||
--mandir=${PREFIX}/man \
|
||||
--without-gdbm \
|
||||
--without-tokyocabinet \
|
||||
@ -85,48 +87,6 @@ CONFIGURE_ARGS+= --with-curses
|
||||
WANTLIB+= ncurses
|
||||
.endif
|
||||
|
||||
# third party patches
|
||||
|
||||
# N.B. In general we would like to avoid additional patches here, they
|
||||
# frequently cause problems at update time. If you have a favourite patch
|
||||
# that you would like to see added, please engage with Mutt upstream
|
||||
# to talk about getting it imported directly instead. You can of course
|
||||
# patch locally :-)
|
||||
|
||||
# If there are conflicts when updating mutt, check to see if gentoo have
|
||||
# already fixed: http://prefix.gentooexperimental.org:8000/mutt-patches
|
||||
|
||||
# sidebar patch (not good, but people seem to like it...)
|
||||
DIST_SIDEBAR= sidebar-1.6.0.diff.gz:2
|
||||
SUPDISTFILES+= ${DIST_SIDEBAR}
|
||||
.if ${FLAVOR:Msidebar}
|
||||
PATCHFILES+= ${DIST_SIDEBAR}
|
||||
.endif
|
||||
|
||||
# compressed folders patch http://www.spinnaker.de/mutt/compressed/
|
||||
DIST_COMPR= compressed-1.6.0.diff.gz:2
|
||||
SUPDISTFILES+= ${DIST_COMPR}
|
||||
.if ${FLAVOR:Mcompressed}
|
||||
PATCHFILES+= ${DIST_COMPR}
|
||||
CONFIGURE_ARGS+= --enable-compressed
|
||||
.endif
|
||||
|
||||
# trashfolder, http://cedricduval.free.fr/mutt/patches/
|
||||
# enabled unconditionally, it's not *too* intrusive (additional flavours
|
||||
# mean a big increase in ports testing required).
|
||||
PATCHFILES+= trashfolder-1.6.0.diff.gz:2
|
||||
|
||||
.if ${FLAVOR:Msidebar} || ${FLAVOR:Mcompressed}
|
||||
AUTOCONF_VERSION= 2.69
|
||||
AUTOMAKE_VERSION= 1.15
|
||||
BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \
|
||||
${MODGNU_AUTOMAKE_DEPENDS}
|
||||
|
||||
post-patch:
|
||||
cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} \
|
||||
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf --install
|
||||
.endif
|
||||
|
||||
post-install:
|
||||
@mv -f ${PREFIX}/share/doc/mutt/samples/* ${PREFIX}/share/examples/mutt
|
||||
@perl -pi -e "s,/usr/bin/gpg,${LOCALBASE}/bin/gpg," \
|
||||
|
||||
@ -1,8 +1,2 @@
|
||||
SHA256 (mutt/compressed-1.6.0.diff.gz) = M0kf2sRul69EWWFx83uNvDnm1FivfwEd8IdpeaapZDI=
|
||||
SHA256 (mutt/mutt-1.6.2.tar.gz) = xdAu8GSGzfBPnuuenXmUiQ2N+n9H57/rU6KmfaKsHY4=
|
||||
SHA256 (mutt/sidebar-1.6.0.diff.gz) = Y7ayjXAIttUr2YFRVHsFIlHNS8h+Rn5H/+vjct/nFVs=
|
||||
SHA256 (mutt/trashfolder-1.6.0.diff.gz) = t3nG32GnfzBpE5qthWK0pHyO7Yq1uPVoF0KhwuqhkLg=
|
||||
SIZE (mutt/compressed-1.6.0.diff.gz) = 6306
|
||||
SIZE (mutt/mutt-1.6.2.tar.gz) = 3956745
|
||||
SIZE (mutt/sidebar-1.6.0.diff.gz) = 12174
|
||||
SIZE (mutt/trashfolder-1.6.0.diff.gz) = 2757
|
||||
SHA256 (mutt/neomutt-20160827.tar.gz) = Z6e3tzy25Hep2D0nOSJWjXFr6f6ZBtdQY1apomhzwLc=
|
||||
SIZE (mutt/neomutt-20160827.tar.gz) = 4347794
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-main_c,v 1.3 2016/04/04 14:55:36 sthen Exp $
|
||||
$OpenBSD: patch-main_c,v 1.4 2016/09/01 17:33:40 sthen Exp $
|
||||
|
||||
Pledge
|
||||
|
||||
--- main.c.orig Sat Apr 2 19:12:22 2016
|
||||
+++ main.c Mon Apr 4 15:32:24 2016
|
||||
@@ -741,6 +741,30 @@ int main (int argc, char **argv)
|
||||
--- main.c.orig Fri Aug 26 23:53:14 2016
|
||||
+++ main.c Thu Sep 1 18:11:34 2016
|
||||
@@ -381,6 +381,30 @@ int main (int argc, char **argv)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-mutt_sasl_c,v 1.2 2016/04/04 14:55:36 sthen Exp $
|
||||
$OpenBSD: patch-mutt_sasl_c,v 1.3 2016/09/01 17:33:40 sthen Exp $
|
||||
|
||||
Pledge
|
||||
|
||||
--- mutt_sasl.c.orig Sun Jan 17 05:18:59 2016
|
||||
+++ mutt_sasl.c Sun Jan 17 05:19:37 2016
|
||||
@@ -84,7 +84,6 @@ static int getnameinfo_err(int ret)
|
||||
--- mutt_sasl.c.orig Fri Aug 26 23:53:14 2016
|
||||
+++ mutt_sasl.c Thu Sep 1 18:11:34 2016
|
||||
@@ -86,7 +86,6 @@ static sasl_callback_t mutt_sasl_callbacks[5];
|
||||
|
||||
static sasl_callback_t mutt_sasl_callbacks[5];
|
||||
static sasl_secret_t *secret_ptr = NULL;
|
||||
|
||||
-static int mutt_sasl_start (void);
|
||||
|
||||
|
||||
@ -5,13 +5,13 @@ threading, encryption and signing with PGP/GPG and S/MIME, and many
|
||||
operations can use regular expressions. It's highly customizable with
|
||||
many options for colours, key bindings, display formats etc.
|
||||
|
||||
This package is built from the NeoMutt tree, adding extra functionality
|
||||
previously available through separate patchsets. Bug reports should go
|
||||
to NeoMutt and not Mutt upstream.
|
||||
|
||||
Flavors:
|
||||
gpgme - build with support for GPGME, simplifying use with GnuPG:
|
||||
"set crypt_use_gpgme = yes" in muttrc, and run gpg-agent:
|
||||
"export GPG_TTY=$(tty); eval $(gpg-agent --daemon)"
|
||||
sasl - build with SASL authentication support
|
||||
slang - use S-Lang instead of curses for screen handling
|
||||
compressed - build with compressed folder support
|
||||
(see: http://www.spinnaker.de/mutt/compressed/)
|
||||
sidebar - adds a sidebar that has a folder list
|
||||
(see: http://thomer.com/mutt/)
|
||||
|
||||
@ -1,18 +1,14 @@
|
||||
@comment $OpenBSD: PLIST,v 1.19 2016/08/19 22:47:55 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.20 2016/09/01 17:33:40 sthen Exp $
|
||||
@pkgpath mail/mutt/stable${FLAVOR_COMMA}
|
||||
@pkgpath mail/mutt/snapshot[,hcache][,idn]${FLAVOR_COMMA}
|
||||
@pkgpath mail/mutt/[,idn]${FLAVOR_COMMA}
|
||||
bin/flea
|
||||
@pkgpath mail/mutt/snapshot[,compressed][,hcache][,idn][,sidebar]${FLAVOR_COMMA}
|
||||
@pkgpath mail/mutt/[,compressed][,idn][,sidebar]${FLAVOR_COMMA}
|
||||
@bin bin/mutt
|
||||
@bin bin/mutt_dotlock
|
||||
bin/muttbug
|
||||
@bin bin/pgpewrap
|
||||
@bin bin/pgpring
|
||||
bin/smime_keys
|
||||
@man man/man1/flea.1
|
||||
@man man/man1/mutt.1
|
||||
@man man/man1/mutt_dotlock.1
|
||||
@man man/man1/muttbug.1
|
||||
@man man/man1/pgpewrap.1
|
||||
@man man/man1/pgpring.1
|
||||
@man man/man1/smime_keys.1
|
||||
@ -22,6 +18,7 @@ bin/smime_keys
|
||||
share/doc/mutt/
|
||||
share/doc/mutt/COPYRIGHT
|
||||
share/doc/mutt/ChangeLog
|
||||
share/doc/mutt/ChangeLog.neomutt
|
||||
share/doc/mutt/GPL
|
||||
share/doc/mutt/INSTALL
|
||||
share/doc/mutt/NEWS
|
||||
@ -29,6 +26,7 @@ share/doc/mutt/PGP-Notes.txt
|
||||
share/doc/mutt/README
|
||||
share/doc/mutt/README.SECURITY
|
||||
share/doc/mutt/README.SSL
|
||||
share/doc/mutt/README.neomutt
|
||||
share/doc/mutt/TODO
|
||||
share/doc/mutt/advancedusage.html
|
||||
share/doc/mutt/applying-patches.txt
|
||||
@ -37,6 +35,20 @@ share/doc/mutt/devel-notes.txt
|
||||
share/doc/mutt/gettingstarted.html
|
||||
share/doc/mutt/index.html
|
||||
share/doc/mutt/intro.html
|
||||
share/doc/mutt/keybase/
|
||||
share/doc/mutt/keybase/KeybaseAndMutt.md
|
||||
share/doc/mutt/keybase/LICENSE
|
||||
share/doc/mutt/keybase/README.md
|
||||
share/doc/mutt/keybase/decrypt.sh
|
||||
share/doc/mutt/keybase/images/
|
||||
share/doc/mutt/keybase/images/attachmentView.png
|
||||
share/doc/mutt/keybase/images/pagerMode.png
|
||||
share/doc/mutt/keybase/install.sh
|
||||
share/doc/mutt/keybase/keybase.py
|
||||
share/doc/mutt/keybase/muttrc
|
||||
share/doc/mutt/keybase/pgpdecrypt.sh
|
||||
share/doc/mutt/keybase/pgpverify.sh
|
||||
share/doc/mutt/keybase/verify.sh
|
||||
share/doc/mutt/manual.html
|
||||
share/doc/mutt/manual.txt
|
||||
share/doc/mutt/mimesupport.html
|
||||
@ -48,6 +60,9 @@ share/doc/mutt/samples/
|
||||
share/doc/mutt/security.html
|
||||
share/doc/mutt/smime-notes.txt
|
||||
share/doc/mutt/tuning.html
|
||||
share/doc/mutt/vim-keybindings/
|
||||
share/doc/mutt/vim-keybindings/README.md
|
||||
share/doc/mutt/vim-keybindings/vim-keybindings.rc
|
||||
share/examples/mutt/
|
||||
@sample ${SYSCONFDIR}/
|
||||
share/examples/mutt/Mush.rc
|
||||
@ -91,34 +106,34 @@ share/examples/mutt/sample.muttrc
|
||||
share/examples/mutt/sample.muttrc-tlr
|
||||
share/examples/mutt/smime.rc
|
||||
share/examples/mutt/smime_keys_test.pl
|
||||
share/locale/bg/LC_MESSAGES/mutt.mo
|
||||
share/locale/ca/LC_MESSAGES/mutt.mo
|
||||
share/locale/cs/LC_MESSAGES/mutt.mo
|
||||
share/locale/da/LC_MESSAGES/mutt.mo
|
||||
share/locale/de/LC_MESSAGES/mutt.mo
|
||||
share/locale/el/LC_MESSAGES/mutt.mo
|
||||
share/locale/eo/LC_MESSAGES/mutt.mo
|
||||
share/locale/es/LC_MESSAGES/mutt.mo
|
||||
share/locale/et/LC_MESSAGES/mutt.mo
|
||||
share/locale/eu/LC_MESSAGES/mutt.mo
|
||||
share/locale/fr/LC_MESSAGES/mutt.mo
|
||||
share/locale/ga/LC_MESSAGES/mutt.mo
|
||||
share/locale/gl/LC_MESSAGES/mutt.mo
|
||||
share/locale/hu/LC_MESSAGES/mutt.mo
|
||||
share/locale/id/LC_MESSAGES/mutt.mo
|
||||
share/locale/it/LC_MESSAGES/mutt.mo
|
||||
share/locale/ja/LC_MESSAGES/mutt.mo
|
||||
share/locale/ko/LC_MESSAGES/mutt.mo
|
||||
share/locale/bg/LC_MESSAGES/neomutt.mo
|
||||
share/locale/ca/LC_MESSAGES/neomutt.mo
|
||||
share/locale/cs/LC_MESSAGES/neomutt.mo
|
||||
share/locale/da/LC_MESSAGES/neomutt.mo
|
||||
share/locale/de/LC_MESSAGES/neomutt.mo
|
||||
share/locale/el/LC_MESSAGES/neomutt.mo
|
||||
share/locale/eo/LC_MESSAGES/neomutt.mo
|
||||
share/locale/es/LC_MESSAGES/neomutt.mo
|
||||
share/locale/et/LC_MESSAGES/neomutt.mo
|
||||
share/locale/eu/LC_MESSAGES/neomutt.mo
|
||||
share/locale/fr/LC_MESSAGES/neomutt.mo
|
||||
share/locale/ga/LC_MESSAGES/neomutt.mo
|
||||
share/locale/gl/LC_MESSAGES/neomutt.mo
|
||||
share/locale/hu/LC_MESSAGES/neomutt.mo
|
||||
share/locale/id/LC_MESSAGES/neomutt.mo
|
||||
share/locale/it/LC_MESSAGES/neomutt.mo
|
||||
share/locale/ja/LC_MESSAGES/neomutt.mo
|
||||
share/locale/ko/LC_MESSAGES/neomutt.mo
|
||||
share/locale/lt/
|
||||
share/locale/lt/LC_MESSAGES/
|
||||
share/locale/lt/LC_MESSAGES/mutt.mo
|
||||
share/locale/nl/LC_MESSAGES/mutt.mo
|
||||
share/locale/pl/LC_MESSAGES/mutt.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/mutt.mo
|
||||
share/locale/ru/LC_MESSAGES/mutt.mo
|
||||
share/locale/sk/LC_MESSAGES/mutt.mo
|
||||
share/locale/sv/LC_MESSAGES/mutt.mo
|
||||
share/locale/tr/LC_MESSAGES/mutt.mo
|
||||
share/locale/uk/LC_MESSAGES/mutt.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/mutt.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/mutt.mo
|
||||
share/locale/lt/LC_MESSAGES/neomutt.mo
|
||||
share/locale/nl/LC_MESSAGES/neomutt.mo
|
||||
share/locale/pl/LC_MESSAGES/neomutt.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/neomutt.mo
|
||||
share/locale/ru/LC_MESSAGES/neomutt.mo
|
||||
share/locale/sk/LC_MESSAGES/neomutt.mo
|
||||
share/locale/sv/LC_MESSAGES/neomutt.mo
|
||||
share/locale/tr/LC_MESSAGES/neomutt.mo
|
||||
share/locale/uk/LC_MESSAGES/neomutt.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/neomutt.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/neomutt.mo
|
||||
|
||||
Loading…
Reference in New Issue
Block a user