diff options
| author | ak <ak@FreeBSD.org> | 2017-09-28 06:11:30 +0800 |
|---|---|---|
| committer | ak <ak@FreeBSD.org> | 2017-09-28 06:11:30 +0800 |
| commit | 28e514bd2e7459e65534d71f5b79c6faf6a3a920 (patch) | |
| tree | 11c71e410118e2a16cda51df46290b342ee3a046 /mail/mutt/files | |
| parent | f074c14658f1192ef2433d191f161e4d14c108e7 (diff) | |
| download | freebsd-ports-gnome-28e514bd2e7459e65534d71f5b79c6faf6a3a920.tar.gz freebsd-ports-gnome-28e514bd2e7459e65534d71f5b79c6faf6a3a920.tar.zst freebsd-ports-gnome-28e514bd2e7459e65534d71f5b79c6faf6a3a920.zip | |
- Remove autotools dependency
- Build sidebar by default, it's small and don't have side-effects when not enabled
- Cleanup WITHOUT=XML handling
Diffstat (limited to 'mail/mutt/files')
| -rw-r--r-- | mail/mutt/files/patch-Makefile.in (renamed from mail/mutt/files/patch-Makefile.am) | 17 | ||||
| -rw-r--r-- | mail/mutt/files/patch-contrib_Makefile.in (renamed from mail/mutt/files/patch-contrib_Makefile.am) | 9 | ||||
| -rw-r--r-- | mail/mutt/files/patch-doc_Makefile.in (renamed from mail/mutt/files/patch-doc_Makefile.am) | 7 | ||||
| -rw-r--r-- | mail/mutt/files/patch-m4_gssapi.m4 | 10 |
4 files changed, 15 insertions, 28 deletions
diff --git a/mail/mutt/files/patch-Makefile.am b/mail/mutt/files/patch-Makefile.in index 5c5f2c65192b..1a75ec2f6e3c 100644 --- a/mail/mutt/files/patch-Makefile.am +++ b/mail/mutt/files/patch-Makefile.in @@ -1,15 +1,14 @@ ---- Makefile.am.orig 2017-02-27 01:12:49 UTC -+++ Makefile.am -@@ -14,7 +14,7 @@ IMAP_SUBDIR = imap - IMAP_INCLUDES = -I$(top_srcdir)/imap - endif - +Index: Makefile.in +@@ -471,7 +471,7 @@ + @BUILD_DOC_TRUE@DOC_SUBDIR = doc + @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap + @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap -SUBDIRS = m4 po intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR) +SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . $(DOC_SUBDIR) - bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET) - -@@ -161,18 +161,9 @@ install-exec-hook: + @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h + BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION) +@@ -1359,18 +1359,9 @@ rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \ ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ fi diff --git a/mail/mutt/files/patch-contrib_Makefile.am b/mail/mutt/files/patch-contrib_Makefile.in index 73ef0e65202e..8d8b027bea19 100644 --- a/mail/mutt/files/patch-contrib_Makefile.am +++ b/mail/mutt/files/patch-contrib_Makefile.in @@ -1,9 +1,8 @@ ---- contrib/Makefile.am.orig 2017-04-12 23:01:05 UTC -+++ contrib/Makefile.am -@@ -2,7 +2,7 @@ - +Index: contrib/Makefile.in +@@ -270,7 +270,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ subdir = contrib - -SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \ +SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \ sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \ diff --git a/mail/mutt/files/patch-doc_Makefile.am b/mail/mutt/files/patch-doc_Makefile.in index e743b3cace29..a8f7e7b09434 100644 --- a/mail/mutt/files/patch-doc_Makefile.am +++ b/mail/mutt/files/patch-doc_Makefile.in @@ -1,6 +1,5 @@ ---- doc/Makefile.am.orig 2016-10-08 19:30:21 UTC -+++ doc/Makefile.am -@@ -79,14 +79,7 @@ install-data-local: makedoc-all instdoc +Index: doc/Makefile.in +@@ -667,14 +667,7 @@ -for f in $(HTML_DOCFILES) ; do \ $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \ done @@ -16,7 +15,7 @@ uninstall-local: for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1 pgpewrap.1 pgpring.1; do \ -@@ -109,9 +102,7 @@ uninstall-local: +@@ -697,9 +690,7 @@ check: manual.txt: manual.html diff --git a/mail/mutt/files/patch-m4_gssapi.m4 b/mail/mutt/files/patch-m4_gssapi.m4 deleted file mode 100644 index 3bbb3f5700cc..000000000000 --- a/mail/mutt/files/patch-m4_gssapi.m4 +++ /dev/null @@ -1,10 +0,0 @@ ---- m4/gssapi.m4.orig 2016-10-08 19:30:21 UTC -+++ m4/gssapi.m4 -@@ -27,6 +27,7 @@ AC_DEFUN([MUTT_AM_PATH_GSSAPI], - GSSAPI_LIBS="`$KRB5CFGPATH --libs gssapi`" - case "`$KRB5CFGPATH --version`" in - "Kerberos 5 "*) GSSAPI_IMPL="MIT";; -+ "FreeBSD heimdal"*) GSSAPI_IMPL="Heimdal";; - ?eimdal*) GSSAPI_IMPL="Heimdal";; - *) GSSAPI_IMPL="Unknown";; - esac |