From owner-freebsd-x11@FreeBSD.ORG  Fri Feb 29 17:58:20 2008
Return-Path: <owner-freebsd-x11@FreeBSD.ORG>
Delivered-To: x11@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 470C3106567B
	for <x11@freebsd.org>; Fri, 29 Feb 2008 17:58:20 +0000 (UTC)
	(envelope-from hmo@sep.oldach.net)
Received: from rigel.oldach.net (rigel.oldach.net [194.8.96.250])
	by mx1.freebsd.org (Postfix) with ESMTP id C54688FC1A
	for <x11@freebsd.org>; Fri, 29 Feb 2008 17:58:19 +0000 (UTC)
	(envelope-from hmo@sep.oldach.net)
Received: from sep.oldach.net (hmo.in-dsl.de [217.197.85.210])
	by rigel.oldach.net (8.14.2/8.14.2/hmo30jul04) with ESMTP id
	m1THbFvS014814
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Fri, 29 Feb 2008 18:37:15 +0100 (CET)
	(envelope-from hmo@sep.oldach.net)
Received: from sep.oldach.net (localhost [127.0.0.1])
	by sep.oldach.net (8.14.2/8.14.2/hmo26jun05) with ESMTP id
	m1THbEpO015742
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Fri, 29 Feb 2008 18:37:14 +0100 (CET)
	(envelope-from hmo@sep.oldach.net)
Received: (from hmo@localhost)
	by sep.oldach.net (8.14.2/8.14.2/Submit/hmo26jun05) id m1THbERd015741; 
	Fri, 29 Feb 2008 18:37:14 +0100 (CET) (envelope-from hmo)
Date: Fri, 29 Feb 2008 18:37:14 +0100 (CET)
Message-Id: <200802291737.m1THbERd015741@sep.oldach.net>
To: FreeBSD-gnats-submit@freebsd.org
From: Helge Oldach <ports-x11-xkeyboard-config-may07@oldach.net>
X-send-pr-version: 3.113
X-GNATS-Notify: 
Cc: x11@freebsd.org
Subject: [patch] ports/x11/xkeyboard-config WITHOUT_NLS support
X-BeenThere: freebsd-x11@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Helge Oldach <ports-x11-xkeyboard-config-may07@oldach.net>
List-Id: X11 on FreeBSD -- maintaining and support <freebsd-x11.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-x11>
List-Post: <mailto:freebsd-x11@freebsd.org>
List-Help: <mailto:freebsd-x11-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Feb 2008 17:58:20 -0000


>Submitter-Id:	current-users
>Originator:	Helge Oldach
>Organization:	
>Confidential:	no 
>Synopsis:	[patch] ports/x11/xkeyboard-config WITHOUT_NLS support
>Severity:	non-critical 
>Priority:	low 
>Category:	ports
>Class:		change-request 
>Release:	FreeBSD 6.3-1132 i386
>Environment:

System: FreeBSD localhost 6.3-1132 FreeBSD 6.3-1132 #0: Fri Feb 15 19:26:49 CET 2008 toor@localhost:/usr/obj/usr/src/sys/HMO i386

>Description:

Please apply the trivial patch below, it will make xkeyboard-config
honor the standard WITHOUT_NLS knob.

>How-To-Repeat:
	
>Fix:

--- Makefile.ctm	Sun May 20 09:16:38 2007
+++ Makefile	Tue May 22 11:00:12 2007
@@ -22,13 +22,18 @@
 PREFIX=		${X11BASE}
 
 USE_BZIP2=	yes
-USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-xkb-base=${PREFIX}/share/X11/xkb \
 			--with-xkb-rules-symlink=xorg
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=        --disable-nls
+.else
+USE_ICONV=	yes
+USE_GETTEXT=	yes
+.endif
 
 post-install:
 	${MKDIR} /var/lib/xkb