Add groff-docs option, enabled by default.

When turning it off, you can get rid of the netpbm, psutils,
and ghostscript dependencies. Might help in bootstrapping some
platforms. Based on a patch from schmonz@.

While here, improve PLIST by trying to remove an additional directory
and bump PKGREVISION for that.

5 files changed, 101 insertions, 92 deletions

diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index f05a6c8c243..e294bddfe2a 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2006/04/07 19:54:17 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2006/07/24 16:49:12 wiz Exp $
 #
 
 DISTNAME=	groff-1.19.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=groff/}
 
@@ -10,15 +10,12 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/groff/groff.html
 COMMENT=	GNU roff text processing suite
 
-DEPENDS+=	netpbm>=10.0:../../graphics/netpbm
-DEPENDS+=	psutils>=1.17:../../print/psutils
-
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		PERLPATH=${PERL5:Q}
-USE_TOOLS+=		gs:run perl:run sed:run
+USE_TOOLS+=		perl:run sed:run awk:run
 
-INFO_FILES=		# PLIST
+INFO_FILES=		YES
 
 REPLACE_INTERPRETER+=	sed
 REPLACE.sed.old=	.*/sed
@@ -27,6 +24,8 @@ REPLACE_FILES.sed+=	font/devps/generate/symbol.sed
 
 .include "options.mk"
 
+PLIST_SRC+=		PLIST
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
@@ -35,6 +34,7 @@ PLIST_SUBST+=	GNU_PREFIX="g"
 PLIST_SUBST+=	GNU_PREFIX=""
 .endif
 
+BUILD_DEFS+=	PAPERSIZE
 .if defined(PAPERSIZE)
 CONFIGURE_ENV+=	PAGE=${PAPERSIZE:Q}
 .endif
diff --git a/textproc/groff/PLIST b/textproc/groff/PLIST
index dda8772d15a..ab853029f97 100644
--- a/textproc/groff/PLIST
+++ b/textproc/groff/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2006/04/07 19:54:17 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/07/24 16:49:12 wiz Exp $
 bin/addftinfo
 bin/afmtodit
 bin/${GNU_PREFIX}eqn
@@ -88,8 +88,6 @@ share/doc/groff/${PKGVERSION}/examples/grnexmpl.g
 share/doc/groff/${PKGVERSION}/examples/grnexmpl.me
 share/doc/groff/${PKGVERSION}/examples/grnexmpl.ps
 share/doc/groff/${PKGVERSION}/examples/groff.css
-share/doc/groff/${PKGVERSION}/examples/img/webpage1.png
-share/doc/groff/${PKGVERSION}/examples/img/webpage2.png
 share/doc/groff/${PKGVERSION}/examples/mom/README.txt
 share/doc/groff/${PKGVERSION}/examples/mom/elvis_syntax
 share/doc/groff/${PKGVERSION}/examples/mom/elvis_syntax.new
@@ -100,57 +98,8 @@ share/doc/groff/${PKGVERSION}/examples/mom/sample_docs.mom
 share/doc/groff/${PKGVERSION}/examples/mom/sample_docs.ps
 share/doc/groff/${PKGVERSION}/examples/mom/typesetting.mom
 share/doc/groff/${PKGVERSION}/examples/mom/typesetting.ps
-share/doc/groff/${PKGVERSION}/examples/webpage.html
 share/doc/groff/${PKGVERSION}/examples/webpage.ms
 share/doc/groff/${PKGVERSION}/examples/webpage.ps
-share/doc/groff/${PKGVERSION}/html/img/pic1.png
-share/doc/groff/${PKGVERSION}/html/img/pic10.png
-share/doc/groff/${PKGVERSION}/html/img/pic11.png
-share/doc/groff/${PKGVERSION}/html/img/pic12.png
-share/doc/groff/${PKGVERSION}/html/img/pic13.png
-share/doc/groff/${PKGVERSION}/html/img/pic14.png
-share/doc/groff/${PKGVERSION}/html/img/pic15.png
-share/doc/groff/${PKGVERSION}/html/img/pic16.png
-share/doc/groff/${PKGVERSION}/html/img/pic17.png
-share/doc/groff/${PKGVERSION}/html/img/pic18.png
-share/doc/groff/${PKGVERSION}/html/img/pic19.png
-share/doc/groff/${PKGVERSION}/html/img/pic2.png
-share/doc/groff/${PKGVERSION}/html/img/pic20.png
-share/doc/groff/${PKGVERSION}/html/img/pic21.png
-share/doc/groff/${PKGVERSION}/html/img/pic22.png
-share/doc/groff/${PKGVERSION}/html/img/pic23.png
-share/doc/groff/${PKGVERSION}/html/img/pic24.png
-share/doc/groff/${PKGVERSION}/html/img/pic25.png
-share/doc/groff/${PKGVERSION}/html/img/pic26.png
-share/doc/groff/${PKGVERSION}/html/img/pic27.png
-share/doc/groff/${PKGVERSION}/html/img/pic28.png
-share/doc/groff/${PKGVERSION}/html/img/pic29.png
-share/doc/groff/${PKGVERSION}/html/img/pic3.png
-share/doc/groff/${PKGVERSION}/html/img/pic30.png
-share/doc/groff/${PKGVERSION}/html/img/pic31.png
-share/doc/groff/${PKGVERSION}/html/img/pic32.png
-share/doc/groff/${PKGVERSION}/html/img/pic33.png
-share/doc/groff/${PKGVERSION}/html/img/pic34.png
-share/doc/groff/${PKGVERSION}/html/img/pic35.png
-share/doc/groff/${PKGVERSION}/html/img/pic36.png
-share/doc/groff/${PKGVERSION}/html/img/pic37.png
-share/doc/groff/${PKGVERSION}/html/img/pic38.png
-share/doc/groff/${PKGVERSION}/html/img/pic39.png
-share/doc/groff/${PKGVERSION}/html/img/pic4.png
-share/doc/groff/${PKGVERSION}/html/img/pic40.png
-share/doc/groff/${PKGVERSION}/html/img/pic41.png
-share/doc/groff/${PKGVERSION}/html/img/pic42.png
-share/doc/groff/${PKGVERSION}/html/img/pic43.png
-share/doc/groff/${PKGVERSION}/html/img/pic44.png
-share/doc/groff/${PKGVERSION}/html/img/pic46.png
-share/doc/groff/${PKGVERSION}/html/img/pic47.png
-share/doc/groff/${PKGVERSION}/html/img/pic48.png
-share/doc/groff/${PKGVERSION}/html/img/pic49.png
-share/doc/groff/${PKGVERSION}/html/img/pic5.png
-share/doc/groff/${PKGVERSION}/html/img/pic6.png
-share/doc/groff/${PKGVERSION}/html/img/pic7.png
-share/doc/groff/${PKGVERSION}/html/img/pic8.png
-share/doc/groff/${PKGVERSION}/html/img/pic9.png
 share/doc/groff/${PKGVERSION}/html/mom/appendices.html
 share/doc/groff/${PKGVERSION}/html/mom/color.html
 share/doc/groff/${PKGVERSION}/html/mom/cover.html
@@ -170,35 +119,10 @@ share/doc/groff/${PKGVERSION}/html/mom/toc.html
 share/doc/groff/${PKGVERSION}/html/mom/typemacdoc.html
 share/doc/groff/${PKGVERSION}/html/mom/typesetting.html
 share/doc/groff/${PKGVERSION}/html/mom/using.html
-share/doc/groff/${PKGVERSION}/html/pic-1.html
-share/doc/groff/${PKGVERSION}/html/pic-10.html
-share/doc/groff/${PKGVERSION}/html/pic-11.html
-share/doc/groff/${PKGVERSION}/html/pic-12.html
-share/doc/groff/${PKGVERSION}/html/pic-13.html
-share/doc/groff/${PKGVERSION}/html/pic-14.html
-share/doc/groff/${PKGVERSION}/html/pic-15.html
-share/doc/groff/${PKGVERSION}/html/pic-16.html
-share/doc/groff/${PKGVERSION}/html/pic-17.html
-share/doc/groff/${PKGVERSION}/html/pic-18.html
-share/doc/groff/${PKGVERSION}/html/pic-19.html
-share/doc/groff/${PKGVERSION}/html/pic-2.html
-share/doc/groff/${PKGVERSION}/html/pic-20.html
-share/doc/groff/${PKGVERSION}/html/pic-21.html
-share/doc/groff/${PKGVERSION}/html/pic-22.html
-share/doc/groff/${PKGVERSION}/html/pic-23.html
-share/doc/groff/${PKGVERSION}/html/pic-3.html
-share/doc/groff/${PKGVERSION}/html/pic-4.html
-share/doc/groff/${PKGVERSION}/html/pic-5.html
-share/doc/groff/${PKGVERSION}/html/pic-6.html
-share/doc/groff/${PKGVERSION}/html/pic-7.html
-share/doc/groff/${PKGVERSION}/html/pic-8.html
-share/doc/groff/${PKGVERSION}/html/pic-9.html
-share/doc/groff/${PKGVERSION}/html/pic.html
 share/doc/groff/${PKGVERSION}/meintro.me
 share/doc/groff/${PKGVERSION}/meintro.ps
 share/doc/groff/${PKGVERSION}/meref.me
 share/doc/groff/${PKGVERSION}/meref.ps
-share/doc/groff/${PKGVERSION}/pdf/pdfmark.pdf
 share/doc/groff/${PKGVERSION}/pic.ms
 share/doc/groff/${PKGVERSION}/pic.ps
 share/groff/${PKGVERSION}/eign
@@ -490,12 +414,9 @@ share/groff/site-tmac/mdoc.local
 @dirrm share/groff/${PKGVERSION}/font
 @dirrm share/groff/${PKGVERSION}
 @dirrm share/groff
-@dirrm share/doc/groff/${PKGVERSION}/pdf
 @dirrm share/doc/groff/${PKGVERSION}/html/mom
-@dirrm share/doc/groff/${PKGVERSION}/html/img
 @dirrm share/doc/groff/${PKGVERSION}/html
 @dirrm share/doc/groff/${PKGVERSION}/examples/mom
-@dirrm share/doc/groff/${PKGVERSION}/examples/img
 @dirrm share/doc/groff/${PKGVERSION}/examples
 @dirrm share/doc/groff/${PKGVERSION}
 @dirrm share/doc/groff
diff --git a/textproc/groff/PLIST.docs b/textproc/groff/PLIST.docs
new file mode 100644
index 00000000000..681d4971164
--- /dev/null
+++ b/textproc/groff/PLIST.docs
@@ -0,0 +1,80 @@
+@comment $NetBSD: PLIST.docs,v 1.1 2006/07/24 16:49:12 wiz Exp $
+share/doc/groff/${PKGVERSION}/examples/img/webpage1.png
+share/doc/groff/${PKGVERSION}/examples/img/webpage2.png
+share/doc/groff/${PKGVERSION}/examples/webpage.html
+share/doc/groff/${PKGVERSION}/html/img/pic1.png
+share/doc/groff/${PKGVERSION}/html/img/pic10.png
+share/doc/groff/${PKGVERSION}/html/img/pic11.png
+share/doc/groff/${PKGVERSION}/html/img/pic12.png
+share/doc/groff/${PKGVERSION}/html/img/pic13.png
+share/doc/groff/${PKGVERSION}/html/img/pic14.png
+share/doc/groff/${PKGVERSION}/html/img/pic15.png
+share/doc/groff/${PKGVERSION}/html/img/pic16.png
+share/doc/groff/${PKGVERSION}/html/img/pic17.png
+share/doc/groff/${PKGVERSION}/html/img/pic18.png
+share/doc/groff/${PKGVERSION}/html/img/pic19.png
+share/doc/groff/${PKGVERSION}/html/img/pic2.png
+share/doc/groff/${PKGVERSION}/html/img/pic20.png
+share/doc/groff/${PKGVERSION}/html/img/pic21.png
+share/doc/groff/${PKGVERSION}/html/img/pic22.png
+share/doc/groff/${PKGVERSION}/html/img/pic23.png
+share/doc/groff/${PKGVERSION}/html/img/pic24.png
+share/doc/groff/${PKGVERSION}/html/img/pic25.png
+share/doc/groff/${PKGVERSION}/html/img/pic26.png
+share/doc/groff/${PKGVERSION}/html/img/pic27.png
+share/doc/groff/${PKGVERSION}/html/img/pic28.png
+share/doc/groff/${PKGVERSION}/html/img/pic29.png
+share/doc/groff/${PKGVERSION}/html/img/pic3.png
+share/doc/groff/${PKGVERSION}/html/img/pic30.png
+share/doc/groff/${PKGVERSION}/html/img/pic31.png
+share/doc/groff/${PKGVERSION}/html/img/pic32.png
+share/doc/groff/${PKGVERSION}/html/img/pic33.png
+share/doc/groff/${PKGVERSION}/html/img/pic34.png
+share/doc/groff/${PKGVERSION}/html/img/pic35.png
+share/doc/groff/${PKGVERSION}/html/img/pic36.png
+share/doc/groff/${PKGVERSION}/html/img/pic37.png
+share/doc/groff/${PKGVERSION}/html/img/pic38.png
+share/doc/groff/${PKGVERSION}/html/img/pic39.png
+share/doc/groff/${PKGVERSION}/html/img/pic4.png
+share/doc/groff/${PKGVERSION}/html/img/pic40.png
+share/doc/groff/${PKGVERSION}/html/img/pic41.png
+share/doc/groff/${PKGVERSION}/html/img/pic42.png
+share/doc/groff/${PKGVERSION}/html/img/pic43.png
+share/doc/groff/${PKGVERSION}/html/img/pic44.png
+share/doc/groff/${PKGVERSION}/html/img/pic46.png
+share/doc/groff/${PKGVERSION}/html/img/pic47.png
+share/doc/groff/${PKGVERSION}/html/img/pic48.png
+share/doc/groff/${PKGVERSION}/html/img/pic49.png
+share/doc/groff/${PKGVERSION}/html/img/pic5.png
+share/doc/groff/${PKGVERSION}/html/img/pic6.png
+share/doc/groff/${PKGVERSION}/html/img/pic7.png
+share/doc/groff/${PKGVERSION}/html/img/pic8.png
+share/doc/groff/${PKGVERSION}/html/img/pic9.png
+share/doc/groff/${PKGVERSION}/html/pic-1.html
+share/doc/groff/${PKGVERSION}/html/pic-10.html
+share/doc/groff/${PKGVERSION}/html/pic-11.html
+share/doc/groff/${PKGVERSION}/html/pic-12.html
+share/doc/groff/${PKGVERSION}/html/pic-13.html
+share/doc/groff/${PKGVERSION}/html/pic-14.html
+share/doc/groff/${PKGVERSION}/html/pic-15.html
+share/doc/groff/${PKGVERSION}/html/pic-16.html
+share/doc/groff/${PKGVERSION}/html/pic-17.html
+share/doc/groff/${PKGVERSION}/html/pic-18.html
+share/doc/groff/${PKGVERSION}/html/pic-19.html
+share/doc/groff/${PKGVERSION}/html/pic-2.html
+share/doc/groff/${PKGVERSION}/html/pic-20.html
+share/doc/groff/${PKGVERSION}/html/pic-21.html
+share/doc/groff/${PKGVERSION}/html/pic-22.html
+share/doc/groff/${PKGVERSION}/html/pic-23.html
+share/doc/groff/${PKGVERSION}/html/pic-3.html
+share/doc/groff/${PKGVERSION}/html/pic-4.html
+share/doc/groff/${PKGVERSION}/html/pic-5.html
+share/doc/groff/${PKGVERSION}/html/pic-6.html
+share/doc/groff/${PKGVERSION}/html/pic-7.html
+share/doc/groff/${PKGVERSION}/html/pic-8.html
+share/doc/groff/${PKGVERSION}/html/pic-9.html
+share/doc/groff/${PKGVERSION}/html/pic.html
+share/doc/groff/${PKGVERSION}/pdf/pdfmark.pdf
+@dirrm share/doc/groff/${PKGVERSION}/pdf
+@dirrm share/doc/groff/${PKGVERSION}/html/img
+@dirrm share/doc/groff/${PKGVERSION}/examples/img
diff --git a/textproc/groff/PLIST.x11 b/textproc/groff/PLIST.x11
index 539b35e59a3..048924cb1ea 100644
--- a/textproc/groff/PLIST.x11
+++ b/textproc/groff/PLIST.x11
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.x11,v 1.1 2005/12/09 20:40:56 wiz Exp $
+@comment $NetBSD: PLIST.x11,v 1.2 2006/07/24 16:49:12 wiz Exp $
 bin/gxditview
 bin/xtotroff
 lib/X11/app-defaults/GXditview
@@ -81,3 +81,4 @@ share/groff/${PKGVERSION}/font/devX75/TR
 @dirrm share/groff/${PKGVERSION}/font/devX100-12
 @dirrm share/groff/${PKGVERSION}/font/devX100
 @unexec ${RMDIR} %D/lib/X11/app-defaults 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/lib/X11 2>/dev/null || ${TRUE}
diff --git a/textproc/groff/options.mk b/textproc/groff/options.mk
index 83cb84301d6..cc23ef63b57 100644
--- a/textproc/groff/options.mk
+++ b/textproc/groff/options.mk
@@ -1,15 +1,22 @@
-# $NetBSD: options.mk,v 1.2 2005/12/31 16:28:40 ben Exp $
+# $NetBSD: options.mk,v 1.3 2006/07/24 16:49:12 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.groff
-PKG_SUPPORTED_OPTIONS=	x11
-PKG_SUGGESTED_OPTIONS=	x11
+PKG_SUPPORTED_OPTIONS=	groff-docs x11
+PKG_SUGGESTED_OPTIONS=	groff-docs x11
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mgroff-docs)
+DEPENDS+=		netpbm>=10.0:../../graphics/netpbm
+DEPENDS+=		psutils>=1.17:../../print/psutils
+USE_TOOLS+=		gs:run
+PLIST_SRC+=		PLIST.docs
+.endif
+
 .if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--with-appresdir=${PREFIX}/lib/X11/app-defaults
-PLIST_SRC=		PLIST.x11 PLIST
+PLIST_SRC+=		PLIST.x11
 .include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.prefs.mk"