- Add flock

Flock is a social browser, cross platform, open source, and
based on Mozilla technologies. Flock includes such features
as blogging tools, feed handling, and integrated del.icio.us
favorites and Flickr photo sharing.

WWW: http://www.flock.com/

Repocopied from:	www/firefox
Repocopied by:		marcus

8 files changed, 97 insertions, 914 deletions

diff --git a/www/Makefile b/www/Makefile
index 4fb697c10486..7233ef563721 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -131,6 +131,7 @@
     SUBDIR += firefox10
     SUBDIR += flashplugin
     SUBDIR += flashplugin-mozilla
+    SUBDIR += flock
     SUBDIR += flood
     SUBDIR += fluxcms
     SUBDIR += fnord
diff --git a/www/flock/Makefile b/www/flock/Makefile
index 94b4262825b7..f3dd0ac83de2 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -6,17 +6,23 @@
 #   $MCom: ports/www/firefox/Makefile,v 1.29 2006/02/01 02:11:23 ahze Exp $
 #
 
-PORTNAME=	firefox
-DISTVERSION=	1.5.0.4
-PORTEPOCH=	1
+PORTNAME=	flock
+DISTVERSION=	0.7
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
-DISTNAME=	${PORTNAME}-${DISTVERSION}-source
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+# http://ftp.osuosl.org/pub/${PORTNAME}/source/${PORTVERSION}/:flock
+MASTER_SITE_SUBDIR=	ahze
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		clucene-flock-3${EXTRACT_SUFX}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
+LIB_DEPENDS=	GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick \
+		jasper.4:${PORTSDIR}/graphics/jasper
+
+MOZILLA_NAME=	Flock
+CLUCENE_WRKSRC=	${WRKDIR}/clucene
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 ALL_TARGET=	default
@@ -26,21 +32,23 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GCC=	3.4+
 
+CPPFLAGS=	-I${WRKDIR}/local/include
+LDFLAGS=	-L${WRKDIR}/local/lib
+
 GECKO_PLIST_PRE_FILES=	lib/${MOZILLA}/chrome/icons/default/default.xpm
 GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons
 
-FIREFOX_ICON=		${MOZILLA}.xpm
-FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/icons/default.xpm
+FLOCK_ICON=		${MOZILLA}.xpm
+FLOCK_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/icons/default.xpm
+CONFIGURE_ARGS=	--with-clucene-prefix=${WRKDIR}/local
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-system-cairo	\
 		--enable-official-branding \
 		--enable-canvas
 
-SYSTEM_PREFS=		${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js
 MOZ_PIS_SCRIPTS=	moz_pis_S50cleanhome
 
-OPTIONS=	NEWTAB "Open external links in a new tab" on \
-		SMB "Enable smb:// URI support using gnomevfs" off
+OPTIONS=	SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
 
@@ -57,27 +65,22 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
 .endif
 
 post-extract::
-	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
-		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
-
-post-patch:
-.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
-	embedding/minimo
-	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
-		/dom.disable_window_open_feature.toolbar/s/false/true/' \
-		${WRKSRC}/${ii}/all.js
-.endfor
+	@${SED} -e 's|@FLOCK_ICON@|${FLOCK_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
+		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
+		<${FILESDIR}/flock.desktop.in >${WRKDIR}/${MOZILLA}.desktop
+
+pre-build:
+	@(cd ${CLUCENE_WRKSRC} && ${SETENV} LIBS="-lcompat" \
+		CC="${CC}" CXX="${CXX}" \
+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+		INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \./configure --prefix=${WRKDIR}/local --disable-shared)
+	@(cd ${CLUCENE_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all)
+	@(cd ${CLUCENE_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install)
 
 pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
-.if !defined(WITHOUT_NEWTAB)
-	${ECHO_CMD} >> ${SYSTEM_PREFS}
-	${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
-	${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \
-		>> ${SYSTEM_PREFS}
-.endif # !defined(WITHOUT_NEWTAB)
+	${ECHO_CMD} 'share/pixmaps/${FLOCK_ICON}' >> ${PLIST}
 
 do-install:
 	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
@@ -94,8 +97,8 @@ post-install:
 	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/
 	${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default
-	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm
-	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
+	${LN} -sf ${FLOCK_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm
+	${LN} -sf ${FLOCK_ICON_SRC} ${PREFIX}/share/pixmaps/${FLOCK_ICON}
 
 .include "${.CURDIR}/../mozilla/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/www/flock/distinfo b/www/flock/distinfo
index 0897f2f9327d..206c045c710a 100644
--- a/www/flock/distinfo
+++ b/www/flock/distinfo
@@ -1,3 +1,6 @@
-MD5 (firefox-1.5.0.4-source.tar.bz2) = 4cb3d7c1b5345585750766c589308b5e
-SHA256 (firefox-1.5.0.4-source.tar.bz2) = 7b91edc5fe7ce07780b78a8c9838d2058e5d3227f9253f6001850f61f20511f4
-SIZE (firefox-1.5.0.4-source.tar.bz2) = 35337540
+MD5 (flock-0.7.tar.bz2) = cadaa412cdcc238672d1e1382d426c8f
+SHA256 (flock-0.7.tar.bz2) = e278d1860f066e7cf7606f140ef73e98191c0ded947fdae5b1272d5cedb28729
+SIZE (flock-0.7.tar.bz2) = 43048787
+MD5 (clucene-flock-3.tar.bz2) = 46eb9b11e8b77b7c7deb1fbfc5636c97
+SHA256 (clucene-flock-3.tar.bz2) = 991c9f20c800f0bd22f2a721cefc7c5933fb954479feddfc3c13d1972823bfba
+SIZE (clucene-flock-3.tar.bz2) = 2076764
diff --git a/www/flock/files/firefox.desktop.in b/www/flock/files/flock.desktop.in
index c1b7a2e59ab9..5c7f770b64a1 100644
--- a/www/flock/files/firefox.desktop.in
+++ b/www/flock/files/flock.desktop.in
@@ -1,66 +1,66 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Firefox Web Browser
+Name=@MOZILLA_NAME@ Web Browser
 Name[am]=
 Name[ar]=
-Name[az]=Firefox Veb Səyyahı
+Name[az]=@MOZILLA_NAME@ Veb Səyyahı
 Name[be]=
-Name[bg]=Интернет браузър Firefox
+Name[bg]=Интернет браузър @MOZILLA_NAME@
 Name[bn]=
-Name[bs]=Firefox web preglednik
-Name[ca]=Navegador web Firefox
-Name[cs]=Prohlížeč WWW Firefox
-Name[cy]=Y Porwr Gwe Firefox
-Name[da]=Firefox - internetsurfning
-Name[de]=Firefox Webbrowser
-Name[el]=Περιηγητής Διαδικτύου Firefox
-Name[en_CA]=Firefox Web Browser
-Name[en_GB]=Firefox Web Browser
-Name[es]=Navegador Web Firefox
-Name[et]=Firefox veebibrauser
-Name[eu]=Firefox web arakatzailea
-Name[fi]=Firefox, WWW-selain
-Name[fr]=Navigateur Web Firefox
-Name[ga]=Brabhsálaí Lín Firefox
+Name[bs]=@MOZILLA_NAME@ web preglednik
+Name[ca]=Navegador web @MOZILLA_NAME@
+Name[cs]=Prohlížeč WWW @MOZILLA_NAME@
+Name[cy]=Y Porwr Gwe @MOZILLA_NAME@
+Name[da]=@MOZILLA_NAME@ - internetsurfning
+Name[de]=@MOZILLA_NAME@ Webbrowser
+Name[el]=Περιηγητής Διαδικτύου @MOZILLA_NAME@
+Name[en_CA]=@MOZILLA_NAME@ Web Browser
+Name[en_GB]=@MOZILLA_NAME@ Web Browser
+Name[es]=Navegador Web @MOZILLA_NAME@
+Name[et]=@MOZILLA_NAME@ veebibrauser
+Name[eu]=@MOZILLA_NAME@ web arakatzailea
+Name[fi]=@MOZILLA_NAME@, WWW-selain
+Name[fr]=Navigateur Web @MOZILLA_NAME@
+Name[ga]=Brabhsálaí Lín @MOZILLA_NAME@
 Name[gu]=એપીફની વૅબ બ્રાઉઝર
-Name[he]=דפדפן Firefox
+Name[he]=דפדפן @MOZILLA_NAME@
 Name[hi]=
-Name[hr]=Firefox Web preglednik
-Name[hu]=Firefox webböngésző
-Name[id]=Web Browser Firefox
-Name[it]=Browser web Firefox
-Name[ja]=Firefox ウェブ・ブラウザ
-Name[ko]=Firefox 웹 브라우저
-Name[li]=Firefox Web Browser
-Name[lt]=Firefox web naršyklė
-Name[mk]=Firefox веб прелистувач
+Name[hr]=@MOZILLA_NAME@ Web preglednik
+Name[hu]=@MOZILLA_NAME@ webböngésző
+Name[id]=Web Browser @MOZILLA_NAME@
+Name[it]=Browser web @MOZILLA_NAME@
+Name[ja]=@MOZILLA_NAME@ ウェブ・ブラウザ
+Name[ko]=@MOZILLA_NAME@ 웹 브라우저
+Name[li]=@MOZILLA_NAME@ Web Browser
+Name[lt]=@MOZILLA_NAME@ web naršyklė
+Name[mk]=@MOZILLA_NAME@ веб прелистувач
 Name[ml]=എപ്പിഫാനി വെബ്ബ് ബ്രൌസ‌ര്
-Name[mn]=Firefox веб хөтөч
-Name[ms]=Pelungsur Web Firefox
-Name[nb]=Firefox nettleser
-Name[nl]=Firefox Webbrowser
-Name[nn]=Firefox nettlesar
-Name[no]=Firefox nettleser
+Name[mn]=@MOZILLA_NAME@ веб хөтөч
+Name[ms]=Pelungsur Web @MOZILLA_NAME@
+Name[nb]=@MOZILLA_NAME@ nettleser
+Name[nl]=@MOZILLA_NAME@ Webbrowser
+Name[nn]=@MOZILLA_NAME@ nettlesar
+Name[no]=@MOZILLA_NAME@ nettleser
 Name[pa]=ਏਪੀਫਾਨੀ ਵੈੱਬ ਬਰਾਊਜ਼ਰ
-Name[pl]=Przeglądarka WWW Firefox
-Name[pt]=Navegador Web Firefox
-Name[pt_BR]=Navegador Web Firefox
-Name[ro]=Navigatorul Firefox
-Name[ru]=Веб-браузер Firefox
+Name[pl]=Przeglądarka WWW @MOZILLA_NAME@
+Name[pt]=Navegador Web @MOZILLA_NAME@
+Name[pt_BR]=Navegador Web @MOZILLA_NAME@
+Name[ro]=Navigatorul @MOZILLA_NAME@
+Name[ru]=Веб-браузер @MOZILLA_NAME@
 Name[sk]=
-Name[sl]=Spletni brskalnik Firefox
-Name[sq]=Firefox - Shfletuesi Web
+Name[sl]=Spletni brskalnik @MOZILLA_NAME@
+Name[sq]=@MOZILLA_NAME@ - Shfletuesi Web
 Name[sr]=
 Name[sr@Latn]=Veb čitač Spoznaja
-Name[sv]=Webbläsaren Firefox
+Name[sv]=Webbläsaren @MOZILLA_NAME@
 Name[ta]=எபிபனி வலை உலாவி
-Name[tk]=Firefox Web Ahtarçisi
-Name[tr]=Firefox Web Tarayıcı
-Name[uk]=Переглядач web Firefox
-Name[vi]=Trình Duyệt Web Firefox
+Name[tk]=@MOZILLA_NAME@ Web Ahtarçisi
+Name[tr]=@MOZILLA_NAME@ Web Tarayıcı
+Name[uk]=Переглядач web @MOZILLA_NAME@
+Name[vi]=Trình Duyệt Web @MOZILLA_NAME@
 Name[wa]=Betchteu waibe epiphany
-Name[zh_CN]=Firefox Web 浏览器
-Name[zh_TW]=Firefox 網頁瀏覽器
+Name[zh_CN]=@MOZILLA_NAME@ Web 浏览器
+Name[zh_TW]=@MOZILLA_NAME@ 網頁瀏覽器
 GenericName=Web Browser
 GenericName[ar]=متصفّح الانترنت
 GenericName[az]=Veb Səyyahı
@@ -80,7 +80,7 @@ GenericName[es]=Navegador web
 GenericName[et]=Veebilehitseja
 GenericName[eu]=Web arakatzailea
 GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur Web Firefox
+GenericName[fr]=Navigateur Web @MOZILLA_NAME@
 GenericName[ga]=Brabhsálaí Lín
 GenericName[gu]=વેબ બ્રાઉઝર
 GenericName[he]=דפדפן אינטרנט
@@ -174,7 +174,7 @@ Comment[sr]=Прегледај веб
 Comment[sr@Latn]=Pregledaj veb
 Comment[sv]=Surfa på nätet
 Comment[ta]=வலையில் உலாவு
-Comment[th]=ใช้งานเว็บบราวเซอร์ Firefox
+Comment[th]=ใช้งานเว็บบราวเซอร์ @MOZILLA_NAME@
 Comment[tk]=Webi Ahtar
 Comment[tr]=Web'e Gözat
 Comment[uk]=Програма перегляду web-сторінок
@@ -182,8 +182,8 @@ Comment[vi]=Duyệt web
 Comment[wa]=Naivyî avå les waibes
 Comment[zh_CN]=浏览 Web
 Comment[zh_TW]=瀏覽網頁
-Exec=firefox %U
-Icon=@FIREFOX_ICON@
+Exec=@MOZILLA@ %U
+Icon=@FLOCK_ICON@
 StartupNotify=false
 Terminal=false
 Type=Application
diff --git a/www/flock/files/patch-xptcall-alpha b/www/flock/files/patch-xptcall-alpha
deleted file mode 100644
index 29631a98e61e..000000000000
--- a/www/flock/files/patch-xptcall-alpha
+++ /dev/null
@@ -1,459 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp	Tue May 27 01:37:00 2003
-@@ -0,0 +1,184 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is 
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+__asm__("invoke_copy_to_stack") __attribute__((unused));
-+
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+    const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
-+
-+    for(PRUint32 i = 0; i < paramCount; i++, d++, s++)
-+    {
-+        if(s->IsPtrData())
-+        {
-+            *d = (PRUint64)s->ptr;
-+            continue;
-+        }
-+        switch(s->type)
-+        {
-+        case nsXPTType::T_I8     : *d = (PRUint64)s->val.i8;     break;
-+        case nsXPTType::T_I16    : *d = (PRUint64)s->val.i16;    break;
-+        case nsXPTType::T_I32    : *d = (PRUint64)s->val.i32;    break;
-+        case nsXPTType::T_I64    : *d = (PRUint64)s->val.i64;    break;
-+        case nsXPTType::T_U8     : *d = (PRUint64)s->val.u8;     break;
-+        case nsXPTType::T_U16    : *d = (PRUint64)s->val.u16;    break;
-+        case nsXPTType::T_U32    : *d = (PRUint64)s->val.u32;    break;
-+        case nsXPTType::T_U64    : *d = (PRUint64)s->val.u64;    break;
-+        case nsXPTType::T_FLOAT  :
-+            if(i < NUM_ARG_REGS)
-+            {
-+                // convert floats to doubles if they are to be passed
-+                // via registers so we can just deal with doubles later
-+                union { PRUint64 u64; double d; } t;
-+                t.d = (double)s->val.f;
-+                *d = t.u64;
-+            }
-+            else
-+                // otherwise copy to stack normally
-+                *d = (PRUint64)s->val.u32;
-+            break;
-+        case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64;    break;
-+        case nsXPTType::T_BOOL   : *d = (PRUint64)s->val.b;      break;
-+        case nsXPTType::T_CHAR   : *d = (PRUint64)s->val.c;      break;
-+        case nsXPTType::T_WCHAR  : *d = (PRUint64)s->val.wc;     break;
-+        default:
-+            // all the others are plain pointer types
-+            *d = (PRUint64)s->val.p;
-+            break;
-+        }
-+    }
-+}
-+
-+/*
-+ * XPTC_PUBLIC_API(nsresult)
-+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+ *                    PRUint32 paramCount, nsXPTCVariant* params, void* vt)
-+ */
-+__asm__(
-+    "#### XPTC_InvokeByIndex ####\n"
-+".text\n\t"
-+    ".align 5\n\t"
-+    ".globl XPTC_InvokeByIndex\n\t"
-+    ".ent XPTC_InvokeByIndex\n"
-+"XPTC_InvokeByIndex:\n\t"
-+    ".frame $15,32,$26,0\n\t"
-+    ".mask 0x4008000,-32\n\t"
-+    "ldgp $29,0($27)\n"
-+"$XPTC_InvokeByIndex..ng:\n\t"
-+    "subq $30,32,$30\n\t"
-+    "stq $26,0($30)\n\t"
-+    "stq $15,8($30)\n\t"
-+    "bis $30,$30,$15\n\t"
-+    ".prologue 1\n\t"
-+
-+    /*
-+     * Allocate enough stack space to hold the greater of 6 or "paramCount"+1
-+     * parameters. (+1 for "this" pointer)  Room for at least 6 parameters
-+     * is required for storage of those passed via registers.
-+     */
-+
-+    "bis $31,5,$2\n\t"      /* count = MAX(5, "paramCount") */
-+    "cmplt $2,$18,$1\n\t"
-+    "cmovne $1,$18,$2\n\t"
-+    "s8addq $2,16,$1\n\t"   /* room for count+1 params (8 bytes each) */
-+    "bic $1,15,$1\n\t"      /* stack space is rounded up to 0 % 16 */
-+    "subq $30,$1,$30\n\t"
-+
-+    "stq $16,0($30)\n\t"    /* save "that" (as "this" pointer) */
-+    "stq $17,16($15)\n\t"   /* save "methodIndex" */
-+
-+    "addq $30,8,$16\n\t"    /* pass stack pointer */
-+    "bis $18,$18,$17\n\t"   /* pass "paramCount" */
-+    "bis $19,$19,$18\n\t"   /* pass "params" */
-+    "bsr $26,$invoke_copy_to_stack..ng\n\t"     /* call invoke_copy_to_stack */
-+
-+    /*
-+     * Copy the first 6 parameters to registers and remove from stack frame.
-+     * Both the integer and floating point registers are set for each parameter
-+     * except the first which is the "this" pointer.  (integer only)
-+     * The floating point registers are all set as doubles since the
-+     * invoke_copy_to_stack function should have converted the floats.
-+     */
-+    "ldq $16,0($30)\n\t"    /* integer registers */
-+    "ldq $17,8($30)\n\t"
-+    "ldq $18,16($30)\n\t"
-+    "ldq $19,24($30)\n\t"
-+    "ldq $20,32($30)\n\t"
-+    "ldq $21,40($30)\n\t"
-+    "ldt $f17,8($30)\n\t"   /* floating point registers */
-+    "ldt $f18,16($30)\n\t"
-+    "ldt $f19,24($30)\n\t"
-+    "ldt $f20,32($30)\n\t"
-+    "ldt $f21,40($30)\n\t"
-+
-+    "addq $30,48,$30\n\t"   /* remove params from stack */
-+
-+    /*
-+     * Call the virtual function with the constructed stack frame.
-+     */
-+    "bis $16,$16,$1\n\t"    /* load "this" */
-+    "ldq $2,16($15)\n\t"    /* load "methodIndex" */
-+    "ldq $1,0($1)\n\t"      /* load vtable */
-+#if 0
-+    "s8addq $2,16,$2\n\t"   /* vtable index = "methodIndex" * 8 + 16 */
-+#else
-+    "mulq $2, 8, $2\n\t"
-+    "addq $2, 0, $2\n\t"   /* vtable index = "methodIndex" * 16 + 24 */
-+#endif
-+    "addq $1,$2,$1\n\t"
-+    "ldq $27,0($1)\n\t"     /* load address of function */
-+    "jsr $26,($27),0\n\t"   /* call virtual function */
-+    "ldgp $29,0($26)\n\t"
-+
-+    "bis $15,$15,$30\n\t"
-+    "ldq $26,0($30)\n\t"
-+    "ldq $15,8($30)\n\t"
-+    "addq $30,32,$30\n\t"
-+    "ret $31,($26),1\n\t"
-+    ".end XPTC_InvokeByIndex"
-+    );
-+
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig	Tue May 27 01:37:30 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp	Tue May 27 01:37:04 2003
-@@ -0,0 +1,269 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is 
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1999
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Implement shared vtbl methods. */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include <sys/types.h>
-+#include <machine/cpu.h>
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+__asm__("PrepareAndDispatch") __attribute__((unused));
-+
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+{
-+    const PRUint8 PARAM_BUFFER_COUNT = 16;
-+    const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
-+
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint8 paramCount;
-+    PRUint8 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no interface info");
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+
-+    // args[0] to args[NUM_ARG_REGS] hold floating point register values
-+    PRUint64* ap = args + NUM_ARG_REGS;
-+    for(i = 0; i < paramCount; i++, ap++)
-+    {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+        if(param.IsOut() || !type.IsArithmetic())
-+        {
-+            dp->val.p = (void*) *ap;
-+            continue;
-+        }
-+        // else
-+        switch(type)
-+        {
-+        case nsXPTType::T_I8     : dp->val.i8  = (PRInt8)    *ap;    break;
-+        case nsXPTType::T_I16    : dp->val.i16 = (PRInt16)   *ap;    break;
-+        case nsXPTType::T_I32    : dp->val.i32 = (PRInt32)   *ap;    break;
-+        case nsXPTType::T_I64    : dp->val.i64 = (PRInt64)   *ap;    break;
-+        case nsXPTType::T_U8     : dp->val.u8  = (PRUint8)   *ap;    break;
-+        case nsXPTType::T_U16    : dp->val.u16 = (PRUint16)  *ap;    break;
-+        case nsXPTType::T_U32    : dp->val.u32 = (PRUint32)  *ap;    break;
-+        case nsXPTType::T_U64    : dp->val.u64 = (PRUint64)  *ap;    break;
-+        case nsXPTType::T_FLOAT  :
-+            if(i < NUM_ARG_REGS)
-+            {
-+                // floats passed via registers are stored as doubles
-+                // in the first NUM_ARG_REGS entries in args
-+                dp->val.u64 = (PRUint64) args[i];
-+                dp->val.f = (float) dp->val.d;    // convert double to float
-+            }
-+            else
-+                dp->val.u32 = (PRUint32) *ap;
-+            break;
-+        case nsXPTType::T_DOUBLE :
-+            // doubles passed via registers are also stored
-+            // in the first NUM_ARG_REGS entries in args
-+            dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap;
-+            break;
-+        case nsXPTType::T_BOOL   : dp->val.b   = (PRBool)    *ap;    break;
-+        case nsXPTType::T_CHAR   : dp->val.c   = (char)      *ap;    break;
-+        case nsXPTType::T_WCHAR  : dp->val.wc  = (PRUnichar) *ap;    break;
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if(dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+/*
-+ * SharedStub()
-+ *  Collects arguments and calls PrepareAndDispatch.  The "methodIndex" is
-+ *  passed to this function via $1 to preserve the argument registers.
-+ */
-+__asm__(
-+    "#### SharedStub ####\n"
-+".text\n\t"
-+    ".align 5\n\t"
-+    ".ent SharedStub\n"
-+"SharedStub:\n\t"
-+    ".frame $30,96,$26,0\n\t"
-+    ".mask 0x4000000,-96\n\t"
-+    "ldgp $29,0($27)\n"
-+"$SharedStub..ng:\n\t"
-+    "subq $30,96,$30\n\t"
-+    "stq $26,0($30)\n\t"
-+    ".prologue 1\n\t"
-+
-+    /*
-+     * Store arguments passed via registers to the stack.
-+     * Floating point registers are stored as doubles and converted
-+     * to floats in PrepareAndDispatch if necessary.
-+     */
-+    "stt $f17,16($30)\n\t"   /* floating point registers */
-+    "stt $f18,24($30)\n\t"
-+    "stt $f19,32($30)\n\t"
-+    "stt $f20,40($30)\n\t"
-+    "stt $f21,48($30)\n\t"
-+    "stq $17,56($30)\n\t"    /* integer registers */
-+    "stq $18,64($30)\n\t"
-+    "stq $19,72($30)\n\t"
-+    "stq $20,80($30)\n\t"
-+    "stq $21,88($30)\n\t"
-+
-+    /*
-+     * Call PrepareAndDispatch function.
-+     */
-+    "bis $1,$1,$17\n\t"      /* pass "methodIndex" */
-+    "addq $30,16,$18\n\t"    /* pass "args" */
-+    "bsr $26,$PrepareAndDispatch..ng\n\t"
-+
-+    "ldq $26,0($30)\n\t"
-+    "addq $30,96,$30\n\t"
-+    "ret $31,($26),1\n\t"
-+    ".end SharedStub"
-+    );
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \
-+    ); \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \
-+    ); \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \
-+    );
-+#else
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+    nsresult result; \
-+__asm__ __volatile__( \
-+    "ldah    $29,0($27)\n\t" \
-+    "lda     $29,0($29)\n\t" \
-+    "lda $1, "#n"\n\t" \
-+    "br $31, $SharedStub..ng\n\t" \
-+    "mov $0, %0\n\t" \
-+    : "=r" (result) \
-+    ); \
-+    return result; \
-+}
-+#endif
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
diff --git a/www/flock/files/patch-xptcall-sparc64 b/www/flock/files/patch-xptcall-sparc64
deleted file mode 100644
index 9599a8a71336..000000000000
--- a/www/flock/files/patch-xptcall-sparc64
+++ /dev/null
@@ -1,327 +0,0 @@
---- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp	Mon May 26 04:12:55 2003
-@@ -0,0 +1,123 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ */
-+
-+/* Implement shared vtbl methods. */
-+
-+#include "xptcprivate.h"
-+
-+#if defined(sparc) || defined(__sparc__)
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args)
-+{
-+
-+#define PARAM_BUFFER_COUNT     16
-+
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint8 paramCount;
-+    PRUint8 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no interface info");
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+
-+    PRUint64* ap = args;
-+    for(i = 0; i < paramCount; i++, ap++)
-+    {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+        if(param.IsOut() || !type.IsArithmetic())
-+        {
-+            dp->val.p = (void*) *ap;
-+            continue;
-+        }
-+        // else
-+        switch(type)
-+        {
-+        case nsXPTType::T_I8     : dp->val.i8  = *((PRInt64*)  ap);      break;
-+        case nsXPTType::T_I16    : dp->val.i16 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_I32    : dp->val.i32 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_DOUBLE : dp->val.d   = *((double*) ap);        break;
-+        case nsXPTType::T_U64    : dp->val.u64 = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_I64    : dp->val.i64 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_U8     : dp->val.u8  = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_U16    : dp->val.u16 = *((PRUint64*)ap);       break;
-+        case nsXPTType::T_U32    : dp->val.u32 = *((PRUint64*)ap);       break;
-+        case nsXPTType::T_FLOAT  : dp->val.f   = ((float*)   ap)[1];     break;
-+        case nsXPTType::T_BOOL   : dp->val.b   = *((PRInt64*)  ap);      break;
-+        case nsXPTType::T_CHAR   : dp->val.c   = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_WCHAR  : dp->val.wc  = *((PRInt64*) ap);       break;
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if(dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+extern "C" int SharedStub(int, int*);
-+
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+	int dummy; /* defeat tail-call optimization */ \
-+	return SharedStub(n, &dummy); \
-+}
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#endif /* sparc || __sparc__ */
---- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s	Mon May 26 04:06:09 2003
-@@ -0,0 +1,104 @@
-+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ *   Chris Seawood <cls@seawood.org>
-+ */
-+
-+/*
-+    Platform specific code to invoke XPCOM methods on native objects
-+    for sparcv9 Solaris.
-+
-+    See the SPARC Compliance Definition (SCD) Chapter 3
-+    for more information about what is going on here, including
-+    the use of BIAS (0x7ff).
-+    The SCD is available from http://www.sparc.com/.
-+*/
-+
-+        .global XPTC_InvokeByIndex
-+        .type   XPTC_InvokeByIndex, #function
-+
-+/*
-+    XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+                   PRUint32 paramCount, nsXPTCVariant* params);
-+    
-+*/
-+XPTC_InvokeByIndex:
-+        save    %sp,-(128 + 64),%sp ! room for the register window and
-+                                    ! struct pointer, rounded up to 0 % 64
-+        sll     %i2,4,%l0           ! assume the worst case
-+                                    ! paramCount * 2 * 8 bytes
-+        cmp     %l0, 0              ! are there any args? If not,
-+        be      .invoke             ! no need to copy args to stack
-+         nop
-+
-+        sub     %sp,%l0,%sp         ! create the additional stack space
-+        add     %sp,0x7ff+136,%o0   ! step past the register window, the
-+                                    ! struct result pointer and the 'this' slot
-+        mov     %i2,%o1             ! paramCount
-+        call    invoke_copy_to_stack
-+        mov     %i3,%o2             ! params
-+
-+!
-+!   load arguments from stack into the outgoing registers
-+!   BIAS is 0x7ff (2047)
-+!
-+
-+!   load the %o1..5 64bit (extended word) output registers registers 
-+        ldx     [%sp + 0x7ff + 136],%o1    ! %i1
-+        ldx     [%sp + 0x7ff + 144],%o2    ! %i2
-+        ldx     [%sp + 0x7ff + 152],%o3    ! %i3
-+        ldx     [%sp + 0x7ff + 160],%o4    ! %i4
-+        ldx     [%sp + 0x7ff + 168],%o5    ! %i5
-+
-+!   load the even number double registers starting with %d2
-+        ldd     [%sp + 0x7ff + 136],%f2
-+        ldd     [%sp + 0x7ff + 144],%f4
-+        ldd     [%sp + 0x7ff + 152],%f6
-+        ldd     [%sp + 0x7ff + 160],%f8
-+        ldd     [%sp + 0x7ff + 168],%f10
-+        ldd     [%sp + 0x7ff + 176],%f12
-+        ldd     [%sp + 0x7ff + 184],%f14
-+        ldd     [%sp + 0x7ff + 192],%f16
-+        ldd     [%sp + 0x7ff + 200],%f18
-+        ldd     [%sp + 0x7ff + 208],%f20
-+        ldd     [%sp + 0x7ff + 216],%f22
-+        ldd     [%sp + 0x7ff + 224],%f24
-+        ldd     [%sp + 0x7ff + 232],%f26
-+        ldd     [%sp + 0x7ff + 240],%f28
-+        ldd     [%sp + 0x7ff + 248],%f30
-+
-+!
-+!   calculate the target address from the vtable
-+!
-+.invoke:
-+        sll     %i1,3,%l0           ! index *= 8
-+!       add     %l0,16,%l0          ! there are 2 extra entries in the vTable (16bytes)
-+        ldx     [%i0],%l1           ! *that --> address of vtable
-+        ldx     [%l0 + %l1],%l0     ! that->vtable[index * 8 + 16] --> address
-+
-+        jmpl    %l0,%o7             ! call the routine
-+        mov     %i0,%o0             ! move 'this' pointer to out register
-+
-+        mov     %o0,%i0             ! propagate return value
-+        ret
-+        restore
-+
-+        .size    XPTC_InvokeByIndex, .-XPTC_InvokeByIndex
---- /dev/null	Mon May 26 14:00:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp	Mon May 26 14:00:49 2003
-@@ -0,0 +1,91 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ *   Chris Seawood <cls@seawood.org>
-+ */
-+
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+#include "xptcprivate.h"
-+
-+#if !defined(__sparc) && !defined(__sparc__)
-+#error "This code is for Sparc only"
-+#endif
-+
-+/* Prototype specifies unmangled function name */
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s);
-+
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+  /*
-+    We need to copy the parameters for this function to locals and use them
-+    from there since the parameters occupy the same stack space as the stack
-+    we're trying to populate.
-+  */
-+  PRUint64 *l_d = d;
-+  nsXPTCVariant *l_s = s;
-+  PRUint64 l_paramCount = paramCount;
-+  PRUint64 regCount = 0;  // return the number of registers to load from the stack
-+
-+  for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++)
-+  {
-+    if (regCount < 5) regCount++;
-+
-+    if (l_s->IsPtrData())
-+    {
-+      *l_d = (PRUint64)l_s->ptr;
-+      continue;
-+    }
-+    switch (l_s->type)
-+    {
-+      case nsXPTType::T_I8    : *((PRInt64*)l_d)     = l_s->val.i8;    break;
-+      case nsXPTType::T_I16   : *((PRInt64*)l_d)     = l_s->val.i16;   break;
-+      case nsXPTType::T_I32   : *((PRInt64*)l_d)     = l_s->val.i32;   break;
-+      case nsXPTType::T_I64   : *((PRInt64*)l_d)     = l_s->val.i64;   break;
-+      
-+      case nsXPTType::T_U8    : *((PRUint64*)l_d)    = l_s->val.u8;    break;
-+      case nsXPTType::T_U16   : *((PRUint64*)l_d)    = l_s->val.u16;   break;
-+      case nsXPTType::T_U32   : *((PRUint64*)l_d)    = l_s->val.u32;   break;
-+      case nsXPTType::T_U64   : *((PRUint64*)l_d)    = l_s->val.u64;   break;
-+
-+      /* in the case of floats, we want to put the bits in to the
-+         64bit space right justified... floats in the paramter array on
-+         sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip
-+         the space that would be occupied by %f0, %f2, etc.
-+      */
-+      case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f;     break;
-+      case nsXPTType::T_DOUBLE: *((double*)l_d)      = l_s->val.d;     break;
-+      case nsXPTType::T_BOOL  : *((PRInt64*)l_d)     = l_s->val.b;     break;
-+      case nsXPTType::T_CHAR  : *((PRUint64*)l_d)    = l_s->val.c;     break;
-+      case nsXPTType::T_WCHAR : *((PRInt64*)l_d)     = l_s->val.wc;    break;
-+
-+      default:
-+        // all the others are plain pointer types
-+        *((void**)l_d) = l_s->val.p;
-+        break;
-+    }
-+  }
-+  
-+  return regCount;
-+}
diff --git a/www/flock/pkg-descr b/www/flock/pkg-descr
index 4f5cfbf2caa9..81d19b220038 100644
--- a/www/flock/pkg-descr
+++ b/www/flock/pkg-descr
@@ -1,12 +1,6 @@
-Firefox is an award winning, free, open-source web browser for many platforms
-and is based on the Mozilla codebase. It is small, fast and easy to use, and
-offers many advanced features:
- o Popup Blocking
- o Tabbed Browsing
- o Live Bookmarks (ie. RSS)
- o Extensions
- o Themes
- o FastFind
- o Improved Security
+Flock is a social browser, cross platform, open source, and
+based on Mozilla technologies. Flock includes such features
+as blogging tools, feed handling, and integrated del.icio.us
+favorites and Flickr photo sharing.
 
-WWW: http://www.mozilla.com/firefox/
+WWW: http://www.flock.com/
diff --git a/www/flock/pkg-message b/www/flock/pkg-message
deleted file mode 100644
index c81c1458d04d..000000000000
--- a/www/flock/pkg-message
+++ /dev/null
@@ -1,32 +0,0 @@
-======================================================================
-
-SMB issues:
-Network group, machine, and share browsing does not work correctly.
-
-SFTP:
-Only sftp access using public key authentication works.  To easily
-setup public key authentication to "remote_host":
-
-ssh-keygen -t dsa
-cat ~/.ssh/id_dsa.pub | ssh remote_host "cat >> .ssh/authorized_keys"
-
-The SSH sever on remote_host must allow pub key authentication.
-
-======================================================================
-
-Any bug reports should be addressed to the maintainers at:
-	gnome@FreeBSD.org
-You may also Cc: freebsd-ports@freebsd.org. Please do not send
-bug reports to any other addresses.
-
-Please include the following information with any bug report:
-* Output from 'uname -a'.
-* Date/time stamp from www/firefox/Makefile.
-* Where/when did the problem occur: configuring, building, or
-	running firefox
-* How can you reproduce the problem?
-
-Thank you for your help in testing and reporting bugs, and we hope you
-enjoy using Firefox.
-The Maintainers (gnome@)
-======================================================================