- fix pkg-plist [1]

  o  when WITHOUT_GTK=YES is used (add DOC2 variable to PLIST_SUB
     at Makefile and corresponding changes to pkg-plist);
  o  change some @dirrmtry to @dirrm (for those directories which
     belongs to the port);
  o  remove @dirrmrty for ${DATADIR}/emacs/site-lisp as it listed at
     BSD.local.dist.
- fix make patch for 5.x and 4.x  [2]
  (remove extrapatch if ${OSVERSION} < 600000 -- upsteam is already have it).

PR:		102893 [1], 102906 [2]
Submitted by:	bsam (me) [1], [2]
Approved by:	keramida__at__ceid.upatras.gr (maintainer timeout 19 days)

3 files changed, 9 insertions, 50 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 2341d4d65441..4f9b76e749ae 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -59,6 +59,11 @@ CONFIGURE_ARGS+=	--without-xim
 
 MAN1=		ctags.1 emacs.1 emacsclient.1 etags.1
 PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
+.if defined(WITHOUT_GTK)
+PLIST_SUB+=	DOC2=""
+.else
+PLIST_SUB+=	DOC2="@comment "
+.endif
 
 INFO=		ada-mode autotype calc ccmode cl dired-x ebrowse ediff \
 		efaq eintr elisp emacs-mime emacs erc eshell eudc \
@@ -70,10 +75,6 @@ LATEST_LINK=	emacs22
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 600000
-EXTRA_PATCHES+=	${FILESDIR}/extrapatch-texinfo
-.endif
-
 pre-everything::
 .if !defined(WITHOUT_X11) && !defined(WITHOUT_GTK)
 	@${ECHO_MSG} "====>"
diff --git a/editors/emacs-devel/files/extrapatch-texinfo b/editors/emacs-devel/files/extrapatch-texinfo
deleted file mode 100644
index 441d2fdc1e68..000000000000
--- a/editors/emacs-devel/files/extrapatch-texinfo
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index aae0c0295155..9162f6016d91 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -24,6 +24,7 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/etc/DEBUG
 %%DATADIR%%/%%EMACS_VER%%/etc/DISTRIB
 %%DATADIR%%/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.1
+%%DOC2%%%%DATADIR%%/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.2
 %%DATADIR%%/%%EMACS_VER%%/etc/ERC-NEWS
 %%DATADIR%%/%%EMACS_VER%%/etc/ETAGS.EBNF
 %%DATADIR%%/%%EMACS_VER%%/etc/FTP
@@ -2599,7 +2600,7 @@ var/games/emacs/snake-scores
 var/games/emacs/tetris-scores
 @dirrm libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%
 @dirrm libexec/emacs/%%EMACS_VER%%
-@dirrmtry libexec/emacs
+@dirrm libexec/emacs
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/url
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/term
@@ -2635,9 +2636,8 @@ var/games/emacs/tetris-scores
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/e
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc
-@dirrmtry %%DATADIR%%/%%EMACS_VER%%/site-lisp
-@dirrmtry %%DATADIR%%/%%EMACS_VER%%
-@dirrmtry %%DATADIR%%/site-lisp
+@dirrm %%DATADIR%%/%%EMACS_VER%%/site-lisp
+@dirrm %%DATADIR%%/%%EMACS_VER%%
 @dirrmtry var/games/emacs
 @dirrmtry var/games
 @dirrmtry var