4 files changed, 2 insertions, 243 deletions

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 10821ed2375f..53a6b06b213f 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	galeon
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.3
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
index 3e25057b68de..8db878f2175b 100644
--- a/www/galeon/distinfo
+++ b/www/galeon/distinfo
@@ -1 +1 @@
-MD5 (galeon-1.2.2.tar.gz) = 487fffb2713ff767c012065961e62e15
+MD5 (galeon-1.2.3.tar.gz) = 19f9888e0493e6ca5da4752d3dfb5137
diff --git a/www/galeon/files/patch-1.0.rc3 b/www/galeon/files/patch-1.0.rc3
deleted file mode 100644
index be2be6fd094d..000000000000
--- a/www/galeon/files/patch-1.0.rc3
+++ /dev/null
@@ -1,221 +0,0 @@
---- src/mozilla/mozilla.cpp	2002/05/24 13:41:30	1.1
-+++ src/mozilla/mozilla.cpp	2002/05/24 13:42:17
-@@ -367,7 +367,7 @@
- 		if (NS_FAILED(rv) || !persist) return NS_ERROR_FAILURE;
- 
- 		nsCOMPtr<nsILocalFile> file;
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 		NS_NewNativeLocalFile(nsDependentCString(filename), PR_TRUE, getter_AddRefs(file)); 
- #else
- 		NS_NewLocalFile(filename, PR_TRUE, getter_AddRefs(file)); 
-@@ -1841,7 +1841,7 @@
- {
- 	nsresult rv;
- 	nsCOMPtr<nsILocalFile> localFile;
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 	rv = NS_NewNativeLocalFile(nsDependentCString(filename), PR_TRUE, getter_AddRefs(localFile)); 
- #else
- 	rv = NS_NewLocalFile(filename, PR_TRUE, getter_AddRefs(localFile)); 
---- src/mozilla/ContentHandler.cpp	2002/05/24 13:41:30	1.1
-+++ src/mozilla/ContentHandler.cpp	2002/05/24 13:42:36
-@@ -361,7 +361,7 @@
- 	}
- 
- 	saveDir = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID);
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 	saveDir->InitWithNativePath (nsDependentCString(expanded_directory));
- #else
- 	saveDir->InitWithPath (expanded_directory);
-@@ -392,7 +392,7 @@
- 	}
- 	else
- 	{
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 		nsCString cDirName;
- 		saveDir->GetNativePath (cDirName);
- 		char *cDefaultFile = mozilla_unicode_to_locale (aDefaultFile);
-@@ -423,7 +423,7 @@
- 		rv = aFile->GetParent (getter_AddRefs(aDirectory));
- 		if(NS_SUCCEEDED(rv) && aDirectory)
- 		{
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 			nsCString cDirectoryName;
- 			rv = aDirectory->GetNativePath(cDirectoryName);
- #else
-@@ -496,7 +496,7 @@
- 			appLauncher->DeleteTemporaryFileOnExit(mTempFile);
- 		}
- 
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 		nsCString aFileName;
- 		mTempFile->GetNativePath(aFileName);
- #else
---- src/mozilla/FilePicker.cpp	2002/05/24 13:41:30	1.1
-+++ src/mozilla/FilePicker.cpp	2002/05/24 13:42:54
-@@ -147,7 +147,7 @@
- 	mFileFormats = fileFormats;
- 	mFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID);
- 	mDisplayDirectory = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID);
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 	mDisplayDirectory->InitWithNativePath(nsDependentCString(g_get_home_dir()));
- #else
- 	mDisplayDirectory->InitWithPath(g_get_home_dir());
-@@ -282,7 +282,7 @@
- 		cFileName = mozilla_unicode_to_locale (mDefaultString.get());
- 	}
- 
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 	nsCAutoString cDirName;
- 	mDisplayDirectory->GetNativePath (cDirName);
- 
-@@ -560,7 +560,7 @@
- 		}
- 	}
- 
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 	aFilePicker->mFile->InitWithNativePath (nsDependentCString(aFileName));
- 
- 	if (aFilePicker->mMode == nsIFilePicker::modeGetFolder)
-@@ -706,7 +706,7 @@
- 
- 	nsCOMPtr<nsILocalFile> aDir = 
- 				do_CreateInstance (NS_LOCAL_FILE_CONTRACTID);
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 	aDir->InitWithNativePath (nsDependentCString(expanded_directory));
- #else
- 	aDir->InitWithPath (expanded_directory);
-@@ -743,7 +743,7 @@
- 			g_free (*ret_fullpath);
- 		nsCOMPtr<nsILocalFile> aFile;
- 		aFilePicker->GetFile (getter_AddRefs(aFile));
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 		nsCString tempFullPathStr;
- 		aFile->GetNativePath (tempFullPathStr);
- 		*ret_fullpath = g_strdup (tempFullPathStr.get());
---- src/mozilla/GaleonWrapper.cpp	2002/05/24 13:45:50	1.3
-+++ src/mozilla/GaleonWrapper.cpp	2002/05/24 13:45:39
-@@ -181,7 +181,7 @@
- 	}
- 	else
- 	{
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 0
- 		result = print->PrintPreview(options, nsnull, nsnull);
- #else
- 		result = print->PrintPreview(options);
-@@ -435,7 +435,7 @@
- 	if (NS_FAILED(rv) || !persist) return NS_ERROR_FAILURE;
- 
- 	nsCOMPtr<nsILocalFile> file;
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 	NS_NewNativeLocalFile(nsDependentCString(filename),
- 			      PR_TRUE, getter_AddRefs(file)); 
- #else
-@@ -492,7 +492,7 @@
- 	if (NS_FAILED(rv) || !persist) return NS_ERROR_FAILURE;
- 
- 	nsCOMPtr<nsILocalFile> file;
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 	NS_NewNativeLocalFile(nsDependentCString(filename),
- 			      PR_TRUE, getter_AddRefs(file)); 
- #else
-@@ -502,7 +502,7 @@
- 
- 	nsCOMPtr<nsILocalFile> path;
- 	if (datapath)
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 		NS_NewNativeLocalFile(nsDependentCString(datapath),
- 				      PR_TRUE, getter_AddRefs(path));
- #else
---- src/mozilla/MozRegisterComponents.cpp	2002/05/24 13:41:30	1.1
-+++ src/mozilla/MozRegisterComponents.cpp	2002/05/24 13:43:06
-@@ -193,7 +193,7 @@
- 	nsresult rv = NS_OK;
- 
- 	nsCOMPtr<nsILocalFile> dllFile;
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 	rv = NS_NewNativeLocalFile (nsDependentCString(aDLLPath),
- 				    PR_TRUE, getter_AddRefs (dllFile));
- #else
---- src/mozilla/PrintProgressListener.cpp	2002/05/24 13:41:30	1.1
-+++ src/mozilla/PrintProgressListener.cpp	2002/05/24 13:43:15
-@@ -54,7 +54,7 @@
- /* void onStateChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aStateFlags, in unsigned long aStatus); */
- NS_IMETHODIMP GPrintListener::OnStateChange(nsIWebProgress *aWebProgress,
- 					    nsIRequest *aRequest,
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 					    PRUint32 aStateFlags,
- #else
- 					    PRInt32 aStateFlags,
-@@ -118,7 +118,7 @@
- /* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long state); */
- NS_IMETHODIMP GPrintListener::OnSecurityChange(nsIWebProgress *aWebProgress,
- 					       nsIRequest *aRequest,
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 					       PRUint32 state)
- #else
- 					       PRInt32 state)
---- src/mozilla/ProgressListener2.cpp	2002/05/24 13:41:30	1.1
-+++ src/mozilla/ProgressListener2.cpp	2002/05/24 13:43:27
-@@ -279,7 +279,7 @@
- 		}
- 
- 		/* setup filename */
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 		nsCString leafName;
- 		rv = mFile->GetNativeLeafName (leafName);
- 		text[COL_FILENAME] = nsCRT::strdup (leafName.get());
-@@ -458,7 +458,7 @@
-  */
- NS_IMETHODIMP GProgressListener2::OnStateChange (nsIWebProgress *aWebProgress,
- 						 nsIRequest *aRequest,
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 						 PRUint32 aStateFlags,
- #else
- 						 PRInt32 aStateFlags,
-@@ -469,7 +469,7 @@
- 
- 	if (aStateFlags & nsIWebProgressListener::STATE_STOP)
- 	{
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 		nsCString filename;
- 		mFile->GetNativePath (filename);
- #else
-@@ -537,7 +537,7 @@
- 					(SetPixmapInfo *) mCallbackInfo;
- 
- 				gchar *fn;
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 				nsCString cfn;
- 				mFile->GetNativePath(cfn);
- 				fn = nsCRT::strdup(cfn.get());
-@@ -833,7 +833,7 @@
- NS_IMETHODIMP GProgressListener2::
- 			OnSecurityChange(nsIWebProgress *aWebProgress,
- 					 nsIRequest *aRequest,
--#if MOZILLA_VERSION > VERSION3(1,0,0)
-+#if 1
- 					 PRUint32 state)
- #else
- 					 PRInt32 state)
diff --git a/www/galeon/files/patch-src::mozilla::ExternalProtocolService.cpp b/www/galeon/files/patch-src::mozilla::ExternalProtocolService.cpp
deleted file mode 100644
index b6653f953405..000000000000
--- a/www/galeon/files/patch-src::mozilla::ExternalProtocolService.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD$
-
---- src/mozilla/ExternalProtocolService.cpp.orig	Sat May 18 02:03:19 2002
-+++ src/mozilla/ExternalProtocolService.cpp	Fri May 24 16:56:19 2002
-@@ -16,7 +16,14 @@
-  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
-+#include "config.h"
-+
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
-+#endif
-+#ifdef HAVE_STDLIB_H
-+#include <stdlib.h>
-+#endif
- #include <gtk/gtk.h>
- 
- #include "ExternalProtocolService.h"