cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backout mutt update, as spotted by kili the compressed folders patch doesn't

Browse Source 
apply, it's going to need more work than i have time for at the moment to
merge (i hate these external patchsets...)
This commit is contained in:
sthen 2016-08-19 22:47:55 +00:00
parent 45ba31041f
commit 510a07e0c0
5 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mail/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.343 2016/08/18 22:41:54 sthen Exp $
# $OpenBSD: Makefile,v 1.344 2016/08/19 22:47:55 sthen Exp $
SUBDIR =
SUBDIR += abook
@ -96,11 +96,12 @@
SUBDIR += msmtp
SUBDIR += mu
SUBDIR += mutt
SUBDIR += mutt,compressed
SUBDIR += mutt,compressed,sasl
SUBDIR += mutt,compressed,sasl,slang
SUBDIR += mutt,compressed,sidebar
SUBDIR += mutt,compressed,sidebar,sasl
SUBDIR += mutt,compressed,sidebar,sasl,slang
SUBDIR += mutt,gpgme
SUBDIR += mutt,sasl
SUBDIR += mutt,slang
SUBDIR += nmh
SUBDIR += nmh,sasl
SUBDIR += nmzmail

28
mail/mutt/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.79 2016/08/18 22:41:55 sthen Exp $
# $OpenBSD: Makefile,v 1.80 2016/08/19 22:47:55 sthen Exp $
COMMENT= tty-based e-mail client
DISTNAME= mutt-1.7.0
EPOCH= 0
DISTNAME= mutt-1.6.2
EPOCH= 1
CATEGORIES= mail
HOMEPAGE= http://www.mutt.org/
@ -19,7 +19,8 @@ WANTLIB+= c crypto iconv idn intl qdbm ssl z
MASTER_SITES= http://ftp.mutt.org/pub/mutt/ \
https://bitbucket.org/mutt/mutt/downloads/ \
ftp://ftp.mutt.org/pub/mutt/
MASTER_SITES0= http://spacehopper.org/mutt/
MASTER_SITES1= http://lunar-linux.org/~tchan/mutt/
MASTER_SITES2= http://spacehopper.org/mutt/
DIST_SUBDIR= mutt
PATCH_DIST_STRIP= -p1
@ -29,7 +30,7 @@ LIB_DEPENDS= databases/qdbm \
BUILD_DEPENDS+= textproc/docbook-xsl \
www/lynx
FLAVORS= compressed gpgme sasl slang
FLAVORS= compressed gpgme sasl sidebar slang
FLAVOR?=
CONFIGURE_STYLE= gnu
@ -38,7 +39,6 @@ FLAVOR_COMMA= ${FLAVOR_EXT:S/-/,/g}
SUBST_VARS= FLAVOR_COMMA
CONFIGURE_ARGS+= --enable-external_dotlock \
--enable-sidebar \
--disable-fcntl \
--enable-flock \
--enable-hcache \
@ -96,13 +96,27 @@ WANTLIB+= ncurses
# If there are conflicts when updating mutt, check to see if gentoo have
# already fixed: http://prefix.gentooexperimental.org:8000/mutt-patches
# sidebar patch (not good, but people seem to like it...)
DIST_SIDEBAR= sidebar-1.6.0.diff.gz:2
SUPDISTFILES+= ${DIST_SIDEBAR}
.if ${FLAVOR:Msidebar}
PATCHFILES+= ${DIST_SIDEBAR}
.endif
# compressed folders patch http://www.spinnaker.de/mutt/compressed/
DIST_COMPR= compressed-1.6.0.diff.gz:0
DIST_COMPR= compressed-1.6.0.diff.gz:2
SUPDISTFILES+= ${DIST_COMPR}
.if ${FLAVOR:Mcompressed}
PATCHFILES+= ${DIST_COMPR}
CONFIGURE_ARGS+= --enable-compressed
.endif
# trashfolder, http://cedricduval.free.fr/mutt/patches/
# enabled unconditionally, it's not *too* intrusive (additional flavours
# mean a big increase in ports testing required).
PATCHFILES+= trashfolder-1.6.0.diff.gz:2
.if ${FLAVOR:Msidebar} || ${FLAVOR:Mcompressed}
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.15
BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \

8
mail/mutt/distinfo
View File

@ -1,4 +1,8 @@
SHA256 (mutt/compressed-1.6.0.diff.gz) = M0kf2sRul69EWWFx83uNvDnm1FivfwEd8IdpeaapZDI=
SHA256 (mutt/mutt-1.7.0.tar.gz) = HT6YdDPYyS74imBPTc79s1qGznPz7/AVfi5JHltVs0U=
SHA256 (mutt/mutt-1.6.2.tar.gz) = xdAu8GSGzfBPnuuenXmUiQ2N+n9H57/rU6KmfaKsHY4=
SHA256 (mutt/sidebar-1.6.0.diff.gz) = Y7ayjXAIttUr2YFRVHsFIlHNS8h+Rn5H/+vjct/nFVs=
SHA256 (mutt/trashfolder-1.6.0.diff.gz) = t3nG32GnfzBpE5qthWK0pHyO7Yq1uPVoF0KhwuqhkLg=
SIZE (mutt/compressed-1.6.0.diff.gz) = 6306
SIZE (mutt/mutt-1.7.0.tar.gz) = 4019567
SIZE (mutt/mutt-1.6.2.tar.gz) = 3956745
SIZE (mutt/sidebar-1.6.0.diff.gz) = 12174
SIZE (mutt/trashfolder-1.6.0.diff.gz) = 2757

2
mail/mutt/pkg/DESCR
View File

@ -13,3 +13,5 @@ Flavors:
slang - use S-Lang instead of curses for screen handling
compressed - build with compressed folder support
(see: http://www.spinnaker.de/mutt/compressed/)
sidebar - adds a sidebar that has a folder list
(see: http://thomer.com/mutt/)

4
mail/mutt/pkg/PLIST
View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.18 2016/08/18 22:41:55 sthen Exp $
@comment $OpenBSD: PLIST,v 1.19 2016/08/19 22:47:55 sthen Exp $
@pkgpath mail/mutt/stable${FLAVOR_COMMA}
@pkgpath mail/mutt/snapshot[,hcache][,idn]${FLAVOR_COMMA}
@pkgpath mail/mutt/[,idn][,sidebar]${FLAVOR_COMMA}
@pkgpath mail/mutt/[,idn]${FLAVOR_COMMA}
bin/flea
@bin bin/mutt
@bin bin/mutt_dotlock