summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/epiphany/Makefile20
-rw-r--r--www/epiphany/PLIST96
-rw-r--r--www/epiphany/buildlink3.mk4
-rw-r--r--www/epiphany/distinfo9
-rw-r--r--www/epiphany/patches/patch-aa13
5 files changed, 86 insertions, 56 deletions
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 38e838e7f23..6ad3cf593b1 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2005/10/12 22:04:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.42 2005/10/14 21:47:59 jmmv Exp $
#
-DISTNAME= epiphany-1.6.5
-PKGREVISION= 2
+DISTNAME= epiphany-1.8.2
CATEGORIES= www gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/1.6/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/1.8/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= jmmv@NetBSD.org
@@ -20,7 +19,7 @@ USE_LIBTOOL= YES
USE_MSGFMT_PLURALS= YES
USE_PKGLOCALEDIR= YES
-PKGCONFIG_OVERRIDE= data/epiphany-1.6.pc.in
+PKGCONFIG_OVERRIDE= data/epiphany-1.8.pc.in
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
@@ -47,23 +46,24 @@ CFLAGS+= -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.glib2+= glib2>=2.8.0
BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.0
-BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.6.10
-BUILDLINK_DEPENDS.pango+= pango>=1.8.0
+BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.8.3
.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 "../../net/ORBit2/buildlink3.mk"
+.include "../../print/libgnomeprint/buildlink3.mk"
+.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/www/epiphany/PLIST b/www/epiphany/PLIST
index 92fcfa7c56d..730cb4ebfd0 100644
--- a/www/epiphany/PLIST
+++ b/www/epiphany/PLIST
@@ -1,38 +1,38 @@
-@comment $NetBSD: PLIST,v 1.14 2005/07/07 17:06:57 drochner Exp $
+@comment $NetBSD: PLIST,v 1.15 2005/10/14 21:47:59 jmmv Exp $
bin/epiphany
-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
+include/epiphany/1.8/epiphany/ephy-bookmarks-type-builtins.h
+include/epiphany/1.8/epiphany/ephy-bookmarks.h
+include/epiphany/1.8/epiphany/ephy-command-manager.h
+include/epiphany/1.8/epiphany/ephy-cookie-manager.h
+include/epiphany/1.8/epiphany/ephy-dialog.h
+include/epiphany/1.8/epiphany/ephy-embed-event.h
+include/epiphany/1.8/epiphany/ephy-embed-factory.h
+include/epiphany/1.8/epiphany/ephy-embed-persist.h
+include/epiphany/1.8/epiphany/ephy-embed-prefs.h
+include/epiphany/1.8/epiphany/ephy-embed-shell.h
+include/epiphany/1.8/epiphany/ephy-embed-single.h
+include/epiphany/1.8/epiphany/ephy-embed-type-builtins.h
+include/epiphany/1.8/epiphany/ephy-embed.h
+include/epiphany/1.8/epiphany/ephy-extension.h
+include/epiphany/1.8/epiphany/ephy-extensions-manager.h
+include/epiphany/1.8/epiphany/ephy-history.h
+include/epiphany/1.8/epiphany/ephy-lib-type-builtins.h
+include/epiphany/1.8/epiphany/ephy-link.h
+include/epiphany/1.8/epiphany/ephy-loader.h
+include/epiphany/1.8/epiphany/ephy-node-db.h
+include/epiphany/1.8/epiphany/ephy-node.h
+include/epiphany/1.8/epiphany/ephy-notebook.h
+include/epiphany/1.8/epiphany/ephy-password-manager.h
+include/epiphany/1.8/epiphany/ephy-permission-manager.h
+include/epiphany/1.8/epiphany/ephy-session.h
+include/epiphany/1.8/epiphany/ephy-shell.h
+include/epiphany/1.8/epiphany/ephy-state.h
+include/epiphany/1.8/epiphany/ephy-statusbar.h
+include/epiphany/1.8/epiphany/ephy-tab.h
+include/epiphany/1.8/epiphany/ephy-type-builtins.h
+include/epiphany/1.8/epiphany/ephy-window.h
lib/bonobo/servers/GNOME_Epiphany_Automation.server
-lib/pkgconfig/epiphany-1.6.pc
+lib/pkgconfig/epiphany-1.8.pc
man/man1/epiphany.1
share/application-registry/epiphany.applications
share/applications/bme.desktop
@@ -92,34 +92,41 @@ share/gnome/help/epiphany/C/figures/ephy-bookmarkbar-smartbookmark-screenshot.pn
share/gnome/help/epiphany/C/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/C/figures/ephy-screenshot.png
share/gnome/help/epiphany/C/legal.xml
+share/gnome/help/epiphany/el/epiphany.xml
+share/gnome/help/epiphany/el/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/el/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/el/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/el/figures/ephy-screenshot.png
share/gnome/help/epiphany/es/epiphany.xml
share/gnome/help/epiphany/es/figures/ephy-addressbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/es/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/es/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/es/figures/ephy-screenshot.png
-share/gnome/help/epiphany/es/legal.xml
share/gnome/help/epiphany/eu/epiphany.xml
+share/gnome/help/epiphany/eu/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/eu/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/eu/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/eu/figures/ephy-screenshot.png
-share/gnome/help/epiphany/eu/legal.xml
share/gnome/help/epiphany/fi/epiphany.xml
share/gnome/help/epiphany/fi/figures/ephy-addressbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/fi/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/fi/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/fi/figures/ephy-screenshot.png
-share/gnome/help/epiphany/fi/legal.xml
share/gnome/help/epiphany/ja/epiphany.xml
share/gnome/help/epiphany/ja/figures/ephy-addressbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/ja/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
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/nl/epiphany.xml
+share/gnome/help/epiphany/nl/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/nl/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/nl/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/nl/figures/ephy-screenshot.png
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
@@ -153,6 +160,7 @@ ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/epiphany.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/epiphany.mo
${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/epiphany.mo
${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/epiphany.mo
+${PKGLOCALEDIR}/locale/ku/LC_MESSAGES/epiphany.mo
${PKGLOCALEDIR}/locale/li/LC_MESSAGES/epiphany.mo
${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/epiphany.mo
${PKGLOCALEDIR}/locale/mi/LC_MESSAGES/epiphany.mo
@@ -179,6 +187,7 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/epiphany.mo
${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/epiphany.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/epiphany.mo
${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/epiphany.mo
+${PKGLOCALEDIR}/locale/te/LC_MESSAGES/epiphany.mo
${PKGLOCALEDIR}/locale/th/LC_MESSAGES/epiphany.mo
${PKGLOCALEDIR}/locale/tk/LC_MESSAGES/epiphany.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/epiphany.mo
@@ -188,10 +197,12 @@ ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/epiphany.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/epiphany.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/epiphany.mo
share/omf/epiphany/epiphany-C.omf
+share/omf/epiphany/epiphany-el.omf
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-nl.omf
share/omf/epiphany/epiphany-uk.omf
share/pixmaps/epiphany-bookmarks.png
@comment in xdg-dirs: @dirrm share/pixmaps
@@ -199,6 +210,8 @@ share/pixmaps/epiphany-bookmarks.png
@comment in scrollkeeper: @dirrm share/omf
@dirrm share/gnome/help/epiphany/uk/figures
@dirrm share/gnome/help/epiphany/uk
+@dirrm share/gnome/help/epiphany/nl/figures
+@dirrm share/gnome/help/epiphany/nl
@dirrm share/gnome/help/epiphany/ja/figures
@dirrm share/gnome/help/epiphany/ja
@dirrm share/gnome/help/epiphany/fi/figures
@@ -207,6 +220,8 @@ share/pixmaps/epiphany-bookmarks.png
@dirrm share/gnome/help/epiphany/eu
@dirrm share/gnome/help/epiphany/es/figures
@dirrm share/gnome/help/epiphany/es
+@dirrm share/gnome/help/epiphany/el/figures
+@dirrm share/gnome/help/epiphany/el
@dirrm share/gnome/help/epiphany/C/figures
@dirrm share/gnome/help/epiphany/C
@dirrm share/gnome/help/epiphany
@@ -219,5 +234,6 @@ 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.6/epiphany
-@dirrm include/epiphany-1.6
+@dirrm include/epiphany/1.8/epiphany
+@dirrm include/epiphany/1.8
+@dirrm include/epiphany
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
index cefb550d51f..0ca0f910a1a 100644
--- a/www/epiphany/buildlink3.mk
+++ b/www/epiphany/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/07/22 14:12:22 dillo Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2005/10/14 21:47:59 jmmv Exp $
#
# This Makefile fragment is included by packages that use epiphany.
#
@@ -14,7 +14,7 @@ BUILDLINK_DEPENDS+= epiphany
.if !empty(EPIPHANY_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= epiphany
-BUILDLINK_DEPENDS.epiphany+= epiphany>=1.6.0
+BUILDLINK_DEPENDS.epiphany+= epiphany>=1.8.0
BUILDLINK_PKGSRCDIR.epiphany?= ../../www/epiphany
.include "../../mk/bsd.prefs.mk"
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index df08a2d3d67..94b7db0587f 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.23 2005/08/23 11:49:10 jmmv Exp $
+$NetBSD: distinfo,v 1.24 2005/10/14 21:47:59 jmmv Exp $
-SHA1 (epiphany-1.6.5.tar.bz2) = b8ef873662eb041431142f4e14a77d8fb0ac00f9
-RMD160 (epiphany-1.6.5.tar.bz2) = 6178f6b99ca04b26652274e02f86f7b690fd23fb
-Size (epiphany-1.6.5.tar.bz2) = 3037945 bytes
+SHA1 (epiphany-1.8.2.tar.bz2) = 245320c298b807ccf066ab6346b9988b5a97ef6f
+RMD160 (epiphany-1.8.2.tar.bz2) = 8fcc70a936a55ac33ef716f83b12ff6609110042
+Size (epiphany-1.8.2.tar.bz2) = 3354620 bytes
+SHA1 (patch-aa) = 84230bd6ac8dd58a707512f3102ef3f7e96f39af
diff --git a/www/epiphany/patches/patch-aa b/www/epiphany/patches/patch-aa
new file mode 100644
index 00000000000..f5dd9af496a
--- /dev/null
+++ b/www/epiphany/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.7 2005/10/14 21:47:59 jmmv Exp $
+
+--- help/Makefile.in.orig 2005-10-02 23:39:48.000000000 +0200
++++ help/Makefile.in
+@@ -977,7 +977,7 @@ install-doc-figs:
+ else \
+ figfile="$(srcdir)/C/$$fig"; \
+ fi; \
+- figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \
++ figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/'`; \
+ figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
+ if ! test -d "$$figdir"; then \
+ echo "$(mkinstalldirs) $$figdir"; \