diff options
| -rw-r--r-- | pkgtools/x11-links/Makefile | 7 | ||||
| -rw-r--r-- | pkgtools/x11-links/buildlink3.mk | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 50a0068736e..a53d725534e 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.104 2009/06/15 12:42:15 tron Exp $ +# $NetBSD: Makefile,v 1.105 2009/09/13 13:31:41 tron Exp $ # # NOTE: If you update this package, then you'll likely need to also update # the x11-links dependency in buildlink3.mk to the correct version, # usually the most recent. -DISTNAME= x11-links-0.43 +DISTNAME= x11-links-0.44 CATEGORIES= pkgtools x11 MASTER_SITES= # empty DISTFILES= # empty @@ -36,7 +36,8 @@ PKG_FAIL_REASON+= "${PKGNAME} requires X headers to be installed" . include "xdec.mk" .elif !empty(X11BASE:M*openwin) . include "openwin.mk" -.elif exists(${X11BASE}/lib/X11/config/xorgversion.def) +.elif exists(${X11BASE}/lib/X11/config/xorgversion.def) || \ + exists(${X11BASE}/lib/pkgconfig/xorg-server.pc) . include "xorg.mk" .else . include "xfree.mk" diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk index c53151c504c..482df82851a 100644 --- a/pkgtools/x11-links/buildlink3.mk +++ b/pkgtools/x11-links/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:25:13 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/09/13 13:31:41 tron Exp $ # # Don't include this file manually! It will be included as necessary # by bsd.buildlink3.mk. @@ -12,7 +12,7 @@ BUILDLINK_TREE+= x11-links .if !defined(X11_LINKS_BUILDLINK3_MK) X11_LINKS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.43 +BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.44 BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links BUILDLINK_DEPMETHOD.x11-links?= build |