summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/epiphany/Makefile19
-rw-r--r--www/epiphany/PLIST78
-rw-r--r--www/epiphany/buildlink3.mk8
-rw-r--r--www/epiphany/distinfo8
4 files changed, 70 insertions, 43 deletions
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 98003a783e2..21c4ac9402f 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2005/02/26 17:25:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.29 2005/03/22 16:26:14 jmmv Exp $
#
-DISTNAME= epiphany-1.4.8
+DISTNAME= epiphany-1.6.0
CATEGORIES= www gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/1.4/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/1.6/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= jmmv@NetBSD.org
@@ -17,8 +17,11 @@ USE_BUILDLINK3= YES
USE_DIRS+= gnome2-1.5
USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
+USE_MSGFMT_PLURALS= YES
USE_PKGLOCALEDIR= YES
+PKGCONFIG_OVERRIDE= data/epiphany-1.6.pc.in
+
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
CPPFLAGS+= -I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/docshell
@@ -29,18 +32,28 @@ CPPFLAGS+= -I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/pref
GCONF2_SCHEMAS= epiphany.schemas
GCONF2_SCHEMAS+= epiphany-lockdown.schemas
+BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
+BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.0
+BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.6.3
+BUILDLINK_DEPENDS.pango+= pango>=1.8.0
+
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../www/mozilla-gtk2/buildlink3.mk"
+.include "../../x11/gnome-desktop/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/epiphany/PLIST b/www/epiphany/PLIST
index 6af139cff2c..a1ee2ab7484 100644
--- a/www/epiphany/PLIST
+++ b/www/epiphany/PLIST
@@ -1,31 +1,38 @@
-@comment $NetBSD: PLIST,v 1.11 2005/02/26 17:25:23 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/03/22 16:26:14 jmmv Exp $
bin/epiphany
-include/epiphany-1.4/epiphany/ephy-bookmarks.h
-include/epiphany-1.4/epiphany/ephy-command-manager.h
-include/epiphany-1.4/epiphany/ephy-cookie-manager.h
-include/epiphany-1.4/epiphany/ephy-dialog.h
-include/epiphany-1.4/epiphany/ephy-embed-event.h
-include/epiphany-1.4/epiphany/ephy-embed-factory.h
-include/epiphany-1.4/epiphany/ephy-embed-persist.h
-include/epiphany-1.4/epiphany/ephy-embed-prefs.h
-include/epiphany-1.4/epiphany/ephy-embed-shell.h
-include/epiphany-1.4/epiphany/ephy-embed-single.h
-include/epiphany-1.4/epiphany/ephy-embed.h
-include/epiphany-1.4/epiphany/ephy-encodings.h
-include/epiphany-1.4/epiphany/ephy-extension.h
-include/epiphany-1.4/epiphany/ephy-history.h
-include/epiphany-1.4/epiphany/ephy-node-db.h
-include/epiphany-1.4/epiphany/ephy-node.h
-include/epiphany-1.4/epiphany/ephy-notebook.h
-include/epiphany-1.4/epiphany/ephy-password-manager.h
-include/epiphany-1.4/epiphany/ephy-permission-manager.h
-include/epiphany-1.4/epiphany/ephy-session.h
-include/epiphany-1.4/epiphany/ephy-shell.h
-include/epiphany-1.4/epiphany/ephy-statusbar.h
-include/epiphany-1.4/epiphany/ephy-tab.h
-include/epiphany-1.4/epiphany/ephy-window.h
+include/epiphany-1.6/epiphany/ephy-bookmarks-type-builtins.h
+include/epiphany-1.6/epiphany/ephy-bookmarks.h
+include/epiphany-1.6/epiphany/ephy-command-manager.h
+include/epiphany-1.6/epiphany/ephy-cookie-manager.h
+include/epiphany-1.6/epiphany/ephy-dialog.h
+include/epiphany-1.6/epiphany/ephy-embed-event.h
+include/epiphany-1.6/epiphany/ephy-embed-factory.h
+include/epiphany-1.6/epiphany/ephy-embed-persist.h
+include/epiphany-1.6/epiphany/ephy-embed-prefs.h
+include/epiphany-1.6/epiphany/ephy-embed-shell.h
+include/epiphany-1.6/epiphany/ephy-embed-single.h
+include/epiphany-1.6/epiphany/ephy-embed-type-builtins.h
+include/epiphany-1.6/epiphany/ephy-embed.h
+include/epiphany-1.6/epiphany/ephy-extension.h
+include/epiphany-1.6/epiphany/ephy-extensions-manager.h
+include/epiphany-1.6/epiphany/ephy-history.h
+include/epiphany-1.6/epiphany/ephy-lib-type-builtins.h
+include/epiphany-1.6/epiphany/ephy-link.h
+include/epiphany-1.6/epiphany/ephy-loader.h
+include/epiphany-1.6/epiphany/ephy-node-db.h
+include/epiphany-1.6/epiphany/ephy-node.h
+include/epiphany-1.6/epiphany/ephy-notebook.h
+include/epiphany-1.6/epiphany/ephy-password-manager.h
+include/epiphany-1.6/epiphany/ephy-permission-manager.h
+include/epiphany-1.6/epiphany/ephy-session.h
+include/epiphany-1.6/epiphany/ephy-shell.h
+include/epiphany-1.6/epiphany/ephy-state.h
+include/epiphany-1.6/epiphany/ephy-statusbar.h
+include/epiphany-1.6/epiphany/ephy-tab.h
+include/epiphany-1.6/epiphany/ephy-type-builtins.h
+include/epiphany-1.6/epiphany/ephy-window.h
lib/bonobo/servers/GNOME_Epiphany_Automation.server
-lib/pkgconfig/epiphany-1.4.pc
+lib/pkgconfig/epiphany-1.6.pc
man/man1/epiphany.1
share/application-registry/epiphany.applications
share/applications/bme.desktop
@@ -41,6 +48,7 @@ share/doc/epiphany/EphyWindow.html
share/doc/epiphany/ch01.html
share/doc/epiphany/ch02.html
share/doc/epiphany/epiphany-EphyEmbedFactory.html
+share/doc/epiphany/epiphany-EphyExtensionsManager.html
share/doc/epiphany/epiphany-EphyGlade.html
share/doc/epiphany/epiphany-ephy-cookie-manager.html
share/doc/epiphany/epiphany-ephy-password-manager.html
@@ -59,13 +67,12 @@ share/epiphany/art/epiphany-download.png
share/epiphany/art/epiphany-entry.png
share/epiphany/art/epiphany-history.png
share/epiphany/art/epiphany-popup-hidden.png
-share/epiphany/art/epiphany-secure.png
-share/epiphany/art/epiphany-unsecure.png
share/epiphany/art/hand-open.png
-share/epiphany/conspiracy.xhtml
share/epiphany/default-prefs.js
share/epiphany/epiphany-bookmark-editor-ui.xml
+share/epiphany/epiphany-bookmarks-html.xsl
share/epiphany/epiphany-bookmarksbar.xml
+share/epiphany/epiphany-extension.xsd
share/epiphany/epiphany-fs-toolbar.xml
share/epiphany/epiphany-history-window-ui.xml
share/epiphany/epiphany-toolbar.xml
@@ -106,6 +113,12 @@ share/gnome/help/epiphany/ja/figures/ephy-bookmarkbar-smartbookmark-screenshot.p
share/gnome/help/epiphany/ja/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/ja/figures/ephy-screenshot.png
share/gnome/help/epiphany/ja/legal.xml
+share/gnome/help/epiphany/uk/epiphany.xml
+share/gnome/help/epiphany/uk/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/uk/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/uk/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/uk/figures/ephy-screenshot.png
+share/gnome/help/epiphany/uk/legal.xml
${PKGLOCALEDIR}/locale/am/LC_MESSAGES/epiphany.mo
${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/epiphany.mo
${PKGLOCALEDIR}/locale/az/LC_MESSAGES/epiphany.mo
@@ -176,10 +189,13 @@ share/omf/epiphany/epiphany-es.omf
share/omf/epiphany/epiphany-eu.omf
share/omf/epiphany/epiphany-fi.omf
share/omf/epiphany/epiphany-ja.omf
+share/omf/epiphany/epiphany-uk.omf
share/pixmaps/epiphany-bookmarks.png
@comment in xdg-dirs: @dirrm share/pixmaps
@dirrm share/omf/epiphany
@comment in scrollkeeper: @dirrm share/omf
+@dirrm share/gnome/help/epiphany/uk/figures
+@dirrm share/gnome/help/epiphany/uk
@dirrm share/gnome/help/epiphany/ja/figures
@dirrm share/gnome/help/epiphany/ja
@dirrm share/gnome/help/epiphany/fi/figures
@@ -200,5 +216,5 @@ share/pixmaps/epiphany-bookmarks.png
@comment in xdg-dirs: @dirrm share/applications
@comment in xdg-dirs: @dirrm share/application-registry
@comment in libbonobo: @dirrm lib/bonobo/servers
-@dirrm include/epiphany-1.4/epiphany
-@dirrm include/epiphany-1.4
+@dirrm include/epiphany-1.6/epiphany
+@dirrm include/epiphany-1.6
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
index 4061c62c480..37e8fa48b72 100644
--- a/www/epiphany/buildlink3.mk
+++ b/www/epiphany/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/01/03 22:49:01 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/03/22 16:26:14 jmmv Exp $
#
# This Makefile fragment is included by packages that use epiphany.
#
@@ -14,17 +14,15 @@ BUILDLINK_DEPENDS+= epiphany
.if !empty(EPIPHANY_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= epiphany
-BUILDLINK_DEPENDS.epiphany+= epiphany>=1.4.7
+BUILDLINK_DEPENDS.epiphany+= epiphany>=1.6.0
BUILDLINK_PKGSRCDIR.epiphany?= ../../www/epiphany
.include "../../devel/GConf2/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libbonoboui/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../sysutils/nautilus/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../www/mozilla-gtk2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 0cffc83bb2a..3b06437cc18 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.19 2005/02/26 17:25:23 jmmv Exp $
+$NetBSD: distinfo,v 1.20 2005/03/22 16:26:14 jmmv Exp $
-SHA1 (epiphany-1.4.8.tar.bz2) = 35ca720d1f3c58a9d3c17115a63146fb1a62c44f
-RMD160 (epiphany-1.4.8.tar.bz2) = 5e626ec1ab08a88a15e5b787ae690056ffbf3c21
-Size (epiphany-1.4.8.tar.bz2) = 3594408 bytes
+SHA1 (epiphany-1.6.0.tar.bz2) = fea937fc7980f2b82301a5c5b5c2acbcf15374a0
+RMD160 (epiphany-1.6.0.tar.bz2) = 2b8670023b5a8f2c20c03ee3c69a5b3cbbd35b35
+Size (epiphany-1.6.0.tar.bz2) = 2983514 bytes