Update to 1.1.1.

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

4 files changed, 23 insertions, 17 deletions

diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index d19644413..1a29fe949 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTVERSION=	1.1.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/1.1
@@ -26,8 +25,6 @@ RUN_DEPENDS=	epiphany:${PORTSDIR}/www/epiphany \
 MOZILLA=	mozilla
 HEADERS_SUFX=
 
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.7"
-
 .if !defined(WITH_MOZILLA)
 MOZILLA=	mozilla
 HEADERS_SUFX=
@@ -35,7 +32,6 @@ HEADERS_SUFX=
 .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2"
 MOZILLA=	mozilla-devel
 HEADERS_SUFX=	-devel
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.8a"
 .else
 MOZILLA=	mozilla
 HEADERS_SUFX=
@@ -49,8 +45,7 @@ USE_LIBTOOL_VER=13
 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" \
-		${MOZ_CONFIGURE_ARGS}
+CONFIGURE_ARGS=	--with-extensions="all"
 
 PLIST_SUB=	VERSION="1.3"
 
@@ -68,7 +63,7 @@ WITH_OPENSP=	yes
 .if defined(WITH_OPENSP)
 CONFIGURE_ARGS+=	--enable-opensp=yes
 .else
-CONFIGURE_ARGS+=	--enable-opensp=no
+CONFIGURE_ARGS+=	--disable-opensp
 .endif
 
 pre-everything::
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index f8c6ba65e..11947cb13 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/epiphany-extensions-1.1.0.tar.bz2) = c9b97c0494c0a81f79d2b5f000651922
-SIZE (gnome2/epiphany-extensions-1.1.0.tar.bz2) = 380502
+MD5 (gnome2/epiphany-extensions-1.1.1.tar.bz2) = c3c538e9e2f872cab30b2defef6b6de5
+SIZE (gnome2/epiphany-extensions-1.1.1.tar.bz2) = 374993
diff --git a/www/epiphany-extensions/files/patch-configure b/www/epiphany-extensions/files/patch-configure
index 3d1a72f41..130053d5a 100644
--- a/www/epiphany-extensions/files/patch-configure
+++ b/www/epiphany-extensions/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Mon Feb  2 01:47:03 2004
-+++ configure	Mon Feb  2 01:47:33 2004
+--- configure.orig	Wed Jul  7 14:09:38 2004
++++ configure	Wed Jul  7 14:10:16 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'
@@ -10,4 +10,18 @@
 +  HAVE_OPENSP_FALSE=
  
  fi
+
+@@ -23149,11 +23149,11 @@
+ echo "$as_me:$LINENO: result: $MOZILLA_VERSION$autodetect" >&5
+ echo "${ECHO_T}$MOZILLA_VERSION$autodetect" >&6
+ 
+-if test $MOZILLA_VERSION == "trunk"; then
++if test $MOZILLA_VERSION = "trunk"; then
+ 	MOZILLA_VERSION=99.0 # use a high number
+ fi
+ 
+-version=$(echo $MOZILLA_VERSION | sed -e 's/\([0-9]\+\|[a-z]\+\)/\1 /g' -e 's/\.//g')
++version=$(echo $MOZILLA_VERSION | sed -E -e 's/([0-9]+|[a-z]+)/\1 /g' -e 's/\.//g')
+ 
+ set -- $version;
  
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index d82b210fa..6f59fd991 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -10,20 +10,18 @@ lib/epiphany-%%VERSION%%/extensions/liberrorviewerextension.so.0
 lib/epiphany-%%VERSION%%/extensions/libgesturesextension.a
 lib/epiphany-%%VERSION%%/extensions/libgesturesextension.so
 lib/epiphany-%%VERSION%%/extensions/libgesturesextension.so.0
-lib/epiphany-%%VERSION%%/extensions/libpopupblockerextension.a
-lib/epiphany-%%VERSION%%/extensions/libpopupblockerextension.so
-lib/epiphany-%%VERSION%%/extensions/libpopupblockerextension.so.0
 lib/epiphany-%%VERSION%%/extensions/libtabsmenuextension.a
 lib/epiphany-%%VERSION%%/extensions/libtabsmenuextension.so
 lib/epiphany-%%VERSION%%/extensions/libtabsmenuextension.so.0
 share/gnome/epiphany-extensions/ephy-gestures.xml
 share/gnome/epiphany-extensions/glade/error-viewer.glade
-share/gnome/epiphany-extensions/icons/popup-blocker.svg
+share/locale/bg/LC_MESSAGES/epiphany-extensions-1.2.mo
 share/locale/ca/LC_MESSAGES/epiphany-extensions-1.2.mo
 share/locale/cs/LC_MESSAGES/epiphany-extensions-1.2.mo
 share/locale/da/LC_MESSAGES/epiphany-extensions-1.2.mo
 share/locale/de/LC_MESSAGES/epiphany-extensions-1.2.mo
 share/locale/el/LC_MESSAGES/epiphany-extensions-1.2.mo
+share/locale/en_CA/LC_MESSAGES/epiphany-extensions-1.2.mo
 share/locale/en_GB/LC_MESSAGES/epiphany-extensions-1.2.mo
 share/locale/es/LC_MESSAGES/epiphany-extensions-1.2.mo
 share/locale/fr/LC_MESSAGES/epiphany-extensions-1.2.mo
@@ -47,7 +45,6 @@ share/locale/sv/LC_MESSAGES/epiphany-extensions-1.2.mo
 share/locale/uk/LC_MESSAGES/epiphany-extensions-1.2.mo
 share/locale/wa/LC_MESSAGES/epiphany-extensions-1.2.mo
 share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-1.2.mo
-@dirrm share/gnome/epiphany-extensions/icons
 @dirrm share/gnome/epiphany-extensions/glade
 @dirrm share/gnome/epiphany-extensions
 @dirrm lib/epiphany-%%VERSION%%/extensions