[pkgsrc/trunk]: pkgsrc/x11/xterm fix an inconsistency: "luit" support was alw...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b842526900f
branches:  trunk
changeset: 396909:1b842526900f
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Aug 05 17:10:37 2009 +0000

description:
fix an inconsistency: "luit" support was always enabled, but without
it being present at build time it didn't work. Make it an option.

diffstat:

 x11/xterm/Makefile   |   4 +---
 x11/xterm/options.mk |  13 ++++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r 8cb0825fbe2d -r 1b842526900f x11/xterm/Makefile
--- a/x11/xterm/Makefile        Wed Aug 05 17:01:17 2009 +0000
+++ b/x11/xterm/Makefile        Wed Aug 05 17:10:37 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2009/07/22 09:01:55 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2009/08/05 17:10:37 drochner Exp $
 
 DISTNAME=      xterm-243
 CATEGORIES=    x11
@@ -19,9 +19,7 @@
 
 CONFIGURE_ARGS+=       --enable-88-color
 CONFIGURE_ARGS+=       --enable-256-color
-CONFIGURE_ARGS+=       --enable-luit
 CONFIGURE_ARGS+=       --enable-paste64
-CONFIGURE_ARGS+=       --enable-mini-luit
 CONFIGURE_ARGS+=       --enable-readline-mouse
 CONFIGURE_ARGS+=       --enable-toolbar        # Resource disabled by default
 
diff -r 8cb0825fbe2d -r 1b842526900f x11/xterm/options.mk
--- a/x11/xterm/options.mk      Wed Aug 05 17:01:17 2009 +0000
+++ b/x11/xterm/options.mk      Wed Aug 05 17:10:37 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.9 2008/04/21 17:10:40 bjs Exp $
+# $NetBSD: options.mk,v 1.10 2009/08/05 17:10:37 drochner Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.xterm
-PKG_SUPPORTED_OPTIONS=         debug pcre freetype
-PKG_SUGGESTED_OPTIONS=         freetype
+PKG_SUPPORTED_OPTIONS=         debug pcre freetype luit
+PKG_SUGGESTED_OPTIONS=         freetype luit
 
 .include "../../mk/bsd.options.mk"
 
@@ -28,3 +28,10 @@
 CONFIGURE_ENV+=  ac_cv_lib_pcreposix_pcreposix_regcomp=yes
 .  include "../../devel/pcre/buildlink3.mk"
 .endif
+
+.if !empty(PKG_OPTIONS:Mluit)
+DEPENDS+=      luit-[0-9]*:../../x11/luit
+CONFIGURE_ARGS+= --enable-luit --enable-mini-luit
+.else
+CONFIGURE_ARGS+= --disable-luit --disable-mini-luit
+.endif