ports/86321: maintainer-update of mail/mutt-devel
Udo Schweigert
udo.schweigert at siemens.com
Mon Sep 19 07:20:18 UTC 2005
>Number: 86321
>Category: ports
>Synopsis: maintainer-update of mail/mutt-devel
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Sep 19 07:20:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Udo Schweigert
>Release: FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
>Description:
Maintainer update of mail/mutt-devel:
- Fix the manual generation (html and txt) as that is now built from
xml and not sgml.
>How-To-Repeat:
>Fix:
diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile
--- /usr/ports/mail/mutt-devel/Makefile Mon Sep 19 06:09:11 2005
+++ ./Makefile Mon Sep 19 08:36:44 2005
@@ -475,8 +475,9 @@
.endif # ! NOPORTDOCS
.if ${XML_USED} == yes
-#BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \
-# lynx:${PORTSDIR}/www/lynx
+BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \
+ ${PREFIX}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
+ lynx:${PORTSDIR}/www/lynx
post-patch::
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-xml
.endif
diff -ru /usr/ports/mail/mutt-devel/files/patch-02 ./files/patch-02
--- /usr/ports/mail/mutt-devel/files/patch-02 Mon Sep 19 06:09:11 2005
+++ ./files/patch-02 Mon Sep 19 08:36:44 2005
@@ -24,15 +24,15 @@
check:
manual.txt: manual.html
- -lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
-+# -lynx -dump -nolist -with_backspaces manual.html > $@
++ -lynx -dump -nolist -with_backspaces manual.html > $@
manual.html: $(srcdir)/html.xsl manual.xml
- -xsltproc --nonet -o $@ $^
-+# -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
++ -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
manual-chunked stamp-doc-chunked: $(srcdir)/chunk.xsl manual.xml
- -xsltproc --nonet $^
-+# -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
++ -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
touch stamp-doc-chunked
manual.pdf: stamp-doc-tex
diff -ru /usr/ports/mail/mutt-devel/files/patch-doc-manual.xml.head ./files/patch-doc-manual.xml.head
--- /usr/ports/mail/mutt-devel/files/patch-doc-manual.xml.head Thu Jan 1 01:00:00 1970
+++ ./files/patch-doc-manual.xml.head Mon Sep 19 08:36:27 2005
@@ -0,0 +1,124 @@
+--- doc/manual.xml.head.orig Mon Sep 19 08:20:38 2005
++++ doc/manual.xml.head Mon Sep 19 08:26:14 2005
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" standalone="no"?>
+ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
++ "/usr/local/share/xml/docbook/4.2/docbookx.dtd">
+ <article>
+
+ <articleinfo>
+@@ -241,24 +241,24 @@
+ <screen>
+ ^A or <Home> bol move to the start of the line
+ ^B or <Left> backward-char move back one char
+-Esc B backward-word move back one word
++Esc B backward-word move back one word
+ ^D or <Delete> delete-char delete the char under the cursor
+ ^E or <End> eol move to the end of the line
+ ^F or <Right> forward-char move forward one char
+-Esc F forward-word move forward one word
++Esc F forward-word move forward one word
+ <Tab> complete complete filename or alias
+ ^T complete-query complete address with query
+ ^K kill-eol delete to the end of the line
+-ESC d kill-eow delete to the end ot the word
++ESC d kill-eow delete to the end ot the word
+ ^W kill-word kill the word in front of the cursor
+ ^U kill-line delete entire line
+ ^V quote-char quote the next typed key
+ <Up> history-up recall previous string from history
+ <Down> history-down recall next string from history
+ <BackSpace> backspace kill the char in front of the cursor
+-Esc u upcase-word convert word to upper case
+-Esc l downcase-word convert word to lower case
+-Esc c capitalize-word capitalize the word
++Esc u upcase-word convert word to upper case
++Esc l downcase-word convert word to lower case
++Esc c capitalize-word capitalize the word
+ ^G n/a abort
+ <Return> n/a finish editing
+ </screen>
+@@ -620,8 +620,8 @@
+ ESC p previous-subthread jump to the start of the previous subthread
+ ESC r read-subthread mark the current subthread as read
+ ESC t tag-thread toggle the tag on the current thread
+-ESC v collapse-thread toggle collapse for the current thread
+-ESC V collapse-all toggle collapse for all threads
++ESC v collapse-thread toggle collapse for the current thread
++ESC V collapse-all toggle collapse for all threads
+ P parent-message jump to parent message in thread
+ </screen>
+
+@@ -898,7 +898,7 @@
+
+ <screen>
+ a attach-file attach a file
+-A attach-message attach message(s) to the message
++A attach-message attach message(s) to the message
+ ESC k attach-key attach a PGP public key
+ d edit-description edit description on attachment
+ D detach-file detach a file
+@@ -914,7 +914,7 @@
+ p pgp-menu select PGP options
+ P postpone-message postpone this message until later
+ q quit quit (abort) sending the message
+-w write-fcc write the message to a folder
++w write-fcc write the message to a folder
+ i ispell check spelling (if available on your system)
+ ^F forget-passphrase wipe passphrase(s) from memory
+ </screen>
+@@ -3286,7 +3286,7 @@
+ ~h EXPR messages which contain EXPR in the message header
+ ~H EXPR messages with a spam attribute matching EXPR
+ ~i EXPR message which match EXPR in the ``Message-ID'' field
+-~k message contains PGP key material
++~k message contains PGP key material
+ ~L EXPR message is either originated or received by EXPR
+ ~l message is addressed to a known mailing list
+ ~m [MIN]-[MAX] message in the range MIN to MAX *)
+@@ -3302,15 +3302,15 @@
+ ~S superseded messages
+ ~t EXPR messages addressed to EXPR
+ ~T tagged messages
+-~u message is addressed to a subscribed mailing list
++~u message is addressed to a subscribed mailing list
+ ~U unread messages
+-~v message is part of a collapsed thread.
+-~V cryptographically verified messages
++~v message is part of a collapsed thread.
++~V cryptographically verified messages
+ ~x EXPR messages which contain EXPR in the `References' field
+ ~y EXPR messages which contain EXPR in the `X-Label' field
+ ~z [MIN]-[MAX] messages with a size in the range MIN to MAX *)
+-~= duplicated messages (see $duplicate_threads)
+-~$ unreferenced messages (requires threaded view)
++~= duplicated messages (see $duplicate_threads)
++~$ unreferenced messages (requires threaded view)
+ </screen>
+
+ </para>
+@@ -3502,10 +3502,10 @@
+ one of the following units:
+
+ <screen>
+-y years
+-m months
+-w weeks
+-d days
++y years
++m months
++w weeks
++d days
+ </screen>
+
+ As a special case, you can replace the sign by a ``*'' character,
+@@ -5461,7 +5461,7 @@
+ <para>
+
+ <screen>
+--A expand an alias
++-A expand an alias
+ -a attach a file to a message
+ -b specify a blind carbon-copy (BCC) address
+ -c specify a carbon-copy (Cc) address
diff -ru /usr/ports/mail/mutt-devel/scripts/generate-plist ./scripts/generate-plist
--- /usr/ports/mail/mutt-devel/scripts/generate-plist Mon Sep 19 06:09:11 2005
+++ ./scripts/generate-plist Mon Sep 19 08:36:44 2005
@@ -130,6 +130,9 @@
echo "%%DOCSDIR%%/html/mimesupport.html" >> $tmp_first
echo "%%DOCSDIR%%/html/miscellany.html" >> $tmp_first
echo "%%DOCSDIR%%/html/reference.html" >> $tmp_first
+ if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then
+ echo "%%DOCSDIR%%/html/compressed-folders.html" >> $tmp_first
+ fi
echo "@dirrm %%DOCSDIR%%/html" >> $tmp_last
fi
cat >> $tmp_last <<EOF
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list