- bugfix update to 1.5.20; this is in the run-up to stable 1.6. using my own re-rolled compressed and sidebar diffs.
- set sysconfdir at fake-install time, rather than patch it afterwards. cleaner and avoids "make plist" spam. - wantlib cleanup (no more libdes) - bump stable PKGNAME Please test and comment/ok. | patch -E -d /usr/ports/mail/mutt p.s. (related); is anyone working on Tokyo Cabinet (qdbm replacement)? Index: Makefile.inc =================================================================== RCS file: /cvs/ports/mail/mutt/Makefile.inc,v retrieving revision 1.30 diff -u -p -r1.30 Makefile.inc --- Makefile.inc 20 Apr 2009 07:43:21 -0000 1.30 +++ Makefile.inc 14 Jun 2009 23:38:16 -0000 @@ -11,6 +11,7 @@ MASTER_SITES_MUTT= ftp://ftp.fu-berlin.d MASTER_SITES0= http://www.spinnaker.de/mutt/compressed/ MASTER_SITES1= http://lunar-linux.org/~tchan/mutt/ +MASTER_SITES2= http://spacehopper.org/mutt/ DIST_SUBDIR= mutt MAINTAINER= Stuart Henderson <[email protected]> @@ -23,7 +24,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB+= c crypto des gssapi krb5 ssl +WANTLIB+= c crypto gssapi krb5 ssl FLAVORS+= slang mixmaster compressed FLAVOR?= @@ -39,8 +40,8 @@ CONFIGURE_ARGS+=--enable-external_dotloc --sysconfdir=${CONFDIR} \ --with-docdir="${PREFIX}/share/doc/mutt" \ --with-gss \ - --with-sharedir="${PREFIX}/share/mutt" \ - --with-ssl \ + --with-ssl +FAKE_FLAGS= sysconfdir="${PREFIX}/share/examples/mutt" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ @@ -56,12 +57,13 @@ WANTLIB+= ncurses .endif # compressed folder support +DIST_COMPRESSED?= patch-${VERSION}.rr.compressed.1.gz:0 .if ${FLAVOR:L:Mcompressed} -PATCHFILES+= patch-${VERSION}.rr.compressed.1.gz:0 +PATCHFILES+= ${DIST_COMPRESSED} PATCH_DIST_STRIP= -p1 CONFIGURE_ARGS+= --enable-compressed .else -SUPDISTFILES+= patch-${VERSION}.rr.compressed.1.gz:0 +SUPDISTFILES+= ${DIST_COMPRESSED} .endif .if ${FLAVOR:L:Mmixmaster} @@ -90,11 +92,6 @@ SUBST_VARS= CONFDIR MUTTRCDIR?= post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mutt - ${INSTALL_DATA} ${WRKSRC}/${MUTTRCDIR}Muttrc \ - ${PREFIX}/share/examples/mutt/Muttrc.sample - ${INSTALL_DATA} ${WRKDIST}/mime.types \ - ${PREFIX}/share/examples/mutt/mime.types.sample @mv -f ${PREFIX}/share/doc/mutt/samples/* ${PREFIX}/share/examples/mutt @perl -pi -e "s,/etc/Muttrc,${CONFDIR}/Muttrc," ${PREFIX}/man/man1/mutt.1 @perl -pi -e "s,/etc/mime.types,${CONFDIR}/mime.types," ${PREFIX}/man/man1/mutt.1 Index: snapshot/Makefile =================================================================== RCS file: /cvs/ports/mail/mutt/snapshot/Makefile,v retrieving revision 1.52 diff -u -p -r1.52 Makefile --- snapshot/Makefile 22 May 2009 15:21:25 -0000 1.52 +++ snapshot/Makefile 14 Jun 2009 23:38:16 -0000 @@ -2,9 +2,8 @@ COMMENT= tty-based e-mail client, development version -VERSION= 1.5.19 +VERSION= 1.5.20 DISTNAME= mutt-${VERSION} -PKGNAME= mutt-${VERSION}p0 MASTER_SITES= ${MASTER_SITES_MUTT:=devel/} WANTLIB= z @@ -12,6 +11,8 @@ WANTLIB= z FLAVORS= idn sasl sidebar FLAVOR?= +# should be 2.63 +AUTOCONF_VERSION= 2.62 CONFIGURE_ARGS= --enable-hcache \ --enable-smtp \ --without-gdbm @@ -25,11 +26,14 @@ LIB_DEPENDS+= sasl2::security/cyrus-sasl MUTTRCDIR= doc/ +DIST_COMPRESSED=compressed-1.5.20.diff.gz:2 +DIST_SIDEBAR= sidebar-1.5.20.diff.gz:2 + .if ${FLAVOR:L:Msidebar} -PATCHFILES+= patch-${VERSION}.sidebar.20090522.txt:1 +PATCHFILES+= ${DIST_SIDEBAR} PATCH_DIST_STRIP= -p1 .else -SUPDISTFILES+= patch-${VERSION}.sidebar.20090522.txt:1 +SUPDISTFILES+= ${DIST_SIDEBAR} .endif .include <bsd.port.mk> Index: snapshot/distinfo =================================================================== RCS file: /cvs/ports/mail/mutt/snapshot/distinfo,v retrieving revision 1.30 diff -u -p -r1.30 distinfo --- snapshot/distinfo 22 May 2009 15:21:25 -0000 1.30 +++ snapshot/distinfo 14 Jun 2009 23:38:16 -0000 @@ -1,15 +1,15 @@ -MD5 (mutt/mutt-1.5.19.tar.gz) = c7N0e8f3yAWSHo0k66xpPw== -MD5 (mutt/patch-1.5.19.rr.compressed.1.gz) = fk6KVHdj0hc1GEbzFZkBng== -MD5 (mutt/patch-1.5.19.sidebar.20090522.txt) = vTXhcQGOyybU6wp0Ohoidw== -RMD160 (mutt/mutt-1.5.19.tar.gz) = 3LjQJ1k7/M1i63q6M4AHvOPH4i4= -RMD160 (mutt/patch-1.5.19.rr.compressed.1.gz) = uOtSAf3nURN35ViJU8Bx0LfjDI0= -RMD160 (mutt/patch-1.5.19.sidebar.20090522.txt) = EWRR1ZqnRmRPJp+MAoSENgyE40I= -SHA1 (mutt/mutt-1.5.19.tar.gz) = luTMHhQZuoFvzBnXclWXjmLCB5M= -SHA1 (mutt/patch-1.5.19.rr.compressed.1.gz) = xjkjCl/ayW1aTnNeMgr2bkveaIo= -SHA1 (mutt/patch-1.5.19.sidebar.20090522.txt) = BWw5RlfHjgVJCdz94GkgB86jP+M= -SHA256 (mutt/mutt-1.5.19.tar.gz) = sWC67fJnakwsGlx0BJ4sY/APzP9D7iWUNnCHoIv9Y8g= -SHA256 (mutt/patch-1.5.19.rr.compressed.1.gz) = t7Tur+bHrlxqGKj2e3DafCxLKXvUqvN1wZm8XMKYXIw= -SHA256 (mutt/patch-1.5.19.sidebar.20090522.txt) = ZLIoKqyIozdLtIqaB7Y3REP+PI9ZBd75rDzcJtn4NVo= -SIZE (mutt/mutt-1.5.19.tar.gz) = 3558746 -SIZE (mutt/patch-1.5.19.rr.compressed.1.gz) = 10562 -SIZE (mutt/patch-1.5.19.sidebar.20090522.txt) = 52307 +MD5 (mutt/compressed-1.5.20.diff.gz) = 4xSjIY/dvydz3LExkxoN4g== +MD5 (mutt/mutt-1.5.20.tar.gz) = AnzdmVkgPeDDxkFJp+41HA== +MD5 (mutt/sidebar-1.5.20.diff.gz) = muZJPx4h6wLWmr1NFdrPsA== +RMD160 (mutt/compressed-1.5.20.diff.gz) = RgaMsDPxgKJTawFQzzm9En/Z1bI= +RMD160 (mutt/mutt-1.5.20.tar.gz) = 31gveTZLn9cKAAHnahGdj3gnXrs= +RMD160 (mutt/sidebar-1.5.20.diff.gz) = jjILlQtLTKeWs5zmg3wngTftsWA= +SHA1 (mutt/compressed-1.5.20.diff.gz) = KhlFfvfP1GA6azseUzAebFHjsnc= +SHA1 (mutt/mutt-1.5.20.tar.gz) = 0r7Hozdx8SjKSbFyOwa20kijXTE= +SHA1 (mutt/sidebar-1.5.20.diff.gz) = kyH1cb8C3sO407wONyrKTtJB/Ps= +SHA256 (mutt/compressed-1.5.20.diff.gz) = 6WGic/h6jKRGWGgc+tdTwkxlAjajcZksWvk9elzjpo8= +SHA256 (mutt/mutt-1.5.20.tar.gz) = lXn8B510/1yJIj/wnfQC705Qi6jKklxJ50qgnAKpp5Y= +SHA256 (mutt/sidebar-1.5.20.diff.gz) = iALUvsxKFzfmlVoURvLd1zyB9DVfLCKBLnFL/GIettQ= +SIZE (mutt/compressed-1.5.20.diff.gz) = 368893 +SIZE (mutt/mutt-1.5.20.tar.gz) = 3635047 +SIZE (mutt/sidebar-1.5.20.diff.gz) = 544721 Index: snapshot/pkg/PLIST =================================================================== RCS file: /cvs/ports/mail/mutt/snapshot/pkg/PLIST,v retrieving revision 1.18 diff -u -p -r1.18 PLIST --- snapshot/pkg/PLIST 20 Apr 2009 07:43:21 -0000 1.18 +++ snapshot/pkg/PLIST 14 Jun 2009 23:38:16 -0000 @@ -40,12 +40,14 @@ share/doc/mutt/optionalfeatures.html share/doc/mutt/patch-notes.txt share/doc/mutt/reference.html share/doc/mutt/samples/ +share/doc/mutt/security.html share/doc/mutt/smime-notes.txt share/doc/mutt/tuning.html share/examples/mutt/ @sample ${CONFDIR}/ share/examples/mutt/Mush.rc -share/examples/mutt/Muttrc.sample +...@comment share/examples/mutt/Muttrc +share/examples/mutt/Muttrc.dist @sample ${CONFDIR}/Muttrc share/examples/mutt/Pine.rc share/examples/mutt/Tin.rc @@ -72,7 +74,8 @@ share/examples/mutt/iconv/iconv.solaris- share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc share/examples/mutt/iconv/iconv.solaris-2.6.rc share/examples/mutt/iconv/iconv.solaris-2.7.rc -share/examples/mutt/mime.types.sample +...@comment share/examples/mutt/mime.types +share/examples/mutt/mime.types.dist @sample ${CONFDIR}/mime.types share/examples/mutt/mutt_xtitle share/examples/mutt/pgp2.rc Index: stable/Makefile =================================================================== RCS file: /cvs/ports/mail/mutt/stable/Makefile,v retrieving revision 1.36 diff -u -p -r1.36 Makefile --- stable/Makefile 20 Apr 2009 07:43:21 -0000 1.36 +++ stable/Makefile 14 Jun 2009 23:38:16 -0000 @@ -4,7 +4,7 @@ COMMENT= tty-based e-mail client VERSION= 1.4.2.3 DISTNAME= mutt-${VERSION} -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 MASTER_SITES= ${MASTER_SITES_MUTT} .include <bsd.port.mk> Index: stable/patches/patch-Makefile_in =================================================================== RCS file: stable/patches/patch-Makefile_in diff -N stable/patches/patch-Makefile_in --- stable/patches/patch-Makefile_in 15 Jun 2007 19:01:07 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.4 2007/06/15 19:01:07 kili Exp $ ---- Makefile.in.orig Sun May 27 03:00:00 2007 -+++ Makefile.in Mon May 28 19:10:48 2007 -@@ -906,7 +906,7 @@ info: info-recursive - - info-am: - --install-data-am: install-data-local -+install-data-am: Muttrc - - install-exec-am: install-binPROGRAMS install-binSCRIPTS \ - install-exec-local Index: stable/pkg/PLIST =================================================================== RCS file: /cvs/ports/mail/mutt/stable/pkg/PLIST,v retrieving revision 1.9 diff -u -p -r1.9 PLIST --- stable/pkg/PLIST 20 Apr 2009 07:43:21 -0000 1.9 +++ stable/pkg/PLIST 14 Jun 2009 23:38:16 -0000 @@ -39,7 +39,7 @@ share/doc/mutt/patch-notes.txt share/doc/mutt/samples/ share/examples/mutt/ share/examples/mutt/Mush.rc -share/examples/mutt/Muttrc.sample +share/examples/mutt/Muttrc @sample ${CONFDIR}/Muttrc share/examples/mutt/Pine.rc share/examples/mutt/Tin.rc @@ -63,7 +63,7 @@ share/examples/mutt/iconv/iconv.solaris- share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc share/examples/mutt/iconv/iconv.solaris-2.6.rc share/examples/mutt/iconv/iconv.solaris-2.7.rc -share/examples/mutt/mime.types.sample +share/examples/mutt/mime.types @sample ${CONFDIR}/mime.types share/examples/mutt/pgp2.rc share/examples/mutt/pgp5.rc
