2 files changed, 49 insertions, 1 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 0ede4d1b7607..c135f9d6c734 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -69,7 +69,13 @@ INFO=		ada-mode autotype calc ccmode cl dired-x ebrowse ediff \
 
 LATEST_LINK=	emacs22
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 600000
+EXTRA_PATCHES+=	${FILESDIR}/extrapatch-texinfo
+.endif
+
 pre-build:
 	(cd ${WRKSRC} ; make bootstrap)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/emacs-devel/files/extrapatch-texinfo b/editors/emacs-devel/files/extrapatch-texinfo
new file mode 100644
index 000000000000..441d2fdc1e68
--- /dev/null
+++ b/editors/emacs-devel/files/extrapatch-texinfo
@@ -0,0 +1,42 @@
+--- man/cc-mode.texi.orig	Mon Feb 27 21:09:36 2006
++++ man/cc-mode.texi	Fri Apr  7 12:01:02 2006
+@@ -1624,8 +1624,8 @@
+ @dfn{subword}.  Here are some examples:
+ 
+ @multitable {@samp{NSGraphicsContext}} {@samp{NS}, @samp{Graphics}, and @samp{Context}}
+-@headitem Nomenclature
+-  @tab Subwords
++@item @strong{Nomenclature}
++  @tab @strong{Subwords}
+ @item @samp{GtkWindow}
+   @tab @samp{Gtk} and @samp{Window}
+ @item @samp{EmacsFrameClass}
+@@ -1657,7 +1657,7 @@
+ @findex c-downcase-subword
+ @findex downcase-subword (c-)
+ @multitable @columnfractions .20 .40 .40
+-@headitem Key         @tab Word oriented command     @tab Subword oriented command
++@item @strong{Key}         @tab @strong{Word oriented command}     @tab @strong{Subword oriented command}
+ @item     @kbd{M-f}   @tab @code{forward-word}       @tab @code{c-forward-subword}
+ @item     @kbd{M-b}   @tab @code{backward-word}      @tab @code{c-backward-subword}
+ @item     @kbd{M-@@}  @tab @code{mark-word}          @tab @code{c-mark-subword}
+--- man/rcirc.texi.orig	Fri Apr  7 13:01:42 2006
++++ man/rcirc.texi	Fri Apr  7 13:01:59 2006
+@@ -118,7 +118,7 @@
+ 
+ @cindex redirection to random servers
+ When you connect to the Freenode network
+-(@indicateurl{http://freenode.net/}), you point your IRC client at the
++(@url{http://freenode.net/}), you point your IRC client at the
+ server @code{irc.freenode.net}.  That server will redirect your client
+ to a random server on the network, such as @code{zelazny.freenode.net}.
+ 
+@@ -430,7 +430,7 @@
+ @cindex help about irc
+ Typical IRC servers implement many more commands.  You can read more
+ about the fantastic world of IRC online at
+-@indicateurl{http://www.irchelp.org/}, the Internet Relay Chat (IRC)
++@url{http://www.irchelp.org/}, the Internet Relay Chat (IRC)
+ help archive.
+ 
+ @node Configuration, , Useful IRC commands, Reference