Remove gir-repository-webkit as the webkit-gtk2 port now installs gir files.

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

4 files changed, 5 insertions, 18 deletions

diff --git a/RMPORTS b/RMPORTS
index 6ad635d07..5e92b1554 100644
--- a/RMPORTS
+++ b/RMPORTS
@@ -1 +1,2 @@
 x11-toolkits/gir-repository-gtk20|x11-toolkits/gtk20|%%DATE%%|Now installed by x11-toolkits/gtk20
+www/gir-repository-webkit|www/webkit-gtk2|%%DATE%%|Now installed by www/webkit-gtk2
diff --git a/devel/gir-repository/Makefile b/devel/gir-repository/Makefile
index 3117de76b..7e00a0074 100644
--- a/devel/gir-repository/Makefile
+++ b/devel/gir-repository/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Pawel Worach <pawel.worach@gmail.com>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gir-repository/Makefile,v 1.9 2009/11/09 09:29:14 kwm Exp $
+#   $MCom: ports/devel/gir-repository/Makefile,v 1.11 2010/01/09 05:50:20 marcus Exp $
 #
 
 MASTER_SITES=	# Empty
@@ -19,7 +19,6 @@ NO_BUILD=	yes
 RUN_DEPENDS=	${GIRDIR}/${atk_GIR}.gir:${PORTSDIR}/${atk_CATEGORY}/gir-repository-atk \
 		${GIRDIR}/${pango_GIR}.gir:${PORTSDIR}/${pango_CATEGORY}/gir-repository-pango \
 		${GIRDIR}/${poppler_GIR}.gir:${PORTSDIR}/${poppler_CATEGORY}/gir-repository-poppler \
-		${GIRDIR}/${webkit_GIR}.gir:${PORTSDIR}/${webkit_CATEGORY}/gir-repository-webkit \
 		${GIRDIR}/${libsoup_GIR}.gir:${PORTSDIR}/${libsoup_CATEGORY}/gir-repository-libsoup \
 		${GIRDIR}/${dbus_GIR}.gir:${PORTSDIR}/${dbus_CATEGORY}/gir-repository-dbus \
 		${GIRDIR}/${gconf2_GIR}.gir:${PORTSDIR}/${gconf2_CATEGORY}/gir-repository-gconf2 \
diff --git a/devel/gir-repository/bsd.gir.mk b/devel/gir-repository/bsd.gir.mk
index f62efe592..9c741199c 100644
--- a/devel/gir-repository/bsd.gir.mk
+++ b/devel/gir-repository/bsd.gir.mk
@@ -15,9 +15,6 @@ pango_GIR=	Pango-1.0
 poppler_CATEGORY=	graphics
 poppler_GIR=	Poppler-0.8
 
-webkit_CATEGORY=	www
-webkit_GIR=	WebKit-1.0
-
 libsoup_CATEGORY=	devel
 libsoup_GIR=	Soup-2.4
 libsoup_GIR_TMPL=	soup
@@ -107,14 +104,6 @@ GIR_FILES=	Poppler-0.8
 CLEAR_DEPS+=	Gdk-2.0
 .endif
 
-.if ${GIR_NAME} == "webkit"
-LIB_DEPENDS+=	webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
-USE_GNOME+=	gtk20
-USE_GIR=	libsoup
-GIR_FILES=	WebKit-1.0 JSCore-1.0
-CLEAR_DEPS+=	Gtk-2.0
-.endif
-
 .if ${GIR_NAME} == "libsoup"
 LIB_DEPENDS+=	soup-2.4.1:${PORTSDIR}/devel/libsoup
 GIR_FILES=	Soup-2.4
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 2d54d3862..c4eb11ff2 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/epiphany/Makefile,v 1.217 2010/01/14 17:42:39 kwm Exp $
+#   $MCom: ports/www/epiphany/Makefile,v 1.218 2010/01/17 00:23:14 kwm Exp $
 #
 
 PORTNAME=	epiphany
 PORTVERSION=	2.29.5
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,14 +16,12 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	An extremely lightweight and simple web browser for GNOME 2
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
-		${LOCALBASE}/share/gir-1.0/WebKit-1.0.gir:${PORTSDIR}/www/gir-repository-webkit
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \
 		notify.1:${PORTSDIR}/devel/libnotify \
 		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
-		${LOCALBASE}/share/gir-1.0/WebKit-1.0.gir:${PORTSDIR}/www/gir-repository-webkit \
 		${LOCALBASE}/share/icons/HighContrastLargePrint/index.theme:${PORTSDIR}/x11-themes/gnome-themes
 
 USE_LDCONFIG=	yes