Update to 1.3.5.

4 files changed, 9 insertions, 34 deletions

diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 9c8293ba61b7..f2ff4eaa5a4b 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	galeon2
-PORTVERSION=	1.3.4
+PORTVERSION=	1.3.5
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/2$//}
@@ -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.4b"
 .else
 MOZILLA=	mozilla-gtk2
 HEADERS_SUFX=
@@ -75,9 +75,8 @@ pre-everything::
 	@${ECHO_MSG} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g' \
+		${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
 		 's|-lpthread|${PTHREAD_LIBS}|g'
 	@${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo
index 1c077b59911d..425c6e0ff5b5 100644
--- a/www/galeon2/distinfo
+++ b/www/galeon2/distinfo
@@ -1 +1 @@
-MD5 (galeon-1.3.4.tar.gz) = 07a37532c00981150605478854180936
+MD5 (galeon-1.3.5.tar.gz) = 0bba66cc1a156f25547974e5b979389e
diff --git a/www/galeon2/files/patch-mozilla_GaleonWrapper.cpp b/www/galeon2/files/patch-mozilla_GaleonWrapper.cpp
deleted file mode 100644
index dca228aec48f..000000000000
--- a/www/galeon2/files/patch-mozilla_GaleonWrapper.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- mozilla/GaleonWrapper.cpp.orig	Fri May 16 17:21:37 2003
-+++ mozilla/GaleonWrapper.cpp	Fri May 16 17:23:41 2003
-@@ -70,7 +70,11 @@
- #include "nsCWebBrowser.h"
- #include "nsReadableUtils.h"
- #include "nsUnicharUtils.h"
-+#if MOZILLA_SNAPSHOT > 7
-+#include "nsIDOMNSDocument.h"
-+#else
- #include "nsIDOMNSHTMLDocument.h"
-+#endif
- #include "nsIDOMHTMLDocument.h"
- #include "nsIDOMHTMLCollection.h"
- #include "nsIDOMHTMLElement.h"
-@@ -1106,8 +1110,13 @@
- 	result = GetDOMDocument (getter_AddRefs(DOMDocument));
- 	if (NS_FAILED(result) || !DOMDocument) return NS_ERROR_FAILURE;
- 
-+#if MOZILLA_SNAPSHOT > 7
-+	nsCOMPtr<nsIDOMNSDocument> doc = do_QueryInterface(DOMDocument);
-+	if (!doc) return NS_ERROR_FAILURE;
-+#else
- 	nsCOMPtr<nsIDOMNSHTMLDocument> doc = do_QueryInterface(DOMDocument);
- 	if(!doc) return NS_ERROR_FAILURE;
-+#endif
- 
- 	nsAutoString value;
- 	doc->GetLastModified(value);
diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist
index ae9b681d9ecc..c30c1bc5a29f 100644
--- a/www/galeon2/pkg-plist
+++ b/www/galeon2/pkg-plist
@@ -64,6 +64,7 @@ share/gnome/galeon/Insecure.png
 share/gnome/galeon/Secure.png
 share/gnome/galeon/about_logo.png
 share/gnome/galeon/autoscroll.xpm
+share/gnome/galeon/blocked.png
 share/gnome/galeon/bookmarks-editor.glade
 share/gnome/galeon/bookmarks.glade
 share/gnome/galeon/bug.png
@@ -198,6 +199,7 @@ share/gnome/pixmaps/galeon.png
 share/gnome/sounds/galeon/clicked.wav
 share/locale/am/LC_MESSAGES/galeon-2.0.mo
 share/locale/az/LC_MESSAGES/galeon-2.0.mo
+share/locale/be/LC_MESSAGES/galeon-2.0.mo
 share/locale/bg/LC_MESSAGES/galeon-2.0.mo
 share/locale/ca/LC_MESSAGES/galeon-2.0.mo
 share/locale/cs/LC_MESSAGES/galeon-2.0.mo
@@ -230,6 +232,8 @@ share/locale/ro/LC_MESSAGES/galeon-2.0.mo
 share/locale/ru/LC_MESSAGES/galeon-2.0.mo
 share/locale/sk/LC_MESSAGES/galeon-2.0.mo
 share/locale/sl/LC_MESSAGES/galeon-2.0.mo
+share/locale/sr/LC_MESSAGES/galeon-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/galeon-2.0.mo
 share/locale/sv/LC_MESSAGES/galeon-2.0.mo
 share/locale/ta/LC_MESSAGES/galeon-2.0.mo
 share/locale/tr/LC_MESSAGES/galeon-2.0.mo