Attachment 29682 Details for Bug 50317 – file.diff

[patch] file.diff

file.diff (text/plain), 7.50 KB, created by Udo.Schweigert on 2003-03-26 17:50:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Udo.Schweigert

Created: 2003-03-26 17:50:11 UTC

Size: 7.50 KB

patch

obsolete

>diff -ru  /usr/ports/mail/mutt-devel/files/patch-examples ./files/patch-examples
>--- /usr/ports/mail/mutt-devel/files/patch-examples	Thu Jan  1 01:00:00 1970
>+++ ./files/patch-examples	Wed Mar 26 16:08:03 2003
>@@ -0,0 +1,103 @@
>+--- 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	Tue Mar  4 10:28:12 2003
>++++ init.h	Wed Mar 26 15:41:19 2003
>+@@ -1455,8 +1455,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 only)
>+   */
>+   { "pgp_getkeys_command",	DT_STR, R_NONE, UL &PgpGetkeysCommand, 0},
>+@@ -1628,8 +1628,8 @@
>+   ** .de
>+   ** .pp
>+   ** For examples on how to configure these formats, see the smime.rc 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.
>+   ** (S/MIME only)
>+   */
>+   { "smime_verify_command", 	DT_STR, R_NONE, UL &SmimeVerifyCommand, 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) \
>+--- INSTALL.orig	Mon Nov 25 15:16:46 2002
>++++ INSTALL	Wed Mar 26 15:59:57 2003
>+@@ -225,13 +225,13 @@
>+ need to tell mutt about implementation-defined names for some
>+ character sets.  Sample configuration files for various systems can
>+ be found in the directory contrib/iconv/ in this source
>+-distribution, and will be installed in the samples/iconv directory
>++distribution, and will be installed in the share/examples/mutt/iconv directory
>+ as part of mutt's documentation.
>+ 
>+ In order to use these sample configuration files, just put a line
>+ like
>+ 
>+-     source /usr/local/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
>++     source /usr/local/share/examples/mutt/iconv/iconv.osf1-4.0d.rc
>+ 
>+ into your system's global Muttrc, which normally resides in /etc or
>+ /usr/local/etc.
>+--- doc/manual.txt.orig	Wed Mar 19 23:30:56 2003
>++++ doc/manual.txt	Wed Mar 26 16:07:20 2003
>+@@ -4954,8 +4954,8 @@
>+ 
>+   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.  (PGP only)
>++  files in the share/examples/mutt/ subdirectory which has been installed on
>++  your system alongside the documentation.  (PGP only)
>+ 
>+   66..33..114433..  ppggpp__ggeettkkeeyyss__ccoommmmaanndd
>+ 
>+@@ -5147,8 +5147,8 @@
>+         ``$smime_ca_location''" or "-CAfile ``$smime_ca_location''".
>+ 
>+   For examples on how to configure these formats, see the smime.rc in
>+-  the samples/ subdirectory which has been installed on your system
>+-  alongside the documentation.  (S/MIME only)
>++  the share/examples/mutt/ subdirectory which has been installed on your
>++  system alongside the documentation.  (S/MIME only)
>+ 
>+   66..33..116622..  ssmmiimmee__vveerriiffyy__ccoommmmaanndd
>+ 
>diff -ru  /usr/ports/mail/mutt-devel/scripts/generate-plist ./scripts/generate-plist
>--- /usr/ports/mail/mutt-devel/scripts/generate-plist	Tue Mar 25 06:32:22 2003
>+++ ./scripts/generate-plist	Wed Mar 26 18:46:34 2003
>@@ -79,37 +79,37 @@
> share/doc/mutt/manual.txt
> share/doc/mutt/patch-notes.txt
> share/doc/mutt/smime-notes.txt
>-share/doc/mutt/samples/Mush.rc
>-share/doc/mutt/samples/Pine.rc
>-share/doc/mutt/samples/Tin.rc
>-share/doc/mutt/samples/ca-bundle.crt
>-share/doc/mutt/samples/gpg.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/doc/mutt/samples/smime.rc
>-share/doc/mutt/samples/smime_keys_test.pl
>-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/examples/mutt/Mush.rc
>+share/examples/mutt/Pine.rc
>+share/examples/mutt/Tin.rc
>+share/examples/mutt/ca-bundle.crt
>+share/examples/mutt/gpg.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/examples/mutt/smime.rc
>+share/examples/mutt/smime_keys_test.pl
>+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
> EOF
> 
>   if [ "$MUTT_NNTP" = "yes" ]; then
>@@ -153,8 +153,8 @@
>     echo "@dirrm share/doc/mutt/html" >> $tmp_last
>   fi
>   cat >> $tmp_last <<EOF
>-@dirrm share/doc/mutt/samples/iconv
>-@dirrm share/doc/mutt/samples
>+@dirrm share/examples/mutt/iconv
>+@dirrm share/examples/mutt
> @dirrm share/doc/mutt
> EOF
> fi

Actions: View | Diff

Attachments on bug 50317: 29682