Thu Feb 26 12:17:04 2015 UTC ()
Fix build with versioned py-docutils, and depend on 0.12.
>From markd.


(wiz)
diff -r1.8 -r1.9 pkgsrc/mail/notmuch/Makefile
cvs diff -r1.8 -r1.9 pkgsrc/mail/notmuch/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/notmuch/Makefile 2014/12/18 10:52:58 1.8
+++ pkgsrc/mail/notmuch/Makefile 2015/02/26 12:17:04 1.9
@@ -1,40 +1,46 @@ @@ -1,40 +1,46 @@
1# $NetBSD: Makefile,v 1.8 2014/12/18 10:52:58 joerg Exp $ 1# $NetBSD: Makefile,v 1.9 2015/02/26 12:17:04 wiz Exp $
2 2
3DISTNAME= notmuch-0.19 3DISTNAME= notmuch-0.19
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= http://notmuchmail.org/releases/ 6MASTER_SITES= http://notmuchmail.org/releases/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://notmuchmail.org/ 9HOMEPAGE= http://notmuchmail.org/
10COMMENT= Mail indexer 10COMMENT= Mail indexer
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils 13BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
14 14
15HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_TOOLS+= gmake pkg-config 17USE_TOOLS+= gmake pkg-config
18MAKE_FLAGS+= PYTHONBIN=${PYTHONBIN} 18MAKE_FLAGS+= PYTHONBIN=${PYTHONBIN}
19 19
20.include "options.mk" 20.include "options.mk"
21 21
22CONFIGURE_ARGS+= --prefix=${PREFIX} 22CONFIGURE_ARGS+= --prefix=${PREFIX}
23CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 23CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
24 24
25.if ${OPSYS} == "SunOS" 25.if ${OPSYS} == "SunOS"
26SUBST_CLASSES+= gnuld 26SUBST_CLASSES+= gnuld
27SUBST_STAGE.gnuld= pre-configure 27SUBST_STAGE.gnuld= pre-configure
28SUBST_FILES.gnuld= lib/Makefile.local 28SUBST_FILES.gnuld= lib/Makefile.local
29SUBST_SED.gnuld= -e 's/-Wl,--[^ ]*//g' 29SUBST_SED.gnuld= -e 's/-Wl,--[^ ]*//g'
30.endif 30.endif
31 31
 32SUBST_CLASSES+= docutils
 33SUBST_SED.docutils+= -e "s,rst2man.py,rst2man-${PYVERSSUFFIX}.py,"
 34SUBST_FILES.docutils+= configure doc/prerst2man.py
 35SUBST_STAGE.docutils= pre-configure
 36SUBST_MESSAGE.docutils= Fix docutils command names.
 37
32LDFLAGS.SunOS+= -lnsl 38LDFLAGS.SunOS+= -lnsl
33 39
34PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # as of 0.19 40PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # as of 0.19
35.include "../../lang/python/application.mk" 41.include "../../lang/python/application.mk"
36.include "../../mail/gmime24/buildlink3.mk" 42.include "../../mail/gmime24/buildlink3.mk"
37.include "../../textproc/xapian/buildlink3.mk" 43.include "../../textproc/xapian/buildlink3.mk"
38.include "../../devel/talloc/buildlink3.mk" 44.include "../../devel/talloc/buildlink3.mk"
39.include "../../devel/zlib/buildlink3.mk" 45.include "../../devel/zlib/buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"