ports/56908: [patch, non-maintainer] Update galeon2 1.3.8 -> 1.3.9

[Simon Barner]

>Number:         56908
>Category:       ports
>Synopsis:       [patch, non-maintainer] Update galeon2 1.3.8 -> 1.3.9
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 15 18:30:18 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Simon Barner
>Release:        FreeBSD 4.9-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD zi025.glhnet.mhn.de 4.9-PRERELEASE FreeBSD 4.9-PRERELEASE #1: Thu Sep 4 20:49:53 CEST 2003 simon at zi025.glhnet.mhn.de:/usr/src/sys/compile/KISTE i386

>Description:

The Galeon team has released a new version which has the following
improvements (from galeon web site):

    * Works with Mozilla 1.4, 1.5a, 1.5b, and trunk
    * Fixes form posting/stylesheet problems that slipped in 1.3.8
    * Remove buggy man, info, toc -protocols, yelp does much better job
    * Bugfixes 

If even after upgrading you're still experiencing form posting/stylesheet
problems, set the default encoding in Preferences/Language (ISO-8859-1 is a
good choice unless you know better) and force reload, clear cache, and/or
restart Galeon. (Mozilla is quite eager serving cached pages.) This fix works
also for 1.3.8.

I changed the port to fetch the bzip2'ed tar-ball, which is much smaller
than the gzip'ed one (about 1.5mb or almost a third).

I also added a pkg-message file, which warns users of the encoding bug
and instructs them to set their default encoding.

This PR supersedes ports/56689.

>How-To-Repeat:
N/A

>Fix:
Please apply the following patch(patch-mozilla_TOCProtocolHandler.[cpp,h]
were removed since galeon2 does not support the ghelp protocol any
longer).

diff -rNu galeon2.orig/Makefile galeon2/Makefile
--- galeon2.orig/Makefile	Tue Sep 16 03:25:59 2003
+++ galeon2/Makefile	Tue Sep 16 03:25:35 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	galeon2
-PORTVERSION=	1.3.8
+PORTVERSION=	1.3.9
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/2$//}
@@ -38,6 +38,7 @@
 .endif
 .endif
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui
 USE_LIBTOOL=	yes
@@ -93,5 +94,12 @@
 
 pre-install:
 	@-${X11BASE}/bin/gconftool-2 --shutdown
+
+post-install:
+.if !defined(BATCH)
+	@${ECHO_MSG}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
+.endif
 
 .include <bsd.port.post.mk>
diff -rNu galeon2.orig/distinfo galeon2/distinfo
--- galeon2.orig/distinfo	Tue Sep 16 03:25:59 2003
+++ galeon2/distinfo	Tue Sep 16 02:09:28 2003
@@ -1 +1 @@
-MD5 (galeon-1.3.8.tar.gz) = 8154fd1854c0e47ffbc93378de011811
+MD5 (galeon-1.3.9.tar.bz2) = f948047373884a0dc8d841930d11680c
diff -rNu galeon2.orig/files/patch-mozilla_TOCProtocolHandler.cpp galeon2/files/patch-mozilla_TOCProtocolHandler.cpp
--- galeon2.orig/files/patch-mozilla_TOCProtocolHandler.cpp	Tue Sep 16 03:25:59 2003
+++ galeon2/files/patch-mozilla_TOCProtocolHandler.cpp	Thu Jan  1 01:00:00 1970
@@ -1,40 +0,0 @@
---- mozilla/TOCProtocolHandler.cpp.orig	Sat Jun 14 11:42:57 2003
-+++ mozilla/TOCProtocolHandler.cpp	Mon Jul 21 11:30:04 2003
-@@ -83,8 +83,8 @@
- 	oStream->Write (str.c_str(), str.size(), &bytesWriten);
- 
- static void ParseEnvPath(const nsCString &path, list<string> &dirs);
--static int gHelpSelect (const struct dirent *dirEntry);
--static int gnomeHelpSelect (const struct dirent *dirEntry);
-+static int gHelpSelect (struct dirent *dirEntry);
-+static int gnomeHelpSelect (struct dirent *dirEntry);
- static void RenderContentType (nsIOutputStream *oStream, PRUint32 &bytesWriten);
- 
- /* Implementation file */
-@@ -362,7 +362,7 @@
- }
- 
- NS_METHOD GTOCProtocolHandler::CreateHelpPage (const char *type,
--					       int (*select)(const struct dirent *))
-+					       int (*select)(struct dirent *))
- {
- 	nsresult rv;
- 
-@@ -445,7 +445,7 @@
- 	}
- }
- 
--int gHelpSelect (const struct dirent *dirEntry)
-+int gHelpSelect (struct dirent *dirEntry)
- {
- #ifdef NOT_PORTED
- 	char *helpPath = gnome_help_file_find_file (
-@@ -461,7 +461,7 @@
- #endif
- }
- 
--int gnomeHelpSelect (const struct dirent *dirEntry)
-+int gnomeHelpSelect (struct dirent *dirEntry)
- {
- #ifdef NOT_PORTED
- 	nsCString fileName = dirEntry->d_name;
diff -rNu galeon2.orig/files/patch-mozilla_TOCProtocolHandler.h galeon2/files/patch-mozilla_TOCProtocolHandler.h
--- galeon2.orig/files/patch-mozilla_TOCProtocolHandler.h	Tue Sep 16 03:25:59 2003
+++ galeon2/files/patch-mozilla_TOCProtocolHandler.h	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- mozilla/TOCProtocolHandler.h.orig	Wed Nov 20 15:25:05 2002
-+++ mozilla/TOCProtocolHandler.h	Wed Nov 20 15:25:10 2002
-@@ -55,7 +55,7 @@
-   	NS_METHOD CreateInfoPage (void);
-   	NS_METHOD CreateManPage (void);
-   	NS_METHOD CreateHelpPage (const char *type,
--  				  int (*select)(const struct dirent *));
-+  				  int (*select)(struct dirent *));
-   	nsCOMPtr<nsIURI> mURI;
- 	nsCOMPtr<nsIChannel> mChannel;
- 	nsCOMPtr<nsIStorageStream> mStream;
diff -rNu galeon2.orig/pkg-message galeon2/pkg-message
--- galeon2.orig/pkg-message	Thu Jan  1 01:00:00 1970
+++ galeon2/pkg-message	Tue Sep 16 03:15:54 2003
@@ -0,0 +1,3 @@
+If you're experiencing form posting/stylesheet problems, please set the default
+encoding in Preferences/Language (ISO-8859-1 is a good choice unless you know
+better) and force reload, clear cache, and/or restart Galeon.
diff -rNu galeon2.orig/pkg-plist galeon2/pkg-plist
--- galeon2.orig/pkg-plist	Tue Sep 16 03:25:59 2003
+++ galeon2/pkg-plist	Tue Sep 16 02:37:13 2003
@@ -172,7 +172,6 @@
 share/gnome/galeon/spinners/pipeon/014.png
 share/gnome/galeon/spinners/pipeon/rest.png
 share/gnome/galeon/stocks.png
-share/gnome/galeon/toc.css
 share/gnome/galeon/toolbar-editor.glade
 share/gnome/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml
 share/gnome/gnome-2.0/ui/galeon-ui.xml
>Release-Note:
>Audit-Trail:
>Unformatted: