Add the adblock extension as a default-on option.

Requested by:	mux


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

2 files changed, 24 insertions, 9 deletions

diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 6b2b54b66..ddaa92d5e 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/epiphany-extensions/Makefile,v 1.70 2006/04/12 06:41:18 marcus Exp $
+#   $MCom: ports/www/epiphany-extensions/Makefile,v 1.71 2006/04/13 07:52:38 bland Exp $
 #
 
 PORTNAME=	epiphany
 PORTVERSION=	2.14.1
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -31,25 +32,32 @@ GNU_CONFIGURE=	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" \
-		--with-mozilla=${GECKO}
+CONFIGURE_ARGS=	--with-mozilla=${GECKO}
+
+EPHY_EXTENSIONS=all
 
 PLIST_SUB=	VERSION="2.14" EPHY_VERSION="2.14"
 
-.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
-.undef WITHOUT_OPENSP
-WITH_OPENSP=	yes
-.endif
+OPTIONS=	OPENSP "Enable OpenSP SGML support" off \
+		ADBLOCK "Enable the adblock extension" on
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
 
-.if defined(WITH_OPENSP) || exists(${LOCALBASE}/lib/libosp.so)
+.if defined(WITH_OPENSP)
 CONFIGURE_ARGS+=	--enable-opensp=yes
 .else
 CONFIGURE_ARGS+=	--disable-opensp
 .endif
 
+.if !defined(WITHOUT_ADBLOCK)
+EPHY_EXTENSIONS:=	${EPHY_EXTENSIONS},adblock
+LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre-utf8
+PLIST_SUB+=		ADBLOCK=""
+.else
+PLIST_SUB+=		ADBLOCK="@comment "
+.endif
+
 .if exists(${LOCALBASE}/share/pygtk/2.0/defs/epiphany.defs)
 USE_PYTHON=	yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
@@ -58,6 +66,8 @@ PLIST_SUB+=	PYTHON=""
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
+CONFIGURE_ARGS+=--with-extensions="${EPHY_EXTENSIONS}"
+
 pre-everything::
 	@${ECHO_MSG} "Epiphany-extensions also supports the following tunable option(s):"
 	@${ECHO_MSG} "	WITH_OPENSP=yes		Enable support for OpenSP SGML validation"
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index 90825323c..f724bdaaa 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -1,4 +1,5 @@
 lib/epiphany/%%VERSION%%/extensions/actions.ephy-extension
+%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/adblock.ephy-extension
 lib/epiphany/%%VERSION%%/extensions/auto-reload.ephy-extension
 lib/epiphany/%%VERSION%%/extensions/auto-scroller.ephy-extension
 lib/epiphany/%%VERSION%%/extensions/certificates.ephy-extension
@@ -15,6 +16,8 @@ lib/epiphany/%%VERSION%%/extensions/gestures.ephy-extension
 lib/epiphany/%%VERSION%%/extensions/java-console.ephy-extension
 lib/epiphany/%%VERSION%%/extensions/libactionsextension.la
 lib/epiphany/%%VERSION%%/extensions/libactionsextension.so
+%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/libadblockextension.la
+%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/libadblockextension.so
 lib/epiphany/%%VERSION%%/extensions/libautoreloadextension.la
 lib/epiphany/%%VERSION%%/extensions/libautoreloadextension.so
 lib/epiphany/%%VERSION%%/extensions/libautoscrollerextension.la
@@ -51,6 +54,8 @@ lib/epiphany/%%VERSION%%/extensions/sidebar.ephy-extension
 lib/epiphany/%%VERSION%%/extensions/smart-bookmarks.ephy-extension
 lib/epiphany/%%VERSION%%/extensions/tab-groups.ephy-extension
 lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension
+%%ADBLOCK%%share/gnome/epiphany-extensions/adblock-patterns
+%%ADBLOCK%%share/gnome/epiphany-extensions/adblock-statusbar-icon.svg
 share/gnome/epiphany-extensions/ephy-gestures.xml
 share/gnome/epiphany-extensions/glade/action-properties.glade
 share/gnome/epiphany-extensions/glade/actions-editor.glade