Date: Wed, 26 Mar 2003 09:50:11 -0800 (PST) From: Udo Schweigert <udo.schweigert@siemens.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/50197: maintainer-update of mail/mutt Message-ID: <200303261750.h2QHoBtu020373@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/50197; it has been noted by GNATS.
From: Udo Schweigert <udo.schweigert@siemens.com>
To: FreeBSD-gnats-submit@FreeBSD.ORG
Cc: Udo Schweigert <udo.schweigert@siemens.com>
Subject: Re: ports/50197: maintainer-update of mail/mutt
Date: Wed, 26 Mar 2003 18:42:37 +0100
On Sat, Mar 22, 2003 at 23:15:41 +0100, Udo Schweigert wrote:
OK, now here is a completely new patch (to be applied against the current
port in the tree), which does:
- 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.
Committer: cvs add files/patch-examples
=============
diff -ru /usr/ports/mail/mutt/Makefile ./Makefile
--- /usr/ports/mail/mutt/Makefile Fri Mar 21 06:31:45 2003
+++ ./Makefile Wed Mar 26 13:33:39 2003
@@ -24,7 +24,7 @@
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 @@
--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 @@
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 -ru /usr/ports/mail/mutt/distinfo ./distinfo
--- /usr/ports/mail/mutt/distinfo Fri Mar 21 06:31:45 2003
+++ ./distinfo Sat Mar 22 22:26:06 2003
@@ -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 -ru /usr/ports/mail/mutt/files/patch-examples ./files/patch-examples
--- /usr/ports/mail/mutt/files/patch-examples Thu Jan 1 01:00:00 1970
+++ ./files/patch-examples Wed Mar 26 13:31:19 2003
@@ -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 -ru /usr/ports/mail/mutt/pkg-plist ./pkg-plist
--- /usr/ports/mail/mutt/pkg-plist Mon Mar 17 08:09:24 2003
+++ ./pkg-plist Wed Mar 26 11:49:30 2003
@@ -21,34 +21,34 @@
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/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
Best regards
--
Udo Schweigert, Siemens AG | Voice : +49 89 636 42170
CT IC CERT, Siemens CERT | Fax : +49 89 636 41166
D-81730 Muenchen / Germany | email : udo.schweigert@siemens.com
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200303261750.h2QHoBtu020373>