Wed Jun 21 07:10:56 2017 UTC ()
Clean up options -- remove ones that are now default-on and not supported
as options any longer.
Remove references to removed mutt_dotlock.


(wiz)
diff -r1.28 -r1.29 pkgsrc/mail/neomutt/Makefile
diff -r1.6 -r1.7 pkgsrc/mail/neomutt/options.mk
cvs diff -r1.28 -r1.29 pkgsrc/mail/neomutt/Makefile (switch to unified diff)

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

--- pkgsrc/mail/neomutt/options.mk 2017/03/12 20:58:20 1.6
+++ pkgsrc/mail/neomutt/options.mk 2017/06/21 07:10:56 1.7
@@ -1,184 +1,151 @@ @@ -1,184 +1,151 @@
1# $NetBSD: options.mk,v 1.6 2017/03/12 20:58:20 wiz Exp $ 1# $NetBSD: options.mk,v 1.7 2017/06/21 07:10:56 wiz Exp $
2 
3# Global and legacy options 
4 2
5PKG_OPTIONS_VAR= PKG_OPTIONS.neomutt 3PKG_OPTIONS_VAR= PKG_OPTIONS.neomutt
6PKG_OPTIONS_REQUIRED_GROUPS= display 4PKG_OPTIONS_REQUIRED_GROUPS= display
7PKG_OPTIONS_GROUP.display= slang ncurses ncursesw curses 5PKG_OPTIONS_GROUP.display= slang ncurses ncursesw curses
8PKG_SUPPORTED_OPTIONS= debug gpgme gssapi idn ssl smime sasl 6PKG_SUPPORTED_OPTIONS= debug gpgme gssapi idn ssl smime sasl
9PKG_SUPPORTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp 7PKG_SUPPORTED_OPTIONS+= mutt-hcache tokyocabinet
10PKG_SUPPORTED_OPTIONS+= mutt-compressed-mbox 8PKG_SUGGESTED_OPTIONS= ncursesw gpgme idn mutt-hcache sasl smime ssl
11PKG_SUPPORTED_OPTIONS+= mutt-sidebar 
12PKG_SUGGESTED_OPTIONS= ncursesw gpgme idn mutt-hcache mutt-smtp sasl smime ssl 
13PKG_SUGGESTED_OPTIONS+= gssapi 9PKG_SUGGESTED_OPTIONS+= gssapi
14PKG_SUGGESTED_OPTIONS+= mutt-compressed-mbox 10PKG_SUGGESTED_OPTIONS+= mutt-hcache tokyocabinet
15PKG_SUGGESTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp 
16PKG_SUGGESTED_OPTIONS+= mutt-compressed-mbox 
17PKG_SUGGESTED_OPTIONS+= mutt-sidebar 
18 11
19.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
20 13
21### 14###
22### GSSAPI 15### GSSAPI
23### 16###
24 17
25.if !empty(PKG_OPTIONS:Mgssapi) 18.if !empty(PKG_OPTIONS:Mgssapi)
26. include "../../mk/krb5.buildlink3.mk" 19. include "../../mk/krb5.buildlink3.mk"
27CONFIGURE_ARGS+= --with-gss=${KRB5BASE} 20CONFIGURE_ARGS+= --with-gss=${KRB5BASE}
28.endif 21.endif
29 22
30### 23###
31### Slang 24### Slang
32### 25###
33.if !empty(PKG_OPTIONS:Mslang) 26.if !empty(PKG_OPTIONS:Mslang)
34. include "../../devel/libslang/buildlink3.mk" 27. include "../../devel/libslang/buildlink3.mk"
35CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang} 28CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang}
36.endif 29.endif
37 30
38### 31###
39### ncurses 32### ncurses
40### 33###
41.if !empty(PKG_OPTIONS:Mncurses) 34.if !empty(PKG_OPTIONS:Mncurses)
42USE_NCURSES= yes 35USE_NCURSES= yes
43. include "../../devel/ncurses/buildlink3.mk" 36. include "../../devel/ncurses/buildlink3.mk"
44CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses} 37CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses}
45.endif 38.endif
46 39
47### 40###
48### SASLv2 41### SASLv2
49### 42###
50.if !empty(PKG_OPTIONS:Msasl) 43.if !empty(PKG_OPTIONS:Msasl)
51. include "../../security/cyrus-sasl/buildlink3.mk" 44. include "../../security/cyrus-sasl/buildlink3.mk"
52CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl} 45CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
53.endif 46.endif
54 47
55### curses 48### curses
56### 49###
57.if !empty(PKG_OPTIONS:Mcurses) 50.if !empty(PKG_OPTIONS:Mcurses)
58. include "../../mk/curses.buildlink3.mk" 51. include "../../mk/curses.buildlink3.mk"
59OPSYSVARS+= BUILDLINK_PASSTHRU_DIRS 52OPSYSVARS+= BUILDLINK_PASSTHRU_DIRS
60BUILDLINK_PASSTHRU_DIRS.SunOS+= /usr/xpg4 53BUILDLINK_PASSTHRU_DIRS.SunOS+= /usr/xpg4
61CONFIGURE_ARGS.SunOS+= --with-curses=/usr/xpg4 54CONFIGURE_ARGS.SunOS+= --with-curses=/usr/xpg4
62LDFLAGS.SunOS+= -L/usr/xpg4/lib${LIBABISUFFIX} 55LDFLAGS.SunOS+= -L/usr/xpg4/lib${LIBABISUFFIX}
63LDFLAGS.SunOS+= ${COMPILER_RPATH_FLAG}/usr/xpg4/lib${LIBABISUFFIX} 56LDFLAGS.SunOS+= ${COMPILER_RPATH_FLAG}/usr/xpg4/lib${LIBABISUFFIX}
64.endif 57.endif
65 58
66### 59###
67### ncursesw 60### ncursesw
68### 61###
69.if !empty(PKG_OPTIONS:Mncursesw) 62.if !empty(PKG_OPTIONS:Mncursesw)
70. include "../../devel/ncursesw/buildlink3.mk" 63. include "../../devel/ncursesw/buildlink3.mk"
71.else 64.else
72SUBST_CLASSES+= curse 65SUBST_CLASSES+= curse
73SUBST_MESSAGE.curse= Fixing mutt to avoid ncursesw 66SUBST_MESSAGE.curse= Fixing mutt to avoid ncursesw
74SUBST_STAGE.curse= post-patch 67SUBST_STAGE.curse= post-patch
75SUBST_FILES.curse= configure.ac 68SUBST_FILES.curse= configure.ac
76SUBST_SED.curse= -e 's,for lib in ncurses ncursesw,for lib in ncurses,' 69SUBST_SED.curse= -e 's,for lib in ncurses ncursesw,for lib in ncurses,'
77.endif 70.endif
78 71
79### 72###
80### SSL 73### SSL
81### 74###
82.if !empty(PKG_OPTIONS:Mssl) 75.if !empty(PKG_OPTIONS:Mssl)
83. include "../../security/openssl/buildlink3.mk" 76. include "../../security/openssl/buildlink3.mk"
84CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} 77CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
85.else 78.else
86CONFIGURE_ARGS+= --without-ssl 79CONFIGURE_ARGS+= --without-ssl
87.endif 80.endif
88 81
89### 82###
90### S/MIME 83### S/MIME
91### 84###
92PLIST_VARS+= smime 85PLIST_VARS+= smime
93.if !empty(PKG_OPTIONS:Msmime) 86.if !empty(PKG_OPTIONS:Msmime)
94USE_TOOLS+= perl:run 87USE_TOOLS+= perl:run
95REPLACE_PERL+= *.pl */*.pl 88REPLACE_PERL+= *.pl */*.pl
96. include "../../security/openssl/buildlink3.mk" 89. include "../../security/openssl/buildlink3.mk"
97CONFIGURE_ARGS+= --enable-smime 90CONFIGURE_ARGS+= --enable-smime
98PLIST.smime= yes 91PLIST.smime= yes
99.else 92.else
100CONFIGURE_ARGS+= --disable-smime 93CONFIGURE_ARGS+= --disable-smime
101.endif 94.endif
102 95
103### 96###
104### Header cache 97### Header cache
105### 98###
106.if !empty(PKG_OPTIONS:Mmutt-hcache) 99.if !empty(PKG_OPTIONS:Mmutt-hcache)
107. if !empty(PKG_OPTIONS:Mtokyocabinet) 100. if !empty(PKG_OPTIONS:Mtokyocabinet)
108. include "../../databases/tokyocabinet/buildlink3.mk" 101. include "../../databases/tokyocabinet/buildlink3.mk"
109CONFIGURE_ARGS+= --with-tokyocabinet 102CONFIGURE_ARGS+= --with-tokyocabinet
110CONFIGURE_ARGS+= --without-gdbm 103CONFIGURE_ARGS+= --without-gdbm
111CONFIGURE_ARGS+= --without-bdb 104CONFIGURE_ARGS+= --without-bdb
112. else 105. else
113BDB_ACCEPTED= db4 db5 106BDB_ACCEPTED= db4 db5
114BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE} 107BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE}
115. include "../../mk/bdb.buildlink3.mk" 108. include "../../mk/bdb.buildlink3.mk"
116CONFIGURE_ARGS+= --with-bdb 109CONFIGURE_ARGS+= --with-bdb
117CONFIGURE_ARGS+= --without-gdbm 110CONFIGURE_ARGS+= --without-gdbm
118# BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate 111# BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate
119# since the real -I and -L flags are added by buildlink already. 112# since the real -I and -L flags are added by buildlink already.
120CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BDBBASE}/include 113CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BDBBASE}/include
121CONFIGURE_ENV+= BDB_LIB_DIR=${BDBBASE}/lib 114CONFIGURE_ENV+= BDB_LIB_DIR=${BDBBASE}/lib
122CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q} 115CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q}
123. endif 116. endif
124.else 117.else
125CONFIGURE_ARGS+= --disable-hcache 118CONFIGURE_ARGS+= --disable-hcache
126.endif 119.endif
127 120
128### 121#BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
129### Compressed mail boxes 122#BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
130### 
131PLIST_VARS+= compressed_mbox 
132.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox) 
133CONFIGURE_ARGS+= --enable-compressed 
134# add xsltproc to be able to regenerate the documentation 
135BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 
136BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 
137.endif 
138 
139### 
140### Internal SMTP relay support 
141### 
142.if !empty(PKG_OPTIONS:Mmutt-smtp) 
143CONFIGURE_ARGS+= --enable-smtp 
144.else 
145CONFIGURE_ARGS+= --disable-smtp 
146.endif 
147 123
148### 124###
149### Internationalized Domain Names 125### Internationalized Domain Names
150### 126###
151.if !empty(PKG_OPTIONS:Midn) 127.if !empty(PKG_OPTIONS:Midn)
152. include "../../devel/libidn/buildlink3.mk" 128. include "../../devel/libidn/buildlink3.mk"
153CONFIGURE_ARGS+= --with-idn=${BUILDLINK_PREFIX.libidn} 129CONFIGURE_ARGS+= --with-idn=${BUILDLINK_PREFIX.libidn}
154.else 130.else
155CONFIGURE_ARGS+= --with-idn=no 131CONFIGURE_ARGS+= --with-idn=no
156.endif 132.endif
157 133
158### 134###
159### Enable debugging support 135### Enable debugging support
160### 136###
161.if !empty(PKG_OPTIONS:Mdebug) 137.if !empty(PKG_OPTIONS:Mdebug)
162CONFIGURE_ARGS+= --enable-debug 138CONFIGURE_ARGS+= --enable-debug
163CFLAGS+= -g 139CFLAGS+= -g
164.endif 140.endif
165 141
166### 142###
167### gpgme support 143### gpgme support
168### 144###
169.if !empty(PKG_OPTIONS:Mgpgme) 145.if !empty(PKG_OPTIONS:Mgpgme)
170. include "../../security/gpgme/buildlink3.mk" 146. include "../../security/gpgme/buildlink3.mk"
171CONFIGURE_ARGS+= --enable-gpgme 147CONFIGURE_ARGS+= --enable-gpgme
172CONFIGURE_ARGS+= --with-gpgme-prefix=${BUILDLINK_PREFIX.gpgme} 148CONFIGURE_ARGS+= --with-gpgme-prefix=${BUILDLINK_PREFIX.gpgme}
173.else 149.else
174CONFIGURE_ARGS+= --disable-gpgme 150CONFIGURE_ARGS+= --disable-gpgme
175.endif 151.endif
176 
177### 
178### sidebar support 
179### 
180.if !empty(PKG_OPTIONS:Mmutt-sidebar) 
181CONFIGURE_ARGS+= --enable-sidebar 
182.else 
183CONFIGURE_ARGS+= --disable-sidebar 
184.endif