Update "x11-links" package to version 0.33:

- Improve handling of "libXmu" on systems with native X.org.

5 files changed, 53 insertions, 22 deletions

diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index 6095cf1b569..a667d078c97 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.86 2007/12/15 17:53:39 tron Exp $
+# $NetBSD: Makefile,v 1.87 2007/12/16 19:05:52 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.32
+DISTNAME=	x11-links-0.33
 CATEGORIES=	pkgtools x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk
index d215a623010..fbb389f5d94 100644
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/12/15 17:53:40 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2007/12/16 19:05:52 tron Exp $
 #
 # Don't include this file manually!  It will be included as necessary
 # by bsd.buildlink3.mk.
@@ -18,7 +18,7 @@ BUILDLINK_PACKAGES:=	x11-links ${BUILDLINK_PACKAGES}
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}x11-links
 
 .if !empty(X11_LINKS_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.32
+BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.33
 BUILDLINK_PKGSRCDIR.x11-links?=	../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=	build
 
diff --git a/pkgtools/x11-links/files/xorg b/pkgtools/x11-links/files/xorg
index e2f594f15ef..50b40a6faf3 100644
--- a/pkgtools/x11-links/files/xorg
+++ b/pkgtools/x11-links/files/xorg
@@ -1,4 +1,4 @@
-# $NetBSD: xorg,v 1.3 2007/12/15 17:53:40 tron Exp $
+# $NetBSD: xorg,v 1.4 2007/12/16 19:05:52 tron Exp $
 #
 # The files listed below are the union of the sets of files installed by
 # the supported Xorg (and some XFree) distributions, minus the set of files
@@ -444,22 +444,6 @@ lib/libXinerama.dylib
 lib/libXinerama.so
 lib/libXinerama.so.1
 lib/libXinerama.so.1.0
-lib/libXmu.6.0.dylib
-lib/libXmu.6.2.dylib
-lib/libXmu.6.dylib
-lib/libXmu.a
-lib/libXmu.dylib
-lib/libXmu.so
-lib/libXmu.so.6
-lib/libXmu.so.6.0
-lib/libXmu.so.6.2
-lib/libXmuu.1.0.dylib
-lib/libXmuu.1.dylib
-lib/libXmuu.a
-lib/libXmuu.dylib
-lib/libXmuu.so
-lib/libXmuu.so.1
-lib/libXmuu.so.1.0
 lib/libXp.6.2.dylib
 lib/libXp.6.dylib
 lib/libXp.a
diff --git a/pkgtools/x11-links/files/xorg.libXmu b/pkgtools/x11-links/files/xorg.libXmu
new file mode 100644
index 00000000000..b0916ca7ff1
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXmu
@@ -0,0 +1,46 @@
+# $NetBSD: xorg.libXmu,v 1.1 2007/12/16 19:05:53 tron Exp $
+#
+include/X11/Xmu/Atoms.h
+include/X11/Xmu/CharSet.h
+include/X11/Xmu/CloseHook.h
+include/X11/Xmu/Converters.h
+include/X11/Xmu/CurUtil.h
+include/X11/Xmu/CvtCache.h
+include/X11/Xmu/DisplayQue.h
+include/X11/Xmu/Drawing.h
+include/X11/Xmu/Editres.h
+include/X11/Xmu/EditresP.h
+include/X11/Xmu/Error.h
+include/X11/Xmu/ExtAgent.h
+include/X11/Xmu/Initer.h
+include/X11/Xmu/Lookup.h
+include/X11/Xmu/Misc.h
+include/X11/Xmu/StdCmap.h
+include/X11/Xmu/StdSel.h
+include/X11/Xmu/SysUtil.h
+include/X11/Xmu/WidgetNode.h
+include/X11/Xmu/WinUtil.h
+include/X11/Xmu/Xct.h
+include/X11/Xmu/Xmu.h
+lib/libXmu.6.0.dylib
+lib/libXmu.6.2.0.dylib
+lib/libXmu.6.2.dylib
+lib/libXmu.6.dylib
+lib/libXmu.a
+lib/libXmu.dylib
+lib/libXmu.la
+lib/libXmu.so
+lib/libXmu.so.6
+lib/libXmu.so.6.0
+lib/libXmu.so.6.2
+lib/libXmuu.1.0.0.dylib
+lib/libXmuu.1.0.dylib
+lib/libXmuu.1.dylib
+lib/libXmuu.a
+lib/libXmuu.dylib
+lib/libXmuu.la
+lib/libXmuu.so
+lib/libXmuu.so.1
+lib/libXmuu.so.1.0
+lib/pkgconfig/xmu.pc
+lib/pkgconfig/xmuu.pc
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
index 9286e8fe7fd..26863853efe 100644
--- a/pkgtools/x11-links/xorg.mk
+++ b/pkgtools/x11-links/xorg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.mk,v 1.6 2007/12/15 17:53:40 tron Exp $
+# $NetBSD: xorg.mk,v 1.7 2007/12/16 19:05:52 tron Exp $
 #
 # This is for X.org, but use "xfree" files also.
 
@@ -18,6 +18,7 @@ FILES_LIST=	${FILESDIR}/xorg
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"