Sun Aug 21 16:46:17 2016 UTC ()
fix distinfo for optional distfiles. Reported by f8l @ #pkgsrc


(tnn)
diff -r1.46 -r1.47 pkgsrc/mail/mutt/distinfo
diff -r1.21 -r1.22 pkgsrc/mail/mutt/options.mk
cvs diff -r1.46 -r1.47 pkgsrc/mail/mutt/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/mutt/distinfo 2016/08/21 11:39:31 1.46
+++ pkgsrc/mail/mutt/distinfo 2016/08/21 16:46:17 1.47
@@ -1,19 +1,27 @@ @@ -1,19 +1,27 @@
1$NetBSD: distinfo,v 1.46 2016/08/21 11:39:31 wiz Exp $ 1$NetBSD: distinfo,v 1.47 2016/08/21 16:46:17 tnn Exp $
2 2
3SHA1 (mutt-1.7.0.tar.gz) = 0d9c0ae7d4725e2216ea0c1271ae19ab8bcf653b 3SHA1 (mutt-1.7.0.tar.gz) = 0d9c0ae7d4725e2216ea0c1271ae19ab8bcf653b
4RMD160 (mutt-1.7.0.tar.gz) = f508f0332d2dfcaa398c3b68889ac619781b1651 4RMD160 (mutt-1.7.0.tar.gz) = f508f0332d2dfcaa398c3b68889ac619781b1651
5SHA512 (mutt-1.7.0.tar.gz) = 60ff00f268285c12b48e39ca0b5a8bd7e09323255874a6211edc94218ed191ad24ad437dd9c180c45ea6d5a9f163d04bb5515ddf3488c92f4e9411588c550612 5SHA512 (mutt-1.7.0.tar.gz) = 60ff00f268285c12b48e39ca0b5a8bd7e09323255874a6211edc94218ed191ad24ad437dd9c180c45ea6d5a9f163d04bb5515ddf3488c92f4e9411588c550612
6Size (mutt-1.7.0.tar.gz) = 4019567 bytes 6Size (mutt-1.7.0.tar.gz) = 4019567 bytes
 7SHA1 (patch-1.5.23.sidebar.20140412.txt) = 8b86f148d8e1a0b37b0b77268349f4c94e797561
 8RMD160 (patch-1.5.23.sidebar.20140412.txt) = 55b691a9d959040d2844644c165b10377a53744d
 9SHA512 (patch-1.5.23.sidebar.20140412.txt) = ac023f1ba5843a010de497b9cd85b22af6a30ceb8622c01be3c5b7e8e0761d8efe8e86e8c9b11aa96dcc405e8b1657672ec6da111b703d562bddf35ba848d34d
 10Size (patch-1.5.23.sidebar.20140412.txt) = 66728 bytes
 11SHA1 (patch-1.6.0.rr.compressed.gz) = 9a672673dd0bd4a2c1624627a8be3c558af2a5d8
 12RMD160 (patch-1.6.0.rr.compressed.gz) = f648b17a84b48c3e8529f45df48ff8bce908dc08
 13SHA512 (patch-1.6.0.rr.compressed.gz) = 2b37b84cb930bcc3809910c400298e798d293d7c351b58b59b44d76f48263af1c068a282c6a3baa7de8f42a23c0a86a4dabb11919be892356eff5bf303b199d9
 14Size (patch-1.6.0.rr.compressed.gz) = 9977 bytes
7SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372 15SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
8SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681 16SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681
9SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044 17SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
10SHA1 (patch-ad) = 6db5792162a0752ee533f5cd4cb3896e0ca92344 18SHA1 (patch-ad) = 6db5792162a0752ee533f5cd4cb3896e0ca92344
11SHA1 (patch-ae) = 6534848a4c27d4a3830edd8d4e19d1181fe396d6 19SHA1 (patch-ae) = 6534848a4c27d4a3830edd8d4e19d1181fe396d6
12SHA1 (patch-af) = e924223be1a5f894d41d430bc5741cae1e4cfe61 20SHA1 (patch-af) = e924223be1a5f894d41d430bc5741cae1e4cfe61
13SHA1 (patch-ag) = b7902d2412538f15bc25b123ca742c03a3dd3a12 21SHA1 (patch-ag) = b7902d2412538f15bc25b123ca742c03a3dd3a12
14SHA1 (patch-ah) = 047f167939367b2e0d29189348deb1c83d4b013a 22SHA1 (patch-ah) = 047f167939367b2e0d29189348deb1c83d4b013a
15SHA1 (patch-al) = fb7e089c9703d13821165659f88fe78204d38a47 23SHA1 (patch-al) = fb7e089c9703d13821165659f88fe78204d38a47
16SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f 24SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
17SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1 25SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1
18SHA1 (patch-ao) = 7c8f18ccb3dc6a6f40daf55b53e52b4722f60efd 26SHA1 (patch-ao) = 7c8f18ccb3dc6a6f40daf55b53e52b4722f60efd
19SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62 27SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62
cvs diff -r1.21 -r1.22 pkgsrc/mail/mutt/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/mutt/options.mk 2016/06/01 21:56:12 1.21
+++ pkgsrc/mail/mutt/options.mk 2016/08/21 16:46:17 1.22
@@ -1,29 +1,26 @@ @@ -1,29 +1,26 @@
1# $NetBSD: options.mk,v 1.21 2016/06/01 21:56:12 tonio Exp $ 1# $NetBSD: options.mk,v 1.22 2016/08/21 16:46:17 tnn 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 tokyocabinet mutt-smtp 9PKG_SUPPORTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp
10PKG_SUPPORTED_OPTIONS+= mutt-compressed-mbox 10PKG_SUPPORTED_OPTIONS+= mutt-compressed-mbox
11PKG_SUPPORTED_OPTIONS+= mutt-sidebar 11PKG_SUPPORTED_OPTIONS+= mutt-sidebar
12PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime ssl 12PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime ssl
13PKG_SUGGESTED_OPTIONS+= mutt-compressed-mbox 13PKG_SUGGESTED_OPTIONS+= mutt-compressed-mbox
14# un-comment out the following lines whenever updating distinfo 
15# and patches are up-to-date 
16#PKG_SUGGESTED_OPTIONS+= mutt-sidebar 
17 14
18.include "../../mk/bsd.options.mk" 15.include "../../mk/bsd.options.mk"
19 16
20### 17###
21### Slang 18### Slang
22### 19###
23.if !empty(PKG_OPTIONS:Mslang) 20.if !empty(PKG_OPTIONS:Mslang)
24. include "../../devel/libslang/buildlink3.mk" 21. include "../../devel/libslang/buildlink3.mk"
25CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang} 22CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang}
26.endif 23.endif
27 24
28### 25###
29### ncurses 26### ncurses
@@ -110,27 +107,28 @@ CONFIGURE_ARGS+= --without-gdbm @@ -110,27 +107,28 @@ CONFIGURE_ARGS+= --without-gdbm
110# since the real -I and -L flags are added by buildlink already. 107# since the real -I and -L flags are added by buildlink already.
111CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BDBBASE}/include 108CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BDBBASE}/include
112CONFIGURE_ENV+= BDB_LIB_DIR=${BDBBASE}/lib 109CONFIGURE_ENV+= BDB_LIB_DIR=${BDBBASE}/lib
113CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q} 110CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q}
114. endif 111. endif
115.else 112.else
116CONFIGURE_ARGS+= --disable-hcache 113CONFIGURE_ARGS+= --disable-hcache
117.endif 114.endif
118 115
119### 116###
120### Compressed mail boxes 117### Compressed mail boxes
121### 118###
122PLIST_VARS+= compressed_mbox 119PLIST_VARS+= compressed_mbox
123.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox) 120.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox) \
 121 || make(distinfo) || make(mps) || make(makepatchsum)
124PLIST.compressed_mbox= yes 122PLIST.compressed_mbox= yes
125#PATCH_SITES+= http://mutt.org.ua/download/${PKGNAME_NOREV}/ 123#PATCH_SITES+= http://mutt.org.ua/download/${PKGNAME_NOREV}/
126#PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.gz 124#PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.gz
127# use the 1.6.0 patch, as suggested by Andreas Kusalananda Kahari 125# use the 1.6.0 patch, as suggested by Andreas Kusalananda Kahari
128PATCH_SITES+= http://mutt.org.ua/download/mutt-1.6.0/ 126PATCH_SITES+= http://mutt.org.ua/download/mutt-1.6.0/
129PATCHFILES+= patch-1.6.0.rr.compressed.gz 127PATCHFILES+= patch-1.6.0.rr.compressed.gz
130PATCH_DIST_STRIP= -p1 128PATCH_DIST_STRIP= -p1
131CONFIGURE_ARGS+= --enable-compressed 129CONFIGURE_ARGS+= --enable-compressed
132SUBST_CLASSES+= compress 130SUBST_CLASSES+= compress
133SUBST_MESSAGE.compress= Patch Makefile.in to avoid autoreconf for compress 131SUBST_MESSAGE.compress= Patch Makefile.in to avoid autoreconf for compress
134SUBST_STAGE.compress= post-patch 132SUBST_STAGE.compress= post-patch
135SUBST_FILES.compress= Makefile.in 133SUBST_FILES.compress= Makefile.in
136SUBST_SED.compress= -e 's,^mutt_SOURCES = ,mutt_SOURCES = compress.c ,' 134SUBST_SED.compress= -e 's,^mutt_SOURCES = ,mutt_SOURCES = compress.c ,'
@@ -143,27 +141,28 @@ BUILD_DEPENDS+= docbook-xsl-[0-9]*:../. @@ -143,27 +141,28 @@ BUILD_DEPENDS+= docbook-xsl-[0-9]*:../.
143 141
144### 142###
145### Internal SMTP relay support 143### Internal SMTP relay support
146### 144###
147.if !empty(PKG_OPTIONS:Mmutt-smtp) 145.if !empty(PKG_OPTIONS:Mmutt-smtp)
148CONFIGURE_ARGS+= --enable-smtp 146CONFIGURE_ARGS+= --enable-smtp
149.else 147.else
150CONFIGURE_ARGS+= --disable-smtp 148CONFIGURE_ARGS+= --disable-smtp
151.endif 149.endif
152 150
153### 151###
154### Sidebar support 152### Sidebar support
155### 153###
156.if !empty(PKG_OPTIONS:Mmutt-sidebar) 154.if !empty(PKG_OPTIONS:Mmutt-sidebar) \
 155 || make(distinfo) || make(mps) || make(makepatchsum)
157# http://www.lunar-linux.org/mutt-sidebar/ 156# http://www.lunar-linux.org/mutt-sidebar/
158PATCH_SITES+= http://lunar-linux.org/~tchan/mutt/ 157PATCH_SITES+= http://lunar-linux.org/~tchan/mutt/
159PATCHFILES+= patch-1.5.23.sidebar.20140412.txt 158PATCHFILES+= patch-1.5.23.sidebar.20140412.txt
160PATCH_DIST_STRIP= -p1 159PATCH_DIST_STRIP= -p1
161PATCH_FUZZ_FACTOR= -F1 160PATCH_FUZZ_FACTOR= -F1
162.endif 161.endif
163 162
164### 163###
165### Internationalized Domain Names 164### Internationalized Domain Names
166### 165###
167.if !empty(PKG_OPTIONS:Midn) 166.if !empty(PKG_OPTIONS:Midn)
168. include "../../devel/libidn/buildlink3.mk" 167. include "../../devel/libidn/buildlink3.mk"
169CONFIGURE_ARGS+= --with-idn=${BUILDLINK_PREFIX.libidn} 168CONFIGURE_ARGS+= --with-idn=${BUILDLINK_PREFIX.libidn}