Tue Oct 10 08:19:02 2017 UTC ()
neomutt: Register conflict with mutt.  Bump PKGREVISION.


(jperkin)
diff -r1.35 -r1.36 pkgsrc/mail/neomutt/Makefile
cvs diff -r1.35 -r1.36 pkgsrc/mail/neomutt/Makefile (switch to unified diff)

--- pkgsrc/mail/neomutt/Makefile 2017/09/13 14:56:14 1.35
+++ pkgsrc/mail/neomutt/Makefile 2017/10/10 08:19:02 1.36
@@ -1,46 +1,49 @@ @@ -1,46 +1,49 @@
1# $NetBSD: Makefile,v 1.35 2017/09/13 14:56:14 wiz Exp $ 1# $NetBSD: Makefile,v 1.36 2017/10/10 08:19:02 jperkin Exp $
2 2
3DISTNAME= neomutt-20170912 3DISTNAME= neomutt-20170912
 4PKGREVISION= 1
4CATEGORIES= mail 5CATEGORIES= mail
5MASTER_SITES= ${MASTER_SITE_GITHUB:=neomutt/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=neomutt/}
6GITHUB_TAG= ${DISTNAME} 7GITHUB_TAG= ${DISTNAME}
7 8
8MAINTAINER= wiz@NetBSD.org 9MAINTAINER= wiz@NetBSD.org
9HOMEPAGE= https://www.neomutt.org/ 10HOMEPAGE= https://www.neomutt.org/
10COMMENT= Fork of mutt with integrated community patches 11COMMENT= Fork of mutt with integrated community patches
11LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # or newer 12LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # or newer
12 13
 14CONFLICTS+= mutt-[0-9]*
 15
13USE_TOOLS+= autoconf automake autoreconf msgfmt gmake 16USE_TOOLS+= autoconf automake autoreconf msgfmt gmake
14 17
15BUILD_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools 18BUILD_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
16 19
17GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
18EXTRACT_USING= bsdtar 21EXTRACT_USING= bsdtar
19CONFIGURE_ARGS+= --enable-notmuch 22CONFIGURE_ARGS+= --enable-notmuch
20#CONFIGURE_ARGS+= CFLAGS="-g -O0" 23#CONFIGURE_ARGS+= CFLAGS="-g -O0"
21 24
22EGDIR= ${PREFIX}/share/examples/mutt 25EGDIR= ${PREFIX}/share/examples/mutt
23CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc 26CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
24CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types 27CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
25INSTALLATION_DIRS+= ${EGDIR} 28INSTALLATION_DIRS+= ${EGDIR}
26INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} DOTLOCK_GROUP= sysconfdir=${EGDIR} 29INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} DOTLOCK_GROUP= sysconfdir=${EGDIR}
27 30
28.include "../../mk/bsd.prefs.mk" 31.include "../../mk/bsd.prefs.mk"
29 32
30.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" 33.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
31# Force sendmail to /usr/sbin to avoid postfix's 34# Force sendmail to /usr/sbin to avoid postfix's
32# ${LOCALBASE}/sbin/sendmail. Should be enabled on all platforms which 35# ${LOCALBASE}/sbin/sendmail. Should be enabled on all platforms which
33# support mailwrapper. 36# support mailwrapper.
34CONFIGURE_ENV+= SENDMAIL=/usr/sbin/sendmail 37CONFIGURE_ENV+= SENDMAIL=/usr/sbin/sendmail
35.endif 38.endif
36 39
37.include "options.mk" 40.include "options.mk"
38 41
39pre-configure: 42pre-configure:
40 cd ${WRKSRC} && autoreconf -fiv 43 cd ${WRKSRC} && autoreconf -fiv
41 44
42.include "../../converters/libiconv/buildlink3.mk" 45.include "../../converters/libiconv/buildlink3.mk"
43.include "../../devel/gettext-lib/buildlink3.mk" 46.include "../../devel/gettext-lib/buildlink3.mk"
44.include "../../devel/zlib/buildlink3.mk" 47.include "../../devel/zlib/buildlink3.mk"
45.include "../../mail/notmuch/buildlink3.mk" 48.include "../../mail/notmuch/buildlink3.mk"
46.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"