diff options
| author | kwm <kwm@FreeBSD.org> | 2011-08-07 16:45:07 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2011-08-07 16:45:07 +0800 |
| commit | 3dd812efc96c4062d1eb4e2220dd329cdeea675a (patch) | |
| tree | 37997007cbaf0f67e74acff8babc9b34e8695a41 | |
| parent | 789e7efe1fdf2c42703c30968d18379673665750 (diff) | |
| download | freebsd-ports-gnome-3dd812efc96c4062d1eb4e2220dd329cdeea675a.tar.gz freebsd-ports-gnome-3dd812efc96c4062d1eb4e2220dd329cdeea675a.tar.zst freebsd-ports-gnome-3dd812efc96c4062d1eb4e2220dd329cdeea675a.zip | |
share/X11 is shared between ports, use @dirrmtry.
bump portrevision for this change.
Get CPPFLAGS from CONFIGURE_ENV and clean up some portlint warnings.0
PR: ports/159105
Submitted by: sunpoet@
With hat: x11@
| -rw-r--r-- | x11/xkeyboard-config/Makefile | 8 | ||||
| -rw-r--r-- | x11/xkeyboard-config/pkg-plist | 2 |
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 |