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 (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,72 +1,72 @@ @@ -1,72 +1,72 @@
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
39.if (${OPSYS} == "SunOS") 39.if (${OPSYS} == "SunOS")
40CONFIGURE_ARGS+= --without-wc-funcs 40CONFIGURE_ARGS+= --without-wc-funcs
41.endif 41.endif
42 42
43# There is a problem using /bin/sh on old NetBSD releases, so use /bin/ksh 43# There is a problem using /bin/sh on old NetBSD releases, so use /bin/ksh
44# there. 44# there.
45# 45#
46.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-5]*-*) 46.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-5]*-*)
47CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh 47CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh
48.endif 48.endif
49 49
50.include "options.mk" 50.include "options.mk"
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 (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,111 +1,111 @@ @@ -1,111 +1,111 @@
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
19share/doc/mutt/INSTALL 19share/doc/mutt/INSTALL
20share/doc/mutt/NEWS 20share/doc/mutt/NEWS
21share/doc/mutt/PGP-Notes.txt 21share/doc/mutt/PGP-Notes.txt
22share/doc/mutt/README 22share/doc/mutt/README
23share/doc/mutt/README.SECURITY 23share/doc/mutt/README.SECURITY
24share/doc/mutt/README.SSL 24share/doc/mutt/README.SSL
25share/doc/mutt/TODO 25share/doc/mutt/TODO
26share/doc/mutt/advancedusage.html 26share/doc/mutt/advancedusage.html
27share/doc/mutt/applying-patches.txt 27share/doc/mutt/applying-patches.txt
28share/doc/mutt/configuration.html 28share/doc/mutt/configuration.html
29share/doc/mutt/devel-notes.txt 29share/doc/mutt/devel-notes.txt
30share/doc/mutt/gettingstarted.html 30share/doc/mutt/gettingstarted.html
31share/doc/mutt/index.html 31share/doc/mutt/index.html
32share/doc/mutt/intro.html 32share/doc/mutt/intro.html
33share/doc/mutt/manual.html 33share/doc/mutt/manual.html
34share/doc/mutt/manual.txt 34share/doc/mutt/manual.txt
35share/doc/mutt/mimesupport.html 35share/doc/mutt/mimesupport.html
36share/doc/mutt/miscellany.html 36share/doc/mutt/miscellany.html
37share/doc/mutt/optionalfeatures.html 37share/doc/mutt/optionalfeatures.html
38share/doc/mutt/patch-notes.txt 38share/doc/mutt/patch-notes.txt
39share/doc/mutt/reference.html 39share/doc/mutt/reference.html
40share/doc/mutt/smime-notes.txt 40share/doc/mutt/smime-notes.txt
41share/doc/mutt/tuning.html 41share/doc/mutt/tuning.html
42share/examples/mutt/Mush.rc 42share/examples/mutt/Mush.rc
43share/examples/mutt/Muttrc 43share/examples/mutt/Muttrc
44share/examples/mutt/Muttrc.dist 44share/examples/mutt/Muttrc.dist
45share/examples/mutt/Pine.rc 45share/examples/mutt/Pine.rc
46share/examples/mutt/Tin.rc 46share/examples/mutt/Tin.rc
47share/examples/mutt/ca-bundle.crt 47share/examples/mutt/ca-bundle.crt
48share/examples/mutt/colors.default 48share/examples/mutt/colors.default
49share/examples/mutt/colors.linux 49share/examples/mutt/colors.linux
50share/examples/mutt/gpg.rc 50share/examples/mutt/gpg.rc
51share/examples/mutt/iconv/iconv.aix-3.2.5.rc 51share/examples/mutt/iconv/iconv.aix-3.2.5.rc
52share/examples/mutt/iconv/iconv.aix-4.1.5.rc 52share/examples/mutt/iconv/iconv.aix-4.1.5.rc
53share/examples/mutt/iconv/iconv.aix-4.2.0.rc 53share/examples/mutt/iconv/iconv.aix-4.2.0.rc
54share/examples/mutt/iconv/iconv.aix-4.3.2.rc 54share/examples/mutt/iconv/iconv.aix-4.3.2.rc
55share/examples/mutt/iconv/iconv.freebsd-3.3.rc 55share/examples/mutt/iconv/iconv.freebsd-3.3.rc
56share/examples/mutt/iconv/iconv.glibc-2.1.3.rc 56share/examples/mutt/iconv/iconv.glibc-2.1.3.rc
57share/examples/mutt/iconv/iconv.glibc-2.1.90.rc 57share/examples/mutt/iconv/iconv.glibc-2.1.90.rc
58share/examples/mutt/iconv/iconv.hpux-10.01.rc 58share/examples/mutt/iconv/iconv.hpux-10.01.rc
59share/examples/mutt/iconv/iconv.hpux-10.20.rc 59share/examples/mutt/iconv/iconv.hpux-10.20.rc
60share/examples/mutt/iconv/iconv.hpux-11.00.rc 60share/examples/mutt/iconv/iconv.hpux-11.00.rc
61share/examples/mutt/iconv/iconv.irix-6.5.rc 61share/examples/mutt/iconv/iconv.irix-6.5.rc
62share/examples/mutt/iconv/iconv.osf1-4.0a.rc 62share/examples/mutt/iconv/iconv.osf1-4.0a.rc
63share/examples/mutt/iconv/iconv.osf1-4.0d.rc 63share/examples/mutt/iconv/iconv.osf1-4.0d.rc
64share/examples/mutt/iconv/iconv.solaris-2.4.rc 64share/examples/mutt/iconv/iconv.solaris-2.4.rc
65share/examples/mutt/iconv/iconv.solaris-2.5.1.rc 65share/examples/mutt/iconv/iconv.solaris-2.5.1.rc
66share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc 66share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc
67share/examples/mutt/iconv/iconv.solaris-2.6.rc 67share/examples/mutt/iconv/iconv.solaris-2.6.rc
68share/examples/mutt/iconv/iconv.solaris-2.7.rc 68share/examples/mutt/iconv/iconv.solaris-2.7.rc
69share/examples/mutt/mime.types 69share/examples/mutt/mime.types
70share/examples/mutt/mime.types.dist 70share/examples/mutt/mime.types.dist
71share/examples/mutt/mutt_xtitle 71share/examples/mutt/mutt_xtitle
72share/examples/mutt/pgp2.rc 72share/examples/mutt/pgp2.rc
73share/examples/mutt/pgp5.rc 73share/examples/mutt/pgp5.rc
74share/examples/mutt/pgp6.rc 74share/examples/mutt/pgp6.rc
75share/examples/mutt/sample.mailcap 75share/examples/mutt/sample.mailcap
76share/examples/mutt/sample.muttrc 76share/examples/mutt/sample.muttrc
77share/examples/mutt/sample.muttrc-tlr 77share/examples/mutt/sample.muttrc-tlr
78share/examples/mutt/smime.rc 78share/examples/mutt/smime.rc
79share/examples/mutt/smime_keys_test.pl 79share/examples/mutt/smime_keys_test.pl
80share/locale/bg/LC_MESSAGES/mutt.mo 80share/locale/bg/LC_MESSAGES/mutt.mo
81share/locale/ca/LC_MESSAGES/mutt.mo 81share/locale/ca/LC_MESSAGES/mutt.mo
82share/locale/cs/LC_MESSAGES/mutt.mo 82share/locale/cs/LC_MESSAGES/mutt.mo
83share/locale/da/LC_MESSAGES/mutt.mo 83share/locale/da/LC_MESSAGES/mutt.mo
84share/locale/de/LC_MESSAGES/mutt.mo 84share/locale/de/LC_MESSAGES/mutt.mo
85share/locale/el/LC_MESSAGES/mutt.mo 85share/locale/el/LC_MESSAGES/mutt.mo
86share/locale/eo/LC_MESSAGES/mutt.mo 86share/locale/eo/LC_MESSAGES/mutt.mo
87share/locale/es/LC_MESSAGES/mutt.mo 87share/locale/es/LC_MESSAGES/mutt.mo
88share/locale/et/LC_MESSAGES/mutt.mo 88share/locale/et/LC_MESSAGES/mutt.mo
89share/locale/eu/LC_MESSAGES/mutt.mo 89share/locale/eu/LC_MESSAGES/mutt.mo
90share/locale/fr/LC_MESSAGES/mutt.mo 90share/locale/fr/LC_MESSAGES/mutt.mo
91share/locale/ga/LC_MESSAGES/mutt.mo 91share/locale/ga/LC_MESSAGES/mutt.mo
92share/locale/gl/LC_MESSAGES/mutt.mo 92share/locale/gl/LC_MESSAGES/mutt.mo
93share/locale/hu/LC_MESSAGES/mutt.mo 93share/locale/hu/LC_MESSAGES/mutt.mo
94share/locale/id/LC_MESSAGES/mutt.mo 94share/locale/id/LC_MESSAGES/mutt.mo
95share/locale/it/LC_MESSAGES/mutt.mo 95share/locale/it/LC_MESSAGES/mutt.mo
96share/locale/ja/LC_MESSAGES/mutt.mo 96share/locale/ja/LC_MESSAGES/mutt.mo
97share/locale/ko/LC_MESSAGES/mutt.mo 97share/locale/ko/LC_MESSAGES/mutt.mo
98share/locale/lt/LC_MESSAGES/mutt.mo 98share/locale/lt/LC_MESSAGES/mutt.mo
99share/locale/nl/LC_MESSAGES/mutt.mo 99share/locale/nl/LC_MESSAGES/mutt.mo
100share/locale/pl/LC_MESSAGES/mutt.mo 100share/locale/pl/LC_MESSAGES/mutt.mo
101share/locale/pt_BR/LC_MESSAGES/mutt.mo 101share/locale/pt_BR/LC_MESSAGES/mutt.mo
102share/locale/ru/LC_MESSAGES/mutt.mo 102share/locale/ru/LC_MESSAGES/mutt.mo
103share/locale/sk/LC_MESSAGES/mutt.mo 103share/locale/sk/LC_MESSAGES/mutt.mo
104share/locale/sv/LC_MESSAGES/mutt.mo 104share/locale/sv/LC_MESSAGES/mutt.mo
105share/locale/tr/LC_MESSAGES/mutt.mo 105share/locale/tr/LC_MESSAGES/mutt.mo
106share/locale/uk/LC_MESSAGES/mutt.mo 106share/locale/uk/LC_MESSAGES/mutt.mo
107share/locale/zh_CN/LC_MESSAGES/mutt.mo 107share/locale/zh_CN/LC_MESSAGES/mutt.mo
108share/locale/zh_TW/LC_MESSAGES/mutt.mo 108share/locale/zh_TW/LC_MESSAGES/mutt.mo
109@dirrm share/examples/mutt/iconv 109@dirrm share/examples/mutt/iconv
110@dirrm share/examples/mutt 110@dirrm share/examples/mutt
111@dirrm share/doc/mutt 111@dirrm share/doc/mutt
cvs diff -r1.56 -r1.57 pkgsrc/mail/mutt-devel/Attic/distinfo (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 (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,158 +1,169 @@ @@ -1,158 +1,169 @@
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
25### 26###
26### ncurses 27### ncurses
27### 28###
28.if !empty(PKG_OPTIONS:Mncurses) 29.if !empty(PKG_OPTIONS:Mncurses)
29USE_NCURSES= yes 30USE_NCURSES= yes
30. include "../../devel/ncurses/buildlink3.mk" 31. include "../../devel/ncurses/buildlink3.mk"
31CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses} 32CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses}
32.endif 33.endif
33 34
34### 35###
35### SASLv2 36### SASLv2
36### 37###
37.if !empty(PKG_OPTIONS:Msasl) 38.if !empty(PKG_OPTIONS:Msasl)
38. include "../../security/cyrus-sasl/buildlink3.mk" 39. include "../../security/cyrus-sasl/buildlink3.mk"
39CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl} 40CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
40.endif 41.endif
41 42
42### curses 43### curses
43### 44###
44.if !empty(PKG_OPTIONS:Mcurses) 45.if !empty(PKG_OPTIONS:Mcurses)
45. include "../../mk/curses.buildlink3.mk" 46. include "../../mk/curses.buildlink3.mk"
46.endif 47.endif
47 48
48### 49###
49### ncursesw 50### ncursesw
50### 51###
51.if !empty(PKG_OPTIONS:Mncursesw) 52.if !empty(PKG_OPTIONS:Mncursesw)
52. include "../../devel/ncursesw/buildlink3.mk" 53. include "../../devel/ncursesw/buildlink3.mk"
53.else 54.else
54SUBST_CLASSES+= curse 55SUBST_CLASSES+= curse
55SUBST_MESSAGE.curse= Fixing mutt to avoid ncursesw 56SUBST_MESSAGE.curse= Fixing mutt to avoid ncursesw
56SUBST_STAGE.curse= post-patch 57SUBST_STAGE.curse= post-patch
57SUBST_FILES.curse= configure 58SUBST_FILES.curse= configure
58SUBST_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,'
59.endif 60.endif
60 61
61### 62###
62### SSL 63### SSL
63### 64###
64.if !empty(PKG_OPTIONS:Mssl) 65.if !empty(PKG_OPTIONS:Mssl)
65. include "../../security/openssl/buildlink3.mk" 66. include "../../security/openssl/buildlink3.mk"
66CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} 67CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
67.else 68.else
68CONFIGURE_ARGS+= --without-ssl 69CONFIGURE_ARGS+= --without-ssl
69.endif 70.endif
70 71
71### 72###
72### S/MIME 73### S/MIME
73### 74###
74PLIST_VARS+= smime 75PLIST_VARS+= smime
75.if !empty(PKG_OPTIONS:Msmime) 76.if !empty(PKG_OPTIONS:Msmime)
76USE_TOOLS+= perl:run 77USE_TOOLS+= perl:run
77REPLACE_PERL+= *.pl */*.pl 78REPLACE_PERL+= *.pl */*.pl
78. include "../../security/openssl/buildlink3.mk" 79. include "../../security/openssl/buildlink3.mk"
79CONFIGURE_ARGS+= --enable-smime 80CONFIGURE_ARGS+= --enable-smime
80PLIST.smime= yes 81PLIST.smime= yes
81.else 82.else
82CONFIGURE_ARGS+= --disable-smime 83CONFIGURE_ARGS+= --disable-smime
83.endif 84.endif
84 85
85### 86###
86### Header cache 87### Header cache
87### 88###
88.if !empty(PKG_OPTIONS:Mmutt-hcache) 89.if !empty(PKG_OPTIONS:Mmutt-hcache)
89. include "../../databases/db4/buildlink3.mk" 90. include "../../databases/db4/buildlink3.mk"
90CONFIGURE_ARGS+= --enable-hcache 91CONFIGURE_ARGS+= --enable-hcache
91CONFIGURE_ARGS+= --without-gdbm 92CONFIGURE_ARGS+= --without-gdbm
92# 93#
93# BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate 94# BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate
94# since the real -I and -L flags are added by buildlink already. 95# since the real -I and -L flags are added by buildlink already.
95# 96#
96CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BUILDLINK_PREFIX.db4}/include 97CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BUILDLINK_PREFIX.db4}/include
97CONFIGURE_ENV+= BDB_LIB_DIR=${BUILDLINK_PREFIX.db4}/lib 98CONFIGURE_ENV+= BDB_LIB_DIR=${BUILDLINK_PREFIX.db4}/lib
98CONFIGURE_ENV+= BDB_LIB=${BUILDLINK_LDADD.db4:S/^-l//:Q} 99CONFIGURE_ENV+= BDB_LIB=${BUILDLINK_LDADD.db4:S/^-l//:Q}
99.else 100.else
100CONFIGURE_ARGS+= --disable-hcache 101CONFIGURE_ARGS+= --disable-hcache
101.endif 102.endif
102 103
103### 104###
104### Compressed mail boxes 105### Compressed mail boxes
105### 106###
106.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox) 107.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox)
107PATCH_SITES= http://www.spinnaker.de/mutt/compressed/ 108PATCH_SITES= http://www.spinnaker.de/mutt/compressed/
108PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.1.gz 109PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.1.gz
109PATCH_DIST_STRIP= -p1 110PATCH_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"
136CONFIGURE_ARGS+= --with-idn=${BUILDLINK_PREFIX.libidn} 147CONFIGURE_ARGS+= --with-idn=${BUILDLINK_PREFIX.libidn}
137.else 148.else
138CONFIGURE_ARGS+= --disable-idn 149CONFIGURE_ARGS+= --disable-idn
139.endif 150.endif
140 151
141### 152###
142### Enable debugging support 153### Enable debugging support
143### 154###
144.if !empty(PKG_OPTIONS:Mdebug) 155.if !empty(PKG_OPTIONS:Mdebug)
145CONFIGURE_ARGS+= --enable-debug 156CONFIGURE_ARGS+= --enable-debug
146CFLAGS+= -g 157CFLAGS+= -g
147.endif 158.endif
148 159
149### 160###
150### gpgme support 161### gpgme support
151### 162###
152.if !empty(PKG_OPTIONS:Mgpgme) 163.if !empty(PKG_OPTIONS:Mgpgme)
153. include "../../security/gpgme/buildlink3.mk" 164. include "../../security/gpgme/buildlink3.mk"
154CONFIGURE_ARGS+= --enable-gpgme 165CONFIGURE_ARGS+= --enable-gpgme
155CONFIGURE_ARGS+= --with-gpgme-prefix=${BUILDLINK_PREFIX.gpgme} 166CONFIGURE_ARGS+= --with-gpgme-prefix=${BUILDLINK_PREFIX.gpgme}
156.else 167.else
157CONFIGURE_ARGS+= --disable-gpgme 168CONFIGURE_ARGS+= --disable-gpgme
158.endif 169.endif