Fri Feb 21 17:45:08 2014 UTC ()
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.


(jperkin)
diff -r1.149 -r1.150 pkgsrc/pkgtools/x11-links/Makefile
diff -r1.51 -r1.52 pkgsrc/pkgtools/x11-links/buildlink3.mk
cvs diff -r1.149 -r1.150 pkgsrc/pkgtools/x11-links/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/Makefile 2014/02/08 17:08:33 1.149
+++ pkgsrc/pkgtools/x11-links/Makefile 2014/02/21 17:45:08 1.150
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.149 2014/02/08 17:08:33 jperkin Exp $ 1# $NetBSD: Makefile,v 1.150 2014/02/21 17:45:08 jperkin Exp $
2# 2#
3# NOTE: If you update this package, then you'll likely need to also update 3# NOTE: If you update this package, then you'll likely need to also update
4# the x11-links dependency in buildlink3.mk to the correct version, 4# the x11-links dependency in buildlink3.mk to the correct version,
5# usually the most recent. 5# usually the most recent.
6 6
7DISTNAME= x11-links-0.82 7DISTNAME= x11-links-0.83
8CATEGORIES= pkgtools x11 8CATEGORIES= pkgtools x11
9MASTER_SITES= # empty 9MASTER_SITES= # empty
10DISTFILES= # empty 10DISTFILES= # empty
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html 13HOMEPAGE= http://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
14COMMENT= Shadow tree of links to native X11 headers and libraries 14COMMENT= Shadow tree of links to native X11 headers and libraries
15LICENSE= original-bsd 15LICENSE= original-bsd
16 16
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
18.if ${OPSYS} == "OpenBSD" 18.if ${OPSYS} == "OpenBSD"
19CHECK_SHLIBS_SUPPORTED= no 19CHECK_SHLIBS_SUPPORTED= no
20.endif 20.endif
@@ -47,26 +47,27 @@ PKG_FAIL_REASON+= "Please note that chan @@ -47,26 +47,27 @@ PKG_FAIL_REASON+= "Please note that chan
47PKG_FAIL_REASON+= "pkgsrc installations is not supported!" 47PKG_FAIL_REASON+= "pkgsrc installations is not supported!"
48.endif 48.endif
49 49
50.if ${OPSYS} == "IRIX" 50.if ${OPSYS} == "IRIX"
51. include "xsgi.mk" 51. include "xsgi.mk"
52.elif ${OPSYS} == "OSF1" 52.elif ${OPSYS} == "OSF1"
53. include "xdec.mk" 53. include "xdec.mk"
54.elif !empty(X11BASE:M*openwin) 54.elif !empty(X11BASE:M*openwin)
55. include "openwin.mk" 55. include "openwin.mk"
56.elif exists(${X11BASE}/lib/X11/config/xorgversion.def) || \ 56.elif exists(${X11BASE}/lib/X11/config/xorgversion.def) || \
57 (exists(${X11BASE}/lib/X11/config/xorg.cf) && \ 57 (exists(${X11BASE}/lib/X11/config/xorg.cf) && \
58 exists(${X11BASE}/lib/X11/config/version.def)) || \ 58 exists(${X11BASE}/lib/X11/config/version.def)) || \
59 exists(${X11BASE}/lib/pkgconfig/xorg-server.pc) || \ 59 exists(${X11BASE}/lib/pkgconfig/xorg-server.pc) || \
 60 exists(${X11BASE}/lib/pkgconfig/x11.pc) || \
60 exists(${X11BASE}/bin/Xquartz) 61 exists(${X11BASE}/bin/Xquartz)
61. include "xorg.mk" 62. include "xorg.mk"
62.else 63.else
63. include "xfree.mk" 64. include "xfree.mk"
64.endif 65.endif
65 66
66X11_LINKS_SUBDIR= share/x11-links 67X11_LINKS_SUBDIR= share/x11-links
67X11_LINKS_BUILD_DIR= ${WRKSRC}/${X11_LINKS_SUBDIR} 68X11_LINKS_BUILD_DIR= ${WRKSRC}/${X11_LINKS_SUBDIR}
68X11_LINKS_DIR= ${PREFIX}/${X11_LINKS_SUBDIR} 69X11_LINKS_DIR= ${PREFIX}/${X11_LINKS_SUBDIR}
69 70
70FILES_LIST_CMD= ${SED} -e "s/@ABI@/${ABI}/" ${FILES_LIST} | ${GREP} -v "^\#" 71FILES_LIST_CMD= ${SED} -e "s/@ABI@/${ABI}/" ${FILES_LIST} | ${GREP} -v "^\#"
71 72
72CREATE_X11LINK?= ${LN} -fs $$src $$dest 73CREATE_X11LINK?= ${LN} -fs $$src $$dest
cvs diff -r1.51 -r1.52 pkgsrc/pkgtools/x11-links/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/buildlink3.mk 2014/02/08 17:08:33 1.51
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk 2014/02/21 17:45:08 1.52
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: buildlink3.mk,v 1.51 2014/02/08 17:08:33 jperkin Exp $ 1# $NetBSD: buildlink3.mk,v 1.52 2014/02/21 17:45:08 jperkin Exp $
2# 2#
3# Don't include this file manually! It will be included as necessary 3# Don't include this file manually! It will be included as necessary
4# by bsd.buildlink3.mk. 4# by bsd.buildlink3.mk.
5 5
6# x11-links is sorted first in mk/buildlink3/bsd.buildlink3.mk, 6# x11-links is sorted first in mk/buildlink3/bsd.buildlink3.mk,
7# so that symlinks created from it can be overriden by other packages. 7# so that symlinks created from it can be overriden by other packages.
8# 8#
9 9
10BUILDLINK_TREE+= x11-links 10BUILDLINK_TREE+= x11-links
11 11
12.if !defined(X11_LINKS_BUILDLINK3_MK) 12.if !defined(X11_LINKS_BUILDLINK3_MK)
13X11_LINKS_BUILDLINK3_MK:= 13X11_LINKS_BUILDLINK3_MK:=
14 14
15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.82 15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.83
16BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links 16BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links
17BUILDLINK_DEPMETHOD.x11-links?= build 17BUILDLINK_DEPMETHOD.x11-links?= build
18 18
19# Force all of the helper programs, headers and libraries to be symlinked 19# Force all of the helper programs, headers and libraries to be symlinked
20# into ${BUILDLINK_X11_DIR}, even in the "pkgviews" case. 20# into ${BUILDLINK_X11_DIR}, even in the "pkgviews" case.
21# 21#
22BUILDLINK_CONTENTS_FILTER.x11-links= \ 22BUILDLINK_CONTENTS_FILTER.x11-links= \
23 ${EGREP} '(bin/.*|include.*/|\.h$$|\.pc$$|/lib[^/]*$$)' 23 ${EGREP} '(bin/.*|include.*/|\.h$$|\.pc$$|/lib[^/]*$$)'
24 24
25# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include 25# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include
26# and ${BUILDLINK_X11_DIR}/lib. 26# and ${BUILDLINK_X11_DIR}/lib.
27# 27#
28BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|" 28BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|"