diff options
| -rw-r--r-- | www/epiphany/Makefile | 10 | ||||
| -rw-r--r-- | www/epiphany/PLIST | 88 | ||||
| -rw-r--r-- | www/epiphany/buildlink3.mk | 7 | ||||
| -rw-r--r-- | www/epiphany/distinfo | 7 | ||||
| -rw-r--r-- | www/epiphany/patches/patch-aa | 16 |
5 files changed, 84 insertions, 44 deletions
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index d406cb24b53..c9b15a7cd6a 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.19 2004/08/31 16:04:48 jmmv Exp $ +# $NetBSD: Makefile,v 1.20 2004/09/21 17:07:58 jmmv Exp $ # -DISTNAME= epiphany-1.2.8 +DISTNAME= epiphany-1.4.0 CATEGORIES= www gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/1.2/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/1.4/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmmv@NetBSD.org @@ -21,6 +21,9 @@ USE_PKGLOCALEDIR= YES CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc +CPPFLAGS+= -I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/find +CPPFLAGS+= -I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/pref + GCONF2_SCHEMAS= epiphany.schemas GCONF2_SCHEMAS+= epiphany-lockdown.schemas @@ -31,6 +34,7 @@ GCONF2_SCHEMAS+= epiphany-lockdown.schemas .include "../../devel/libgnomeui/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" diff --git a/www/epiphany/PLIST b/www/epiphany/PLIST index 315aaf33f53..cc47b158e19 100644 --- a/www/epiphany/PLIST +++ b/www/epiphany/PLIST @@ -1,40 +1,48 @@ -@comment $NetBSD: PLIST,v 1.6 2004/08/31 16:04:48 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.7 2004/09/21 17:07:58 jmmv Exp $ bin/epiphany -bin/epiphany-bin -include/epiphany-1.2/epiphany/ephy-bookmarks.h -include/epiphany-1.2/epiphany/ephy-command-manager.h -include/epiphany-1.2/epiphany/ephy-cookie-manager.h -include/epiphany-1.2/epiphany/ephy-dialog.h -include/epiphany-1.2/epiphany/ephy-embed-event.h -include/epiphany-1.2/epiphany/ephy-embed-persist.h -include/epiphany-1.2/epiphany/ephy-embed-prefs.h -include/epiphany-1.2/epiphany/ephy-embed-shell.h -include/epiphany-1.2/epiphany/ephy-embed-single.h -include/epiphany-1.2/epiphany/ephy-embed.h -include/epiphany-1.2/epiphany/ephy-encodings.h -include/epiphany-1.2/epiphany/ephy-extension.h -include/epiphany-1.2/epiphany/ephy-history.h -include/epiphany-1.2/epiphany/ephy-node-db.h -include/epiphany-1.2/epiphany/ephy-node.h -include/epiphany-1.2/epiphany/ephy-notebook.h -include/epiphany-1.2/epiphany/ephy-password-manager.h -include/epiphany-1.2/epiphany/ephy-permission-manager.h -include/epiphany-1.2/epiphany/ephy-session.h -include/epiphany-1.2/epiphany/ephy-shell.h -include/epiphany-1.2/epiphany/ephy-statusbar.h -include/epiphany-1.2/epiphany/ephy-tab.h -include/epiphany-1.2/epiphany/ephy-window.h +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 lib/bonobo/servers/GNOME_Epiphany_Automation.server -lib/pkgconfig/epiphany-1.2.pc +lib/pkgconfig/epiphany-1.4.pc share/application-registry/epiphany.applications share/applications/bme.desktop share/applications/epiphany.desktop +share/doc/epiphany/EphyCommandManager.html +share/doc/epiphany/EphyEmbed.html +share/doc/epiphany/EphyNodeDb.html +share/doc/epiphany/EphyTab.html +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-EphyEmbedPersist.html +share/doc/epiphany/epiphany-EphyEmbedSingle.html +share/doc/epiphany/epiphany-EphyGlade.html +share/doc/epiphany/epiphany-EphyPermissionManager.html share/doc/epiphany/epiphany-ephy-cookie-manager.html -share/doc/epiphany/epiphany-ephy-embed-factory.html -share/doc/epiphany/epiphany-ephy-embed-single.html share/doc/epiphany/epiphany-ephy-password-manager.html -share/doc/epiphany/epiphany-ephy-permission-manager.html share/doc/epiphany/epiphany-ephy-session.html share/doc/epiphany/epiphany-ephy-shell.html share/doc/epiphany/epiphany.devhelp @@ -43,18 +51,20 @@ share/doc/epiphany/index.html share/doc/epiphany/index.sgml share/doc/epiphany/left.png share/doc/epiphany/right.png +share/doc/epiphany/style.css share/doc/epiphany/up.png share/epiphany/art/epiphany-bookmarks.png 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-tab-loading.gif 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-bookmarksbar.xml share/epiphany/epiphany-fs-toolbar.xml share/epiphany/epiphany-history-window-ui.xml share/epiphany/epiphany-toolbar.xml @@ -65,7 +75,6 @@ share/epiphany/glade/epiphany.glade share/epiphany/glade/prefs-dialog.glade share/epiphany/glade/print.glade share/epiphany/mime-types-permissions.xml -share/epiphany/nautilus-epiphany-view.xml share/gconf/schemas/epiphany-lockdown.schemas share/gconf/schemas/epiphany.schemas share/gnome/help/epiphany/C/epiphany.xml @@ -84,12 +93,19 @@ share/gnome/help/epiphany/eu/epiphany.xml 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/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 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/epiphany.mo ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/epiphany.mo ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/epiphany.mo ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/epiphany.mo ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/epiphany.mo ${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/epiphany.mo +${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/epiphany.mo ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/epiphany.mo ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/epiphany.mo ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/epiphany.mo @@ -119,8 +135,11 @@ ${PKGLOCALEDIR}/locale/li/LC_MESSAGES/epiphany.mo ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/epiphany.mo ${PKGLOCALEDIR}/locale/mi/LC_MESSAGES/epiphany.mo ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/epiphany.mo +${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/epiphany.mo ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/epiphany.mo ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/epiphany.mo +${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/epiphany.mo +${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/epiphany.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/epiphany.mo ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/epiphany.mo ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/epiphany.mo @@ -148,10 +167,13 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/epiphany.mo share/omf/epiphany/epiphany-C.omf share/omf/epiphany/epiphany-es.omf share/omf/epiphany/epiphany-eu.omf +share/omf/epiphany/epiphany-ja.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/ja/figures +@dirrm share/gnome/help/epiphany/ja @dirrm share/gnome/help/epiphany/eu/figures @dirrm share/gnome/help/epiphany/eu @dirrm share/gnome/help/epiphany/es/figures @@ -168,5 +190,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.2/epiphany -@dirrm include/epiphany-1.2 +@dirrm include/epiphany-1.4/epiphany +@dirrm include/epiphany-1.4 diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk index 20691c457b8..14d66420369 100644 --- a/www/epiphany/buildlink3.mk +++ b/www/epiphany/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/04/13 20:23:15 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/09/21 17:07:58 jmmv Exp $ # # This Makefile fragment is included by packages that use epiphany. # @@ -14,12 +14,9 @@ BUILDLINK_DEPENDS+= epiphany .if !empty(EPIPHANY_BUILDLINK3_MK:M+) BUILDLINK_PACKAGES+= epiphany -BUILDLINK_DEPENDS.epiphany+= epiphany>=1.2.2 +BUILDLINK_DEPENDS.epiphany+= epiphany>=1.4.0 BUILDLINK_PKGSRCDIR.epiphany?= ../../www/epiphany -PRINT_PLIST_AWK+= /^@dirrm lib\/epiphany$$/ \ - { print "@comment in epiphany: " $$0; next; } - .include "../../devel/GConf2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libbonoboui/buildlink3.mk" diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo index 4b590bb3f55..927d037d5b0 100644 --- a/www/epiphany/distinfo +++ b/www/epiphany/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.10 2004/08/31 16:04:48 jmmv Exp $ +$NetBSD: distinfo,v 1.11 2004/09/21 17:07:58 jmmv Exp $ -SHA1 (epiphany-1.2.8.tar.bz2) = 5c7c066eef255c08dd574d230cca1f3e4ea2614a -Size (epiphany-1.2.8.tar.bz2) = 2979211 bytes +SHA1 (epiphany-1.4.0.tar.bz2) = 23695a16488c33c26095616e78fab0b76efb6a40 +Size (epiphany-1.4.0.tar.bz2) = 3381335 bytes +SHA1 (patch-aa) = 06772fd02f5399e5e7827f80be089c3584551597 diff --git a/www/epiphany/patches/patch-aa b/www/epiphany/patches/patch-aa new file mode 100644 index 00000000000..7c6bc07176f --- /dev/null +++ b/www/epiphany/patches/patch-aa @@ -0,0 +1,16 @@ +$NetBSD: patch-aa,v 1.5 2004/09/21 17:07:58 jmmv Exp $ + +--- configure.orig 2004-09-13 11:24:48.000000000 +0200 ++++ configure +@@ -21909,7 +21909,11 @@ if test $MOZILLA_VERSION = "trunk"; then + MOZILLA_VERSION=9.0 # use a high number + fi + ++if test `uname` = NetBSD; then ++version=$(echo $MOZILLA_VERSION | sed -E -e 's/([0-9]+|[a-z]+)/\1 /g' -e 's/\.//g') ++else + version=$(echo $MOZILLA_VERSION | sed -e 's/\([0-9]\+\|[a-z]\+\)/\1 /g' -e 's/\.//g') ++fi + + set -- $version; + |