diff options
| author | kwm <kwm@FreeBSD.org> | 2012-05-02 15:22:42 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2012-05-02 15:22:42 +0800 |
| commit | 20e61c8f6cae2dbc443708b5868afb1cb40bd8f0 (patch) | |
| tree | edefab2c0891555cd5b816889150a07bfd3b9cde /Mk/bsd.xorg.mk | |
| parent | 2c22dc7dae8ab6d4963afd39f04d38973bc11bcf (diff) | |
| download | freebsd-ports-gnome-20e61c8f6cae2dbc443708b5868afb1cb40bd8f0.tar.gz freebsd-ports-gnome-20e61c8f6cae2dbc443708b5868afb1cb40bd8f0.tar.zst freebsd-ports-gnome-20e61c8f6cae2dbc443708b5868afb1cb40bd8f0.zip | |
Fix building of atleast xf86-input-{mouse,keyboard} in tinderbox when
WITH_NEW_XORG is set.
While here fix the XSERVER_VER macro so it actualy works [1]
Reported by: decke@ [1]
Diffstat (limited to 'Mk/bsd.xorg.mk')
| -rw-r--r-- | Mk/bsd.xorg.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk index 509144ffb339..ca284fec0324 100644 --- a/Mk/bsd.xorg.mk +++ b/Mk/bsd.xorg.mk @@ -20,7 +20,7 @@ Xorg_Pre_Include= bsd.xorg.mk # app - requires pkgconfig, don't install shared libraries (I guess) # data - nothing I could factorize # doc - no particular notes -# driver - input depends on inputproto/randrproto at least +# driver - input depends on inputproto/renderproto at least # video depends on randrproto/renderproto at least # font - don't install .pc file # lib - various dependencies, install .pc file @@ -51,7 +51,7 @@ USE_GNOME+= pkgconfig USE_XORG+= xorg-server xproto randrproto xi CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4' . if ${PORTNAME:M*input*}x != x -USE_XORG+= inputproto +USE_XORG+= inputproto renderproto . elif ${PORTNAME:M*video*}x != x USE_XORG+= fontsproto renderproto . else @@ -142,7 +142,7 @@ USE_XORG+= pciaccess .endif .if exists(${LOCALBASE}/bin/X) -XSERVER_VER= ${LOCALBASE}/bin/X -version 2>&1 | sed -n 's;^X\.Org X Server \([^ ]*\).*;\1;p' +XSERVER_VER!= ${LOCALBASE}/bin/X -version 2>&1 | sed -n 's;^X\.Org X Server \([^ ]*\).*;\1;p' .endif .if defined(_POSTMKINCLUDED) && !defined(Xorg_Post_Include) |