pkg/33400: make x11 optional in net/arla package

[dlg%dorkzilla.org@localhost]

>Number:         33400
>Category:       pkg
>Synopsis:       make x11 optional in net/arla package
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon May 01 04:10:00 +0000 2006
>Originator:     david l goodrich
>Release:        NetBSD 3.0
>Organization:
>Environment:
NetBSD chaos.dsrw.org 3.0 NetBSD 3.0 (XENU_nodiag_pf) #0: Sun Apr 30 10:13:57 
CDT 2006 
dlg%chaos.dsrw.org@localhost:/usr/src/sys/arch/i386/compile/XENU_nodiag_pf i386

>Description:
Attached is a patch to make the x11 components of pkgsrc/net/arla - 
specifically bin/amon - a mk.conf option.

This patch includes work done by David L. Goodrich <dlg%dorkzilla.org@localhost>
and Thomas L. Kula <kula%tproa.net@localhost>
>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/arla/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- Makefile
+++ Makefile
@@ -21,6 +21,7 @@
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 
+.include "options.mk"
 .include "../../mk/bsd.prefs.mk"
 
 .if !exists(/usr/src/sys/lib/libkern/libkern.h)
@@ -62,7 +63,6 @@
 RCD_SCRIPTS=   arlad
 OWN_DIRS_PERMS=        ${ARLA_CACHE} ${ROOT_USER} ${ROOT_GROUP} 0700
 
-.include "../../mk/x11.buildlink3.mk"
 
 post-extract:
        ${CP} ${FILESDIR}/lkm.conf ${WRKDIR}/lkm.conf
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/net/arla/PLIST,v
retrieving revision 1.20
diff -u -r1.20 PLIST
--- PLIST
+++ PLIST
@@ -1,7 +1,7 @@
 @comment $NetBSD: PLIST,v 1.20 2006/04/06 03:20:54 jlam Exp $
 bin/afsfsperf
 bin/afstool
-bin/amon
+${X11_SUPPORT}bin/amon
 bin/arla-send-pr
 bin/bos
 bin/fs
Index: options.mk
--- /dev/null
+++ options.mk
@@ -0,0 +1,15 @@
+PKG_OPTIONS_VAR=       PKG_OPTIONS.arla
+PKG_SUPPORTED_OPTIONS= x11
+PKG_SUGGESTED_OPTIONS= 
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+=       --with-x
+PLIST_SUBST+=          X11_SUPPORT=
+.include "../../mk/x11.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=        --without-x
+PLIST_SUBST+=           X11_SUPPORT='@comment '
+.endif
+