7 files changed, 129 insertions, 2 deletions
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index e976b67a60b..11632b0e826 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.71 2005/06/10 03:44:07 jlam Exp $
+# $NetBSD: Makefile,v 1.72 2005/07/25 20:50:25 reed 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.25
+DISTNAME=	x11-links-0.26
 CATEGORIES=	pkgtools x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -37,6 +37,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)
+.  include "xorg.mk"
 .else
 .  include "xfree.mk"
 .endif
diff --git a/pkgtools/x11-links/files/xorg.Xcomposite b/pkgtools/x11-links/files/xorg.Xcomposite
new file mode 100644
index 00000000000..69963100d8b
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.Xcomposite
@@ -0,0 +1,5 @@
+# $NetBSD: xorg.Xcomposite,v 1.1 2005/07/25 20:50:25 reed Exp $
+include/X11/extensions/Xcomposite.h
+lib/libXcomposite.so.1.0
+lib/libXcomposite.a
+lib/pkgconfig/xcomposite.pc
diff --git a/pkgtools/x11-links/files/xorg.Xfixes b/pkgtools/x11-links/files/xorg.Xfixes
new file mode 100644
index 00000000000..9a5d42b458d
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.Xfixes
@@ -0,0 +1,8 @@
+# $NetBSD: xorg.Xfixes,v 1.1 2005/07/25 20:50:25 reed Exp $
+#
+include/X11/extensions/Xfixes.h
+lib/libXfixes.a
+lib/libXfixes.so
+lib/libXfixes.so.3
+lib/libXfixes.so.3.0
+lib/pkgconfig/xfixes.pc
diff --git a/pkgtools/x11-links/files/xorg.compositeext b/pkgtools/x11-links/files/xorg.compositeext
new file mode 100644
index 00000000000..a33bb2294d8
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.compositeext
@@ -0,0 +1,4 @@
+# $NetBSD: xorg.compositeext,v 1.1 2005/07/25 20:50:25 reed Exp $
+include/X11/extensions/composite.h
+include/X11/extensions/compositeproto.h
+lib/pkgconfig/compositeext.pc
diff --git a/pkgtools/x11-links/files/xorg.fixesext b/pkgtools/x11-links/files/xorg.fixesext
new file mode 100644
index 00000000000..611bb30675a
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.fixesext
@@ -0,0 +1,4 @@
+# $NetBSD: xorg.fixesext,v 1.1 2005/07/25 20:50:25 reed Exp $
+include/X11/extensions/xfixesproto.h
+include/X11/extensions/xfixeswire.h
+lib/pkgconfig/fixesext.pc
diff --git a/pkgtools/x11-links/files/xorg.xextensions b/pkgtools/x11-links/files/xorg.xextensions
new file mode 100644
index 00000000000..27b778dfc89
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xextensions
@@ -0,0 +1,54 @@
+# $NetBSD: xorg.xextensions,v 1.1 2005/07/25 20:50:25 reed Exp $
+include/X11/extensions/MITMisc.h
+include/X11/extensions/XEVI.h
+include/X11/extensions/XEVIstr.h
+include/X11/extensions/XI.h
+include/X11/extensions/XInput.h
+include/X11/extensions/XIproto.h
+include/X11/extensions/XKB.h
+include/X11/extensions/XKBgeom.h
+include/X11/extensions/XKBproto.h
+include/X11/extensions/XKBsrv.h
+include/X11/extensions/XKBstr.h
+include/X11/extensions/XLbx.h
+include/X11/extensions/XShm.h
+include/X11/extensions/XTest.h
+include/X11/extensions/Xag.h
+include/X11/extensions/Xagsrv.h
+include/X11/extensions/Xagstr.h
+include/X11/extensions/Xcup.h
+include/X11/extensions/Xcupstr.h
+include/X11/extensions/Xdbe.h
+include/X11/extensions/Xdbeproto.h
+include/X11/extensions/Xext.h
+include/X11/extensions/Xv.h
+include/X11/extensions/XvMC.h
+include/X11/extensions/XvMCproto.h
+include/X11/extensions/Xvproto.h
+include/X11/extensions/bigreqstr.h
+include/X11/extensions/dpms.h
+include/X11/extensions/dpmsstr.h
+include/X11/extensions/extutil.h
+include/X11/extensions/lbxbuf.h
+include/X11/extensions/lbxbufstr.h
+include/X11/extensions/lbxdeltastr.h
+include/X11/extensions/lbximage.h
+include/X11/extensions/lbxopts.h
+include/X11/extensions/lbxstr.h
+include/X11/extensions/lbxzlib.h
+include/X11/extensions/mitmiscstr.h
+include/X11/extensions/multibuf.h
+include/X11/extensions/multibufst.h
+include/X11/extensions/saver.h
+include/X11/extensions/saverproto.h
+include/X11/extensions/security.h
+include/X11/extensions/securstr.h
+include/X11/extensions/shape.h
+include/X11/extensions/shapestr.h
+include/X11/extensions/shmstr.h
+include/X11/extensions/sync.h
+include/X11/extensions/syncstr.h
+include/X11/extensions/xcmiscstr.h
+include/X11/extensions/xtestext1.h
+include/X11/extensions/xteststr.h
+lib/pkgconfig/xextensions.pc
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
new file mode 100644
index 00000000000..5bb4dd2908c
--- /dev/null
+++ b/pkgtools/x11-links/xorg.mk
@@ -0,0 +1,50 @@
+# $NetBSD: xorg.mk,v 1.1 2005/07/25 20:50:25 reed Exp $
+#
+# This is for X.org, but use "xfree" files also.
+
+FILES_LIST=	${FILESDIR}/xorg
+
+# libXdamage and damageext only in pkgsrc-wip so not used here
+# XXX: what about xaw?
+
+.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../x11/compositeext/buildlink3.mk"
+.include "../../x11/fixesext/buildlink3.mk"
+.include "../../x11/xextensions/buildlink3.mk"
+.include "../../x11/Xcomposite/buildlink3.mk"
+.include "../../x11/Xfixes/buildlink3.mk"
+.include "../../x11/Xrandr/buildlink3.mk"
+.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/render/buildlink3.mk"
+.include "../../x11/randrext/buildlink3.mk"
+.include "../../x11/xcursor/buildlink3.mk"
+
+# XXX  what is ${X11_MODULES} ?
+
+# Check if any headers and libraries for ${X11_MODULES} found in
+# ${X11BASE} actually belong to the base Xorg or not.
+#
+# XXX: maybe skip iconv and zlib too?
+.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links}
+CHECK_BUILTIN.${_pkg_}:=	yes
+USE_BUILTIN.${_pkg_}=		yes
+.  sinclude "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk"
+CHECK_BUILTIN.${_pkg_}:=	no
+.endfor
+
+.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links}
+IGNORE_PKG.${_pkg_}=	yes
+.  if !empty(IS_BUILTIN.${_pkg_}:M[yY][eE][sS])
+.    if exists(${FILESDIR}/xorg.${_pkg_})
+FILES_LIST+=	${FILESDIR}/xorg.${_pkg_}
+.    elif exists(${FILESDIR}/xfree.${_pkg_})
+FILES_LIST+=	${FILESDIR}/xfree.${_pkg_}
+.    endif
+.  endif
+.endfor