aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2011-08-07 08:45:07 +0000
committerKoop Mast <kwm@FreeBSD.org>2011-08-07 08:45:07 +0000
commite75cc75c5eee31dbbd3cf4b56e4d4dcea73ac293 (patch)
tree669df512fa5db76c33212676d38819edf7009852 /x11
parentaa2b64b1341b5c50a96de151e149fb1eed4eb3c4 (diff)
downloadports-e75cc75c5eee31dbbd3cf4b56e4d4dcea73ac293.tar.gz
ports-e75cc75c5eee31dbbd3cf4b56e4d4dcea73ac293.zip
Notes
Diffstat (limited to 'x11')
-rw-r--r--x11/xkeyboard-config/Makefile8
-rw-r--r--x11/xkeyboard-config/pkg-plist2
2 files changed, 5 insertions, 5 deletions
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index bd5e28c94957..33cb565e20ba 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xkeyboard-config
PORTVERSION= 1.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://xlibs.freedesktop.org/xkbdesc/
DISTNAME= xkeyboard-config-${PORTVERSION}
@@ -23,9 +23,9 @@ USE_GNOME= intlhack
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
+CPPFLAGS+= -I${LOCALBASE}/include
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls --with-included-gettext
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
index 21c744ac3924..a8647d1bd3d8 100644
--- a/x11/xkeyboard-config/pkg-plist
+++ b/x11/xkeyboard-config/pkg-plist
@@ -379,5 +379,5 @@ share/X11/xkb/xkbcomp
@dirrm share/X11/xkb/geometry
@dirrm share/X11/xkb/compat
@dirrm share/X11/xkb
-@dirrm share/X11
+@dirrmtry share/X11
@dirrmtry var/lib/xkb