Make sure we install the gdk headers in the right space.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14947 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 32 insertions, 43 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index c65e176ff..bad79b7c4 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.13 2010/12/16 18:08:30 kwm Exp $
+#   $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.14 2010/12/25 21:39:38 kwm Exp $
 #
 
 PORTNAME=	gtk
 PORTVERSION=	2.91.7
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
 		ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
diff --git a/x11-toolkits/gtk30/files/patch-gdk_Makefile.in b/x11-toolkits/gtk30/files/patch-gdk_Makefile.in
deleted file mode 100644
index cc9daac87..000000000
--- a/x11-toolkits/gtk30/files/patch-gdk_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdk/Makefile.in.orig	2010-12-24 00:25:23.000000000 +0100
-+++ gdk/Makefile.in	2010-12-24 00:27:00.000000000 +0100
-@@ -562,7 +562,7 @@
- #
- # setup GDK sources and their dependencies
- #
--gdkincludedir = $(includedir)/gtk-3.0/gdk
-+gdkincludedir = $(prefix)/include/gtk-3.0
- gdkinclude_HEADERS = $(gdk_public_h_sources) $(gdk_built_public_sources)
- common_sources = \
- 	$(gdk_private_headers)	\
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index caa001b1a..0f11ef27c 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -7,7 +7,36 @@ include/gail-3.0/gail/gailwidget.h
 include/gail-3.0/libgail-util/gail-util.h
 include/gail-3.0/libgail-util/gailmisc.h
 include/gail-3.0/libgail-util/gailtextutil.h
-include/gtk-3.0/gdk.h
+include/gtk-3.0/gdk/gdk.h
+include/gtk-3.0/gdk/gdkapplaunchcontext.h
+include/gtk-3.0/gdk/gdkcairo.h
+include/gtk-3.0/gdk/gdkcolor.h
+include/gtk-3.0/gdk/gdkconfig.h
+include/gtk-3.0/gdk/gdkcursor.h
+include/gtk-3.0/gdk/gdkdevice.h
+include/gtk-3.0/gdk/gdkdevicemanager.h
+include/gtk-3.0/gdk/gdkdisplay.h
+include/gtk-3.0/gdk/gdkdisplaymanager.h
+include/gtk-3.0/gdk/gdkdnd.h
+include/gtk-3.0/gdk/gdkenumtypes.h
+include/gtk-3.0/gdk/gdkevents.h
+include/gtk-3.0/gdk/gdkkeys.h
+include/gtk-3.0/gdk/gdkkeysyms-compat.h
+include/gtk-3.0/gdk/gdkkeysyms.h
+include/gtk-3.0/gdk/gdkmain.h
+include/gtk-3.0/gdk/gdkpango.h
+include/gtk-3.0/gdk/gdkpixbuf.h
+include/gtk-3.0/gdk/gdkprivate.h
+include/gtk-3.0/gdk/gdkproperty.h
+include/gtk-3.0/gdk/gdkrectangle.h
+include/gtk-3.0/gdk/gdkrgba.h
+include/gtk-3.0/gdk/gdkscreen.h
+include/gtk-3.0/gdk/gdkselection.h
+include/gtk-3.0/gdk/gdktestutils.h
+include/gtk-3.0/gdk/gdkthreads.h
+include/gtk-3.0/gdk/gdktypes.h
+include/gtk-3.0/gdk/gdkvisual.h
+include/gtk-3.0/gdk/gdkwindow.h
 include/gtk-3.0/gdk/gdkx.h
 include/gtk-3.0/gdk/x11/gdkx11applaunchcontext.h
 include/gtk-3.0/gdk/x11/gdkx11cursor.h
@@ -27,35 +56,6 @@ include/gtk-3.0/gdk/x11/gdkx11selection.h
 include/gtk-3.0/gdk/x11/gdkx11utils.h
 include/gtk-3.0/gdk/x11/gdkx11visual.h
 include/gtk-3.0/gdk/x11/gdkx11window.h
-include/gtk-3.0/gdkapplaunchcontext.h
-include/gtk-3.0/gdkcairo.h
-include/gtk-3.0/gdkcolor.h
-include/gtk-3.0/gdkconfig.h
-include/gtk-3.0/gdkcursor.h
-include/gtk-3.0/gdkdevice.h
-include/gtk-3.0/gdkdevicemanager.h
-include/gtk-3.0/gdkdisplay.h
-include/gtk-3.0/gdkdisplaymanager.h
-include/gtk-3.0/gdkdnd.h
-include/gtk-3.0/gdkenumtypes.h
-include/gtk-3.0/gdkevents.h
-include/gtk-3.0/gdkkeys.h
-include/gtk-3.0/gdkkeysyms-compat.h
-include/gtk-3.0/gdkkeysyms.h
-include/gtk-3.0/gdkmain.h
-include/gtk-3.0/gdkpango.h
-include/gtk-3.0/gdkpixbuf.h
-include/gtk-3.0/gdkprivate.h
-include/gtk-3.0/gdkproperty.h
-include/gtk-3.0/gdkrectangle.h
-include/gtk-3.0/gdkrgba.h
-include/gtk-3.0/gdkscreen.h
-include/gtk-3.0/gdkselection.h
-include/gtk-3.0/gdktestutils.h
-include/gtk-3.0/gdkthreads.h
-include/gtk-3.0/gdktypes.h
-include/gtk-3.0/gdkvisual.h
-include/gtk-3.0/gdkwindow.h
 include/gtk-3.0/gtk/gtkcellarea.h
 include/gtk-3.0/gtk/gtkcellareabox.h
 include/gtk-3.0/gtk/gtkcellareaboxcontext.h