Update to 0.7.

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

5 files changed, 99 insertions, 7 deletions

diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index a98dd837d..52b196a65 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	0.6
+PORTVERSION=	0.7
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/0.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/0.7
 PKGNAMESUFFIX=	-extensions
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
@@ -17,8 +17,29 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A set of add-ons for the Epiphany web browser
 
-BUILD_DEPENDS=	epiphany:${PORTSDIR}/www/epiphany
-RUN_DEPENDS=	epiphany:${PORTSDIR}/www/epiphany
+BUILD_DEPENDS=	epiphany:${PORTSDIR}/www/epiphany \
+		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
+RUN_DEPENDS=	epiphany:${PORTSDIR}/www/epiphany \
+		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
+
+MOZILLA=	mozilla-gtk2
+HEADERS_SUFX=
+
+MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.6"
+
+.if !defined(WITH_MOZILLA)
+MOZILLA=	mozilla-gtk2
+HEADERS_SUFX=
+.else
+.if ${WITH_MOZILLA}=="mozilla-devel-gtk2"
+MOZILLA=	${WITH_MOZILLA}
+HEADERS_SUFX=	-devel
+MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="trunk"
+.else
+MOZILLA=	mozilla-gtk2
+HEADERS_SUFX=
+.endif
+.endif
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -27,6 +48,33 @@ USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--with-extensions="all"
+CONFIGURE_ARGS=	--with-extensions="all" \
+		${MOZ_CONFIGURE_ARGS}
+
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/lib/libosp.so)
+WITH_OPENSP=	yes
+.endif
+
+.if defined(WITH_OPENSP)
+CONFIGURE_ARGS+=	--enable-opensp=yes
+.else
+CONFIGURE_ARGS+=	--enable-opensp=no
+.endif
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} " By default epiphany-extensions builds with www/mozilla-gtk2 support, but you can"
+	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
+	@${ECHO_MSG}
+	@${ECHO_MSG} "  mozilla-devel-gtk2 "
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Epiphany-extensions also supports the following tunable option(s):"
+	@${ECHO_MSG} "	WITH_OPENSP=yes		Enable support for OpenSP SGML validation"
+	@${ECHO_MSG} ""
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}-gtk2|g' ${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index bf4376da9..b5305684e 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1 +1 @@
-MD5 (gnome2/epiphany-extensions-0.6.tar.bz2) = eb28e6834aad362da1ae07e76ed153f6
+MD5 (gnome2/epiphany-extensions-0.7.tar.bz2) = 3780fd96d0acc4c6b02b310a4bfbb5f4
diff --git a/www/epiphany-extensions/files/patch-configure b/www/epiphany-extensions/files/patch-configure
new file mode 100644
index 000000000..3d1a72f41
--- /dev/null
+++ b/www/epiphany-extensions/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	Mon Feb  2 01:47:03 2004
++++ configure	Mon Feb  2 01:47:33 2004
+@@ -22050,6 +22050,10 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
++else
++
++  HAVE_OPENSP_TRUE='#'
++  HAVE_OPENSP_FALSE=
+ 
+ fi
+ 
diff --git a/www/epiphany-extensions/files/patch-extensions_dashboard_dashboard-frontend-xmlwriter.c b/www/epiphany-extensions/files/patch-extensions_dashboard_dashboard-frontend-xmlwriter.c
new file mode 100644
index 000000000..7ade3da72
--- /dev/null
+++ b/www/epiphany-extensions/files/patch-extensions_dashboard_dashboard-frontend-xmlwriter.c
@@ -0,0 +1,10 @@
+--- extensions/dashboard/dashboard-frontend-xmlwriter.c.orig	Mon Feb  2 01:48:57 2004
++++ extensions/dashboard/dashboard-frontend-xmlwriter.c	Mon Feb  2 01:49:39 2004
+@@ -32,6 +32,7 @@
+ #include <unistd.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
++#include <sys/time.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <fcntl.h>
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index 78331255a..31662a3f2 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -1,3 +1,12 @@
+lib/epiphany/extensions/libcertificatesextension.a
+lib/epiphany/extensions/libcertificatesextension.so
+lib/epiphany/extensions/libcertificatesextension.so.0
+lib/epiphany/extensions/libdashboardextension.a
+lib/epiphany/extensions/libdashboardextension.so
+lib/epiphany/extensions/libdashboardextension.so.0
+lib/epiphany/extensions/liberrorviewerextension.a
+lib/epiphany/extensions/liberrorviewerextension.so
+lib/epiphany/extensions/liberrorviewerextension.so.0
 lib/epiphany/extensions/libgesturesextension.a
 lib/epiphany/extensions/libgesturesextension.so
 lib/epiphany/extensions/libgesturesextension.so.0
@@ -8,10 +17,22 @@ lib/epiphany/extensions/libtabsmenuextension.a
 lib/epiphany/extensions/libtabsmenuextension.so
 lib/epiphany/extensions/libtabsmenuextension.so.0
 share/gnome/epiphany-extensions/ephy-gestures.xml
+share/gnome/epiphany-extensions/glade/error-viewer.glade
+share/locale/cs/LC_MESSAGES/epiphany-extensions-1.0.mo
+share/locale/da/LC_MESSAGES/epiphany-extensions-1.0.mo
 share/locale/de/LC_MESSAGES/epiphany-extensions-1.0.mo
 share/locale/en_GB/LC_MESSAGES/epiphany-extensions-1.0.mo
+share/locale/es/LC_MESSAGES/epiphany-extensions-1.0.mo
 share/locale/fr/LC_MESSAGES/epiphany-extensions-1.0.mo
 share/locale/ja/LC_MESSAGES/epiphany-extensions-1.0.mo
+share/locale/nl/LC_MESSAGES/epiphany-extensions-1.0.mo
+share/locale/no/LC_MESSAGES/epiphany-extensions-1.0.mo
+share/locale/pt/LC_MESSAGES/epiphany-extensions-1.0.mo
+share/locale/sk/LC_MESSAGES/epiphany-extensions-1.0.mo
+share/locale/sr/LC_MESSAGES/epiphany-extensions-1.0.mo
+share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-1.0.mo
+share/locale/sv/LC_MESSAGES/epiphany-extensions-1.0.mo
+@dirrm share/gnome/epiphany-extensions/glade
 @dirrm share/gnome/epiphany-extensions
 @dirrm lib/epiphany/extensions
 @dirrm lib/epiphany