From 7ce988c5d70e1cfe0d244a46de4ed5bd8ba722fe Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Mon, 22 Mar 2004 19:04:01 +0000
Subject: [PATCH] Import some changes from Freedesktop CVS to fix the build.

Reported by:	bento via kris
Obtained from:	Freedesktop CVS
---
 x11-toolkits/libXt/Makefile                        |  5 ++++-
 x11-toolkits/libXt/files/patch-Makefile.in         | 12 ++++++++++--
 x11-toolkits/libXt/files/patch-include_Makefile.in | 10 ++++++++++
 x11-toolkits/libXt/pkg-plist                       |  1 +
 4 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 x11-toolkits/libXt/files/patch-include_Makefile.in

diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index 8149f7303c9e..5f7bb0b5d4d2 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libXt
 PORTVERSION=	0.1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://pdx.freedesktop.org/~xlibs/release/
 
@@ -29,4 +29,7 @@ CFLAGS+=	-DMALLOC_0_RETURNS_NULL
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig
 
+post-extract:
+	@${MV} ${WRKSRC}/ObjectP.h ${WRKSRC}/include/X11
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libXt/files/patch-Makefile.in b/x11-toolkits/libXt/files/patch-Makefile.in
index 0435e42196f3..41044d85d446 100644
--- a/x11-toolkits/libXt/files/patch-Makefile.in
+++ b/x11-toolkits/libXt/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sat Mar 13 23:21:57 2004
-+++ Makefile.in	Sat Mar 13 23:22:26 2004
+--- Makefile.in.orig	Mon Mar 22 13:52:13 2004
++++ Makefile.in	Mon Mar 22 13:59:02 2004
 @@ -163,7 +163,7 @@
  
  SUBDIRS = include util
@@ -9,3 +9,11 @@
  
  lib_LTLIBRARIES = libXt.la
  
+@@ -210,7 +210,6 @@
+ 	Manage.c \
+ 	NextEvent.c \
+ 	Object.c \
+-	ObjectP.h \
+ 	PassivGraI.h \
+ 	PassivGrab.c \
+ 	Pointer.c \
diff --git a/x11-toolkits/libXt/files/patch-include_Makefile.in b/x11-toolkits/libXt/files/patch-include_Makefile.in
new file mode 100644
index 000000000000..17a579a3fd58
--- /dev/null
+++ b/x11-toolkits/libXt/files/patch-include_Makefile.in
@@ -0,0 +1,10 @@
+--- include/Makefile.in.orig	Mon Mar 22 13:58:27 2004
++++ include/Makefile.in	Mon Mar 22 13:58:41 2004
+@@ -148,6 +148,7 @@
+ 	X11/Intrinsic.h \
+ 	X11/IntrinsicP.h \
+ 	X11/Object.h \
++	X11/ObjectP.h \
+ 	X11/RectObj.h \
+ 	X11/RectObjP.h \
+ 	X11/ShellP.h \
diff --git a/x11-toolkits/libXt/pkg-plist b/x11-toolkits/libXt/pkg-plist
index 251859bd06d1..bc7a14aa408b 100644
--- a/x11-toolkits/libXt/pkg-plist
+++ b/x11-toolkits/libXt/pkg-plist
@@ -7,6 +7,7 @@ include/X11/CoreP.h
 include/X11/Intrinsic.h
 include/X11/IntrinsicP.h
 include/X11/Object.h
+include/X11/ObjectP.h
 include/X11/RectObj.h
 include/X11/RectObjP.h
 include/X11/ShellP.h