diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2005-03-01 18:56:43 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2005-03-01 18:56:43 +0000 |
| commit | bd7351b254eaf9333d120a265d44e2ebb73e95c2 (patch) | |
| tree | 63eec8cc999affaccd54e5dd024c82de01e80d73 /fonts | |
| parent | 4613b80af8a1bc87d4452c350ffba4d21d3e1ad5 (diff) | |
| download | pkgsrc-bd7351b254eaf9333d120a265d44e2ebb73e95c2.tar.gz | |
Look for XORG_VERSION_* defs from ${X11BASE}/lib/X11/config/xorgversion.def
before xorg.cf, which in xorg from pkgsrc does not contain them.
(This is required by our xorg-* packages).
Diffstat (limited to 'fonts')
| -rw-r--r-- | fonts/Xft2/builtin.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk index b79732a37d4..a3054887996 100644 --- a/fonts/Xft2/builtin.mk +++ b/fonts/Xft2/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.5 2004/07/24 06:50:19 grant Exp $ +# $NetBSD: builtin.mk,v 1.6 2005/03/01 18:56:43 xtraeme Exp $ _X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl @@ -27,8 +27,10 @@ _XFT2_2.1.0= 4.2.99.* 4.3 4.3.[0-9] 4.3.[0-9].* 4.3.[1-8][0-9]* 4.3.9[0-8]* _XFT2_2.1.0+= 4.3.99.* 4.[4-9]* 4.[1-9][0-9]* . if !defined(XF86_VERSION) XF86_VERSION= 3.3 -. if exists(${X11BASE}/lib/X11/config/xorg.cf) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorg.cf +. if exists(${X11BASE}/lib/X11/config/xorgversion.def) +_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorgversion.def +. elif exists(${X11BASE}/lib/X11/config/xorg.cf) +_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorg.cf _XORG_MAJOR!= \ ${AWK} '/\#define[ ]*XORG_VERSION_MAJOR/ { print $$3 }' \ ${_X11_CONFIG_VERSION_DEF} |