From fea84135ac022651cc7cb59d31690ac47f85c1b1 Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Tue, 1 Mar 2005 05:52:54 +0000
Subject: Be sure to pass our special CPPFLAGS in CONFIGURE_ENV to fix
 libxklavier on FreeBSD > 4.X.  The reason this isn't needed for 4.X is that
 USE_GETOPT_LONG handles creating CONFIGURE_ENV.

Thanks to mezz from the testing, and raadradd on #freebsd-gnome for
reporting.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3753 df743ca5-7f9a-e211-a948-0013205c9059
---
 x11/libxklavier/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'x11')

diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index f7906407e..8022a3043 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libxklavier
 PORTVERSION=	2.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -21,10 +22,11 @@ USE_GNOME=	gnometarget gnomehack libxml2
 INSTALLS_SHLIB=	yes
 USE_GETOPT_LONG=yes
 USE_LIBTOOL_VER=15
+CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
 CONFIGURE_ARGS=	--disable-doxygen \
 		--with-xkb-base=${X11BASE}/lib/X11/xkb
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-- 
cgit v1.2.3