3 files changed, 3 insertions, 32 deletions

diff --git a/mail/notmuch/files/patch-Makefile.local b/mail/notmuch/files/patch-Makefile.local
deleted file mode 100644
index f0b2bf84635e..000000000000
--- a/mail/notmuch/files/patch-Makefile.local
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.local.orig	2014-06-25 10:30:10.000000000 +0000
-+++ Makefile.local
-@@ -302,7 +302,7 @@ notmuch-shared: $(notmuch_client_modules
- .PHONY: install
- install: all install-man
- 	mkdir -p "$(DESTDIR)$(prefix)/bin/"
--	install notmuch-shared "$(DESTDIR)$(prefix)/bin/notmuch"
-+	${BSD_INSTALL_PROGRAM} notmuch-shared "$(DESTDIR)$(prefix)/bin/notmuch"
- ifeq ($(MAKECMDGOALS), install)
- 	@echo ""
- 	@echo "Notmuch is now installed to $(DESTDIR)$(prefix)"
diff --git a/mail/notmuch/files/patch-doc_Makefile.local b/mail/notmuch/files/patch-doc_Makefile.local
index 2a89db236667..6c7f4ff4d2d9 100644
--- a/mail/notmuch/files/patch-doc_Makefile.local
+++ b/mail/notmuch/files/patch-doc_Makefile.local
@@ -1,13 +1,11 @@
---- doc/Makefile.local.orig	2014-06-25 10:30:10.000000000 +0000
+--- doc/Makefile.local.orig	2015-07-09 20:39:00 UTC
 +++ doc/Makefile.local
-@@ -7,8 +7,8 @@ SPHINXOPTS    := -q
+@@ -7,7 +7,7 @@ SPHINXOPTS    := -q
  SPHINXBUILD   = sphinx-build
  DOCBUILDDIR      := $(dir)/_build
  
--prerst2man := python $(srcdir)/$(dir)/prerst2man.py
 -mkdocdeps := python $(srcdir)/$(dir)/mkdocdeps.py
-+prerst2man := ${PYTHONCMD} $(srcdir)/$(dir)/prerst2man.py
-+mkdocdeps := ${PYTHONCMD} $(srcdir)/$(dir)/mkdocdeps.py
++mkdocdeps := $(PYTHON) $(srcdir)/$(dir)/mkdocdeps.py
  
  # Internal variables.
  ALLSPHINXOPTS   := -d $(DOCBUILDDIR)/doctrees $(SPHINXOPTS) $(srcdir)/$(dir)
diff --git a/mail/notmuch/files/patch-lib_Makefile.local b/mail/notmuch/files/patch-lib_Makefile.local
deleted file mode 100644
index 4f450748b9f2..000000000000
--- a/mail/notmuch/files/patch-lib_Makefile.local
+++ /dev/null
@@ -1,16 +0,0 @@
---- lib/Makefile.local.orig	2014-06-25 10:30:10.000000000 +0000
-+++ lib/Makefile.local
-@@ -92,11 +92,11 @@ install: install-$(dir)
- 
- install-$(dir): $(dir)/$(LIBNAME)
- 	mkdir -p "$(DESTDIR)$(libdir)/"
--	install -m0644 "$(lib)/$(LIBNAME)" "$(DESTDIR)$(libdir)/"
-+	${BSD_INSTALL_LIB} "$(lib)/$(LIBNAME)" "$(DESTDIR)$(libdir)/"
- 	ln -sf $(LIBNAME) "$(DESTDIR)$(libdir)/$(SONAME)"
- 	ln -sf $(LIBNAME) "$(DESTDIR)$(libdir)/$(LINKER_NAME)"
- 	mkdir -p "$(DESTDIR)$(includedir)"
--	install -m0644 "$(srcdir)/$(lib)/notmuch.h" "$(DESTDIR)$(includedir)/"
-+	${BSD_INSTALL_DATA} "$(srcdir)/$(lib)/notmuch.h" "$(DESTDIR)$(includedir)/"
- 	$(LIBRARY_INSTALL_POST_COMMAND)
- 
- SRCS  := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs)