Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/xkeyboard-config/Makefile,v
--- Makefile	31 May 2010 02:01:42 -0000	1.18
+++ Makefile	22 Jul 2011 08:39:03 -0000
@@ -7,10 +7,9 @@ 
 
 PORTNAME=	xkeyboard-config
 PORTVERSION=	1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://xlibs.freedesktop.org/xkbdesc/
-DISTNAME=	xkeyboard-config-${PORTVERSION}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Keyboard Configuration Database
@@ -23,9 +22,9 @@ 
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
-			--with-xkb-rules-symlink=xorg
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		--with-xkb-rules-symlink=xorg
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls --with-included-gettext
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/x11/xkeyboard-config/pkg-plist,v
--- pkg-plist	1 May 2010 11:40:24 -0000	1.12
+++ pkg-plist	22 Jul 2011 08:39:03 -0000
@@ -379,5 +379,5 @@ 
 @dirrm share/X11/xkb/geometry
 @dirrm share/X11/xkb/compat
 @dirrm share/X11/xkb
-@dirrm share/X11
+@dirrmtry share/X11
 @dirrmtry var/lib/xkb