Tue Aug 28 20:15:41 2012 UTC ()
Add an option to use tokyocabinet as backend for mutt header cache


(tonio)
diff -r1.42 -r1.43 pkgsrc/mail/mutt-devel/options.mk
cvs diff -r1.42 -r1.43 pkgsrc/mail/mutt-devel/Attic/options.mk (switch to unified diff)

--- pkgsrc/mail/mutt-devel/Attic/options.mk 2010/12/20 14:03:39 1.42
+++ pkgsrc/mail/mutt-devel/Attic/options.mk 2012/08/28 20:15:41 1.43
@@ -1,182 +1,190 @@ @@ -1,182 +1,190 @@
1# $NetBSD: options.mk,v 1.42 2010/12/20 14:03:39 tonio Exp $ 1# $NetBSD: options.mk,v 1.43 2012/08/28 20:15:41 tonio Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.mutt 5PKG_OPTIONS_VAR= PKG_OPTIONS.mutt
6PKG_OPTIONS_REQUIRED_GROUPS= display 6PKG_OPTIONS_REQUIRED_GROUPS= display
7PKG_OPTIONS_GROUP.display= slang ncurses ncursesw curses 7PKG_OPTIONS_GROUP.display= slang ncurses ncursesw curses
8PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl 8PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl
9PKG_SUPPORTED_OPTIONS+= mutt-hcache mutt-smtp 9PKG_SUPPORTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp
10# Comment the following line out on updates. 10# Comment the following line out on updates.
11PKG_SUPPORTED_OPTIONS+= mutt-compressed-mbox 11PKG_SUPPORTED_OPTIONS+= mutt-compressed-mbox
12PKG_SUPPORTED_OPTIONS+= mutt-sidebar 12PKG_SUPPORTED_OPTIONS+= mutt-sidebar
13#PKG_SUPPORTED_OPTIONS+= mutt-xlabel 13#PKG_SUPPORTED_OPTIONS+= mutt-xlabel
14PKG_SUGGESTED_OPTIONS= ssl smime curses 14PKG_SUGGESTED_OPTIONS= ssl smime curses
15 15
16.include "../../mk/bsd.options.mk" 16.include "../../mk/bsd.options.mk"
17 17
18### 18###
19### Slang 19### Slang
20### 20###
21.if !empty(PKG_OPTIONS:Mslang) 21.if !empty(PKG_OPTIONS:Mslang)
22. include "../../devel/libslang/buildlink3.mk" 22. include "../../devel/libslang/buildlink3.mk"
23CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang} 23CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang}
24.endif 24.endif
25 25
26### 26###
27### ncurses 27### ncurses
28### 28###
29.if !empty(PKG_OPTIONS:Mncurses) 29.if !empty(PKG_OPTIONS:Mncurses)
30USE_NCURSES= yes 30USE_NCURSES= yes
31. include "../../devel/ncurses/buildlink3.mk" 31. include "../../devel/ncurses/buildlink3.mk"
32CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses} 32CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses}
33.endif 33.endif
34 34
35### 35###
36### SASLv2 36### SASLv2
37### 37###
38.if !empty(PKG_OPTIONS:Msasl) 38.if !empty(PKG_OPTIONS:Msasl)
39. include "../../security/cyrus-sasl/buildlink3.mk" 39. include "../../security/cyrus-sasl/buildlink3.mk"
40CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl} 40CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
41.endif 41.endif
42 42
43### curses 43### curses
44### 44###
45.if !empty(PKG_OPTIONS:Mcurses) 45.if !empty(PKG_OPTIONS:Mcurses)
46. include "../../mk/curses.buildlink3.mk" 46. include "../../mk/curses.buildlink3.mk"
47.endif 47.endif
48 48
49### 49###
50### ncursesw 50### ncursesw
51### 51###
52.if !empty(PKG_OPTIONS:Mncursesw) 52.if !empty(PKG_OPTIONS:Mncursesw)
53. include "../../devel/ncursesw/buildlink3.mk" 53. include "../../devel/ncursesw/buildlink3.mk"
54.else 54.else
55SUBST_CLASSES+= curse 55SUBST_CLASSES+= curse
56SUBST_MESSAGE.curse= Fixing mutt to avoid ncursesw 56SUBST_MESSAGE.curse= Fixing mutt to avoid ncursesw
57SUBST_STAGE.curse= post-patch 57SUBST_STAGE.curse= post-patch
58SUBST_FILES.curse= configure 58SUBST_FILES.curse= configure
59SUBST_SED.curse= -e 's,for lib in ncurses ncursesw,for lib in ncurses,' 59SUBST_SED.curse= -e 's,for lib in ncurses ncursesw,for lib in ncurses,'
60.endif 60.endif
61 61
62### 62###
63### SSL 63### SSL
64### 64###
65.if !empty(PKG_OPTIONS:Mssl) 65.if !empty(PKG_OPTIONS:Mssl)
66. include "../../security/openssl/buildlink3.mk" 66. include "../../security/openssl/buildlink3.mk"
67CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} 67CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
68.else 68.else
69CONFIGURE_ARGS+= --without-ssl 69CONFIGURE_ARGS+= --without-ssl
70.endif 70.endif
71 71
72### 72###
73### S/MIME 73### S/MIME
74### 74###
75PLIST_VARS+= smime 75PLIST_VARS+= smime
76.if !empty(PKG_OPTIONS:Msmime) 76.if !empty(PKG_OPTIONS:Msmime)
77USE_TOOLS+= perl:run 77USE_TOOLS+= perl:run
78REPLACE_PERL+= *.pl */*.pl 78REPLACE_PERL+= *.pl */*.pl
79. include "../../security/openssl/buildlink3.mk" 79. include "../../security/openssl/buildlink3.mk"
80CONFIGURE_ARGS+= --enable-smime 80CONFIGURE_ARGS+= --enable-smime
81PLIST.smime= yes 81PLIST.smime= yes
82.else 82.else
83CONFIGURE_ARGS+= --disable-smime 83CONFIGURE_ARGS+= --disable-smime
84.endif 84.endif
85 85
86### 86###
87### Header cache 87### Header cache
88### 88###
89.if !empty(PKG_OPTIONS:Mmutt-hcache) 89.if !empty(PKG_OPTIONS:Mmutt-hcache)
 90. if !empty(PKG_OPTIONS:Mtokyocabinet)
 91. include "../../databases/tokyocabinet/buildlink3.mk"
 92CONFIGURE_ARGS+= --enable-hcache
 93CONFIGURE_ARGS+= --enable-tokyocabinet
 94CONFIGURE_ARGS+= --without-gdbm
 95CONFIGURE_ARGS+= --without-bdb
 96. else
90BDB_ACCEPTED= db4 db5 97BDB_ACCEPTED= db4 db5
91BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE} 98BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE}
92. include "../../mk/bdb.buildlink3.mk" 99. include "../../mk/bdb.buildlink3.mk"
93CONFIGURE_ARGS+= --enable-hcache 100CONFIGURE_ARGS+= --enable-hcache
94CONFIGURE_ARGS+= --without-gdbm 101CONFIGURE_ARGS+= --without-gdbm
95# BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate 102# BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate
96# since the real -I and -L flags are added by buildlink already. 103# since the real -I and -L flags are added by buildlink already.
97CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BDBBASE}/include 104CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BDBBASE}/include
98CONFIGURE_ENV+= BDB_LIB_DIR=${BDBBASE}/lib 105CONFIGURE_ENV+= BDB_LIB_DIR=${BDBBASE}/lib
99CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q} 106CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q}
 107. endif
100.else 108.else
101CONFIGURE_ARGS+= --disable-hcache 109CONFIGURE_ARGS+= --disable-hcache
102.endif 110.endif
103 111
104### 112###
105### Compressed mail boxes 113### Compressed mail boxes
106### 114###
107.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox) 115.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox)
108PATCH_SITES+= http://mutt.org.ua/download/${PKGNAME_NOREV}/ 116PATCH_SITES+= http://mutt.org.ua/download/${PKGNAME_NOREV}/
109PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.gz 117PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.gz
110PATCH_DIST_STRIP= -p1 118PATCH_DIST_STRIP= -p1
111CONFIGURE_ARGS+= --enable-compressed 119CONFIGURE_ARGS+= --enable-compressed
112SUBST_CLASSES+= compress 120SUBST_CLASSES+= compress
113SUBST_MESSAGE.compress= Patch Makefile.in to avoid autoreconf for compress 121SUBST_MESSAGE.compress= Patch Makefile.in to avoid autoreconf for compress
114SUBST_STAGE.compress= post-patch 122SUBST_STAGE.compress= post-patch
115SUBST_FILES.compress= Makefile.in 123SUBST_FILES.compress= Makefile.in
116SUBST_SED.compress= -e 's,^mutt_SOURCES = ,mutt_SOURCES = compress.c ,' 124SUBST_SED.compress= -e 's,^mutt_SOURCES = ,mutt_SOURCES = compress.c ,'
117SUBST_SED.compress+= -e 's,^EXTRA_DIST = ,EXTRA_DIST = compress.h ,' 125SUBST_SED.compress+= -e 's,^EXTRA_DIST = ,EXTRA_DIST = compress.h ,'
118SUBST_SED.compress+= -e 's,^mutt_OBJECTS = ,mutt_OBJECTS = compress.o ,' 126SUBST_SED.compress+= -e 's,^mutt_OBJECTS = ,mutt_OBJECTS = compress.o ,'
119.endif 127.endif
120 128
121### 129###
122### Internal SMTP relay support 130### Internal SMTP relay support
123### 131###
124.if !empty(PKG_OPTIONS:Mmutt-smtp) 132.if !empty(PKG_OPTIONS:Mmutt-smtp)
125CONFIGURE_ARGS+= --enable-smtp 133CONFIGURE_ARGS+= --enable-smtp
126.else 134.else
127CONFIGURE_ARGS+= --disable-smtp 135CONFIGURE_ARGS+= --disable-smtp
128.endif 136.endif
129 137
130### 138###
131### Sidebar support 139### Sidebar support
132### 140###
133.if !empty(PKG_OPTIONS:Mmutt-sidebar) 141.if !empty(PKG_OPTIONS:Mmutt-sidebar)
134PATCH_SITES+= http://spacehopper.org/mutt/ 142PATCH_SITES+= http://spacehopper.org/mutt/
135PATCHFILES+= sidebar-5302767aa6aa.gz 143PATCHFILES+= sidebar-5302767aa6aa.gz
136PATCH_DIST_STRIP= -p1 144PATCH_DIST_STRIP= -p1
137PATCH_FUZZ_FACTOR= -F1 145PATCH_FUZZ_FACTOR= -F1
138SUBST_CLASSES+= sidebar 146SUBST_CLASSES+= sidebar
139SUBST_MESSAGE.sidebar= Patch Makefile.in to avoid autoreconf for sidebar 147SUBST_MESSAGE.sidebar= Patch Makefile.in to avoid autoreconf for sidebar
140SUBST_STAGE.sidebar= post-patch 148SUBST_STAGE.sidebar= post-patch
141SUBST_FILES.sidebar= Makefile.in 149SUBST_FILES.sidebar= Makefile.in
142SUBST_SED.sidebar= -e 's,lib.c \\,lib.c sidebar.c \\,' 150SUBST_SED.sidebar= -e 's,lib.c \\,lib.c sidebar.c \\,'
143SUBST_SED.sidebar+= -e 's, lib\.\(.(OBJEXT)\), lib.\1 sidebar.\1,' 151SUBST_SED.sidebar+= -e 's, lib\.\(.(OBJEXT)\), lib.\1 sidebar.\1,'
144.endif 152.endif
145 153
146### 154###
147### X-Label header support 155### X-Label header support
148### 156###
149.if !empty(PKG_OPTIONS:Mmutt-xlabel) 157.if !empty(PKG_OPTIONS:Mmutt-xlabel)
150PATCH_SITES= http://home.uchicago.edu/~dgc/sw/mutt/ 158PATCH_SITES= http://home.uchicago.edu/~dgc/sw/mutt/
151PATCHFILES+= patch-1.5.17.dgc.xlabel_ext.9 159PATCHFILES+= patch-1.5.17.dgc.xlabel_ext.9
152PATCH_DIST_STRIP= -p1 160PATCH_DIST_STRIP= -p1
153.endif 161.endif
154 162
155### 163###
156### Internationalized Domain Names 164### Internationalized Domain Names
157### 165###
158.if !empty(PKG_OPTIONS:Midn) 166.if !empty(PKG_OPTIONS:Midn)
159. include "../../devel/libidn/buildlink3.mk" 167. include "../../devel/libidn/buildlink3.mk"
160CONFIGURE_ARGS+= --with-idn=${BUILDLINK_PREFIX.libidn} 168CONFIGURE_ARGS+= --with-idn=${BUILDLINK_PREFIX.libidn}
161.else 169.else
162CONFIGURE_ARGS+= --with-idn=no 170CONFIGURE_ARGS+= --with-idn=no
163.endif 171.endif
164 172
165### 173###
166### Enable debugging support 174### Enable debugging support
167### 175###
168.if !empty(PKG_OPTIONS:Mdebug) 176.if !empty(PKG_OPTIONS:Mdebug)
169CONFIGURE_ARGS+= --enable-debug 177CONFIGURE_ARGS+= --enable-debug
170CFLAGS+= -g 178CFLAGS+= -g
171.endif 179.endif
172 180
173### 181###
174### gpgme support 182### gpgme support
175### 183###
176.if !empty(PKG_OPTIONS:Mgpgme) 184.if !empty(PKG_OPTIONS:Mgpgme)
177. include "../../security/gpgme/buildlink3.mk" 185. include "../../security/gpgme/buildlink3.mk"
178CONFIGURE_ARGS+= --enable-gpgme 186CONFIGURE_ARGS+= --enable-gpgme
179CONFIGURE_ARGS+= --with-gpgme-prefix=${BUILDLINK_PREFIX.gpgme} 187CONFIGURE_ARGS+= --with-gpgme-prefix=${BUILDLINK_PREFIX.gpgme}
180.else 188.else
181CONFIGURE_ARGS+= --disable-gpgme 189CONFIGURE_ARGS+= --disable-gpgme
182.endif 190.endif