pkg/49101: x11/xdm might be compiled without libXft

[mochid%netside.co.jp@localhost]

>Number:         49101
>Category:       pkg
>Synopsis:       x11/xdm might be compiled without libXft
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Aug 11 17:20:00 +0000 2014
>Originator:     MOCHIDA Shuji
>Release:        NetBSD 6.1_STABLE
>Organization:
NETside Technologies Inc.
>Environment:
System: NetBSD pine 6.1_STABLE NetBSD 6.1_STABLE (OXI1) #0: Wed Sep 18 22:51:27 
JST 2013 mochid@xxx:/xx/obj-kern/sparc/OXI1 sparc
Architecture: sparc
Machine: sparc
>Description:
         x11/xdm might be compiled without libXft on computer that has
        small resources.
>How-To-Repeat:
>Fix:

--- Makefile.ORIG
+++ Makefile
@@ -76,7 +76,6 @@
 .include "options.mk"
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"
--- options.mk.ORIG
+++ options.mk
@@ -1,8 +1,8 @@
 # $NetBSD: options.mk,v 1.2 2012/06/12 15:46:06 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xdm
-PKG_SUPPORTED_OPTIONS+=        inet6
-PKG_SUGGESTED_OPTIONS= inet6
+PKG_SUPPORTED_OPTIONS+=        inet6 xft
+PKG_SUGGESTED_OPTIONS= inet6 xft
 
 .include "../../mk/bsd.options.mk"
 
@@ -11,3 +11,9 @@
 .else
 CONFIGURE_ARGS+=       --disable-ipv6
 .endif
+
+.if !empty(PKG_OPTIONS:Mxft)
+.include "../../x11/libXft/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-xft
+.endif