Attachment 158581 Details for Bug 201272 – patch v2

[patch] patch v2

notmuch.patch (text/plain), 4.56 KB, created by mp39590 on 2015-07-10 10:23:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mp39590

Created: 2015-07-10 10:23:22 UTC

Size: 4.56 KB

patch

obsolete

>diff -ruN notmuch.orig/Makefile notmuch/Makefile
>--- notmuch.orig/Makefile	2015-07-01 22:57:15.674782000 +0300
>+++ notmuch/Makefile	2015-07-10 13:09:39.919381000 +0300
>@@ -2,11 +2,11 @@
> # $FreeBSD: head/mail/notmuch/Makefile 382576 2015-03-29 10:03:55Z wen $
> 
> PORTNAME=	notmuch
>-PORTVERSION=	0.19
>+PORTVERSION=	0.20.2
> CATEGORIES=	mail
> MASTER_SITES=	http://notmuchmail.org/releases/
> 
>-MAINTAINER=	ross@rosstimson.com
>+MAINTAINER=	mp39590@gmail.com
> COMMENT=	Thread-based email index, search, and tagging application
> 
> LICENSE=	GPLv3
>@@ -37,12 +37,16 @@
> .endif
> 
> HAS_CONFIGURE=	yes
>-USES=		pkgconfig python:build gmake
>+USES=		gmake pkgconfig python:build
> CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${MANPREFIX}/man
> USE_LDCONFIG=	yes
> 
> MAKE_ENV+=		PYTHONCMD=${PYTHON_CMD}
> 
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.4.2.0
>+
> .include <bsd.port.pre.mk>
> 
> .if ${OSVERSION} < 900044
>diff -ruN notmuch.orig/distinfo notmuch/distinfo
>--- notmuch.orig/distinfo	2015-07-01 22:57:15.695841000 +0300
>+++ notmuch/distinfo	2015-07-01 22:58:44.249362000 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (notmuch-0.19.tar.gz) = 396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb
>-SIZE (notmuch-0.19.tar.gz) = 659038
>+SHA256 (notmuch-0.20.2.tar.gz) = f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec
>+SIZE (notmuch-0.20.2.tar.gz) = 652945
>diff -ruN notmuch.orig/files/patch-Makefile.local notmuch/files/patch-Makefile.local
>--- notmuch.orig/files/patch-Makefile.local	2015-07-01 22:57:15.698044000 +0300
>+++ notmuch/files/patch-Makefile.local	1970-01-01 03:00:00.000000000 +0300
>@@ -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 -ruN notmuch.orig/files/patch-doc_Makefile.local notmuch/files/patch-doc_Makefile.local
>--- notmuch.orig/files/patch-doc_Makefile.local	2015-07-01 22:57:15.699219000 +0300
>+++ notmuch/files/patch-doc_Makefile.local	2015-07-09 23:39:18.655086000 +0300
>@@ -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 -ruN notmuch.orig/files/patch-lib_Makefile.local notmuch/files/patch-lib_Makefile.local
>--- notmuch.orig/files/patch-lib_Makefile.local	2015-07-01 22:57:15.700421000 +0300
>+++ notmuch/files/patch-lib_Makefile.local	1970-01-01 03:00:00.000000000 +0300
>@@ -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)
>diff -ruN notmuch.orig/pkg-plist notmuch/pkg-plist
>--- notmuch.orig/pkg-plist	2015-07-01 22:57:15.702321000 +0300
>+++ notmuch/pkg-plist	2015-07-01 23:09:09.433077000 +0300
>@@ -2,12 +2,13 @@
> include/notmuch.h
> lib/libnotmuch.so
> lib/libnotmuch.so.4
>-lib/libnotmuch.so.4.1.0
>+lib/libnotmuch.so.4.2.0
> man/man1/notmuch-address.1.gz
> man/man1/notmuch-compact.1.gz
> man/man1/notmuch-config.1.gz
> man/man1/notmuch-count.1.gz
> man/man1/notmuch-dump.1.gz
>+man/man1/notmuch-emacs-mua.1.gz
> man/man1/notmuch-insert.1.gz
> man/man1/notmuch-new.1.gz
> man/man1/notmuch-reply.1.gz

Actions: View | Diff

Attachments on bug 201272: 158257 | 158581 | 158582