Update to 1.7.3, and fix the build with WITH_MOZILLA=mozilla. Note: I'm not

happy with the hack needed to build the Ukranian help translation.  I
basically had to remove the translator's name from the copyright holder
list.  I have a feeling non-ASCII characters are not permitted here.  I will
be filing a bug on this.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4333 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 46 insertions, 13 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 2868610a3..fd722caf4 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/epiphany/Makefile,v 1.75 2005/07/14 05:52:04 ahze Exp $
+#   $MCom: ports/www/epiphany/Makefile,v 1.76 2005/07/22 04:33:39 ahze Exp $
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	1.7.2
-PORTREVISION=	1
+PORTVERSION=	1.7.3
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.7
@@ -31,9 +30,9 @@ MOZILLA=	firefox
 HEADERS_SUFX=
 MOZ_BUILD=	firefox
 .else
-.if ${WITH_MOZILLA}=="firefox"
-MOZILLA=	firefox
-MOZ_BUILD=	firefox
+.if ${WITH_MOZILLA}=="mozilla"
+MOZILLA=	mozilla
+MOZ_BUILD=	mozilla
 .else
 .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2"
 MOZILLA=	mozilla-devel
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index f41913c55..6a21cd2c4 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/epiphany-1.7.2.tar.bz2) = 241844be26a49a2c4e014b0ef983cf70
-SIZE (gnome2/epiphany-1.7.2.tar.bz2) = 3106227
+MD5 (gnome2/epiphany-1.7.3.tar.bz2) = 555cce01c7727a6492efb745134dc568
+SIZE (gnome2/epiphany-1.7.3.tar.bz2) = 3303146
diff --git a/www/epiphany/files/patch-help_Makefile.in b/www/epiphany/files/patch-help_Makefile.in
new file mode 100644
index 000000000..1b9f2bb6f
--- /dev/null
+++ b/www/epiphany/files/patch-help_Makefile.in
@@ -0,0 +1,11 @@
+--- help/Makefile.in.orig	Wed Jul 27 02:50:59 2005
++++ help/Makefile.in	Wed Jul 27 02:51:22 2005
+@@ -972,7 +972,7 @@
+ 	    else \
+ 	      figfile="$(srcdir)/C/$$fig"; \
+ 	    fi; \
+-	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \
++	    figdir="$$lc/"`echo $$fig | sed -E -e 's/^(.*\/).*|.*/\1/'`; \
+ 	    figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
+ 	    if ! test -d "$$figdir"; then \
+ 	      echo "$(mkinstalldirs) $$figdir"; \
diff --git a/www/epiphany/files/patch-help_uk_uk.po b/www/epiphany/files/patch-help_uk_uk.po
new file mode 100644
index 000000000..e9d976f92
--- /dev/null
+++ b/www/epiphany/files/patch-help_uk_uk.po
@@ -0,0 +1,18 @@
+--- help/uk/uk.po.orig	Wed Jul 27 02:52:17 2005
++++ help/uk/uk.po	Wed Jul 27 02:34:45 2005
+@@ -1866,14 +1866,9 @@
+ #: epiphany.xml:2550 
+ msgid "This manual was written by David Bordoley (<email>bordoley@msu.edu</email>), Piers Cornwell (<email>piers@gnome.org</email>) and Patanjali Somayaji (<email>patanjali@codito.com</email>)."
+ msgstr ""
+-"Цю довідку написав David Bordoley (<email>bordoley@msu.edu</email>), Piers Cornwell (<email>piers@gnome.org</email>) та Patanjali Somayaji (<email>patanjali@codito.com</email>). Переклад виконав Максим Дзюманенко (<email>mvd@mylinux.com.ua</email>)"
++"Цю довідку написав David Bordoley (<email>bordoley@msu.edu</email>), Piers Cornwell (<email>piers@gnome.org</email>) та Patanjali Somayaji (<email>patanjali@codito.com</email>)."
+ 
+ #: epiphany.xml:2557 
+ msgid "This program is distributed under the terms of the GNU General Public license as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this license can be found at this <ulink url=\"ghelp:gpl\" type=\"help\">link</ulink>, or in the file COPYING included with the source code of this program."
+ msgstr ""
+ "Ця програма поширюється на умовах Публічної ліцензії GNU, яку опубліковано Фондом вільного ПЗ; версією 2 цієї ліцензії, або (на ваш розсуд) будь-якою пізнішою версією ліцензією. Копію цієї ліцензії можна знайти за цим <ulink url=\"ghelp:gpl\" type=\"help\">посиланням</ulink>, або у файлі COPYING, що включений у код цієї програми."
+-
+-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
+-#: epiphany.xml:0 
+-msgid "translator-credits"
+-msgstr "Максим Дзюманенко <mvd@mylinux.com.ua>, 2003, 2005"
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index bd6b4841b..e5a73652f 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -95,34 +95,37 @@ share/gnome/help/epiphany/es/figures/ephy-addressbar-smartbookmark-screenshot.pn
 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
 share/gnome/omf/epiphany/epiphany-C.omf
 share/gnome/omf/epiphany/epiphany-es.omf
 share/gnome/omf/epiphany/epiphany-eu.omf
 share/gnome/omf/epiphany/epiphany-fi.omf
 share/gnome/omf/epiphany/epiphany-ja.omf
+share/gnome/omf/epiphany/epiphany-nl.omf
 share/gnome/omf/epiphany/epiphany-uk.omf
 share/gnome/pixmaps/epiphany-bookmarks.png
 share/locale/am/LC_MESSAGES/epiphany.mo
@@ -195,6 +198,8 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 @dirrm share/gnome/omf/epiphany
 @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