Update to 2.91.92.

Finaly got un-lazy and fixed introspection needed for seed (javascript) support.
Do a little cleanup.


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

4 files changed, 29 insertions, 17 deletions

diff --git a/www/epiphany3/Makefile b/www/epiphany3/Makefile
index 398644f8c..f195c571b 100644
--- a/www/epiphany3/Makefile
+++ b/www/epiphany3/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/epiphany3/Makefile,v 1.8 2011/03/09 21:59:21 kwm Exp $
+#   $MCom: ports/www/epiphany3/Makefile,v 1.9 2011/03/13 20:30:31 kwm Exp $
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	2.91.91.1
+PORTVERSION=	2.91.92
 PORTREVISION?=	0
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
@@ -36,16 +36,17 @@ USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 GNOME_DESKTOP_VERSION=3
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedocutils
-#gnomedesktop desktopfileutils
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomedocutils libxml2
+USE_XORG=	ice x11 sm
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
-CONFIGURE_ARGS+=--enable-introspection=no \
+CONFIGURE_ARGS+=--enable-introspection \
 		--enable-network-manager=no \
 		--with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		LIBS="${PTHREAD_LIBS}"
 
 GLIB_SCHEMAS=	org.gnome.Epiphany.enums.xml \
 		org.gnome.epiphany.gschema.xml
@@ -56,7 +57,7 @@ MAN1=		epiphany.1
 
 OPTIONS=	NSS "Import passwords from 2.26 and older on first run" off \
 		SPELLCHECK "Enable spell checking by default" on \
-#		SEED "Enable seed (JavaScript) support" off
+		SEED "Enable seed (JavaScript) support" off
 
 .if defined(PACKAGE_BUILDING)
 .undef WITHOUT_GNOME
@@ -78,10 +79,10 @@ CONFIGURE_ARGS+=--enable-nss
 CONFIGURE_ARGS+=--disable-nss
 .endif
 
-#.if defined(WITH_SEED)
-#LIB_DEPENDS+=	seed.0:${PORTSDIR}/devel/seed3
-#CONFIGURE_ARGS+=--enable-seed
-#.endif
+.if defined(WITH_SEED)
+LIB_DEPENDS+=	seed-gtk3.0:${PORTSDIR}/devel/seed3
+CONFIGURE_ARGS+=--enable-seed
+.endif
 
 .if defined(WITH_SPELLCHECK)
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-embed_ephy-embed-prefs.c
diff --git a/www/epiphany3/distinfo b/www/epiphany3/distinfo
index 76fa27519..3cb2f7cfc 100644
--- a/www/epiphany3/distinfo
+++ b/www/epiphany3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/epiphany-2.91.91.1.tar.bz2) = eef91749dc14abf0d1275a83f9cf9acf8e6e9a7615dafd4f5dcae0cc15896346
-SIZE (gnome3/epiphany-2.91.91.1.tar.bz2) = 5935056
+SHA256 (gnome3/epiphany-2.91.92.tar.bz2) = 16bfb56af1723db458aa3c9942218480407ed199e78dbba33af483bcf417db1c
+SIZE (gnome3/epiphany-2.91.92.tar.bz2) = 5906187
diff --git a/www/epiphany3/files/patch-src_Makefile.in b/www/epiphany3/files/patch-src_Makefile.in
new file mode 100644
index 000000000..b5c8af689
--- /dev/null
+++ b/www/epiphany3/files/patch-src_Makefile.in
@@ -0,0 +1,10 @@
+--- src/Makefile.in.orig	2011-03-23 21:11:50.000000000 +0100
++++ src/Makefile.in	2011-03-23 21:16:26.000000000 +0100
+@@ -1568,6 +1568,7 @@ stamp-ephy-dbus-client-bindings.h: $(top
+ @HAVE_INTROSPECTION_TRUE@		--include=Gtk-3.0 \
+ @HAVE_INTROSPECTION_TRUE@		--include=libxml2-2.0 \
+ @HAVE_INTROSPECTION_TRUE@		--library=$(top_builddir)/lib/egg/libegg.la \
++@HAVE_INTROSPECTION_TRUE@		--libtool="$(LIBTOOL)" \
+ @HAVE_INTROSPECTION_TRUE@		--pkg=gtk+-3.0 \
+ @HAVE_INTROSPECTION_TRUE@		--pkg=libxml-2.0 \
+ @HAVE_INTROSPECTION_TRUE@		--output=$@ \
diff --git a/www/epiphany3/pkg-plist b/www/epiphany3/pkg-plist
index 87d75ac4a..82086455c 100644
--- a/www/epiphany3/pkg-plist
+++ b/www/epiphany3/pkg-plist
@@ -33,15 +33,16 @@ include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-state.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-type-builtins.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-web-view.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-window.h
-@comment lib/girepository-1.0/Epiphany-2.31.typelib
-@comment libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
+lib/girepository-1.0/EphyEgg-2.31.typelib
+lib/girepository-1.0/Epiphany-2.31.typelib
 libdata/pkgconfig/epiphany-2.31.pc
 share/aclocal/epiphany.m4
 share/applications/bme.desktop
 share/applications/epiphany.desktop
 share/dbus-1/services/org.gnome.Epiphany.service
 share/GConf/gsettings/epiphany.convert
-@comment share/gir-1.0/Epiphany-%%EPHY_VERSION%%.gir
+share/gir-1.0/EphyEgg-2.31.gir
+share/gir-1.0/Epiphany-2.31.gir
 %%DATADIR%%/about.ini
 %%DATADIR%%/default-bookmarks.rdf
 %%DATADIR%%/epiphany-bookmark-editor-ui.xml