x11-links-0.83: Assume Xorg if x11.pc exists. This fixes detection on RHEL-based distributions which have the X11 libraries and development files installed but not the X server.diff -r1.149 -r1.150 pkgsrc/pkgtools/x11-links/Makefile
(jperkin)
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.149 2014/02/08 17:08:33 jperkin Exp $
+# $NetBSD: Makefile,v 1.150 2014/02/21 17:45:08 jperkin 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.82
+DISTNAME= x11-links-0.83
CATEGORIES= pkgtools x11
MASTER_SITES= # empty
DISTFILES= # empty
@@ -57,6 +57,7 @@
(exists(${X11BASE}/lib/X11/config/xorg.cf) && \
exists(${X11BASE}/lib/X11/config/version.def)) || \
exists(${X11BASE}/lib/pkgconfig/xorg-server.pc) || \
+ exists(${X11BASE}/lib/pkgconfig/x11.pc) || \
exists(${X11BASE}/bin/Xquartz)
. include "xorg.mk"
.else
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.51 2014/02/08 17:08:33 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.52 2014/02/21 17:45:08 jperkin Exp $
#
# Don't include this file manually! It will be included as necessary
# by bsd.buildlink3.mk.
@@ -12,7 +12,7 @@
.if !defined(X11_LINKS_BUILDLINK3_MK)
X11_LINKS_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.82
+BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.83
BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links
BUILDLINK_DEPMETHOD.x11-links?= build