- updated diff using Terry Chan's updated sidebar patch which works (tested by Simon Kuhnle and myself on a variety of arch).
- don't unconditionally strip the installed binary. - regen PLIST for 1.4. - take MAINTAINER. ok? Index: Makefile.inc =================================================================== RCS file: /cvs/ports/mail/mutt/Makefile.inc,v retrieving revision 1.29 diff -N -u -p Makefile.inc --- Makefile.inc 2 Sep 2008 18:35:57 -0000 1.29 +++ Makefile.inc 11 Mar 2009 11:05:23 -0000 @@ -10,15 +10,18 @@ MASTER_SITES_MUTT= ftp://ftp.fu-berlin.de/pub/unix/mai ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/ MASTER_SITES0= http://www.spinnaker.de/mutt/compressed/ -MASTER_SITES1= http://spacehopper.org/ +MASTER_SITES1= http://lunar-linux.org/~tchan/mutt/ +MAINTAINER= Stuart Henderson <[email protected]> + MODULES= devel/gettext -# GPL +# GPLv2+ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes + WANTLIB+= c crypto des gssapi krb5 ssl FLAVORS+= slang mixmaster compressed @@ -51,8 +54,7 @@ CONFIGURE_ARGS+= --with-curses WANTLIB+= ncurses .endif -# compressed folder support provided by -# http://www.spinnaker.de/mutt/compressed/ +# compressed folder support .if ${FLAVOR:L:Mcompressed} PATCHFILES+= patch-${VERSION}.rr.compressed.1.gz:0 PATCH_DIST_STRIP= -p1 @@ -87,7 +89,6 @@ SUBST_VARS= CONFDIR MUTTRCDIR?= post-install: - @strip ${PREFIX}/bin/mutt ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mutt ${INSTALL_DATA} ${WRKSRC}/${MUTTRCDIR}Muttrc \ ${PREFIX}/share/examples/mutt/Muttrc.sample Index: snapshot/Makefile =================================================================== RCS file: /cvs/ports/mail/mutt/snapshot/Makefile,v retrieving revision 1.49 diff -N -u -p snapshot/Makefile --- snapshot/Makefile 22 May 2008 14:40:12 -0000 1.49 +++ snapshot/Makefile 11 Mar 2009 11:05:23 -0000 @@ -2,7 +2,7 @@ COMMENT= tty-based e-mail client, development version -VERSION= 1.5.18 +VERSION= 1.5.19 DISTNAME= mutt-${VERSION} MASTER_SITES= ${MASTER_SITES_MUTT:=devel/} @@ -25,10 +25,10 @@ LIB_DEPENDS+= sasl2::security/cyrus-sasl2 MUTTRCDIR= doc/ .if ${FLAVOR:L:Msidebar} -PATCHFILES+= patch-${VERSION}.sidebar-b.txt:1 +PATCHFILES+= patch-${VERSION}.sidebar.20090308.txt:1 PATCH_DIST_STRIP= -p1 .else -SUPDISTFILES+= patch-${VERSION}.sidebar-b.txt:1 +SUPDISTFILES+= patch-${VERSION}.sidebar.20090308.txt:1 .endif .include <bsd.port.mk> Index: snapshot/distinfo =================================================================== RCS file: /cvs/ports/mail/mutt/snapshot/distinfo,v retrieving revision 1.27 diff -N -u -p snapshot/distinfo --- snapshot/distinfo 21 May 2008 13:46:19 -0000 1.27 +++ snapshot/distinfo 11 Mar 2009 11:05:23 -0000 @@ -1,15 +1,15 @@ -MD5 (mutt-1.5.18.tar.gz) = J8MANxIBibn5wNPnY2G4+A== -MD5 (patch-1.5.18.rr.compressed.1.gz) = k88UXqhLBeOoshfChB5caQ== -MD5 (patch-1.5.18.sidebar-b.txt) = MuAcUWqAOKSzIXOWSx89hg== -RMD160 (mutt-1.5.18.tar.gz) = HIWV9m65qpTAGmAgviCnXAyNLRQ= -RMD160 (patch-1.5.18.rr.compressed.1.gz) = VV+dKFuPdwbUR4kgTT7RhNlZCzI= -RMD160 (patch-1.5.18.sidebar-b.txt) = Pyi+yGHsL01hxtNGhko7tlo6ym0= -SHA1 (mutt-1.5.18.tar.gz) = qDWhkzKXSU8sbGi5ozTMHXGpXlo= -SHA1 (patch-1.5.18.rr.compressed.1.gz) = 7nFhH68wNI9oXtTBikQGuMNPkec= -SHA1 (patch-1.5.18.sidebar-b.txt) = NhFc7vNFw/pb1ExUp0k6BCcODoA= -SHA256 (mutt-1.5.18.tar.gz) = i7bWnqLHIDC2bsm7S9QAe6bY3F9g/f3ntxLieE4Iv7M= -SHA256 (patch-1.5.18.rr.compressed.1.gz) = yovuAdAv6ukwCWFa7VHPPaiLtH5qeJcm4yNvOxDfdSU= -SHA256 (patch-1.5.18.sidebar-b.txt) = Xpqja8Pm3cMvjiZYz4owQ5rEsrIjrjF2GiBxz/ztYRs= -SIZE (mutt-1.5.18.tar.gz) = 3602632 -SIZE (patch-1.5.18.rr.compressed.1.gz) = 10577 -SIZE (patch-1.5.18.sidebar-b.txt) = 44857 +MD5 (mutt-1.5.19.tar.gz) = c7N0e8f3yAWSHo0k66xpPw== +MD5 (patch-1.5.19.rr.compressed.1.gz) = fk6KVHdj0hc1GEbzFZkBng== +MD5 (patch-1.5.19.sidebar.20090308.txt) = YB+ffuRmU/E4zFPl/0RM0g== +RMD160 (mutt-1.5.19.tar.gz) = 3LjQJ1k7/M1i63q6M4AHvOPH4i4= +RMD160 (patch-1.5.19.rr.compressed.1.gz) = uOtSAf3nURN35ViJU8Bx0LfjDI0= +RMD160 (patch-1.5.19.sidebar.20090308.txt) = B2Jy/8tw8RjB2IUMQw89dPQ60js= +SHA1 (mutt-1.5.19.tar.gz) = luTMHhQZuoFvzBnXclWXjmLCB5M= +SHA1 (patch-1.5.19.rr.compressed.1.gz) = xjkjCl/ayW1aTnNeMgr2bkveaIo= +SHA1 (patch-1.5.19.sidebar.20090308.txt) = wWUzF2/OK0jSfNWHtjyqN5JY50A= +SHA256 (mutt-1.5.19.tar.gz) = sWC67fJnakwsGlx0BJ4sY/APzP9D7iWUNnCHoIv9Y8g= +SHA256 (patch-1.5.19.rr.compressed.1.gz) = t7Tur+bHrlxqGKj2e3DafCxLKXvUqvN1wZm8XMKYXIw= +SHA256 (patch-1.5.19.sidebar.20090308.txt) = f2X1O78uDSt19YRLmG/cI0MlGYSBg6VA5OfEns97/cs= +SIZE (mutt-1.5.19.tar.gz) = 3558746 +SIZE (patch-1.5.19.rr.compressed.1.gz) = 10562 +SIZE (patch-1.5.19.sidebar.20090308.txt) = 51936 Index: snapshot/pkg/PLIST =================================================================== RCS file: /cvs/ports/mail/mutt/snapshot/pkg/PLIST,v retrieving revision 1.17 diff -N -u -p snapshot/pkg/PLIST --- snapshot/pkg/PLIST 11 Nov 2007 10:09:43 -0000 1.17 +++ snapshot/pkg/PLIST 11 Mar 2009 11:05:23 -0000 @@ -1,11 +1,11 @@ @comment $OpenBSD: PLIST,v 1.17 2007/11/11 10:09:43 sthen Exp $ @pkgpath mail/mutt/snapshot,hcache bin/flea -bin/mutt -bin/mutt_dotlock +...@bin bin/mutt +...@bin bin/mutt_dotlock bin/muttbug -bin/pgpewrap -bin/pgpring +...@bin bin/pgpewrap +...@bin bin/pgpring bin/smime_keys @man man/man1/flea.1 @man man/man1/mutt.1 @@ -17,7 +17,6 @@ bin/smime_keys share/doc/mutt/ share/doc/mutt/COPYRIGHT share/doc/mutt/ChangeLog -share/doc/mutt/ChangeLog.old share/doc/mutt/GPL share/doc/mutt/INSTALL share/doc/mutt/NEWS @@ -93,8 +92,6 @@ share/locale/el/LC_MESSAGES/mutt.mo share/locale/eo/LC_MESSAGES/mutt.mo share/locale/es/LC_MESSAGES/mutt.mo share/locale/et/LC_MESSAGES/mutt.mo -share/locale/eu/ -share/locale/eu/LC_MESSAGES/ share/locale/eu/LC_MESSAGES/mutt.mo share/locale/fr/LC_MESSAGES/mutt.mo share/locale/ga/LC_MESSAGES/mutt.mo Index: stable/Makefile =================================================================== RCS file: /cvs/ports/mail/mutt/stable/Makefile,v retrieving revision 1.35 diff -N -u -p stable/Makefile --- stable/Makefile 9 May 2008 17:46:51 -0000 1.35 +++ stable/Makefile 11 Mar 2009 11:05:23 -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/PLIST =================================================================== RCS file: /cvs/ports/mail/mutt/stable/pkg/PLIST,v retrieving revision 1.8 diff -N -u -p stable/pkg/PLIST --- stable/pkg/PLIST 24 Jul 2006 09:44:20 -0000 1.8 +++ stable/pkg/PLIST 11 Mar 2009 11:05:23 -0000 @@ -1,10 +1,10 @@ @comment $OpenBSD: PLIST,v 1.8 2006/07/24 09:44:20 bernd Exp $ bin/flea -bin/mutt -bin/mutt_dotlock +...@bin bin/mutt +...@bin bin/mutt_dotlock bin/muttbug -bin/pgpewrap -bin/pgpring +...@bin bin/pgpewrap +...@bin bin/pgpring @man man/man1/flea.1 @man man/man1/mutt.1 @man man/man1/mutt_dotlock.1
