Update "x11-links" package to version 0.60:

- Fix a fundamental problem which meant that the package included links
  for builtin components that "pkgsrc" will not use because they are too old.
- Remove NetBSD specific "pixman" hack that is no longer necessary.

3 files changed, 8 insertions, 10 deletions

diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index dc39f70d4f3..17171858b1a 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.121 2010/09/14 17:30:12 tron Exp $
+# $NetBSD: Makefile,v 1.122 2010/09/14 19:40:15 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.56
+DISTNAME=	x11-links-0.60
 CATEGORIES=	pkgtools x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
+HOMEPAGE=	http://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
 COMMENT=	Shadow tree of links to native X11 headers and libraries
 LICENSE=	original-bsd
 
diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk
index 8d08024965f..104195b2831 100644
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2010/09/14 17:30:12 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2010/09/14 19:40:15 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.56
+BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.60
 BUILDLINK_PKGSRCDIR.x11-links?=	../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=	build
 
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
index ebe4868a655..3990e73ca9a 100644
--- a/pkgtools/x11-links/xorg.mk
+++ b/pkgtools/x11-links/xorg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.mk,v 1.20 2010/09/14 17:30:12 tron Exp $
+# $NetBSD: xorg.mk,v 1.21 2010/09/14 19:40:15 tron Exp $
 #
 # This is for X.org, but use "xfree" files also.
 
@@ -51,9 +51,7 @@ FILES_LIST=	${FILESDIR}/xorg
 .include "../../x11/libdrm/buildlink3.mk"
 .include "../../x11/liblbxutil/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
-.if empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-*)
 .include "../../x11/pixman/buildlink3.mk"
-.endif
 .include "../../x11/printproto/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/recordproto/buildlink3.mk"
@@ -84,14 +82,14 @@ FILES_LIST=	${FILESDIR}/xorg
 # XXX: maybe skip iconv and zlib too?
 .for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u}
 CHECK_BUILTIN.${_pkg_}:=	yes
-USE_BUILTIN.${_pkg_}=		yes
 .  sinclude "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk"
 CHECK_BUILTIN.${_pkg_}:=	no
 .endfor
 
 .for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u}
 IGNORE_PKG.${_pkg_}=	yes
-.  if defined(IS_BUILTIN.${_pkg_}) && !empty(IS_BUILTIN.${_pkg_}:M[yY][eE][sS])
+.  if defined(USE_BUILTIN.${_pkg_}) && \
+      !empty(USE_BUILTIN.${_pkg_}:M[yY][eE][sS])
 .    if exists(${FILESDIR}/xorg.${_pkg_})
 FILES_LIST+=	${FILESDIR}/xorg.${_pkg_}
 .    elif exists(${FILESDIR}/xfree.${_pkg_})