Update to 1.8.1.

4 files changed, 56 insertions, 58 deletions

diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index ea245eb2aaaa..fe51c4cb4769 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,13 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/www/epiphany-extensions/Makefile,v 1.54 2005/10/02 23:33:10 marcus Exp $
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	1.6.6
+PORTVERSION=	1.8.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/1.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/1.8
 PKGNAMESUFFIX=	-extensions
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
@@ -27,19 +28,21 @@ HEADERS_SUFX=
 MOZ_BUILD=	mozilla
 
 .if !defined(WITH_MOZILLA)
-MOZILLA=	mozilla
-HEADERS_SUFX=
-.else
-.if ${WITH_MOZILLA}=="firefox"
 MOZILLA=	firefox
+HEADERS_SUFX=
 MOZ_BUILD=	firefox
 .else
+.if ${WITH_MOZILLA}=="mozilla"
+MOZILLA=	mozilla
+MOZ_BUILD=	mozilla
+.else
 .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2"
 MOZILLA=	mozilla-devel
 HEADERS_SUFX=	-devel
 .else
-MOZILLA=	mozilla
+MOZILLA=	firefox
 HEADERS_SUFX=
+MOZ_BUILD=	firefox
 .endif
 .endif
 .endif
@@ -47,14 +50,14 @@ HEADERS_SUFX=
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnometarget
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 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=${MOZ_BUILD}
 
-PLIST_SUB=	VERSION="1.6" EPHY_VERSION="1.6"
+PLIST_SUB=	VERSION="1.8" EPHY_VERSION="1.8"
 
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
 .undef WITHOUT_OPENSP
@@ -81,10 +84,10 @@ USE_GCC=	3.4
 
 pre-everything::
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} " By default epiphany-extensions builds with www/mozilla support, but you can"
+	@${ECHO_MSG} " By default epiphany-extensions builds with www/firefox support, but you can"
 	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
 	@${ECHO_MSG}
-	@${ECHO_MSG} "  firefox       "
+	@${ECHO_MSG} "  mozilla       "
 	@${ECHO_MSG} "  mozilla-devel "
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Epiphany-extensions also supports the following tunable option(s):"
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index f05739e34f29..1a4c0f4b3a76 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/epiphany-extensions-1.6.6.tar.bz2) = 251f0a79867bfcd650d9a3f53d8447c8
-SIZE (gnome2/epiphany-extensions-1.6.6.tar.bz2) = 570024
+MD5 (gnome2/epiphany-extensions-1.8.1.tar.bz2) = d1c40978c89a845973ed131774fa7769
+SIZE (gnome2/epiphany-extensions-1.8.1.tar.bz2) = 611775
diff --git a/www/epiphany-extensions/files/patch-configure b/www/epiphany-extensions/files/patch-configure
deleted file mode 100644
index 2611517cb8d4..000000000000
--- a/www/epiphany-extensions/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+else
-+
-+  HAVE_OPENSP_TRUE='#'
-+  HAVE_OPENSP_FALSE=
- 
- fi
-
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index b1717e4dc1a4..345aa634f2dd 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -1,33 +1,35 @@
-lib/epiphany-%%VERSION%%/extensions/actions.xml
-lib/epiphany-%%VERSION%%/extensions/bookmarks-tray.xml
-lib/epiphany-%%VERSION%%/extensions/certificates.xml
-lib/epiphany-%%VERSION%%/extensions/dashboard.xml
-lib/epiphany-%%VERSION%%/extensions/error-viewer.xml
-lib/epiphany-%%VERSION%%/extensions/extensions-manager-ui.xml
-lib/epiphany-%%VERSION%%/extensions/gestures.xml
-lib/epiphany-%%VERSION%%/extensions/libactionsextension.a
-lib/epiphany-%%VERSION%%/extensions/libactionsextension.so
-lib/epiphany-%%VERSION%%/extensions/libactionsextension.so.0
-lib/epiphany-%%VERSION%%/extensions/libbookmarkstrayextension.so
-lib/epiphany-%%VERSION%%/extensions/libcertificatesextension.so
-lib/epiphany-%%VERSION%%/extensions/libdashboardextension.so
-lib/epiphany-%%VERSION%%/extensions/liberrorviewerextension.so
-lib/epiphany-%%VERSION%%/extensions/libextensionsmanageruiextension.so
-lib/epiphany-%%VERSION%%/extensions/libgesturesextension.so
-lib/epiphany-%%VERSION%%/extensions/libpageinfoextension.so
-lib/epiphany-%%VERSION%%/extensions/libselectstylesheetextension.so
-lib/epiphany-%%VERSION%%/extensions/libsidebarextension.so
-lib/epiphany-%%VERSION%%/extensions/libsmartbookmarksextension.so
-lib/epiphany-%%VERSION%%/extensions/libtabgroupsextension.so
-lib/epiphany-%%VERSION%%/extensions/libtabstatesextension.a
-lib/epiphany-%%VERSION%%/extensions/libtabstatesextension.so
-lib/epiphany-%%VERSION%%/extensions/libtabstatesextension.so.0
-lib/epiphany-%%VERSION%%/extensions/page-info.xml
-lib/epiphany-%%VERSION%%/extensions/select-stylesheet.xml
-lib/epiphany-%%VERSION%%/extensions/sidebar.xml
-lib/epiphany-%%VERSION%%/extensions/smart-bookmarks.xml
-lib/epiphany-%%VERSION%%/extensions/tab-groups.xml
-lib/epiphany-%%VERSION%%/extensions/tab-states.xml
+lib/epiphany/%%VERSION%%/extensions/actions.xml
+lib/epiphany/%%VERSION%%/extensions/auto-scroller.xml
+lib/epiphany/%%VERSION%%/extensions/bookmarks-tray.xml
+lib/epiphany/%%VERSION%%/extensions/certificates.xml
+lib/epiphany/%%VERSION%%/extensions/dashboard.xml
+lib/epiphany/%%VERSION%%/extensions/error-viewer.xml
+lib/epiphany/%%VERSION%%/extensions/extensions-manager-ui.xml
+lib/epiphany/%%VERSION%%/extensions/gestures.xml
+lib/epiphany/%%VERSION%%/extensions/libactionsextension.a
+lib/epiphany/%%VERSION%%/extensions/libactionsextension.so
+lib/epiphany/%%VERSION%%/extensions/libactionsextension.so.0
+lib/epiphany/%%VERSION%%/extensions/libautoscrollerextension.so
+lib/epiphany/%%VERSION%%/extensions/libbookmarkstrayextension.so
+lib/epiphany/%%VERSION%%/extensions/libcertificatesextension.so
+lib/epiphany/%%VERSION%%/extensions/libdashboardextension.so
+lib/epiphany/%%VERSION%%/extensions/liberrorviewerextension.so
+lib/epiphany/%%VERSION%%/extensions/libextensionsmanageruiextension.so
+lib/epiphany/%%VERSION%%/extensions/libgesturesextension.so
+lib/epiphany/%%VERSION%%/extensions/libpageinfoextension.so
+lib/epiphany/%%VERSION%%/extensions/libselectstylesheetextension.so
+lib/epiphany/%%VERSION%%/extensions/libsidebarextension.so
+lib/epiphany/%%VERSION%%/extensions/libsmartbookmarksextension.so
+lib/epiphany/%%VERSION%%/extensions/libtabgroupsextension.so
+lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.a
+lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.so
+lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.so.0
+lib/epiphany/%%VERSION%%/extensions/page-info.xml
+lib/epiphany/%%VERSION%%/extensions/select-stylesheet.xml
+lib/epiphany/%%VERSION%%/extensions/sidebar.xml
+lib/epiphany/%%VERSION%%/extensions/smart-bookmarks.xml
+lib/epiphany/%%VERSION%%/extensions/tab-groups.xml
+lib/epiphany/%%VERSION%%/extensions/tab-states.xml
 share/gnome/epiphany-extensions/ephy-gestures.xml
 share/gnome/epiphany-extensions/glade/action-properties.glade
 share/gnome/epiphany-extensions/glade/actions-editor.glade
@@ -48,12 +50,14 @@ share/locale/en_GB/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/es/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/fi/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/fr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/gl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/hr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/hu/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/it/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/ja/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/ko/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/lt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/ne/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/nl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/no/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/pa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@@ -61,6 +65,7 @@ share/locale/pl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/pt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/pt_BR/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/ru/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/rw/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/sk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/sq/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/sr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@@ -70,8 +75,11 @@ share/locale/uk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/wa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw 2> /dev/null || true
 @dirrm share/gnome/epiphany-extensions/xml
 @dirrm share/gnome/epiphany-extensions/glade
 @dirrm share/gnome/epiphany-extensions
-@unexec rmdir %D/lib/epiphany-%%VERSION%%/extensions 2>/dev/null || true
-@unexec rmdir %D/lib/epiphany-%%VERSION%% 2>/dev/null || true
+@unexec rmdir %D/lib/epiphany/%%VERSION%%/extensions 2>/dev/null || true
+@unexec rmdir %D/lib/epiphany/%%VERSION%% 2>/dev/null || true
+@unexec rmdir %D/lib/epiphany 2>/dev/null || true