OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 22-Sep-2003 20:47:24
Branch: OPENPKG_1_3_SOLID HEAD Handle: 2003092219472102
Modified files:
openpkg-web news.txt
Modified files: (Branch: OPENPKG_1_3_SOLID)
openpkg-src/mutt mailcap mutt.spec muttrc
Log:
MFC: all recent changes
Summary:
Revision Changes Path
1.2.10.1 +13 -8 openpkg-src/mutt/mailcap
1.41.2.4.2.2+25 -7 openpkg-src/mutt/mutt.spec
1.3.6.1 +10 -1 openpkg-src/mutt/muttrc
1.6688 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mutt/mailcap
============================================================================
$ cvs diff -u -r1.2 -r1.2.10.1 mailcap
--- openpkg-src/mutt/mailcap 30 Nov 2001 18:06:55 -0000 1.2
+++ openpkg-src/mutt/mailcap 22 Sep 2003 18:47:23 -0000 1.2.10.1
@@ -1,13 +1,18 @@
##
## @l_prefix@/etc/mutt/mailcap -- Global Mutt Mail Capability Database
-## Copyright (c) 1998-2001 Ralf S. Engelschall <[EMAIL PROTECTED]>
+## Copyright (c) 1998-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
-text/html; (w3m %s) 2>/dev/null || (lynx %s) 2>/dev/null || netscape
-remote openURL\(%s\)
-image/gif; (xv %s) 2>/dev/null || display %s
-image/jpg; (xv %s) 2>/dev/null || display %s
-image/jpeg; (xv %s) 2>/dev/null || display %s
-application/pdf; (mgv %s) 2>/dev/null || (gv %s) 2>/dev/null || (ghostview
%s) 2>/dev/null || gs %s
-application/postscript; (mgv %s) 2>/dev/null || (gv %s) 2>/dev/null || (ghostview
%s) 2>/dev/null || gs %s
-application/x-dvi; xdvi %s
+text/html; (w3m %s) 2>/dev/null || (lynx %s) 2>/dev/null ||
mozilla -remote openURL\(%s\); nametemplate=%s.html
+text/html; (w3m -dump %s) 2>/dev/null || (lynx -dump %s)
2>/dev/null || cat; nametemplate=%s.html; copiousoutput
+image/*; (display %s) 2>/dev/null || xv %s
+image/*; (anytopnm %s | pnmscale -xysize 80 46 | ppmtopgm |
pgmtopbm | pbmtoascii -1x2) 2>&1; copiousoutput
+video/*; mplayer %s
+application/pdf; (acroread %s) 2>/dev/null || (mgv %s) 2>/dev/null ||
(gv %s) 2>/dev/null || (ghostview %s) 2>/dev/null || gs %s
+application/postscript; (mgv %s) 2>/dev/null || (gv %s) 2>/dev/null ||
(ghostview %s) 2>/dev/null || gs %s
+application/x-dvi; xdvi %s
+application/vnd.ms-powerpoint; (msov --format=ppt %s) 2>/dev/null || openoffice %s
+application/vnd.ms-excel; (msov --format=xls %s) 2>/dev/null || openoffice %s
+application/vnd.ms-word; (msov --format=doc %s) 2>/dev/null || openoffice %s
+application/msword; (msov --format=doc %s) 2>/dev/null || openoffice %s
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mutt/mutt.spec
============================================================================
$ cvs diff -u -r1.41.2.4.2.1 -r1.41.2.4.2.2 mutt.spec
--- openpkg-src/mutt/mutt.spec 29 Jul 2003 14:59:59 -0000 1.41.2.4.2.1
+++ openpkg-src/mutt/mutt.spec 22 Sep 2003 18:47:23 -0000 1.41.2.4.2.2
@@ -24,7 +24,7 @@
##
# package version
-%define V_mutt 1.4.1
+%define V_mutt 1.4.1
# package information
Name: mutt
@@ -36,11 +36,13 @@
Group: Mail
License: BSD
Version: %{V_mutt}i
-Release: 1.3.0
+Release: 1.3.1
# build options
-%option with_comp no
-%option with_nntp no
+%option with_comp no
+%option with_nntp no
+%option with_initials no
+%option with_quote no
# list of sources
Source0: ftp://ftp.mutt.org/mutt/mutt-%{V_mutt}i.tar.gz
@@ -48,6 +50,8 @@
Source2: muttrc
Patch0:
ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt}/patch-%{V_mutt}.rr.compressed.gz
Patch1:
ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt}/patch-%{V_mutt}.vvv.nntp.gz
+Patch2:
ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt}/patch-%{V_mutt}.vvv.initials.gz
+Patch3:
ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt}/patch-%{V_mutt}.vvv.quote.gz
# build information
Prefix: %{l_prefix}
@@ -67,10 +71,23 @@
%prep
%setup -q -n mutt-%{V_mutt}
%if "%{with_comp}" == "yes"
- %patch0 -p1
+ %{l_gzip} -d -c <%{PATCH0} |\
+ sed -e '/^diff.*Makefile\.am/,/^diff/d' \
+ -e '/^diff.*configure\.in /,/^diff/d' \
+ -e '/^diff.*acconfig\.h /,/^diff/d' |\
+ %{l_patch} -p1
%endif
%if "%{with_nntp}" == "yes"
- %patch1 -p1
+ %{l_gzip} -d -c <%{PATCH1} |\
+ sed -e '/^diff.*configure\.in /,/^diff/d' \
+ -e '/^diff.*acconfig\.h /,/^diff/d' |\
+ %{l_patch} -p1
+%endif
+%if "%{with_initials}" == "yes"
+ %patch2 -p1
+%endif
+%if "%{with_quote}" == "yes"
+ %patch3 -p1
%endif
%build
@@ -83,7 +100,7 @@
esac
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="-DICONV_CONST=const" \
+ CPPFLAGS="%{l_cppflags}" \
LDFLAGS="-Limap %{l_ldflags}" \
./configure \
--cache-file=./config.cache \
@@ -101,6 +118,7 @@
--enable-nntp \
%endif
--enable-buffy-size \
+ --disable-warnings \
--without-iconv \
--without-wc-funcs \
--disable-nls \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mutt/muttrc
============================================================================
$ cvs diff -u -r1.3 -r1.3.6.1 muttrc
--- openpkg-src/mutt/muttrc 30 Dec 2002 22:05:20 -0000 1.3
+++ openpkg-src/mutt/muttrc 22 Sep 2003 18:47:23 -0000 1.3.6.1
@@ -46,7 +46,8 @@
# display customization
set to_chars = "L CC "
set charset = iso-8859-1
-set quote_regexp = "^([ \t]*>)+"
+set quote_regexp="^[ \t]*([A-Za-z ]+>|[]>:}][]>:}]*)"
+set smileys="(>From )|(>?[;:][-^]?[][)(><}{|/DP][)}]*)"
mono quoted bold
mono markers bold
set menu_scroll
@@ -69,13 +70,21 @@
set forw_format = "[FWD] %s"
unset mime_fwd
unset forw_quote
+unset metoo
# new mail generation
set hdrs
set use_8bitmime
+# autoviewing via .mailcap handlers
+auto_view text/html image/*
+
# no printing by default
set print = no
+
+# toggle sort mode
+macro index \cxd set sort=date-sent
+macro index \cxt set sort=threads
# show documentation on <ESC>+'h'
macro generic "\eh" "!${PAGER-more} @l_prefix@/share/mutt/manual.txt\n" "Show Mutt
Manual"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6687 -r1.6688 news.txt
--- openpkg-web/news.txt 22 Sep 2003 18:38:40 -0000 1.6687
+++ openpkg-web/news.txt 22 Sep 2003 18:47:21 -0000 1.6688
@@ -1,3 +1,4 @@
+22-Sep-2003: Upgraded package: P<mutt-1.4.1i-1.3.1>
22-Sep-2003: Upgraded package: P<bind-9.2.2-1.3.1>
22-Sep-2003: Upgraded package: P<crm114-20030920-20030922>
22-Sep-2003: Upgraded package: P<zoem-03.265-20030922>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
