diff options
| author | obache <obache> | 2014-08-25 08:30:46 +0000 |
|---|---|---|
| committer | obache <obache> | 2014-08-25 08:30:46 +0000 |
| commit | 5c61d123b937e02c7da290071df1b4b59c0e2216 (patch) | |
| tree | 957e5019763de285561c0cc23b5441aab0d2790b | |
| parent | 8c99cc60e531c0dab1949ef86e9360f6310bcd94 (diff) | |
| download | pkgsrc-5c61d123b937e02c7da290071df1b4b59c0e2216.tar.gz | |
Let xft to be optional.
PR pkg/49101.
| -rw-r--r-- | x11/xdm/Makefile | 3 | ||||
| -rw-r--r-- | x11/xdm/options.mk | 13 |
2 files changed, 11 insertions, 5 deletions
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile index a72fdaeffd3..c0d2dd07ddf 100644 --- a/x11/xdm/Makefile +++ b/x11/xdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2013/06/16 13:34:30 obache Exp $ +# $NetBSD: Makefile,v 1.26 2014/08/25 08:30:46 obache Exp $ DISTNAME= xdm-1.1.11 PKGREVISION= 4 @@ -76,7 +76,6 @@ CONFIGURE_ARGS+= --with-default-vt=vt05 .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" diff --git a/x11/xdm/options.mk b/x11/xdm/options.mk index 6201c82535f..9d52d578584 100644 --- a/x11/xdm/options.mk +++ b/x11/xdm/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:06 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2014/08/25 08:30:46 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xdm -PKG_SUPPORTED_OPTIONS+= inet6 -PKG_SUGGESTED_OPTIONS= inet6 +PKG_SUPPORTED_OPTIONS+= inet6 xft2 +PKG_SUGGESTED_OPTIONS= inet6 xft2 .include "../../mk/bsd.options.mk" @@ -11,3 +11,10 @@ CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif + +.if !empty(PKG_OPTIONS:Mxft2) +.include "../../x11/libXft/buildlink3.mk" +CONFIGURE_ARGS+= --with-xft +.else +CONFIGURE_ARGS+= --without-xft +.endif |