Pullup ticket 2112 - requested by schmonz

deal with Xrandr cvs repo move on HEAD

Revisions pulled up:
- pkgsrc/x11/Makefile					1.505
- pkgsrc/x11/libXrandr/buildlink3.mk			1.3
- pkgsrc/x11/liboldXrandr/DESCR				1.1
- pkgsrc/x11/liboldXrandr/Makefile			1.1
- pkgsrc/x11/liboldXrandr/PLIST				1.1
- pkgsrc/x11/liboldXrandr/buildlink3.mk			1.1, 1.2
- pkgsrc/x11/liboldXrandr/builtin.mk			1.1
- pkgsrc/x11/liboldXrandr/distinfo			1.1
- pkgsrc/x11/liboldXrandr/patches/patch-aa		1.1
- pkgsrc/x11/liboldXrandr/patches/patch-ab		1.1
- pkgsrc/x11/Xrandr/*					gone (repo copy)
- pkgsrc/x11/Xrandr-mixedcase/*				removed (repo copy)

   Module Name:		pkgsrc
   Committed By:	schmonz
   Date:		Wed May 30 01:22:13 UTC 2007

   Modified Files:
   	pkgsrc/x11: Makefile
   	pkgsrc/x11/libXrandr: buildlink3.mk
   Added Files:
   	pkgsrc/x11/liboldXrandr: DESCR Makefile PLIST buildlink3.mk builtin.mk
   	    distinfo
   	pkgsrc/x11/liboldXrandr/patches: patch-aa patch-ab
   Removed Files:
   	pkgsrc/x11/Xrandr: DESCR Makefile PLIST buildlink3.mk builtin.mk
   	    distinfo
   	pkgsrc/x11/Xrandr/patches: patch-aa patch-ab

   Log Message:
   Move Xrandr to liboldXrandr (name suggested by joerg) so it can be
   checked out on a case-insensitive filesystem without interfering
   with lowercase xrandr. PKGNAME stays the same.
---
   Module Name:		pkgsrc
   Committed By:	seb
   Date:		Wed May 30 16:00:51 UTC 2007

   Modified Files:
   	pkgsrc/x11/liboldXrandr: buildlink3.mk

   Log Message:
   Fix path to self in BUILDLINK_PKGSRCDIR.Xrandr after move of this
   package from x11/Xrandr to x11/liboldXrandr.

10 files changed, 12 insertions, 12 deletions

diff --git a/x11/Makefile b/x11/Makefile
index b74fa6caceb..0b8f4b0ac11 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.488 2007/03/23 20:21:57 kristerw Exp $
+# $NetBSD: Makefile,v 1.488.2.1 2007/06/14 22:03:07 salo Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -12,7 +12,6 @@ SUBDIR+=	Xbae
 SUBDIR+=	Xcomposite
 SUBDIR+=	Xfixes
 SUBDIR+=	XmHTML
-SUBDIR+=	Xrandr
 SUBDIR+=	Xrender
 SUBDIR+=	acidlaunch
 SUBDIR+=	alacarte
@@ -205,6 +204,7 @@ SUBDIR+=	libXxf86vm
 SUBDIR+=	libdrm
 SUBDIR+=	libexo
 SUBDIR+=	liblbxutil
+SUBDIR+=	liboldXrandr
 SUBDIR+=	libxfce4gui
 SUBDIR+=	libxfce4mcs
 SUBDIR+=	libxfce4util
diff --git a/x11/libXrandr/buildlink3.mk b/x11/libXrandr/buildlink3.mk
index e08ca1bf2e9..e1be5ca003b 100644
--- a/x11/libXrandr/buildlink3.mk
+++ b/x11/libXrandr/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2.4.1 2007/06/14 22:03:08 salo Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if ${X11_TYPE} != "modular"
-.include "../../x11/Xrandr/buildlink3.mk"
+.include "../../x11/liboldXrandr/buildlink3.mk"
 .else
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
diff --git a/x11/Xrandr-mixedcase/DESCR b/x11/liboldXrandr/DESCR
index 92d5f2237dc..92d5f2237dc 100644
--- a/x11/Xrandr-mixedcase/DESCR
+++ b/x11/liboldXrandr/DESCR
diff --git a/x11/Xrandr-mixedcase/Makefile b/x11/liboldXrandr/Makefile
index 6df3872aa6f..46d98d791d8 100644
--- a/x11/Xrandr-mixedcase/Makefile
+++ b/x11/liboldXrandr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/02/22 19:27:25 wiz Exp $
+# $NetBSD: Makefile,v 1.1.2.2 2007/06/14 22:03:08 salo Exp $
 #
 
 DISTNAME=		libXrandr-1.0.2
diff --git a/x11/Xrandr-mixedcase/PLIST b/x11/liboldXrandr/PLIST
index 16c85826e2f..fbdf7f164bf 100644
--- a/x11/Xrandr-mixedcase/PLIST
+++ b/x11/liboldXrandr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:57 jlam Exp $
+@comment $NetBSD: PLIST,v 1.1.2.2 2007/06/14 22:03:09 salo Exp $
 include/X11/extensions/Xrandr.h
 lib/libXrandr.la
 lib/pkgconfig/xrandr.pc
diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/liboldXrandr/buildlink3.mk
index 56950746f01..a496d9224e5 100644
--- a/x11/Xrandr-mixedcase/buildlink3.mk
+++ b/x11/liboldXrandr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2006/12/15 20:33:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2.2.2 2007/06/14 22:03:09 salo Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -16,7 +16,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xrandr
 .if !empty(XRANDR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.Xrandr+=	Xrandr>=0.99
 BUILDLINK_ABI_DEPENDS.Xrandr+=	Xrandr>=1.0.2nb3
-BUILDLINK_PKGSRCDIR.Xrandr?=	../../x11/Xrandr
+BUILDLINK_PKGSRCDIR.Xrandr?=	../../x11/liboldXrandr
 .endif	# XRANDR_BUILDLINK3_MK
 
 .include "../../x11/libXrender/buildlink3.mk"
diff --git a/x11/Xrandr-mixedcase/builtin.mk b/x11/liboldXrandr/builtin.mk
index 66f0e80461f..a825ce1414d 100644
--- a/x11/Xrandr-mixedcase/builtin.mk
+++ b/x11/liboldXrandr/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.17 2006/05/21 11:46:29 rillig Exp $
+# $NetBSD: builtin.mk,v 1.1.2.2 2007/06/14 22:03:09 salo Exp $
 
 BUILTIN_PKG:=	Xrandr
 
diff --git a/x11/Xrandr-mixedcase/distinfo b/x11/liboldXrandr/distinfo
index 91f6869e7d0..f0875711638 100644
--- a/x11/Xrandr-mixedcase/distinfo
+++ b/x11/liboldXrandr/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 17:36:09 wiz Exp $
+$NetBSD: distinfo,v 1.1.2.2 2007/06/14 22:03:10 salo Exp $
 
 SHA1 (libXrandr-1.0.2.tar.bz2) = 9d0d5fe7ddab5c976a75cc848afa56aa6beabf18
 RMD160 (libXrandr-1.0.2.tar.bz2) = a75443dabe360398d8de287f6885cd7569190132
diff --git a/x11/Xrandr-mixedcase/patches/patch-aa b/x11/liboldXrandr/patches/patch-aa
index c2bdb4c93ee..8150431469b 100644
--- a/x11/Xrandr-mixedcase/patches/patch-aa
+++ b/x11/liboldXrandr/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2003/12/04 18:57:45 recht Exp $
+$NetBSD: patch-aa,v 1.1.2.2 2007/06/14 22:03:10 salo Exp $
 
 --- configure.orig	2003-12-04 18:33:43.000000000 +0100
 +++ configure
diff --git a/x11/Xrandr-mixedcase/patches/patch-ab b/x11/liboldXrandr/patches/patch-ab
index 9b6555da295..1eeb641f9fa 100644
--- a/x11/Xrandr-mixedcase/patches/patch-ab
+++ b/x11/liboldXrandr/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2004/04/05 23:03:52 reinoud Exp $
+$NetBSD: patch-ab,v 1.1.2.2 2007/06/14 22:03:10 salo Exp $
 
 --- Xrandr.c.orig	2003-05-28 00:26:42.000000000 +0200
 +++ Xrandr.c