diff options
author | Oliver Braun <obraun@FreeBSD.org> | 2003-03-26 18:21:14 +0000 |
---|---|---|
committer | Oliver Braun <obraun@FreeBSD.org> | 2003-03-26 18:21:14 +0000 |
commit | 57cbd869ac6cd9dd94f577feb829b5d72a05dd4b (patch) | |
tree | 093c93ab121c6c60d1e7ade056657093c84547ef /mail | |
parent | Update to 1.0.0. (diff) |
- Integrate the new "initials"-patch.
- Honor the MUTT_CONFIGURE_ARGS variable, if present.
- Fix the PATH for gpg in the rc-example.
- Install the configuration examples in ${PREFIX}/share/examples/mutt.
PR: ports/50197
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=77493
Diffstat (limited to 'mail')
-rw-r--r-- | mail/mutt/Makefile | 11 | ||||
-rw-r--r-- | mail/mutt/distinfo | 2 | ||||
-rw-r--r-- | mail/mutt/files/patch-examples | 50 | ||||
-rw-r--r-- | mail/mutt/pkg-plist | 60 | ||||
-rw-r--r-- | mail/mutt14/Makefile | 11 | ||||
-rw-r--r-- | mail/mutt14/distinfo | 2 | ||||
-rw-r--r-- | mail/mutt14/files/patch-examples | 50 | ||||
-rw-r--r-- | mail/mutt14/pkg-plist | 60 |
8 files changed, 180 insertions, 66 deletions
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index c4823cac95df..92c3182b5b4e 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -24,7 +24,7 @@ PATCH_SITES= http://www.spinnaker.de/mutt/compressed/:spinnaker \ ftp://ftp.mutt.org.ua/pub/mutt/mutt-${PORTVERSION}/:vvv \ ftp://ftp2.mutt.org.ua/pub/mutt/mutt-${PORTVERSION}/:vvv PATCHFILES= patch-${PORTVERSION}.rr.compressed.1.gz:spinnaker \ - patch-${PORTVERSION:C/\.[0-9]*$//}.vvv.initials.gz:vvv + patch-${PORTVERSION}.vvv.initials.gz:vvv PATCH_DIST_STRIP= -p1 MAINTAINER?= udo.schweigert@siemens.com @@ -72,6 +72,9 @@ CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \ --with-docdir=${PREFIX}/share/doc/mutt --with-charmaps \ --with-libiconv-prefix=${PREFIX} \ --enable-compressed +.if defined(MUTT_CONFIGURE_ARGS) +CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS} +.endif .if defined(WITH_LOCALES_FIX) CONFIGURE_ARGS+= --enable-locales-fix .endif @@ -87,8 +90,12 @@ CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} MAN1= flea.1 mutt.1 mutt_dotlock.1 muttbug.1 MAN5= mbox.5 muttrc.5 +post-patch:: + @${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \ + ${WRKSRC}/contrib/gpg.rc + .if defined(WITH_MUTT_XFACE) -post-patch: +post-patch:: @${ECHO} "===> Applying XFACE patch" slrnface_dir=`${FIND} ${PORTSDIR}/news/slrnface/work -type d \ -name slrnface-\*`; \ diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo index 3ad80fe65861..bb75b8c019b2 100644 --- a/mail/mutt/distinfo +++ b/mail/mutt/distinfo @@ -1,3 +1,3 @@ MD5 (mutt/mutt-1.4.1i.tar.gz) = fb5418135c5be2638964eef2f654f847 MD5 (mutt/patch-1.4.1.rr.compressed.1.gz) = b50484f8b12328c3ee69222a3eb1da11 -MD5 (mutt/patch-1.4.vvv.initials.gz) = 43b4c482d9f8164a016d6d869328ad66 +MD5 (mutt/patch-1.4.1.vvv.initials.gz) = 467a4ba3a0aae4ea94ab4d31a94540ab diff --git a/mail/mutt/files/patch-examples b/mail/mutt/files/patch-examples new file mode 100644 index 000000000000..26db7d6c955f --- /dev/null +++ b/mail/mutt/files/patch-examples @@ -0,0 +1,50 @@ +--- contrib/Makefile.in.orig Mon Jun 4 19:14:31 2001 ++++ contrib/Makefile.in Wed Mar 26 11:45:15 2003 +@@ -12,6 +12,7 @@ + mandir = @mandir@ + srcdir = @srcdir@ + docdir = @docdir@ ++samplesdir = @prefix@/share/examples/mutt + top_srcdir = @top_srcdir@ + top_builddir = .. + INSTALL = @INSTALL@ +@@ -37,12 +38,12 @@ + check: + + install: +- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(samplesdir) $(DESTDIR)$(samplesdir)/iconv + for f in $(SAMPLES) ; do \ +- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ; \ ++ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(samplesdir); \ + done + for f in $(srcdir)/iconv/*.rc ; do \ +- $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv ; \ ++ $(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv ; \ + done + + # Nothing needs to be done - uninstall in doc removes samples as well. +--- init.h.orig Wed Mar 26 11:50:36 2003 ++++ init.h Wed Mar 26 12:54:37 2003 +@@ -1347,8 +1347,8 @@ + ** .pp + ** For examples on how to configure these formats for the various versions + ** of PGP which are floating around, see the pgp*.rc and gpg.rc files in +- ** the samples/ subdirectory which has been installed on your system +- ** alongside the documentation. ++ ** the share/examples/mutt subdirectory which has been installed on your ++ ** system. + */ + { "pgp_getkeys_command", DT_STR, R_NONE, UL &PgpGetkeysCommand, 0}, + /* +--- Makefile.am.orig Wed Mar 26 13:13:10 2003 ++++ Makefile.am Wed Mar 26 13:25:40 2003 +@@ -13,7 +13,7 @@ + + bin_SCRIPTS = muttbug flea + +-BUILT_SOURCES = keymap_defs.h patchlist.c ++BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc + + bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ + mutt_SOURCES = $(BUILT_SOURCES) \ diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist index f95d3e5cdd1c..a7e2d9e1c270 100644 --- a/mail/mutt/pkg-plist +++ b/mail/mutt/pkg-plist @@ -21,34 +21,34 @@ share/doc/mutt/applying-patches.txt share/doc/mutt/devel-notes.txt share/doc/mutt/manual.txt share/doc/mutt/patch-notes.txt -share/doc/mutt/samples/Mush.rc -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/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 +share/examples/mutt/Mush.rc +share/examples/mutt/Pine.rc +share/examples/mutt/Tin.rc +share/examples/mutt/gpg.rc +share/examples/mutt/iconv/iconv.aix-3.2.5.rc +share/examples/mutt/iconv/iconv.aix-4.1.5.rc +share/examples/mutt/iconv/iconv.aix-4.2.0.rc +share/examples/mutt/iconv/iconv.aix-4.3.2.rc +share/examples/mutt/iconv/iconv.freebsd-3.3.rc +share/examples/mutt/iconv/iconv.glibc-2.1.3.rc +share/examples/mutt/iconv/iconv.glibc-2.1.90.rc +share/examples/mutt/iconv/iconv.hpux-10.01.rc +share/examples/mutt/iconv/iconv.hpux-10.20.rc +share/examples/mutt/iconv/iconv.hpux-11.00.rc +share/examples/mutt/iconv/iconv.irix-6.5.rc +share/examples/mutt/iconv/iconv.osf1-4.0a.rc +share/examples/mutt/iconv/iconv.osf1-4.0d.rc +share/examples/mutt/iconv/iconv.solaris-2.4.rc +share/examples/mutt/iconv/iconv.solaris-2.5.1.rc +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/pgp2.rc +share/examples/mutt/pgp5.rc +share/examples/mutt/pgp6.rc +share/examples/mutt/sample.mailcap +share/examples/mutt/sample.muttrc +share/examples/mutt/sample.muttrc-tlr share/locale/ca/LC_MESSAGES/mutt.mo share/locale/cs/LC_MESSAGES/mutt.mo share/locale/da/LC_MESSAGES/mutt.mo @@ -75,6 +75,6 @@ share/locale/tr/LC_MESSAGES/mutt.mo share/locale/uk/LC_MESSAGES/mutt.mo share/locale/zh_CN/LC_MESSAGES/mutt.mo share/locale/zh_TW/LC_MESSAGES/mutt.mo -@dirrm share/doc/mutt/samples/iconv -@dirrm share/doc/mutt/samples +@dirrm share/examples/mutt/iconv +@dirrm share/examples/mutt @dirrm share/doc/mutt diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile index c4823cac95df..92c3182b5b4e 100644 --- a/mail/mutt14/Makefile +++ b/mail/mutt14/Makefile @@ -24,7 +24,7 @@ PATCH_SITES= http://www.spinnaker.de/mutt/compressed/:spinnaker \ ftp://ftp.mutt.org.ua/pub/mutt/mutt-${PORTVERSION}/:vvv \ ftp://ftp2.mutt.org.ua/pub/mutt/mutt-${PORTVERSION}/:vvv PATCHFILES= patch-${PORTVERSION}.rr.compressed.1.gz:spinnaker \ - patch-${PORTVERSION:C/\.[0-9]*$//}.vvv.initials.gz:vvv + patch-${PORTVERSION}.vvv.initials.gz:vvv PATCH_DIST_STRIP= -p1 MAINTAINER?= udo.schweigert@siemens.com @@ -72,6 +72,9 @@ CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \ --with-docdir=${PREFIX}/share/doc/mutt --with-charmaps \ --with-libiconv-prefix=${PREFIX} \ --enable-compressed +.if defined(MUTT_CONFIGURE_ARGS) +CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS} +.endif .if defined(WITH_LOCALES_FIX) CONFIGURE_ARGS+= --enable-locales-fix .endif @@ -87,8 +90,12 @@ CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} MAN1= flea.1 mutt.1 mutt_dotlock.1 muttbug.1 MAN5= mbox.5 muttrc.5 +post-patch:: + @${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \ + ${WRKSRC}/contrib/gpg.rc + .if defined(WITH_MUTT_XFACE) -post-patch: +post-patch:: @${ECHO} "===> Applying XFACE patch" slrnface_dir=`${FIND} ${PORTSDIR}/news/slrnface/work -type d \ -name slrnface-\*`; \ diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo index 3ad80fe65861..bb75b8c019b2 100644 --- a/mail/mutt14/distinfo +++ b/mail/mutt14/distinfo @@ -1,3 +1,3 @@ MD5 (mutt/mutt-1.4.1i.tar.gz) = fb5418135c5be2638964eef2f654f847 MD5 (mutt/patch-1.4.1.rr.compressed.1.gz) = b50484f8b12328c3ee69222a3eb1da11 -MD5 (mutt/patch-1.4.vvv.initials.gz) = 43b4c482d9f8164a016d6d869328ad66 +MD5 (mutt/patch-1.4.1.vvv.initials.gz) = 467a4ba3a0aae4ea94ab4d31a94540ab diff --git a/mail/mutt14/files/patch-examples b/mail/mutt14/files/patch-examples new file mode 100644 index 000000000000..26db7d6c955f --- /dev/null +++ b/mail/mutt14/files/patch-examples @@ -0,0 +1,50 @@ +--- contrib/Makefile.in.orig Mon Jun 4 19:14:31 2001 ++++ contrib/Makefile.in Wed Mar 26 11:45:15 2003 +@@ -12,6 +12,7 @@ + mandir = @mandir@ + srcdir = @srcdir@ + docdir = @docdir@ ++samplesdir = @prefix@/share/examples/mutt + top_srcdir = @top_srcdir@ + top_builddir = .. + INSTALL = @INSTALL@ +@@ -37,12 +38,12 @@ + check: + + install: +- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(samplesdir) $(DESTDIR)$(samplesdir)/iconv + for f in $(SAMPLES) ; do \ +- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ; \ ++ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(samplesdir); \ + done + for f in $(srcdir)/iconv/*.rc ; do \ +- $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv ; \ ++ $(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv ; \ + done + + # Nothing needs to be done - uninstall in doc removes samples as well. +--- init.h.orig Wed Mar 26 11:50:36 2003 ++++ init.h Wed Mar 26 12:54:37 2003 +@@ -1347,8 +1347,8 @@ + ** .pp + ** For examples on how to configure these formats for the various versions + ** of PGP which are floating around, see the pgp*.rc and gpg.rc files in +- ** the samples/ subdirectory which has been installed on your system +- ** alongside the documentation. ++ ** the share/examples/mutt subdirectory which has been installed on your ++ ** system. + */ + { "pgp_getkeys_command", DT_STR, R_NONE, UL &PgpGetkeysCommand, 0}, + /* +--- Makefile.am.orig Wed Mar 26 13:13:10 2003 ++++ Makefile.am Wed Mar 26 13:25:40 2003 +@@ -13,7 +13,7 @@ + + bin_SCRIPTS = muttbug flea + +-BUILT_SOURCES = keymap_defs.h patchlist.c ++BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc + + bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ + mutt_SOURCES = $(BUILT_SOURCES) \ diff --git a/mail/mutt14/pkg-plist b/mail/mutt14/pkg-plist index f95d3e5cdd1c..a7e2d9e1c270 100644 --- a/mail/mutt14/pkg-plist +++ b/mail/mutt14/pkg-plist @@ -21,34 +21,34 @@ share/doc/mutt/applying-patches.txt share/doc/mutt/devel-notes.txt share/doc/mutt/manual.txt share/doc/mutt/patch-notes.txt -share/doc/mutt/samples/Mush.rc -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/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 +share/examples/mutt/Mush.rc +share/examples/mutt/Pine.rc +share/examples/mutt/Tin.rc +share/examples/mutt/gpg.rc +share/examples/mutt/iconv/iconv.aix-3.2.5.rc +share/examples/mutt/iconv/iconv.aix-4.1.5.rc +share/examples/mutt/iconv/iconv.aix-4.2.0.rc +share/examples/mutt/iconv/iconv.aix-4.3.2.rc +share/examples/mutt/iconv/iconv.freebsd-3.3.rc +share/examples/mutt/iconv/iconv.glibc-2.1.3.rc +share/examples/mutt/iconv/iconv.glibc-2.1.90.rc +share/examples/mutt/iconv/iconv.hpux-10.01.rc +share/examples/mutt/iconv/iconv.hpux-10.20.rc +share/examples/mutt/iconv/iconv.hpux-11.00.rc +share/examples/mutt/iconv/iconv.irix-6.5.rc +share/examples/mutt/iconv/iconv.osf1-4.0a.rc +share/examples/mutt/iconv/iconv.osf1-4.0d.rc +share/examples/mutt/iconv/iconv.solaris-2.4.rc +share/examples/mutt/iconv/iconv.solaris-2.5.1.rc +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/pgp2.rc +share/examples/mutt/pgp5.rc +share/examples/mutt/pgp6.rc +share/examples/mutt/sample.mailcap +share/examples/mutt/sample.muttrc +share/examples/mutt/sample.muttrc-tlr share/locale/ca/LC_MESSAGES/mutt.mo share/locale/cs/LC_MESSAGES/mutt.mo share/locale/da/LC_MESSAGES/mutt.mo @@ -75,6 +75,6 @@ share/locale/tr/LC_MESSAGES/mutt.mo share/locale/uk/LC_MESSAGES/mutt.mo share/locale/zh_CN/LC_MESSAGES/mutt.mo share/locale/zh_TW/LC_MESSAGES/mutt.mo -@dirrm share/doc/mutt/samples/iconv -@dirrm share/doc/mutt/samples +@dirrm share/examples/mutt/iconv +@dirrm share/examples/mutt @dirrm share/doc/mutt |