Index: head/editors/jove/Makefile
===================================================================
--- head/editors/jove/Makefile	(revision 529900)
+++ head/editors/jove/Makefile	(revision 529901)
@@ -1,27 +1,37 @@
 # Created by: jkh
 # $FreeBSD$
 
 PORTNAME=	jove
 PORTVERSION=	4.16
 PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/moraes/jove/ \
 		LOCAL/simon
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Jonathan's Own Version of Emacs
 
 LICENSE=	JOVE
 LICENSE_NAME=	JOVE License
 LICENSE_FILE=	${WRKSRC}/README
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		groff ncurses
+USES=		ncurses
 MAKE_ARGS=	LIBS="${LDFLAGS} -lncurses"
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+OPTIONS_DEFINE=	EXTRADOCS
+EXTRADOCS_DESC=	Build and install cmds.doc
+EXTRADOCS_USES=	groff
+OPTIONS_DEFAULT=
+OPTIONS_SUB=	yes
+
 post-patch:
 # Fix collisions with getline(3)
 	@${REINPLACE_CMD} 's|[[:<:]]getline[[:>:]]|get_line|g' ${WRKSRC}/*.c ${WRKSRC}/*.h
+
+post-patch-EXTRADOCS-off:
+	@${REINPLACE_CMD} -E 's|^(all:.*) doc/cmds\.doc$$|\1|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's|^CMDS.DOC = .*|CMDS.DOC=|' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
Index: head/editors/jove/pkg-plist
===================================================================
--- head/editors/jove/pkg-plist	(revision 529900)
+++ head/editors/jove/pkg-plist	(revision 529901)
@@ -1,25 +1,25 @@
 bin/jove
 bin/teachjove
 libexec/jove/portsrv
 libexec/jove/recover
 man/man1/jove.1.gz
 man/man1/teachjove.1.gz
 %%DATADIR%%/XTermresource
-%%DATADIR%%/cmds.doc
+%%EXTRADOCS%%%%DATADIR%%/cmds.doc
 %%DATADIR%%/jove.rc
 %%DATADIR%%/jove.rc.3022
 %%DATADIR%%/jove.rc.sun
 %%DATADIR%%/jove.rc.sun-cmd
 %%DATADIR%%/jove.rc.vt100
 %%DATADIR%%/jove.rc.wyse
 %%DATADIR%%/jove.rc.xterm
 %%DATADIR%%/jove.rc.z29
 %%DATADIR%%/keychart.
 %%DATADIR%%/keychart.3022
 %%DATADIR%%/keychart.sun
 %%DATADIR%%/keychart.sun-cmd
 %%DATADIR%%/keychart.vt100
 %%DATADIR%%/keychart.wyse
 %%DATADIR%%/keychart.xterm
 %%DATADIR%%/keychart.z29
 %%DATADIR%%/teach-jove