diff options
| author | jperkin <jperkin@pkgsrc.org> | 2014-02-21 17:45:08 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2014-02-21 17:45:08 +0000 |
| commit | 7285cf3f67d6b04289afdcd66a0ce4f039d39d8b (patch) | |
| tree | cdde114c333b0f8e5a712a3ba66fb7060797a21f /pkgtools | |
| parent | 5a62f96175df78c4e6ea2421de4d79df62f38494 (diff) | |
| download | pkgsrc-7285cf3f67d6b04289afdcd66a0ce4f039d39d8b.tar.gz | |
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.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/x11-links/Makefile | 5 | ||||
| -rw-r--r-- | pkgtools/x11-links/buildlink3.mk | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 0b5ba6df781..5bcc471f310 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -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 @@ PKG_FAIL_REASON+= "pkgsrc installations is not supported!" (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 diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk index 78dce2224b2..a019f86b758 100644 --- a/pkgtools/x11-links/buildlink3.mk +++ b/pkgtools/x11-links/buildlink3.mk @@ -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 @@ BUILDLINK_TREE+= x11-links .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 |