- 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)

1 files changed, 5 insertions, 4 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} "====>"