diff options
| -rw-r--r-- | mail/Makefile | 3 | ||||
| -rw-r--r-- | mail/mutt-devel/DESCR | 9 | ||||
| -rw-r--r-- | mail/mutt-devel/Makefile | 66 | ||||
| -rw-r--r-- | mail/mutt-devel/PLIST | 94 | ||||
| -rw-r--r-- | mail/mutt-devel/distinfo | 9 | ||||
| -rw-r--r-- | mail/mutt-devel/patches/patch-aa | 13 | ||||
| -rw-r--r-- | mail/mutt-devel/patches/patch-ab | 13 | ||||
| -rw-r--r-- | mail/mutt-devel/patches/patch-ac | 13 | ||||
| -rw-r--r-- | mail/mutt-devel/patches/patch-ad | 13 | ||||
| -rw-r--r-- | mail/mutt-devel/patches/patch-ae | 63 |
10 files changed, 1 insertions, 295 deletions
diff --git a/mail/Makefile b/mail/Makefile index 871d3c8e7b2..8dd424eb11c 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.127 2002/05/18 11:29:55 zuntum Exp $ +# $NetBSD: Makefile,v 1.128 2002/05/29 12:15:36 tron Exp $ # COMMENT= Electronic mail utilities @@ -53,7 +53,6 @@ SUBDIR+= mew-xemacs SUBDIR+= mhonarc SUBDIR+= mush SUBDIR+= mutt -SUBDIR+= mutt-devel SUBDIR+= newmail SUBDIR+= nmh SUBDIR+= nullmailer diff --git a/mail/mutt-devel/DESCR b/mail/mutt-devel/DESCR deleted file mode 100644 index 60af96672d3..00000000000 --- a/mail/mutt-devel/DESCR +++ /dev/null @@ -1,9 +0,0 @@ -The Mutt E-Mail Client by Michael Elkins <me@cs.hmc.edu> - -``All mail clients suck. This one just sucks less.'' -me, circa 1995 - -Mutt is a small but very powerful text-based MIME mail client.Mutt -is highly configurable, and is well suited to the mail power user with -advanced features like key bindings, keyboard macros, mail threading, -regular expression searches and a powerful pattern matching language -for selecting groups of messages. diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile deleted file mode 100644 index 796d2edff25..00000000000 --- a/mail/mutt-devel/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# $NetBSD: Makefile,v 1.24 2002/05/04 00:37:02 grant Exp $ - -DISTNAME= mutt-1.3.99i -PKGNAME= ${DISTNAME:C/i$//} -CATEGORIES= mail -MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ - -MAINTAINER= tron@netbsd.org -HOMEPAGE= http://www.mutt.org/ -COMMENT= text-based MIME mail client with PGP support - -USE_BUILDLINK_ONLY= YES - -BUILD_DEPENDS+= automake>=1.4:../../devel/automake - -BUILD_USES_MSGFMT= YES - -USE_GMAKE= YES -GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \ - --with-docdir=${PREFIX}/share/doc/mutt \ - --without-included-gettext \ - --enable-pop --enable-imap - -LDFLAGS+= ${_STRIPFLAG_CC} -WRKSRC= ${WRKDIR}/${DISTNAME:C/i$$//} - -.include "../../mk/bsd.prefs.mk" - -.if defined(MUTT_USE_SLANG) && ${MUTT_USE_SLANG} != NO -.include "../../devel/libslang/buildlink.mk" -CONFIGURE_ARGS+= --with-slang=${BUILDLINK_DIR} -.else -.include "../../devel/ncurses/buildlink.mk" -CONFIGURE_ARGS+= --with-curses=${BUILDLINK_DIR} -.endif - -# There seems to be a problem using NetBSD's /bin/sh, so use /bin/ksh instead. -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh -.endif - -MUTT_USE_SSL?= YES - -.if defined(MUTT_USE_SSL) && ${MUTT_USE_SSL} == "YES" -.include "../../security/openssl/buildlink.mk" -CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_DIR} -.else -CONFIGURE_ARGS+= --without-ssl -.endif - -BUILD_DEFS+= MUTT_USE_SLANG MUTT_USE_SSL -MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" - -EGDIR= ${PREFIX}/share/doc/mutt/samples -CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc -SUPPORT_FILES= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types - -post-install: - ${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/share/doc/mutt/samples - ${INSTALL_DATA} ${WRKSRC}/mime.types ${PREFIX}/share/doc/mutt/samples - -.include "../../converters/libiconv/buildlink.mk" -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../mk/bsd.pkg.install.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/mail/mutt-devel/PLIST b/mail/mutt-devel/PLIST deleted file mode 100644 index 0f70ae0d50c..00000000000 --- a/mail/mutt-devel/PLIST +++ /dev/null @@ -1,94 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2002/01/02 09:07:45 tron Exp $ -bin/flea -bin/mutt -bin/muttbug -bin/pgpewrap -bin/pgpring -man/man1/flea.1 -man/man1/mutt.1 -man/man1/mutt_dotlock.1 -man/man1/muttbug.1 -man/man5/mbox.5 -man/man5/muttrc.5 -share/doc/mutt/COPYRIGHT -share/doc/mutt/ChangeLog -share/doc/mutt/GPL -share/doc/mutt/INSTALL -share/doc/mutt/NEWS -share/doc/mutt/PGP-Notes.txt -share/doc/mutt/README -share/doc/mutt/README.SECURITY -share/doc/mutt/README.SSL -share/doc/mutt/TODO -share/doc/mutt/applying-patches.txt -share/doc/mutt/devel-notes.txt -share/doc/mutt/html/manual-1.html -share/doc/mutt/html/manual-2.html -share/doc/mutt/html/manual-3.html -share/doc/mutt/html/manual-4.html -share/doc/mutt/html/manual-5.html -share/doc/mutt/html/manual-6.html -share/doc/mutt/html/manual-7.html -share/doc/mutt/html/manual.html -share/doc/mutt/manual.txt -share/doc/mutt/patch-notes.txt -share/doc/mutt/samples/Mush.rc -share/doc/mutt/samples/Muttrc -share/doc/mutt/samples/Pine.rc -share/doc/mutt/samples/Tin.rc -share/doc/mutt/samples/gpg.rc -share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc -share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc -share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc -share/doc/mutt/samples/iconv/iconv.aix-4.3.2.rc -share/doc/mutt/samples/iconv/iconv.freebsd-3.3.rc -share/doc/mutt/samples/iconv/iconv.glibc-2.1.3.rc -share/doc/mutt/samples/iconv/iconv.glibc-2.1.90.rc -share/doc/mutt/samples/iconv/iconv.hpux-10.01.rc -share/doc/mutt/samples/iconv/iconv.hpux-10.20.rc -share/doc/mutt/samples/iconv/iconv.hpux-11.00.rc -share/doc/mutt/samples/iconv/iconv.irix-6.5.rc -share/doc/mutt/samples/iconv/iconv.osf1-4.0a.rc -share/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc -share/doc/mutt/samples/iconv/iconv.solaris-2.4.rc -share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc -share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc -share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc -share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc -share/doc/mutt/samples/mime.types -share/doc/mutt/samples/pgp2.rc -share/doc/mutt/samples/pgp5.rc -share/doc/mutt/samples/pgp6.rc -share/doc/mutt/samples/sample.mailcap -share/doc/mutt/samples/sample.muttrc -share/doc/mutt/samples/sample.muttrc-tlr -${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/da/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/de/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/el/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/es/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/et/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/id/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/it/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/mutt.mo -${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/mutt.mo -@dirrm share/doc/mutt/samples/iconv -@dirrm share/doc/mutt/samples -@dirrm share/doc/mutt/html -@dirrm share/doc/mutt diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo deleted file mode 100644 index f4d78663873..00000000000 --- a/mail/mutt-devel/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: distinfo,v 1.15 2002/05/04 00:37:02 grant Exp $ - -SHA1 (mutt-1.3.99i.tar.gz) = 937e4b7de4121e8c6b60b9630a4f7fdf4e1aa905 -Size (mutt-1.3.99i.tar.gz) = 2553143 bytes -SHA1 (patch-aa) = 8325c09e6ab9b43786571548359fa0be4f94d14c -SHA1 (patch-ab) = 24984804280b5db991a2a471eba39506369add70 -SHA1 (patch-ac) = 4aa38ccf5454e4d3e79b8ddc8aad610b1c1bd6c2 -SHA1 (patch-ad) = 919093aa2162d8f7fd52d476d0c6835447f236d5 -SHA1 (patch-ae) = 7a7bc491c9f58b6ba26d5619182fb812d0f5e94e diff --git a/mail/mutt-devel/patches/patch-aa b/mail/mutt-devel/patches/patch-aa deleted file mode 100644 index 8de5aee9a98..00000000000 --- a/mail/mutt-devel/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2001/07/22 15:24:10 tron Exp $ - ---- intl/Makefile.in.orig Thu Jun 7 22:00:05 2001 -+++ intl/Makefile.in Sun Jul 22 16:58:54 2001 -@@ -31,7 +31,7 @@ - libdir = @libdir@ - includedir = @includedir@ - datadir = @datadir@ --localedir = $(datadir)/locale -+localedir = $(prefix)/$(PKGLOCALEDIR)/locale - gettextsrcdir = $(datadir)/gettext/intl - aliaspath = $(localedir) - subdir = intl diff --git a/mail/mutt-devel/patches/patch-ab b/mail/mutt-devel/patches/patch-ab deleted file mode 100644 index 5df4b053502..00000000000 --- a/mail/mutt-devel/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2001/07/22 13:37:13 tron Exp $ - ---- doc/Makefile.in.orig Mon Jun 4 19:14:32 2001 -+++ doc/Makefile.in Sun Jul 22 15:09:17 2001 -@@ -29,7 +29,7 @@ - CPPFLAGS = @CPPFLAGS@ - - DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DHAVE_CONFIG_H=1 --INCLUDES = -I. -I.. -I$(includedir) -I$(top_srcdir) -+INCLUDES = -I. -I.. -I$(top_srcdir) - - MAKEDOC_CPP = $(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C - diff --git a/mail/mutt-devel/patches/patch-ac b/mail/mutt-devel/patches/patch-ac deleted file mode 100644 index 9110d76dfc3..00000000000 --- a/mail/mutt-devel/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2002/01/02 09:07:46 tron Exp $ - ---- po/Makefile.in.in.orig Tue Jan 1 21:17:15 2002 -+++ po/Makefile.in.in Wed Jan 2 09:54:40 2002 -@@ -23,7 +23,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = @datadir@ --localedir = $(datadir)/locale -+localedir = $(prefix)/$(PKGLOCALEDIR)/locale - gettextsrcdir = $(datadir)/gettext/po - - INSTALL = @INSTALL@ diff --git a/mail/mutt-devel/patches/patch-ad b/mail/mutt-devel/patches/patch-ad deleted file mode 100644 index 0cd92ebce72..00000000000 --- a/mail/mutt-devel/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2002/01/30 23:03:25 jlam Exp $ - ---- Makefile.in.orig Wed Jan 30 17:50:34 2002 -+++ Makefile.in Wed Jan 30 17:56:07 2002 -@@ -144,7 +144,7 @@ - - INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl - --CPPFLAGS = @CPPFLAGS@ -I$(includedir) -+CPPFLAGS = @CPPFLAGS@ - - non_us_sources = pgp.c pgpinvoke.c pgpkey.c pgplib.c sha1.c pgpmicalg.c gnupgparse.c sha1.h doc/language.txt doc/language50.txt OPS.PGP doc/PGP-Notes.txt OPS.MIX remailer.c remailer.h pgpewrap.c contrib/pgp2.rc contrib/pgp5.rc contrib/gpg.rc mutt_ssl.c mutt_ssl.h README.SSL mutt_ssl_nss.c pgppacket.c pgppacket.h - diff --git a/mail/mutt-devel/patches/patch-ae b/mail/mutt-devel/patches/patch-ae deleted file mode 100644 index b678a8fb6b9..00000000000 --- a/mail/mutt-devel/patches/patch-ae +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2002/04/16 08:34:29 tron Exp $ - ---- contrib/gpg.rc.orig Tue Dec 11 10:33:57 2001 -+++ contrib/gpg.rc Tue Apr 16 10:28:08 2002 -@@ -31,44 +31,44 @@ - # breaking PGP/MIME. - - # decode application/pgp --set pgp_decode_command="/usr/bin/gpg %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f" -+set pgp_decode_command="gpg %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f" - - # verify a pgp/mime signature --set pgp_verify_command="/usr/bin/gpg --no-verbose --quiet --batch --output - --verify %s %f" -+set pgp_verify_command="gpg --no-verbose --quiet --batch --output - --verify %s %f" - - # decrypt a pgp/mime attachment --set pgp_decrypt_command="/usr/bin/gpg --passphrase-fd 0 --no-verbose --quiet --batch --output - %f" -+set pgp_decrypt_command="gpg --passphrase-fd 0 --no-verbose --quiet --batch --output - %f" - - # create a pgp/mime signed attachment --# set pgp_sign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f" --set pgp_sign_command="/usr/bin/gpg --no-verbose --batch --quiet --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f" -+# set pgp_sign_command="gpg-2comp --comment '' --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f" -+set pgp_sign_command="gpg --no-verbose --batch --quiet --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f" - - # create a application/pgp signed (old-style) message --# set pgp_clearsign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f" --set pgp_clearsign_command="/usr/bin/gpg --no-verbose --batch --quiet --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f" -+# set pgp_clearsign_command="gpg-2comp --comment '' --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f" -+set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f" - - # create a pgp/mime encrypted attachment - # set pgp_encrypt_only_command="pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" --set pgp_encrypt_only_command="pgpewrap /usr/bin/gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" -+set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" - - # create a pgp/mime encrypted and signed attachment - # set pgp_encrypt_sign_command="pgpewrap gpg-2comp --passphrase-fd 0 -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" --set pgp_encrypt_sign_command="pgpewrap /usr/bin/gpg --passphrase-fd 0 --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" -+set pgp_encrypt_sign_command="pgpewrap gpg --passphrase-fd 0 --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" - - # import a key into the public key ring --set pgp_import_command="/usr/bin/gpg --no-verbose --import -v %f" -+set pgp_import_command="gpg --no-verbose --import -v %f" - - # export a key from the public key ring --set pgp_export_command="/usr/bin/gpg --no-verbose --export --armor %r" -+set pgp_export_command="gpg --no-verbose --export --armor %r" - - # verify a key --set pgp_verify_key_command="/usr/bin/gpg --verbose --batch --fingerprint --check-sigs %r" -+set pgp_verify_key_command="gpg --verbose --batch --fingerprint --check-sigs %r" - - # read in the public key ring --set pgp_list_pubring_command="/usr/bin/gpg --no-verbose --batch --quiet --with-colons --list-keys %r" -+set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --list-keys %r" - - # read in the secret key ring --set pgp_list_secring_command="/usr/bin/gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r" -+set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r" - - # fetch keys - # set pgp_getkeys_command="pkspxycwrap %r" |