aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--www/epiphany/Makefile15
-rw-r--r--www/epiphany/distinfo2
-rw-r--r--www/epiphany/files/patch-configure19
-rw-r--r--www/epiphany/pkg-plist4
4 files changed, 34 insertions, 6 deletions
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 9ed8809c1902..f13f8faa47d9 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= epiphany
-PORTVERSION= 0.6.1
+PORTVERSION= 0.7.0
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.6
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.7
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -31,7 +31,7 @@ HEADERS_SUFX=
.if ${WITH_MOZILLA}=="mozilla-devel-gtk2"
MOZILLA= ${WITH_MOZILLA}
HEADERS_SUFX= -devel
-MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="trunk"
+MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.4"
.else
MOZILLA= mozilla-gtk2
HEADERS_SUFX=
@@ -41,12 +41,12 @@ HEADERS_SUFX=
USE_X_PREFIX= yes
USE_GNOMENG= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui
+WANT_GNOME= yes
USE_LIBTOOL= yes
USE_GMAKE= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \
--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
- --enable-nautilus-view=no \
${MOZ_CONFIGURE_ARGS}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
@@ -55,6 +55,13 @@ FLASHPLAYER= ${LOCALBASE}/lib/libflashplayer.so.1
.include <bsd.port.pre.mk>
+.if ${HAVE_GNOME:Mnautilus2}!=""
+USE_GNOME+= nautilus2
+CONFIGURE_ARGS+= --enable-nautilus-view
+.else
+CONFIGURE_ARGS+= --enable-nautilus-view=no
+.endif
+
.if ${OSVERSION} > 500000
# Galeon does not build correctly in -CURRENT if -Werror is passed
# to the compiler.
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 183138b931f6..342689458235 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1 +1 @@
-MD5 (gnome2/epiphany-0.6.1.tar.gz) = 162a19c2897ad4213bfa17e26c6626be
+MD5 (gnome2/epiphany-0.7.0.tar.gz) = f1b12bdedefd232560de75d0dde3920e
diff --git a/www/epiphany/files/patch-configure b/www/epiphany/files/patch-configure
new file mode 100644
index 000000000000..462a30148646
--- /dev/null
+++ b/www/epiphany/files/patch-configure
@@ -0,0 +1,19 @@
+--- configure.orig Fri Jun 6 14:15:07 2003
++++ configure Thu Jun 12 14:59:44 2003
+@@ -18202,6 +18202,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -20127,7 +20128,7 @@
+
+ if test "x${nautilus_prefix}" != "x${epiphany_prefix}"; then
+ cat >>confdefs.h <<_ACEOF
+-#define NAUTILUS_PREFIX "${nautilus_prefix}"
++#define NAUTILUS_PREFIX "${epiphany_prefix}"
+ _ACEOF
+
+ fi
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 17f6e98a4361..73308a6d0b07 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -39,7 +39,6 @@ share/gnome/epiphany/art/epiphany-tab-loading.gif
share/gnome/epiphany/art/epiphany-unsecure.png
share/gnome/epiphany/art/epiphany-viewsource.png
share/gnome/epiphany/conspiracy.xhtml
-share/gnome/epiphany/default-prefs.js
share/gnome/epiphany/epiphany-bookmark-editor-ui.xml
share/gnome/epiphany/epiphany-history-window-ui.xml
share/gnome/epiphany/epiphany-toolbar.xml
@@ -60,6 +59,7 @@ share/gnome/omf/epiphany/epiphany-C.omf
share/gnome/pixmaps/epiphany-bookmarks.png
share/gnome/pixmaps/epiphany.png
share/locale/am/LC_MESSAGES/epiphany-2.0.mo
+share/locale/be/LC_MESSAGES/epiphany-2.0.mo
share/locale/ca/LC_MESSAGES/epiphany-2.0.mo
share/locale/cs/LC_MESSAGES/epiphany-2.0.mo
share/locale/da/LC_MESSAGES/epiphany-2.0.mo
@@ -70,6 +70,7 @@ share/locale/fr/LC_MESSAGES/epiphany-2.0.mo
share/locale/hu/LC_MESSAGES/epiphany-2.0.mo
share/locale/ja/LC_MESSAGES/epiphany-2.0.mo
share/locale/ko/LC_MESSAGES/epiphany-2.0.mo
+share/locale/li/LC_MESSAGES/epiphany-2.0.mo
share/locale/ms/LC_MESSAGES/epiphany-2.0.mo
share/locale/nl/LC_MESSAGES/epiphany-2.0.mo
share/locale/no/LC_MESSAGES/epiphany-2.0.mo
@@ -81,6 +82,7 @@ share/locale/sr/LC_MESSAGES/epiphany-2.0.mo
share/locale/sr@Latn/LC_MESSAGES/epiphany-2.0.mo
share/locale/sv/LC_MESSAGES/epiphany-2.0.mo
share/locale/tr/LC_MESSAGES/epiphany-2.0.mo
+share/locale/vi/LC_MESSAGES/epiphany-2.0.mo
share/locale/zh_TW/LC_MESSAGES/epiphany-2.0.mo
@dirrm share/gnome/omf/epiphany
@dirrm share/gnome/help/epiphany/C/figures