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
--- 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,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2009/02/05 13:45:28 tonio Exp $
+# $NetBSD: Makefile,v 1.74 2009/04/12 08:25:43 tonio Exp $
DISTNAME= mutt-1.5.19
PKGREVISION= 2
@@ -22,7 +22,7 @@
USE_TOOLS+= msgfmt
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \
--with-docdir=${PREFIX}/share/doc/mutt \
--without-included-gettext \
--enable-external-dotlock \
@@ -61,7 +61,7 @@
SUBST_CLASSES+= paths
SUBST_FILES.paths= doc/Muttrc
SUBST_VARS.paths+= DOCDIR PREFIX
-SUBST_STAGE.paths+= pre-configure
+SUBST_STAGE.paths= pre-configure
SPECIAL_PERMS+= bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551
INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
--- 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,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.19 2009/01/27 19:50:33 tonio Exp $
+@comment $NetBSD: PLIST,v 1.20 2009/04/12 08:25:43 tonio Exp $
bin/flea
bin/mutt
-bin/muttbug
bin/mutt_dotlock
+bin/muttbug
bin/pgpewrap
bin/pgpring
${PLIST.smime}bin/smime_keys
--- 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,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2009/03/23 00:24:31 joerg Exp $
+$NetBSD: distinfo,v 1.57 2009/04/12 08:25:43 tonio Exp $
SHA1 (mutt-1.5.19.tar.gz) = 96e4cc1e1419ba816fcc19d77255978e62c20793
RMD160 (mutt-1.5.19.tar.gz) = dcb8d027593bfccd62eb7aba338007bce3c7e22e
@@ -6,6 +6,9 @@
SHA1 (patch-1.5.19.rr.compressed.1.gz) = c639230a5fdac96d5a4e735e320af66e4bde688a
RMD160 (patch-1.5.19.rr.compressed.1.gz) = b8eb5201fde7511377e5588953c071d0b7e30c8d
Size (patch-1.5.19.rr.compressed.1.gz) = 10562 bytes
+SHA1 (patch-1.5.19.sidebar.20090308.txt) = c16533176fce2b48d27cd587b63caa379258e740
+RMD160 (patch-1.5.19.sidebar.20090308.txt) = 076272ffcb70f118c1d8850c430f3d74f43ad23b
+Size (patch-1.5.19.sidebar.20090308.txt) = 51936 bytes
SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
SHA1 (patch-ab) = 39a3cbe6e1738e036cb679a22c7385ed5ac401eb
SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
--- 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,4 +1,4 @@
-# $NetBSD: options.mk,v 1.34 2009/03/23 00:24:31 joerg Exp $
+# $NetBSD: options.mk,v 1.35 2009/04/12 08:25:43 tonio Exp $
# Global and legacy options
@@ -9,6 +9,7 @@
PKG_SUPPORTED_OPTIONS+= mutt-hcache mutt-smtp
# Comment the following line out on updates.
PKG_SUPPORTED_OPTIONS+= mutt-compressed-mbox
+PKG_SUPPORTED_OPTIONS+= mutt-sidebar
#PKG_SUPPORTED_OPTIONS+= mutt-xlabel
PKG_SUGGESTED_OPTIONS= ssl smime curses
@@ -117,6 +118,16 @@
CONFIGURE_ARGS+= --enable-smtp
.else
CONFIGURE_ARGS+= --disable-smtp
+.endif
+
+###
+### Sidebar support
+###
+.if !empty(PKG_OPTIONS:Mmutt-sidebar)
+PATCH_SITES= http://lunar-linux.org/~tchan/mutt/
+PATCHFILES+= patch-1.5.19.sidebar.20090308.txt
+PATCH_DIST_STRIP= -p1
+PATCH_FUZZ_FACTOR= -F1
.endif
###