Todd T. Fries [2007-07-25, 09:28:33]: > So, anybody have _any_ comments? > > I don't see why this would hurt, because these flavors add functionality > that is not enabled by default, one must add .muttrc entries to enable > them. These also (as Brad points out) do not alter the dependencies of > mutt in any way. > > I'd like to hear comments, but I'd also like to commit this if there are > no objections heard soon.
The code added by the flavors is not part of the official mutt and keeping it flavored allows one to use the main version in a straightforward way. I prefer to keep it the way it is. > > Thanks, > > On Friday 20 July 2007 23:12:50 Brad wrote: > > Here is a diff based on a suggestion Todd had and that is to > > integrate the compressed and sidebar FLAVORs by default, as > > they do not introduce any new external dependencies. As well > > as a little cleanup. Todd has tested that the various > > combinations of FLAVORs currently in the port build Ok. > > > > Comments/objections? > > > > > > Index: Makefile > > =================================================================== > > RCS file: /cvs/ports/mail/mutt/Makefile,v > > retrieving revision 1.54 > > diff -u -p -r1.54 Makefile > > --- Makefile 19 Jul 2007 00:19:28 -0000 1.54 > > +++ Makefile 20 Jul 2007 21:19:31 -0000 > > @@ -1,10 +1,7 @@ > > # $OpenBSD: Makefile,v 1.54 2007/07/19 00:19:28 todd Exp $ > > > > SUBDIR += stable > > - SUBDIR += stable,compressed > > SUBDIR += snapshot > > - SUBDIR += snapshot,compressed > > SUBDIR += snapshot,sasl > > - SUBDIR += snapshot,sidebar > > > > .include <bsd.port.subdir.mk> > > Index: Makefile.inc > > =================================================================== > > RCS file: /cvs/ports/mail/mutt/Makefile.inc,v > > retrieving revision 1.24 > > diff -u -p -r1.24 Makefile.inc > > --- Makefile.inc 21 Jun 2007 17:26:29 -0000 1.24 > > +++ Makefile.inc 20 Jul 2007 21:35:53 -0000 > > @@ -12,6 +12,11 @@ MASTER_SITES_MUTT= ftp://ftp.fu-berlin.d > > MASTER_SITES0= http://www.spinnaker.de/mutt/compressed/ > > MASTER_SITES1= http://spacehopper.org/ > > > > +# compressed folder support provided by > > +# http://www.spinnaker.de/mutt/compressed/ > > +PATCHFILES+= patch-${VERSION}.rr.compressed.1.gz:0 > > +PATCH_DIST_STRIP= -p1 > > + > > MODULES= devel/gettext > > > > # GPL > > @@ -22,13 +27,14 @@ PERMIT_DISTFILES_FTP= Yes > > > > WANTLIB= c crypto des ssl > > > > -FLAVORS+= slang mixmaster compressed > > +FLAVORS+= mixmaster slang > > FLAVOR?= > > > > AUTOCONF_VERSION?= 2.59 > > CONFIGURE_STYLE= autoconf old > > CONFIGURE_ARGS+=--with-sharedir="${PREFIX}/share/mutt" \ > > --with-docdir="${PREFIX}/share/doc/mutt" \ > > + --enable-compressed \ > > --enable-flock \ > > --disable-fcntl \ > > --enable-external_dotlock \ > > @@ -46,50 +52,26 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/ > > LDFLAGS="-L${LOCALBASE}/lib" \ > > ISPELL="${LOCALBASE}/bin/ispell" > > > > -.if ${FLAVOR:L:Mslang} > > -LIB_DEPENDS+= slang.>=14::devel/libslang > > -CONFIGURE_ARGS+= --with-slang="${PREFIX}" > > -WANTLIB+= m termlib > > -.else > > -CONFIGURE_ARGS+= --with-curses > > -WANTLIB+= ncurses > > -.endif > > - > > -# compressed folder support provided by > > -# http://www.spinnaker.de/mutt/compressed/ > > -.if ${FLAVOR:L:Mcompressed} > > -PATCHFILES+= patch-${VERSION}.rr.compressed.1.gz:0 > > -PATCH_DIST_STRIP= -p1 > > -CONFIGURE_ARGS+= --enable-compressed > > -.else > > -SUPDISTFILES+= patch-${VERSION}.rr.compressed.1.gz:0 > > -.endif > > - > > .if ${FLAVOR:L:Mmixmaster} > > -CONFIGURE_ARGS+= --with-mixmaster="${LOCALBASE}/sbin/mixmaster" > > -RUN_DEPENDS+= ::mail/mixmaster > > +CONFIGURE_ARGS+=--with-mixmaster="${LOCALBASE}/sbin/mixmaster" > > +RUN_DEPENDS+= ::mail/mixmaster > > .endif > > > > -.if ${FLAVOR:L:Midn} > > -CONFIGURE_ARGS+= --with-idn > > -LIB_DEPENDS+= idn.>=16::devel/libidn > > -.else > > -CONFIGURE_ARGS+= --without-idn > > -.endif > > - > > -.if ${FLAVOR:L:Msidebar} > > -PATCHFILES+= patch-1.5.16.sidebar.txt:1 > > -PATCH_DIST_STRIP= -p1 > > +.if ${FLAVOR:L:Mslang} > > +LIB_DEPENDS+= slang.>=14::devel/libslang > > +CONFIGURE_ARGS+=--with-slang="${PREFIX}" > > +WANTLIB+= m termlib > > .else > > -SUPDISTFILES+= patch-1.5.16.sidebar.txt:1 > > +CONFIGURE_ARGS+=--with-curses > > +WANTLIB+= ncurses > > .endif > > > > .if defined(HOMESPOOL) > > -CONFIGURE_ARGS+= --with-homespool="${HOMESPOOL}" > > +CONFIGURE_ARGS+=--with-homespool="${HOMESPOOL}" > > .endif > > > > .if defined(DOMAIN) > > -CONFIGURE_ARGS+= --with-domain="${DOMAIN}" > > +CONFIGURE_ARGS+=--with-domain="${DOMAIN}" > > .endif > > > > WRKDIST= ${WRKDIR}/${DISTNAME:S/i$//} > > Index: snapshot/Makefile > > =================================================================== > > RCS file: /cvs/ports/mail/mutt/snapshot/Makefile,v > > retrieving revision 1.43 > > diff -u -p -r1.43 Makefile > > --- snapshot/Makefile 19 Jul 2007 00:18:12 -0000 1.43 > > +++ snapshot/Makefile 20 Jul 2007 21:23:48 -0000 > > @@ -4,10 +4,12 @@ COMMENT= "tty-based e-mail client, devel > > > > VERSION= 1.5.16 > > DISTNAME= mutt-${VERSION} > > -PKGNAME= ${DISTNAME}p0 > > +PKGNAME= ${DISTNAME}p1 > > MASTER_SITES= ${MASTER_SITES_MUTT:=devel/} > > > > -FLAVORS= idn sasl sidebar > > +PATCHFILES+= patch-1.5.16.sidebar.txt:1 > > + > > +FLAVORS= idn sasl > > FLAVOR?= > > > > AUTOCONF_VERSION=2.60 > > @@ -19,8 +21,15 @@ CONFIGURE_ARGS= --enable-smtp \ > > > > LIB_DEPENDS= qdbm.>=14::databases/qdbm > > > > +.if ${FLAVOR:L:Midn} > > +CONFIGURE_ARGS+=--with-idn > > +LIB_DEPENDS+= idn.>=16::devel/libidn > > +.else > > +CONFIGURE_ARGS+=--without-idn > > +.endif > > + > > .if ${FLAVOR:L:Msasl} > > -CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} > > +CONFIGURE_ARGS+=--with-sasl=${LOCALBASE} > > LIB_DEPENDS+= sasl2::security/cyrus-sasl2 > > .endif > > > > Index: snapshot/pkg/DESCR > > =================================================================== > > RCS file: /cvs/ports/mail/mutt/snapshot/pkg/DESCR,v > > retrieving revision 1.8 > > diff -u -p -r1.8 DESCR > > --- snapshot/pkg/DESCR 19 Jul 2007 00:18:12 -0000 1.8 > > +++ snapshot/pkg/DESCR 20 Jul 2007 21:39:36 -0000 > > @@ -14,15 +14,13 @@ Other features include: > > - PGP/MIME (RFC2015) > > - small and efficient > > - Maildir/IMAP/POP3 header caching support > > +- Compressed folder support (http://www.spinnaker.de/mutt/compressed/) > > +- Sidebar that has a folder list (http://thomer.com/mutt/) > > > > Flavors: > > - sasl - build with SASL authentication support > > - slang - build using the S-Lang library for screen handling > > - compressed - build with compressed folder support > > - (see: http://www.spinnaker.de/mutt/compressed/) > > - mixmaster - build with anonymous remailing support > > - idn - build with internationalized domain name support > > - sidebar - adds a sidebar that has a folder list > > - (see: http://thomer.com/mutt/) > > + idn - Build with internationalized domain name support > > + mixmaster - Build with anonymous remailing support > > + sasl - Build with SASL authentication support > > + slang - Build using the S-Lang library for screen handling > > > > This is the development version of mutt. > > Index: stable/Makefile > > =================================================================== > > RCS file: /cvs/ports/mail/mutt/stable/Makefile,v > > retrieving revision 1.32 > > diff -u -p -r1.32 Makefile > > --- stable/Makefile 15 Jun 2007 19:01:07 -0000 1.32 > > +++ stable/Makefile 20 Jul 2007 21:23:55 -0000 > > @@ -4,6 +4,7 @@ COMMENT= "tty-based e-mail client" > > > > VERSION= 1.4.2.3 > > DISTNAME= mutt-${VERSION} > > +PKGNAME= ${DISTNAME}p0 > > MASTER_SITES= ${MASTER_SITES_MUTT} > > > > .include <bsd.port.mk> > > Index: stable/pkg/DESCR > > =================================================================== > > RCS file: /cvs/ports/mail/mutt/stable/pkg/DESCR,v > > retrieving revision 1.3 > > diff -u -p -r1.3 DESCR > > --- stable/pkg/DESCR 15 Dec 2003 21:42:39 -0000 1.3 > > +++ stable/pkg/DESCR 20 Jul 2007 21:38:26 -0000 > > @@ -13,9 +13,8 @@ Other features include: > > - Delivery Status Notification (DSN) support > > - PGP/MIME (RFC2015) > > - small and efficient > > +- Compressed folder support (http://www.spinnaker.de/mutt/compressed/) > > > > Flavors: > > - slang - build using the S-Lang library for screen handling. > > - compressed - build with compressed folder support > > - (see: http://www.spinnaker.de/mutt/compressed/) > > - mixmaster - build with anonymous remailing support. > > + mixmaster - Build with anonymous remailing support. > > + slang - Build using the S-Lang library for screen handling. > > > > -- > Todd Fries .. [EMAIL PROTECTED] > > _____________________________________________ > | \ 1.636.410.0632 (voice) > | Free Daemon Consulting \ 1.405.227.9094 (voice) > | http://FreeDaemonConsulting.com \ 1.866.792.3418 (FAX) > | "..in support of free software solutions." \ 250797 (FWD) > | \ > \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ > > 37E7 D3EB 74D0 8D66 A68D B866 0326 204E 3F42 004A > http://todd.fries.net/pgp.txt >
