mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-12 07:27:57 +00:00
Code Issues Releases Activity

Fix building of atleast xf86-input-{mouse,keyboard} in tinderbox when

Browse Source 
WITH_NEW_XORG is set.
While here fix the XSERVER_VER macro so it actualy works [1]

Reported by:	decke@ [1]
This commit is contained in:
Koop Mast 2012-05-02 07:22:42 +00:00
parent 711390509b
commit 2c0e73a187
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=295847
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mk/bsd.xorg.mk
View File

@ -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)