Add x11 option to the package, on by default.

Addresses PR 23130 by reed@

3 files changed, 104 insertions, 1 deletions

diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index f5dac5cd691..7badb6ec5b3 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2005/12/07 17:51:51 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/09 20:40:56 wiz Exp $
 #
 
 DISTNAME=	groff-1.19.2
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=groff/}
 
@@ -19,6 +20,8 @@ USE_TOOLS+=		gs:run perl:run
 
 INFO_FILES=	groff
 
+.include "options.mk"
+
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(PAPERSIZE)
diff --git a/textproc/groff/PLIST.x11 b/textproc/groff/PLIST.x11
new file mode 100644
index 00000000000..539b35e59a3
--- /dev/null
+++ b/textproc/groff/PLIST.x11
@@ -0,0 +1,83 @@
+@comment $NetBSD: PLIST.x11,v 1.1 2005/12/09 20:40:56 wiz Exp $
+bin/gxditview
+bin/xtotroff
+lib/X11/app-defaults/GXditview
+man/man1/gxditview.1
+man/man1/xtotroff.1
+share/groff/${PKGVERSION}/font/devX100-12/CB
+share/groff/${PKGVERSION}/font/devX100-12/CBI
+share/groff/${PKGVERSION}/font/devX100-12/CI
+share/groff/${PKGVERSION}/font/devX100-12/CR
+share/groff/${PKGVERSION}/font/devX100-12/DESC
+share/groff/${PKGVERSION}/font/devX100-12/HB
+share/groff/${PKGVERSION}/font/devX100-12/HBI
+share/groff/${PKGVERSION}/font/devX100-12/HI
+share/groff/${PKGVERSION}/font/devX100-12/HR
+share/groff/${PKGVERSION}/font/devX100-12/NB
+share/groff/${PKGVERSION}/font/devX100-12/NBI
+share/groff/${PKGVERSION}/font/devX100-12/NI
+share/groff/${PKGVERSION}/font/devX100-12/NR
+share/groff/${PKGVERSION}/font/devX100-12/S
+share/groff/${PKGVERSION}/font/devX100-12/TB
+share/groff/${PKGVERSION}/font/devX100-12/TBI
+share/groff/${PKGVERSION}/font/devX100-12/TI
+share/groff/${PKGVERSION}/font/devX100-12/TR
+share/groff/${PKGVERSION}/font/devX100/CB
+share/groff/${PKGVERSION}/font/devX100/CBI
+share/groff/${PKGVERSION}/font/devX100/CI
+share/groff/${PKGVERSION}/font/devX100/CR
+share/groff/${PKGVERSION}/font/devX100/DESC
+share/groff/${PKGVERSION}/font/devX100/HB
+share/groff/${PKGVERSION}/font/devX100/HBI
+share/groff/${PKGVERSION}/font/devX100/HI
+share/groff/${PKGVERSION}/font/devX100/HR
+share/groff/${PKGVERSION}/font/devX100/NB
+share/groff/${PKGVERSION}/font/devX100/NBI
+share/groff/${PKGVERSION}/font/devX100/NI
+share/groff/${PKGVERSION}/font/devX100/NR
+share/groff/${PKGVERSION}/font/devX100/S
+share/groff/${PKGVERSION}/font/devX100/TB
+share/groff/${PKGVERSION}/font/devX100/TBI
+share/groff/${PKGVERSION}/font/devX100/TI
+share/groff/${PKGVERSION}/font/devX100/TR
+share/groff/${PKGVERSION}/font/devX75-12/CB
+share/groff/${PKGVERSION}/font/devX75-12/CBI
+share/groff/${PKGVERSION}/font/devX75-12/CI
+share/groff/${PKGVERSION}/font/devX75-12/CR
+share/groff/${PKGVERSION}/font/devX75-12/DESC
+share/groff/${PKGVERSION}/font/devX75-12/HB
+share/groff/${PKGVERSION}/font/devX75-12/HBI
+share/groff/${PKGVERSION}/font/devX75-12/HI
+share/groff/${PKGVERSION}/font/devX75-12/HR
+share/groff/${PKGVERSION}/font/devX75-12/NB
+share/groff/${PKGVERSION}/font/devX75-12/NBI
+share/groff/${PKGVERSION}/font/devX75-12/NI
+share/groff/${PKGVERSION}/font/devX75-12/NR
+share/groff/${PKGVERSION}/font/devX75-12/S
+share/groff/${PKGVERSION}/font/devX75-12/TB
+share/groff/${PKGVERSION}/font/devX75-12/TBI
+share/groff/${PKGVERSION}/font/devX75-12/TI
+share/groff/${PKGVERSION}/font/devX75-12/TR
+share/groff/${PKGVERSION}/font/devX75/CB
+share/groff/${PKGVERSION}/font/devX75/CBI
+share/groff/${PKGVERSION}/font/devX75/CI
+share/groff/${PKGVERSION}/font/devX75/CR
+share/groff/${PKGVERSION}/font/devX75/DESC
+share/groff/${PKGVERSION}/font/devX75/HB
+share/groff/${PKGVERSION}/font/devX75/HBI
+share/groff/${PKGVERSION}/font/devX75/HI
+share/groff/${PKGVERSION}/font/devX75/HR
+share/groff/${PKGVERSION}/font/devX75/NB
+share/groff/${PKGVERSION}/font/devX75/NBI
+share/groff/${PKGVERSION}/font/devX75/NI
+share/groff/${PKGVERSION}/font/devX75/NR
+share/groff/${PKGVERSION}/font/devX75/S
+share/groff/${PKGVERSION}/font/devX75/TB
+share/groff/${PKGVERSION}/font/devX75/TBI
+share/groff/${PKGVERSION}/font/devX75/TI
+share/groff/${PKGVERSION}/font/devX75/TR
+@dirrm share/groff/${PKGVERSION}/font/devX75-12
+@dirrm share/groff/${PKGVERSION}/font/devX75
+@dirrm share/groff/${PKGVERSION}/font/devX100-12
+@dirrm share/groff/${PKGVERSION}/font/devX100
+@unexec ${RMDIR} %D/lib/X11/app-defaults 2>/dev/null || ${TRUE}
diff --git a/textproc/groff/options.mk b/textproc/groff/options.mk
new file mode 100644
index 00000000000..1e3598cecec
--- /dev/null
+++ b/textproc/groff/options.mk
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2005/12/09 20:40:56 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.groff
+PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUGGESTED_OPTIONS=	x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+=	--with-x
+CONFIGURE_ARGS+=	--with-appresdir=${PREFIX}/lib/X11/app-defaults
+PLIST_SRC=		PLIST.x11 PLIST
+.include "../../mk/xaw.buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-x
+.endif