Attachment #158581 for bug #201272




# $FreeBSD: head/mail/notmuch/Makefile 382576 2015-03-29 10:03:55Z wen $

PORTNAME=	notmuch
PORTVERSION=	0.20.2
CATEGORIES=	mail
MASTER_SITES=	http://notmuchmail.org/releases/

MAINTAINER=	mp39590@gmail.com
COMMENT=	Thread-based email index, search, and tagging application

LICENSE=	GPLv3

.endif

HAS_CONFIGURE=	yes
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

Lines 1-2 Link Here

(-)notmuch/distinfo (-2 / +2 lines)
1	SHA256 (notmuch-0.19.tar.gz) = 396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb	1	SHA256 (notmuch-0.20.2.tar.gz) = f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec
2	SIZE (notmuch-0.19.tar.gz) = 659038	2	SIZE (notmuch-0.20.2.tar.gz) = 652945

Lines 1-11 Link Here

(-)notmuch/files/patch-Makefile.local (-11 lines)
1	--- Makefile.local.orig 2014-06-25 10:30:10.000000000 +0000
2	+++ Makefile.local
3	@@ -302,7 +302,7 @@ notmuch-shared: $(notmuch_client_modules
4	.PHONY: install
5	install: all install-man
6	mkdir -p "$(DESTDIR)$(prefix)/bin/"
7	- install notmuch-shared "$(DESTDIR)$(prefix)/bin/notmuch"
8	+ ${BSD_INSTALL_PROGRAM} notmuch-shared "$(DESTDIR)$(prefix)/bin/notmuch"
9	ifeq ($(MAKECMDGOALS), install)
10	@echo ""
11	@echo "Notmuch is now installed to $(DESTDIR)$(prefix)"




--- doc/Makefile.local.orig	2015-07-09 20:39:00 UTC
+++ doc/Makefile.local
@@ -7,7 +7,7 @@ SPHINXOPTS    := -q
 SPHINXBUILD   = sphinx-build
 DOCBUILDDIR      := $(dir)/_build
 
-prerst2man := python $(srcdir)/$(dir)/prerst2man.py
-mkdocdeps := python $(srcdir)/$(dir)/mkdocdeps.py
+mkdocdeps := $(PYTHON) $(srcdir)/$(dir)/mkdocdeps.py
+mkdocdeps := ${PYTHONCMD} $(srcdir)/$(dir)/mkdocdeps.py
 
 # Internal variables.
 ALLSPHINXOPTS   := -d $(DOCBUILDDIR)/doctrees $(SPHINXOPTS) $(srcdir)/$(dir)




--- 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)




include/notmuch.h
lib/libnotmuch.so
lib/libnotmuch.so.4
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

Return to bug 201272

Lines 2-12 Link Here

(-)notmuch/Makefile (-3 / +7 lines)
2	# $FreeBSD: head/mail/notmuch/Makefile 382576 2015-03-29 10:03:55Z wen $	2	# $FreeBSD: head/mail/notmuch/Makefile 382576 2015-03-29 10:03:55Z wen $
3		3
4	PORTNAME= notmuch	4	PORTNAME= notmuch
5	PORTVERSION= 0.19	5	PORTVERSION= 0.20.2
6	CATEGORIES= mail	6	CATEGORIES= mail
7	MASTER_SITES= http://notmuchmail.org/releases/	7	MASTER_SITES= http://notmuchmail.org/releases/
8		8
9	MAINTAINER= ross@rosstimson.com	9	MAINTAINER= mp39590@gmail.com
10	COMMENT= Thread-based email index, search, and tagging application	10	COMMENT= Thread-based email index, search, and tagging application
11		11
12	LICENSE= GPLv3	12	LICENSE= GPLv3
Lines 37-48 Link Here
37	.endif	37	.endif
38		38
39	HAS_CONFIGURE= yes	39	HAS_CONFIGURE= yes
40	USES= pkgconfig python:build gmake	40	USES= gmake pkgconfig python:build
41	CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man	41	CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man
42	USE_LDCONFIG= yes	42	USE_LDCONFIG= yes
43		43
44	MAKE_ENV+= PYTHONCMD=${PYTHON_CMD}	44	MAKE_ENV+= PYTHONCMD=${PYTHON_CMD}
45		45
		46	post-install:
		47	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
		48	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.4.2.0
		49
46	.include <bsd.port.pre.mk>	50	.include <bsd.port.pre.mk>
47		51
48	.if ${OSVERSION} < 900044	52	.if ${OSVERSION} < 900044

Lines 1-13 Link Here

(-)notmuch/files/patch-doc_Makefile.local (-5 / +3 lines)
1	--- doc/Makefile.local.orig 2014-06-25 10:30:10.000000000 +0000	1	--- doc/Makefile.local.orig 2015-07-09 20:39:00 UTC
2	+++ doc/Makefile.local	2	+++ doc/Makefile.local
3	@@ -7,8 +7,8 @@ SPHINXOPTS := -q	3	@@ -7,7 +7,7 @@ SPHINXOPTS := -q
4	SPHINXBUILD = sphinx-build	4	SPHINXBUILD = sphinx-build
5	DOCBUILDDIR := $(dir)/_build	5	DOCBUILDDIR := $(dir)/_build
6		6
7	-prerst2man := python $(srcdir)/$(dir)/prerst2man.py
8	-mkdocdeps := python $(srcdir)/$(dir)/mkdocdeps.py	7	-mkdocdeps := python $(srcdir)/$(dir)/mkdocdeps.py
9	+prerst2man := ${PYTHONCMD} $(srcdir)/$(dir)/prerst2man.py	8	+mkdocdeps := $(PYTHON) $(srcdir)/$(dir)/mkdocdeps.py
10	+mkdocdeps := ${PYTHONCMD} $(srcdir)/$(dir)/mkdocdeps.py
11		9
12	# Internal variables.	10	# Internal variables.
13	ALLSPHINXOPTS := -d $(DOCBUILDDIR)/doctrees $(SPHINXOPTS) $(srcdir)/$(dir)	11	ALLSPHINXOPTS := -d $(DOCBUILDDIR)/doctrees $(SPHINXOPTS) $(srcdir)/$(dir)

Lines 1-16 Link Here

(-)notmuch/files/patch-lib_Makefile.local (-16 lines)
1	--- lib/Makefile.local.orig 2014-06-25 10:30:10.000000000 +0000
2	+++ lib/Makefile.local
3	@@ -92,11 +92,11 @@ install: install-$(dir)
4
5	install-$(dir): $(dir)/$(LIBNAME)
6	mkdir -p "$(DESTDIR)$(libdir)/"
7	- install -m0644 "$(lib)/$(LIBNAME)" "$(DESTDIR)$(libdir)/"
8	+ ${BSD_INSTALL_LIB} "$(lib)/$(LIBNAME)" "$(DESTDIR)$(libdir)/"
9	ln -sf $(LIBNAME) "$(DESTDIR)$(libdir)/$(SONAME)"
10	ln -sf $(LIBNAME) "$(DESTDIR)$(libdir)/$(LINKER_NAME)"
11	mkdir -p "$(DESTDIR)$(includedir)"
12	- install -m0644 "$(srcdir)/$(lib)/notmuch.h" "$(DESTDIR)$(includedir)/"
13	+ ${BSD_INSTALL_DATA} "$(srcdir)/$(lib)/notmuch.h" "$(DESTDIR)$(includedir)/"
14	$(LIBRARY_INSTALL_POST_COMMAND)
15
16	SRCS := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs)

Lines 2-13 Link Here

(-)notmuch/pkg-plist (-1 / +2 lines)
2	include/notmuch.h	2	include/notmuch.h
3	lib/libnotmuch.so	3	lib/libnotmuch.so
4	lib/libnotmuch.so.4	4	lib/libnotmuch.so.4
5	lib/libnotmuch.so.4.1.0	5	lib/libnotmuch.so.4.2.0
6	man/man1/notmuch-address.1.gz	6	man/man1/notmuch-address.1.gz
7	man/man1/notmuch-compact.1.gz	7	man/man1/notmuch-compact.1.gz
8	man/man1/notmuch-config.1.gz	8	man/man1/notmuch-config.1.gz
9	man/man1/notmuch-count.1.gz	9	man/man1/notmuch-count.1.gz
10	man/man1/notmuch-dump.1.gz	10	man/man1/notmuch-dump.1.gz
		11	man/man1/notmuch-emacs-mua.1.gz
11	man/man1/notmuch-insert.1.gz	12	man/man1/notmuch-insert.1.gz
12	man/man1/notmuch-new.1.gz	13	man/man1/notmuch-new.1.gz
13	man/man1/notmuch-reply.1.gz	14	man/man1/notmuch-reply.1.gz