Sun Apr 12 08:25:43 2009 UTC ()
Enable sidebar patch support, as provided by tonnerre@.
This also fixes PR pkg/35917


(tonio)
diff -r1.73 -r1.74 pkgsrc/mail/mutt-devel/Makefile
diff -r1.19 -r1.20 pkgsrc/mail/mutt-devel/PLIST
diff -r1.56 -r1.57 pkgsrc/mail/mutt-devel/distinfo
diff -r1.34 -r1.35 pkgsrc/mail/mutt-devel/options.mk
cvs diff -r1.73 -r1.74 pkgsrc/mail/mutt-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/mutt-devel/Attic/Makefile 2009/02/05 13:45:28 1.73
+++ pkgsrc/mail/mutt-devel/Attic/Makefile 2009/04/12 08:25:43 1.74
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: Makefile,v 1.73 2009/02/05 13:45:28 tonio Exp $ 1# $NetBSD: Makefile,v 1.74 2009/04/12 08:25:43 tonio Exp $
2 2
3DISTNAME= mutt-1.5.19 3DISTNAME= mutt-1.5.19
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= mail 5CATEGORIES= mail
6MUTT_SITES= ftp://ftp.mutt.org/mutt/ \ 6MUTT_SITES= ftp://ftp.mutt.org/mutt/ \
7 ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \ 7 ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
8 ftp://gd.tuwien.ac.at/infosys/mail/mutt/ \ 8 ftp://gd.tuwien.ac.at/infosys/mail/mutt/ \
9 ftp://ftp.fu-berlin.de/unix/mail/mutt/ 9 ftp://ftp.fu-berlin.de/unix/mail/mutt/
10MASTER_SITES= ${MUTT_SITES:=devel/} 10MASTER_SITES= ${MUTT_SITES:=devel/}
11 11
12MAINTAINER= tonio@NetBSD.org 12MAINTAINER= tonio@NetBSD.org
13HOMEPAGE= http://www.mutt.org/ 13HOMEPAGE= http://www.mutt.org/
14COMMENT= Text-based MIME mail client with PGP & S/MIME support 14COMMENT= Text-based MIME mail client with PGP & S/MIME support
15 15
16PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
18 18
19.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
20 20
21USE_PKGLOCALEDIR= yes 21USE_PKGLOCALEDIR= yes
22USE_TOOLS+= msgfmt 22USE_TOOLS+= msgfmt
23 23
24GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
25CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \ 25CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \
26 --with-docdir=${PREFIX}/share/doc/mutt \ 26 --with-docdir=${PREFIX}/share/doc/mutt \
27 --without-included-gettext \ 27 --without-included-gettext \
28 --enable-external-dotlock \ 28 --enable-external-dotlock \
29 --enable-pop \ 29 --enable-pop \
30 --enable-imap 30 --enable-imap
31 31
32.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" 32.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
33# Force sendmail to /usr/sbin to avoid postfix's 33# Force sendmail to /usr/sbin to avoid postfix's
34# ${LOCALBASE}/sbin/sendmail. Should be enabled on all platforms which 34# ${LOCALBASE}/sbin/sendmail. Should be enabled on all platforms which
35# support mailwrapper. 35# support mailwrapper.
36CONFIGURE_ENV+= SENDMAIL=/usr/sbin/sendmail 36CONFIGURE_ENV+= SENDMAIL=/usr/sbin/sendmail
37.endif 37.endif
38 38
@@ -51,22 +51,22 @@ CONFIGURE_ARGS+= --with-exec-shell=/bin/ @@ -51,22 +51,22 @@ CONFIGURE_ARGS+= --with-exec-shell=/bin/
51 51
52LDFLAGS+= ${_STRIPFLAG_CC} 52LDFLAGS+= ${_STRIPFLAG_CC}
53 53
54DOCDIR= ${PREFIX}/share/doc/mutt 54DOCDIR= ${PREFIX}/share/doc/mutt
55EGDIR= ${PREFIX}/share/examples/mutt 55EGDIR= ${PREFIX}/share/examples/mutt
56CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc 56CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
57CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types 57CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
58FILES_SUBST+= DOCDIR=${DOCDIR} 58FILES_SUBST+= DOCDIR=${DOCDIR}
59INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} 59INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}
60 60
61SUBST_CLASSES+= paths 61SUBST_CLASSES+= paths
62SUBST_FILES.paths= doc/Muttrc 62SUBST_FILES.paths= doc/Muttrc
63SUBST_VARS.paths+= DOCDIR PREFIX 63SUBST_VARS.paths+= DOCDIR PREFIX
64SUBST_STAGE.paths+= pre-configure 64SUBST_STAGE.paths= pre-configure
65 65
66SPECIAL_PERMS+= bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551 66SPECIAL_PERMS+= bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551
67INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR} 67INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
68 68
69.include "../../converters/libiconv/buildlink3.mk" 69.include "../../converters/libiconv/buildlink3.mk"
70.include "../../devel/gettext-lib/buildlink3.mk" 70.include "../../devel/gettext-lib/buildlink3.mk"
71 71
72.include "../../mk/bsd.pkg.mk" 72.include "../../mk/bsd.pkg.mk"
cvs diff -r1.19 -r1.20 pkgsrc/mail/mutt-devel/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/mutt-devel/Attic/PLIST 2009/01/27 19:50:33 1.19
+++ pkgsrc/mail/mutt-devel/Attic/PLIST 2009/04/12 08:25:43 1.20
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1@comment $NetBSD: PLIST,v 1.19 2009/01/27 19:50:33 tonio Exp $ 1@comment $NetBSD: PLIST,v 1.20 2009/04/12 08:25:43 tonio Exp $
2bin/flea 2bin/flea
3bin/mutt 3bin/mutt
4bin/muttbug 
5bin/mutt_dotlock 4bin/mutt_dotlock
 5bin/muttbug
6bin/pgpewrap 6bin/pgpewrap
7bin/pgpring 7bin/pgpring
8${PLIST.smime}bin/smime_keys 8${PLIST.smime}bin/smime_keys
9man/man1/flea.1 9man/man1/flea.1
10man/man1/mutt.1 10man/man1/mutt.1
11man/man1/mutt_dotlock.1 11man/man1/mutt_dotlock.1
12man/man1/muttbug.1 12man/man1/muttbug.1
13man/man5/mutt-mbox.5 13man/man5/mutt-mbox.5
14man/man5/mutt-mmdf.5 14man/man5/mutt-mmdf.5
15man/man5/muttrc.5 15man/man5/muttrc.5
16share/doc/mutt/COPYRIGHT 16share/doc/mutt/COPYRIGHT
17share/doc/mutt/ChangeLog 17share/doc/mutt/ChangeLog
18share/doc/mutt/GPL 18share/doc/mutt/GPL
cvs diff -r1.56 -r1.57 pkgsrc/mail/mutt-devel/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/mutt-devel/Attic/distinfo 2009/03/23 00:24:31 1.56
+++ pkgsrc/mail/mutt-devel/Attic/distinfo 2009/04/12 08:25:43 1.57
@@ -1,18 +1,21 @@ @@ -1,18 +1,21 @@
1$NetBSD: distinfo,v 1.56 2009/03/23 00:24:31 joerg Exp $ 1$NetBSD: distinfo,v 1.57 2009/04/12 08:25:43 tonio Exp $
2 2
3SHA1 (mutt-1.5.19.tar.gz) = 96e4cc1e1419ba816fcc19d77255978e62c20793 3SHA1 (mutt-1.5.19.tar.gz) = 96e4cc1e1419ba816fcc19d77255978e62c20793
4RMD160 (mutt-1.5.19.tar.gz) = dcb8d027593bfccd62eb7aba338007bce3c7e22e 4RMD160 (mutt-1.5.19.tar.gz) = dcb8d027593bfccd62eb7aba338007bce3c7e22e
5Size (mutt-1.5.19.tar.gz) = 3558746 bytes 5Size (mutt-1.5.19.tar.gz) = 3558746 bytes
6SHA1 (patch-1.5.19.rr.compressed.1.gz) = c639230a5fdac96d5a4e735e320af66e4bde688a 6SHA1 (patch-1.5.19.rr.compressed.1.gz) = c639230a5fdac96d5a4e735e320af66e4bde688a
7RMD160 (patch-1.5.19.rr.compressed.1.gz) = b8eb5201fde7511377e5588953c071d0b7e30c8d 7RMD160 (patch-1.5.19.rr.compressed.1.gz) = b8eb5201fde7511377e5588953c071d0b7e30c8d
8Size (patch-1.5.19.rr.compressed.1.gz) = 10562 bytes 8Size (patch-1.5.19.rr.compressed.1.gz) = 10562 bytes
 9SHA1 (patch-1.5.19.sidebar.20090308.txt) = c16533176fce2b48d27cd587b63caa379258e740
 10RMD160 (patch-1.5.19.sidebar.20090308.txt) = 076272ffcb70f118c1d8850c430f3d74f43ad23b
 11Size (patch-1.5.19.sidebar.20090308.txt) = 51936 bytes
9SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372 12SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
10SHA1 (patch-ab) = 39a3cbe6e1738e036cb679a22c7385ed5ac401eb 13SHA1 (patch-ab) = 39a3cbe6e1738e036cb679a22c7385ed5ac401eb
11SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc 14SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
12SHA1 (patch-ag) = 2b76839be18271a72cb9e407f54879736f2a7ad6 15SHA1 (patch-ag) = 2b76839be18271a72cb9e407f54879736f2a7ad6
13SHA1 (patch-al) = ac8d963286d9edee73ee00bdb8f4ffcd65c6cd5d 16SHA1 (patch-al) = ac8d963286d9edee73ee00bdb8f4ffcd65c6cd5d
14SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f 17SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
15SHA1 (patch-an) = 96eb3aeea3f567b4835eac5d799355f62ad5a455 18SHA1 (patch-an) = 96eb3aeea3f567b4835eac5d799355f62ad5a455
16SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5 19SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5
17SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62 20SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62
18SHA1 (patch-aq) = d327ac440e65516515ddc1646b849b27af61e864 21SHA1 (patch-aq) = d327ac440e65516515ddc1646b849b27af61e864
cvs diff -r1.34 -r1.35 pkgsrc/mail/mutt-devel/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/mutt-devel/Attic/options.mk 2009/03/23 00:24:31 1.34
+++ pkgsrc/mail/mutt-devel/Attic/options.mk 2009/04/12 08:25:43 1.35
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1# $NetBSD: options.mk,v 1.34 2009/03/23 00:24:31 joerg Exp $ 1# $NetBSD: options.mk,v 1.35 2009/04/12 08:25:43 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 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
12#PKG_SUPPORTED_OPTIONS+= mutt-xlabel 13#PKG_SUPPORTED_OPTIONS+= mutt-xlabel
13PKG_SUGGESTED_OPTIONS= ssl smime curses 14PKG_SUGGESTED_OPTIONS= ssl smime curses
14 15
15.include "../../mk/bsd.options.mk" 16.include "../../mk/bsd.options.mk"
16 17
17### 18###
18### Slang 19### Slang
19### 20###
20.if !empty(PKG_OPTIONS:Mslang) 21.if !empty(PKG_OPTIONS:Mslang)
21. include "../../devel/libslang/buildlink3.mk" 22. include "../../devel/libslang/buildlink3.mk"
22CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang} 23CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang}
23.endif 24.endif
24 25
@@ -110,26 +111,36 @@ PATCH_DIST_STRIP= -p1 @@ -110,26 +111,36 @@ PATCH_DIST_STRIP= -p1
110CONFIGURE_ARGS+= --enable-compressed 111CONFIGURE_ARGS+= --enable-compressed
111.endif 112.endif
112 113
113### 114###
114### Internal SMTP relay support 115### Internal SMTP relay support
115### 116###
116.if !empty(PKG_OPTIONS:Mmutt-smtp) 117.if !empty(PKG_OPTIONS:Mmutt-smtp)
117CONFIGURE_ARGS+= --enable-smtp 118CONFIGURE_ARGS+= --enable-smtp
118.else 119.else
119CONFIGURE_ARGS+= --disable-smtp 120CONFIGURE_ARGS+= --disable-smtp
120.endif 121.endif
121 122
122### 123###
 124### Sidebar support
 125###
 126.if !empty(PKG_OPTIONS:Mmutt-sidebar)
 127PATCH_SITES= http://lunar-linux.org/~tchan/mutt/
 128PATCHFILES+= patch-1.5.19.sidebar.20090308.txt
 129PATCH_DIST_STRIP= -p1
 130PATCH_FUZZ_FACTOR= -F1
 131.endif
 132
 133###
123### X-Label header support 134### X-Label header support
124### 135###
125.if !empty(PKG_OPTIONS:Mmutt-xlabel) 136.if !empty(PKG_OPTIONS:Mmutt-xlabel)
126PATCH_SITES= http://home.uchicago.edu/~dgc/sw/mutt/ 137PATCH_SITES= http://home.uchicago.edu/~dgc/sw/mutt/
127PATCHFILES+= patch-1.5.14.dgc.xlabel_ext.9 138PATCHFILES+= patch-1.5.14.dgc.xlabel_ext.9
128PATCH_DIST_STRIP= -p1 139PATCH_DIST_STRIP= -p1
129.endif 140.endif
130 141
131### 142###
132### Internationalized Domain Names 143### Internationalized Domain Names
133### 144###
134.if !empty(PKG_OPTIONS:Midn) 145.if !empty(PKG_OPTIONS:Midn)
135. include "../../devel/libidn/buildlink3.mk" 146. include "../../devel/libidn/buildlink3.mk"