summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authortonio <tonio>2010-12-20 14:03:39 +0000
committertonio <tonio>2010-12-20 14:03:39 +0000
commit867b0c5fc6ed68714c9d71b06828ee04141bbebd (patch)
tree690118c2112854c8c20e8d3f69e942a49514f034 /mail
parent2d1019f057c1c4f9b2ba07cb277280200c704f63 (diff)
downloadpkgsrc-867b0c5fc6ed68714c9d71b06828ee04141bbebd.tar.gz
Reenable mutt-sidebar and mutt-compressed-mbox options.
Use patch urls found by gls@
Diffstat (limited to 'mail')
-rw-r--r--mail/mutt-devel/distinfo8
-rw-r--r--mail/mutt-devel/options.mk27
2 files changed, 27 insertions, 8 deletions
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index aa92ebcee39..aabd0b08709 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,8 +1,14 @@
-$NetBSD: distinfo,v 1.65 2010/11/07 14:52:47 tonio Exp $
+$NetBSD: distinfo,v 1.66 2010/12/20 14:03:39 tonio Exp $
SHA1 (mutt-1.5.21.tar.gz) = a8475f2618ce5d5d33bff85c0affdf21ab1d76b9
RMD160 (mutt-1.5.21.tar.gz) = b235a42972ae410592253cdc117a90baf279f47a
Size (mutt-1.5.21.tar.gz) = 3716886 bytes
+SHA1 (patch-1.5.21.rr.compressed.gz) = 5c0ce1e75f2360bb81316e970df75b2bab472bf8
+RMD160 (patch-1.5.21.rr.compressed.gz) = 137a1a9fa042401c078be0de177ecfed60939fbe
+Size (patch-1.5.21.rr.compressed.gz) = 10133 bytes
+SHA1 (sidebar-5302767aa6aa.gz) = 3f87da8e209213a23f228f48ac554beee15adc0a
+RMD160 (sidebar-5302767aa6aa.gz) = c4fd8186cbca3dad30de253b673b9c45cb9abf26
+Size (sidebar-5302767aa6aa.gz) = 11762 bytes
SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
SHA1 (patch-ab) = 73d7fcd363d0064366c953fa61cfae9a71dcf9d4
SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
index a5fde35d360..9ebd7a1672b 100644
--- a/mail/mutt-devel/options.mk
+++ b/mail/mutt-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.41 2010/11/07 14:52:47 tonio Exp $
+# $NetBSD: options.mk,v 1.42 2010/12/20 14:03:39 tonio Exp $
# Global and legacy options
@@ -8,8 +8,8 @@ PKG_OPTIONS_GROUP.display= slang ncurses ncursesw curses
PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl
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-compressed-mbox
+PKG_SUPPORTED_OPTIONS+= mutt-sidebar
#PKG_SUPPORTED_OPTIONS+= mutt-xlabel
PKG_SUGGESTED_OPTIONS= ssl smime curses
@@ -105,10 +105,17 @@ CONFIGURE_ARGS+= --disable-hcache
### Compressed mail boxes
###
.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox)
-PATCH_SITES= http://www.spinnaker.de/mutt/compressed/
-PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.1.gz
+PATCH_SITES+= http://mutt.org.ua/download/${PKGNAME_NOREV}/
+PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.gz
PATCH_DIST_STRIP= -p1
CONFIGURE_ARGS+= --enable-compressed
+SUBST_CLASSES+= compress
+SUBST_MESSAGE.compress= Patch Makefile.in to avoid autoreconf for compress
+SUBST_STAGE.compress= post-patch
+SUBST_FILES.compress= Makefile.in
+SUBST_SED.compress= -e 's,^mutt_SOURCES = ,mutt_SOURCES = compress.c ,'
+SUBST_SED.compress+= -e 's,^EXTRA_DIST = ,EXTRA_DIST = compress.h ,'
+SUBST_SED.compress+= -e 's,^mutt_OBJECTS = ,mutt_OBJECTS = compress.o ,'
.endif
###
@@ -124,10 +131,16 @@ CONFIGURE_ARGS+= --disable-smtp
### Sidebar support
###
.if !empty(PKG_OPTIONS:Mmutt-sidebar)
-PATCH_SITES= http://lunar-linux.org/~tchan/mutt/
-PATCHFILES+= patch-1.5.20.sidebar.20090619.txt
+PATCH_SITES+= http://spacehopper.org/mutt/
+PATCHFILES+= sidebar-5302767aa6aa.gz
PATCH_DIST_STRIP= -p1
PATCH_FUZZ_FACTOR= -F1
+SUBST_CLASSES+= sidebar
+SUBST_MESSAGE.sidebar= Patch Makefile.in to avoid autoreconf for sidebar
+SUBST_STAGE.sidebar= post-patch
+SUBST_FILES.sidebar= Makefile.in
+SUBST_SED.sidebar= -e 's,lib.c \\,lib.c sidebar.c \\,'
+SUBST_SED.sidebar+= -e 's, lib\.\(.(OBJEXT)\), lib.\1 sidebar.\1,'
.endif
###