stick with firefox codebase and manually check out xulrunner update

so that applications which depend on xulrunner won't suffer from
the vulnerabilities which are already fixed.

MFSA 2007-17; MFSA 2007-16; MFSA 2007-14; MFSA 2007-13; MFSA 2007-12;
MFSA 2007-11; MFSA 2007-09; MFSA 2007-08; MFSA 2007-07; MFSA 2007-06;
MFSA 2007-05; MFSA 2007-04; MFSA 2007-03; MFSA 2007-02; MFSA 2007-01;
MFSA 2006-76; MFSA 2006-75; MFSA 2006-73; MFSA 2006-72; MFSA 2006-71;
MFSA 2006-70; MFSA 2006-69; MFSA 2006-68; MFSA 2006-67; MFSA 2006-66;
MFSA 2006-65; MFSA 2006-64; MFSA 2006-62; MFSA 2006-61; MFSA 2006-60;
MFSA 2006-59; MFSA 2006-58; MFSA 2006-57; MFSA 2006-56; MFSA 2006-55;
MFSA 2006-54; MFSA 2006-53; MFSA 2006-52; MFSA 2006-51; MFSA 2006-50;
MFSA 2006-48; MFSA 2006-47; MFSA 2006-46; MFSA 2006-45; MFSA 2006-44.

(these are for firefox 1_8_0_4 -> 1_8_1_4)

ok kurt@

devel/xulrunner/Makefile

@@ -1,29 +1,21 @@
-# $OpenBSD: Makefile,v 1.5 2007/04/18 18:56:49 kili Exp $
+# $OpenBSD: Makefile,v 1.6 2007/06/28 19:50:04 martynas Exp $
 
 ONLY_FOR_ARCHS=	alpha amd64 i386 powerpc sparc sparc64
 
 COMMENT-main=	"standalone XUL/XPCOM runtime environment"
 COMMENT-devel=	"devel files for Gecko"
 
-VER=		1.8.0.4
+VER=		1.8.1.4
 DISTNAME=	mozilla
 PKGNAME=	xulrunner-${VER}
-PKGNAME-main=	xulrunner-${VER}p2
-PKGNAME-devel=	xulrunner-devel-${VER}p2
-SO_VERSION=	1.0
+PKGNAME-main=	xulrunner-${VER}
+PKGNAME-devel=	xulrunner-devel-${VER}
+SO_VERSION=	2.0
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
-.for _lib in accessibility appcomps auth autoconfig browsercomps \
-	browserdirprovider caps chrome commandlines composer cookie docshell \
-	editor embedcomponents fileview gfx_gtk gfxps gfxpsshar gkgfx \
-	gklayout gkplugin gtkembedmoz gtkxtbin htmlpars i18n imglib2 inspector \
-	jar50 jsd jsj mork mozfind mozjs necko necko2 nsappshell nss3 \
-	nssckbi oji permissions pipboot pipnss pippki pref rdf \
-	remoteservice searchservice smime3 softokn3 ssl3 system-pref \
-	toolkitcomps transformiix txmgr uconv ucvmath universalchardet \
-	webbrwsr websrvcs widget_gtk2 xmlextras xpcom xpcom_compat \
-	xpcom_compat_c xpcom_core xpconnect xpinstall xpistub xul \
-	xulutil fort swft
+.for _lib in auth autoconfig fileview gtkembedmoz mozjs nullplugin \
+	pipboot pipnss pippki system-pref transformiix universalchardet \
+	unixprintplugin websrvcs xmlextras xpcom xul xulutil
 SHARED_LIBS+=	${_lib}	${SO_VERSION}
 .endfor
 
@@ -33,28 +25,30 @@ HOMEPAGE=	http://developer.mozilla.org/en/docs/XULRunner
 
 MULTI_PACKAGES=	-main -devel
 
-# mozilla public license
+# MPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/${VER}/source/
-DISTFILES=	xulrunner-${VER}-source.tar.bz2
+MASTER_SITES=	http://mirrors.protection.cx/~martynas/mozilla/xulrunner/ \
+		http://www.obsd.fr/OpenBSD/distfiles/mozilla/xulrunner/
+DISTFILES=	xulrunner-${VER}${EXTRACT_SUFX}
 
 MODULES=	devel/gettext
 BUILD_DEPENDS=	:zip->=2.3:archivers/zip
 LIB_DEPENDS=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
-                nspr4.>=17,plc4.>=17,plds4.>=17:nspr->=4.6.4p1:devel/nspr
+		nspr4.>=17,plc4.>=17,plds4.>=17:nspr->=4.6.4p1:devel/nspr \
+		nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss
 WANTLIB=	c glib-2.0 m pthread stdc++
 
-WANTLIB-main=	${WANTLIB} X11 Xau Xdmcp Xft Xinerama Xrender Xt atk-1.0 cairo \
-		expat fontconfig freetype glitz gmodule-2.0 gobject-2.0 jpeg \
-		pango-1.0 pangocairo-1.0 pangoft2-1.0 png z
+WANTLIB-main=	${WANTLIB} X11 Xau Xcursor Xdmcp Xext Xfixes Xft \
+		Xi Xinerama Xrandr Xrender Xt atk-1.0 cairo expat \
+		fontconfig freetype glitz gmodule-2.0 gobject-2.0 \
+		jpeg pango-1.0 pangocairo-1.0 pangoft2-1.0 png z
 
 LIB_DEPENDS-devel= ${MODGETTEXT_LIB_DEPENDS} IDL-2::devel/libIDL \
-		xulrunner/mozjs,xulrunner/nss3,xulrunner/smime3,xulrunner/ssl3,xulrunner/xpcom,xulrunner/xul:${PKGNAME-main}:devel/xulrunner,-main
-WANTLIB-devel=	${WANTLIB} nspr4 plc4 plds4
+		xulrunner/mozjs,xulrunner/xpcom,xulrunner/xul:${PKGNAME-main}:devel/xulrunner,-main
 
 VMEM_WARNING=	Yes
 
@@ -72,9 +66,10 @@ CONFIGURE_ARGS=	--with-system-jpeg=${LOCALBASE}	\
 		--with-system-png=${LOCALBASE}	\
 		--with-system-zlib=/usr/lib	\
 		--with-system-nspr		\
+		--with-system-nss		\
 		--with-pthreads			\
 		--enable-xft			\
-		--enable-optimize=-Os		\
+		--disable-optimize		\
 		--enable-default-toolkit=gtk2	\
 		--disable-debug			\
 		--disable-tests			\
@@ -88,10 +83,8 @@ CONFIGURE_ARGS=	--with-system-jpeg=${LOCALBASE}	\
 		--enable-svg			\
 		--enable-svg-renderer=cairo	\
 		--enable-system-cairo		\
-		--enable-canvas
-
-# from browser/config/mozconfig
-CONFIGURE_ARGS+=--enable-application=xulrunner
+		--enable-canvas			\
+		--enable-application=xulrunner
 
 MAKE_ENV=	MOZ_CO_PROJECT=xulrunner \
 		LD_LIBRARY_PATH="${WRKSRC}/dist/bin" \
@@ -99,44 +92,46 @@ MAKE_ENV=	MOZ_CO_PROJECT=xulrunner \
 		MOZILLA_OFFICIAL=1 \
 		SO_VERSION="${SO_VERSION}"
 CONFIGURE_ENV=	${MAKE_ENV} \
-		PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig"
+		PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig" \
+		topsrcdir=${WRKSRC}
 
 MOB=		${WRKSRC}/dist/bin
 MOZ=		${PREFIX}/xulrunner
 
+DATADIRS=	chrome defaults icons res components greprefs plugins
+DISTDIRS=	idl include
+TOOLS=		TestGtkEmbed xpcshell xpt_link mozilla-xremote-client \
+		xpicleanup xulrunner-bin nsinstall xpidl xulrunner-stub \
+		regxpcom xpt_dump
+
 post-extract:
 	@cp ${FILESDIR}/xptc* ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix/
 
 pre-configure:
 	@perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g; s|_X11BASE_|${X11BASE}|g' \
+		${WRKSRC}/js/src/xpconnect/shell/Makefile.in \
 		${WRKSRC}/xulrunner/app/mozilla.in \
 		${WRKSRC}/xulrunner/setup/nsXULAppInstall.js
 	@perl -pi -e 's|_SO_VERSION_|${SO_VERSION}|g' \
 		${WRKSRC}/xpcom/components/nsNativeComponentLoader.cpp
 
 do-install:
-.for dir in include idl
-	${INSTALL_DATA_DIR} ${MOZ}/${dir}
-	@cd ${WRKSRC}/dist && ${TAR} -chf - ${dir} | \
-		${TAR} -xf - -C ${MOZ}
-.endfor
-	@cd ${WRKSRC}/dist/public && ${TAR} -chf - nss | \
-		${TAR} -xf - -C ${MOZ}/include
-.for dir in chrome components defaults greprefs icons res 
-	${INSTALL_DATA_DIR} ${MOZ}/${dir}
-	@cd ${MOB} && ${TAR} -chf - ${dir} | \
-		${TAR} -xf - -C ${MOZ}
-.endfor
-	@cd ${MOB} && ${TAR} -chf - *.so.?.? | \
-		${TAR} -xf - -C ${MOZ}
-	@chmod 444 ${MOZ}/*.so.?.? ${MOZ}/components/*.so.?.? ${MOZ}/components/*.js
+	cd ${WRKSRC}/dist && \
+		find ${DISTDIRS} -type d \
+			-exec ${INSTALL_DATA_DIR} ${MOZ}/{} \; && \
+		find ${DISTDIRS} ! -type d \
+			-exec ${INSTALL_DATA} {} ${MOZ}/{} \;
+	cd ${MOB} && \
+		find ${DATADIRS} -type d \
+			-exec ${INSTALL_DATA_DIR} ${MOZ}/{} \; && \
+		find ${DATADIRS} ! -type d \
+			-exec ${INSTALL_DATA} -m 644 {} ${MOZ}/{} \; && \
+		${INSTALL_PROGRAM} ${TOOLS} ${MOZ}
+	${INSTALL_DATA} ${MOB}/*.so.${SO_VERSION} ${MOZ}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${MOZ}
-	${INSTALL_DATA} ${WRKSRC}/xulrunner/app/mozicon16.xpm ${WRKSRC}/xulrunner/app/mozicon50.xpm ${MOZ}
-	${INSTALL_SCRIPT} ${MOB}/xulrunner ${MOB}/xulrunner-config ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${MOB}/xulrunner \
+		${MOB}/xulrunner-config ${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${MOZ}
-	${INSTALL_PROGRAM} ${MOB}/regxpcom ${MOB}/xulrunner-bin ${MOB}/mozilla-xremote-client ${MOB}/TestGtkEmbed \
-	${MOB}/mangle ${MOB}/nsinstall ${MOB}/shlibsign ${MOB}/xpcshell ${MOB}/xpicleanup ${MOB}/xpidl \
-	${MOB}/xpt_dump ${MOB}/xpt_link ${MOB}/xulrunner-stub ${MOZ}
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig
 	${INSTALL_DATA} ${WRKBUILD}/build/unix/*.pc ${PREFIX}/lib/pkgconfig
 

devel/xulrunner/distinfo

@@ -1,5 +1,5 @@
-MD5 (xulrunner-1.8.0.4-source.tar.bz2) = TcCYMapOlP2lGCpIl+0I6Q==
-RMD160 (xulrunner-1.8.0.4-source.tar.bz2) = eXnemzvIWmtENnKD40PN3RLnC9s=
-SHA1 (xulrunner-1.8.0.4-source.tar.bz2) = lISkeDuGxtwcubmTMXkb4Hm4aX4=
-SHA256 (xulrunner-1.8.0.4-source.tar.bz2) = GTglWT7zfinYL4vL/zEZyvExOQoDaXCcFme1Cfd0/6k=
-SIZE (xulrunner-1.8.0.4-source.tar.bz2) = 33846136
+MD5 (xulrunner-1.8.1.4.tar.gz) = 6QlCCjjeKxrpykIP8sy4fw==
+RMD160 (xulrunner-1.8.1.4.tar.gz) = oGiH0wRI9bCii5j1PuIKrcJYBV4=
+SHA1 (xulrunner-1.8.1.4.tar.gz) = PvNmvCUSt+HXcuHSFwQSCQQIb5I=
+SHA256 (xulrunner-1.8.1.4.tar.gz) = xYyYRdICItt3G1VFzdTOKzvX00g8ry6ygYtr+DBGprI=
+SIZE (xulrunner-1.8.1.4.tar.gz) = 44803810

devel/xulrunner/patches/patch-build_autoconf_altoptions_m4

@@ -1,18 +0,0 @@
-$OpenBSD: patch-build_autoconf_altoptions_m4,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- build/autoconf/altoptions.m4.orig	Sun Apr 18 16:17:09 2004
-+++ build/autoconf/altoptions.m4	Sat Sep 10 09:47:31 2005
-@@ -143,14 +143,3 @@ echo "
-         [$3]
-     fi
- ])
--
--dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
--AC_DEFUN(MOZ_READ_MOZCONFIG,
--[AC_REQUIRE([AC_INIT_BINSH])dnl
--# Read in '.mozconfig' script to set the initial options.
--# See the mozconfig2configure script for more details.
--_AUTOCONF_TOOLS_DIR=`dirname [$]0`/[$1]/build/autoconf
--. $_AUTOCONF_TOOLS_DIR/mozconfig2configure])
--
--dnl This gets inserted at the top of the configure script
--MOZ_READ_MOZCONFIG(MOZ_TOPSRCDIR)

devel/xulrunner/patches/patch-config_autoconf_mk_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-config_autoconf_mk_in,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- config/autoconf.mk.in.orig	Fri Apr 21 16:50:30 2006
-+++ config/autoconf.mk.in	Tue Dec 26 23:32:51 2006
-@@ -56,13 +56,13 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+$OpenBSD: patch-config_autoconf_mk_in,v 1.2 2007/06/28 19:50:05 martynas Exp $
+--- config/autoconf.mk.in.orig	Thu Sep 14 21:07:03 2006
++++ config/autoconf.mk.in	Tue Jun  5 23:06:01 2007
+@@ -57,13 +57,13 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
@@ -18,12 +18,3 @@ $OpenBSD: patch-config_autoconf_mk_in,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
  mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
  mrelibdir	= $(mredir)/lib
  
-@@ -242,7 +242,7 @@ OS_LDFLAGS	= @LDFLAGS@
- OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
- OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
- 
--OS_INCLUDES	= $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
-+OS_INCLUDES	= $(NSPR_CFLAGS) $(FT2_CFLAGS) $(LIBIDL_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
- OS_LIBS		= @LIBS@
- ACDEFINES	= @MOZ_DEFINES@
- 

devel/xulrunner/patches/patch-config_mkdepend_imakemdep_h

@@ -1,13 +0,0 @@
-$OpenBSD: patch-config_mkdepend_imakemdep_h,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- config/mkdepend/imakemdep.h.orig	Tue Apr 20 23:38:14 2004
-+++ config/mkdepend/imakemdep.h	Sat Sep 10 09:47:31 2005
-@@ -440,6 +440,9 @@ char *cpp_argv[ARGUMENTS] = {
- # ifdef __i386__
- 	"-D__i386__",
- # endif
-+# if defined(__amd64__) || defined(__x86_64__)
-+	"-D__amd64__ -D__x86_64__",
-+# endif
- # ifdef __GNUC__
- 	"-traditional",
- # endif

devel/xulrunner/patches/patch-configure_in

@@ -1,20 +1,7 @@
-$OpenBSD: patch-configure_in,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- configure.in.orig	Fri Apr 21 16:50:21 2006
-+++ configure.in	Fri Dec 22 23:55:59 2006
-@@ -1287,9 +1287,9 @@ dnl Get mozilla version from central mil
- MOZILLA_VERSION=`$PERL $srcdir/config/milestone.pl -topsrcdir $srcdir`
- 
- dnl Get version of various core apps from the version files.
--FIREFOX_VERSION=`cat $topsrcdir/browser/config/version.txt`
--THUNDERBIRD_VERSION=`cat $topsrcdir/mail/config/version.txt`
--SEAMONKEY_VERSION=`cat $topsrcdir/xpfe/bootstrap/version.txt`
-+FIREFOX_VERSION=`cat ./browser/config/version.txt`
-+THUNDERBIRD_VERSION=`cat ./mail/config/version.txt`
-+SEAMONKEY_VERSION=`cat ./xpfe/bootstrap/version.txt`
- 
- AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
- AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION)
-@@ -1859,7 +1859,7 @@ case "$target" in
+$OpenBSD: patch-configure_in,v 1.2 2007/06/28 19:50:05 martynas Exp $
+--- configure.in.orig	Tue Apr  3 18:40:02 2007
++++ configure.in	Tue Jun  5 23:06:42 2007
+@@ -1974,7 +1974,7 @@ case "$target" in
  	;;
  
  *-openbsd*)
@@ -23,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
      DSO_CFLAGS=''
      DSO_PIC_CFLAGS='-fPIC'
      DSO_LDOPTS='-shared -fPIC'
-@@ -3643,7 +3643,7 @@ _SAVE_LIBS=$LIBS
+@@ -3872,7 +3872,7 @@ _SAVE_LIBS=$LIBS
  CFLAGS="$ZLIB_CFLAGS $CFLAGS"
  LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS"
  if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; then
@@ -32,7 +19,7 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
      LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS"
  fi
  if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then
-@@ -3673,7 +3673,7 @@ LDFLAGS=$_SAVE_LDFLAGS
+@@ -3902,7 +3902,7 @@ LDFLAGS=$_SAVE_LDFLAGS
  LIBS=$_SAVE_LIBS
  
  if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then

devel/xulrunner/patches/patch-content_xul_templates_src_nsTemplateMatchSet_h

@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_xul_templates_src_nsTemplateMatchSet_h,v 1.1 2007/02/22 00:40:59 naddy Exp $
+$OpenBSD: patch-content_xul_templates_src_nsTemplateMatchSet_h,v 1.2 2007/06/28 19:50:05 martynas Exp $
 --- content/xul/templates/src/nsTemplateMatchSet.h.orig	Sun Apr 18 00:52:30 2004
-+++ content/xul/templates/src/nsTemplateMatchSet.h	Mon Feb 19 23:54:24 2007
-@@ -207,7 +207,11 @@ protected:
++++ content/xul/templates/src/nsTemplateMatchSet.h	Tue Jun  5 23:06:01 2007
+@@ -207,7 +207,11 @@ class nsTemplateMatchRefSet (protected)
       * If the set is currently
       */
      struct InlineMatches {

devel/xulrunner/patches/patch-gfx_src_ps_nsFontMetricsPS_cpp

@@ -1,27 +1,12 @@
-$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- gfx/src/ps/nsFontMetricsPS.cpp.orig	Tue Dec 20 11:16:58 2005
-+++ gfx/src/ps/nsFontMetricsPS.cpp	Tue Dec 20 11:17:37 2005
-@@ -1033,8 +1033,10 @@ nsFontPSXft::Init(nsXftEntry* aEntry,
+$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.2 2007/06/28 19:50:05 martynas Exp $
+--- gfx/src/ps/nsFontMetricsPS.cpp.orig	Thu Nov 30 04:17:21 2006
++++ gfx/src/ps/nsFontMetricsPS.cpp	Fri Apr  6 17:21:07 2007
+@@ -995,7 +995,7 @@ nsFontPSXft::FindFont(PRUnichar aChar, const nsFont& a
  
- nsFontPSXft::~nsFontPSXft()
- {
--  if (mEntry->mFace) 
-+  if (mEntry->mFace) {
-     FT_Done_Face(mEntry->mFace);
-+    mEntry->mFace = nsnull;
-+  }
- 
-   if (FT_Done_FreeType(mFreeTypeLibrary))
-     return;
-@@ -2323,8 +2325,10 @@ nsXftType1Generator::Init(nsXftEntry* aE
- 
- nsXftType1Generator::~nsXftType1Generator()
- {
--  if (mEntry->mFace) 
-+  if (mEntry->mFace) {
-     FT_Done_Face(mEntry->mFace);
-+    mEntry->mFace = nsnull;
-+  }
- 
-   if (FT_Done_FreeType(mFreeTypeLibrary))
-     return;
+         fontps *fps = new fontps;
+         fps->entry = xftEntry;
+-        fps->charset = fc_charset;
++        fps->charset = FcCharSetCopy(fc_charset);
+         fps->fontps = nsnull;
+         fpi.fontps->AppendElement(fps);
+     }

devel/xulrunner/patches/patch-gfx_src_psshared_nsCUPSShim_cpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-gfx_src_psshared_nsCUPSShim_cpp,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- gfx/src/psshared/nsCUPSShim.cpp.orig	Sun May  8 11:01:20 2005
-+++ gfx/src/psshared/nsCUPSShim.cpp	Tue Dec 26 07:59:09 2006
-@@ -59,7 +59,7 @@ static const int gSymNameCt = sizeof(gSy
+$OpenBSD: patch-gfx_src_psshared_nsCUPSShim_cpp,v 1.2 2007/06/28 19:50:05 martynas Exp $
+--- gfx/src/psshared/nsCUPSShim.cpp.orig	Sun May  8 18:01:20 2005
++++ gfx/src/psshared/nsCUPSShim.cpp	Tue Jun  5 23:06:01 2007
+@@ -59,7 +59,7 @@ static const int gSymNameCt = sizeof(gSymName) / sizeo
  PRBool
  nsCUPSShim::Init()
  {

devel/xulrunner/patches/patch-js_src_xpconnect_shell_Makefile_in

@@ -1,11 +1,11 @@
---- js/src/xpconnect/shell/Makefile.in.orig	Tue Apr  5 08:35:51 2005
-+++ js/src/xpconnect/shell/Makefile.in	Fri Dec 22 23:42:23 2006
+--- js/src/xpconnect/shell/Makefile.in.orig	Tue Apr  5 15:35:51 2005
++++ js/src/xpconnect/shell/Makefile.in	Fri Jun  8 21:04:24 2007
 @@ -56,6 +56,8 @@ REQUIRES	= xpconnect \
  CPPSRCS		= xpcshell.cpp
  
  LIBS		= \
-+		-Wl,-rpath-link,/usr/local/lib/ \
-+		-Wl,-rpath-link,/usr/X11R6/lib/ \
++		-Wl,-rpath-link,_LOCALBASE_/lib/ \
++		-Wl,-rpath-link,_X11BASE_/lib/ \
  		$(MOZ_JS_LIBS) \
  		$(XPCOM_LIBS) \
  		$(NSPR_LIBS) \

devel/xulrunner/patches/patch-modules_libpref_src_init_all_js

@@ -1,7 +1,7 @@
-$OpenBSD: patch-modules_libpref_src_init_all_js,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- modules/libpref/src/init/all.js.orig	Mon May  8 16:22:51 2006
-+++ modules/libpref/src/init/all.js	Fri Dec 22 23:42:23 2006
-@@ -2052,7 +2052,7 @@ pref("font.scale.outline.min",      6);
+$OpenBSD: patch-modules_libpref_src_init_all_js,v 1.2 2007/06/28 19:50:05 martynas Exp $
+--- modules/libpref/src/init/all.js.orig	Fri Jan  5 03:04:33 2007
++++ modules/libpref/src/init/all.js	Fri Apr  6 17:21:07 2007
+@@ -2098,7 +2098,7 @@ pref("font.scale.outline.min",      6);
  
  // TrueType
  pref("font.FreeType2.enable", false);

devel/xulrunner/patches/patch-modules_plugin_base_public_nptypes_h

@@ -1,24 +0,0 @@
-$OpenBSD: patch-modules_plugin_base_public_nptypes_h,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- modules/plugin/base/public/nptypes.h.orig	Thu May 19 23:49:42 2005
-+++ modules/plugin/base/public/nptypes.h	Sat Sep 10 09:27:13 2005
-@@ -67,10 +67,8 @@
- 
-   /*
-    * BSD/OS ships no header that defines uint32_t, nor bool (for C)
--   * OpenBSD ships no header that defines uint32_t and using its bool macro is
--   * unsafe.
-    */
--  #if defined(bsdi) || defined(OPENBSD)
-+  #if defined(bsdi)
-   typedef u_int32_t uint32_t;
- 
-   #if !defined(__cplusplus)
-@@ -78,7 +76,7 @@
-   #endif
-   #else
-   /*
--   * FreeBSD defines uint32_t and bool.
-+   * FreeBSD, and OpenBSD defines uint32_t and bool.
-    */
-     #include <inttypes.h>
-     #include <stdbool.h>

devel/xulrunner/patches/patch-security_coreconf_OpenBSD_mk

@@ -1,16 +1,8 @@
-$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- security/coreconf/OpenBSD.mk.orig	Sun Apr 25 11:02:17 2004
-+++ security/coreconf/OpenBSD.mk	Tue Dec 26 10:12:42 2006
-@@ -37,12 +37,12 @@
- 
- include $(CORE_DEPTH)/coreconf/UNIX.mk
- 
--DEFAULT_COMPILER	= gcc
--CC			= gcc
--CCC			= g++
-+DEFAULT_COMPILER	= ${CC}
-+#CC			= ${CC}
-+CCC			= ${CXX}
+$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.2 2007/06/28 19:50:05 martynas Exp $
+--- security/coreconf/OpenBSD.mk.orig	Sun Apr 25 18:02:17 2004
++++ security/coreconf/OpenBSD.mk	Thu Mar 22 20:29:45 2007
+@@ -42,7 +42,7 @@ CC			= gcc
+ CCC			= g++
  RANLIB			= ranlib
  
 -CPU_ARCH		:= $(shell uname -p)
@@ -27,7 +19,7 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.1.1.1 2007/01/05 14:44:48 kurt
  
  OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DOPENBSD
  
-@@ -64,8 +64,9 @@ OS_LIBS			= 
+@@ -64,7 +64,7 @@ OS_LIBS			= 
  ARCH			= openbsd
  
  DSO_CFLAGS		= -fPIC -DPIC
@@ -36,5 +28,3 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.1.1.1 2007/01/05 14:44:48 kurt
  DSO_LDFLAGS		=
  
  MKSHLIB			= $(CC) $(DSO_LDOPTS)
- 
-+NSPR_LIBS		= $(shell pkg-config --libs nspr)

devel/xulrunner/patches/patch-security_coreconf_rules_mk

@@ -1,11 +0,0 @@
-$OpenBSD: patch-security_coreconf_rules_mk,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- security/coreconf/rules.mk.orig	Fri Apr 15 02:36:28 2005
-+++ security/coreconf/rules.mk	Sat Sep 10 09:47:32 2005
-@@ -352,7 +352,6 @@ ifdef XP_OS2_VACPP
- else
- 	$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
- endif
--	chmod +x $@
- ifeq ($(OS_TARGET),Darwin)
- ifdef MAPFILE
- 	nmedit -s $(MAPFILE) $@

devel/xulrunner/patches/patch-security_manager_Makefile_in

@@ -1,12 +0,0 @@
-$OpenBSD: patch-security_manager_Makefile_in,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- security/manager/Makefile.in.orig	Sat Dec 23 00:00:52 2006
-+++ security/manager/Makefile.in	Tue Dec 26 08:05:11 2006
-@@ -79,7 +79,7 @@ endif
- # NSS makefiles are not safe for parallel execution.
- DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
- DEFAULT_GMAKE_FLAGS += CC="$(CC)"
--DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
-+DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(NSPR_CFLAGS) -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
- DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist
- DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist
- DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1

devel/xulrunner/patches/patch-security_manager_ssl_src_Makefile_in

@@ -0,0 +1,14 @@
+$OpenBSD: patch-security_manager_ssl_src_Makefile_in,v 1.1 2007/06/28 19:50:05 martynas Exp $
+--- security/manager/ssl/src/Makefile.in.orig	Wed Jan 10 13:09:11 2007
++++ security/manager/ssl/src/Makefile.in	Wed Jan 10 14:17:42 2007
+@@ -126,7 +126,10 @@ REQUIRES	= nspr \
+ 
+ EXTRA_DEPS = $(NSS_DEP_LIBS)
+ 
++NSS_LIBDIR = $(shell $(NSS_CONFIG) --libdir)
++
+ DEFINES += -DNSS_ENABLE_ECC
++DEFINES += -DNSS_LIBDIR=\"$(NSS_LIBDIR)\"
+ 
+ # Use local includes because they are inserted before INCLUDES
+ # so that Mozilla's nss.h is used, not glibc's

devel/xulrunner/patches/patch-security_manager_ssl_src_nsNSSComponent_cpp

@@ -0,0 +1,27 @@
+$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.1 2007/06/28 19:50:05 martynas Exp $
+--- security/manager/ssl/src/nsNSSComponent.cpp.orig	Mon May 15 21:24:30 2006
++++ security/manager/ssl/src/nsNSSComponent.cpp	Wed Jan 10 18:13:16 2007
+@@ -699,11 +699,10 @@ nsNSSComponent::InstallLoadableRoots()
+       return;
+ 
+     const char *possible_ckbi_locations[] = {
++      0, // This special value means: 
++        //   search for ckbi in the the system NSS_LIBDIR
+       NS_GRE_DIR,
+-      NS_XPCOM_CURRENT_PROCESS_DIR,
+-      0 // This special value means: 
+-        //   search for ckbi in the directories on the shared
+-        //   library/DLL search path
++      NS_XPCOM_CURRENT_PROCESS_DIR
+     };
+ 
+     for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
+@@ -712,7 +711,7 @@ nsNSSComponent::InstallLoadableRoots()
+ 
+       if (!possible_ckbi_locations[il])
+       {
+-        fullModuleName = PR_GetLibraryName(nsnull, "nssckbi");
++        fullModuleName = PR_GetLibraryName(NSS_LIBDIR, "nssckbi");
+       }
+       else
+       {

devel/xulrunner/patches/patch-security_nss_Makefile

@@ -1,12 +0,0 @@
-$OpenBSD: patch-security_nss_Makefile,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- security/nss/Makefile.orig	Thu Apr 14 20:28:40 2005
-+++ security/nss/Makefile	Tue Dec 26 08:06:23 2006
-@@ -78,7 +78,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
- # (7) Execute "local" rules. (OPTIONAL).                              #
- #######################################################################
- 
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf build_dbm all
- 
- build_coreconf:
- 	cd $(CORE_DEPTH)/coreconf ;  $(MAKE)

devel/xulrunner/patches/patch-security_nss_cmd_pkiutil_platlibs_mk

@@ -1,13 +0,0 @@
-$OpenBSD: patch-security_nss_cmd_pkiutil_platlibs_mk,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- security/nss/cmd/pkiutil/platlibs.mk.orig	Sun Apr 25 11:02:51 2004
-+++ security/nss/cmd/pkiutil/platlibs.mk	Tue Dec 26 08:06:23 2006
-@@ -50,8 +50,6 @@ EXTRA_SHARED_LIBS += \
- 	-L$(DIST)/lib/ \
- 	-lnsspki3 \
- 	-lnss3 \
--	-lplc4 \
--	-lplds4 \
--	-lnspr4 \
-+	$(NSPR_LIBS) \
- 	$(NULL)
- 

devel/xulrunner/patches/patch-security_nss_cmd_platlibs_mk

@@ -1,26 +0,0 @@
-$OpenBSD: patch-security_nss_cmd_platlibs_mk,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- security/nss/cmd/platlibs.mk.orig	Wed Apr  6 17:35:41 2005
-+++ security/nss/cmd/platlibs.mk	Tue Dec 26 08:06:23 2006
-@@ -136,10 +136,7 @@ EXTRA_SHARED_LIBS += \
- 	$(NULL)
- else
- EXTRA_SHARED_LIBS += \
--	-L$(DIST)/lib \
--	-lplc4 \
--	-lplds4 \
--	-lnspr4 \
-+	$(NSPR_LIBS) \
- 	$(NULL)
- endif
- endif
-@@ -222,9 +219,7 @@ EXTRA_SHARED_LIBS += \
- 	-lssl3 \
- 	-lsmime3 \
- 	-lnss3 \
--	-lplc4 \
--	-lplds4 \
--	-lnspr4 \
-+	$(NSPR_LIBS) \
- 	$(NULL)
- 
- JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) \

devel/xulrunner/patches/patch-security_nss_lib_ckfw_builtins_Makefile

@@ -1,14 +0,0 @@
-$OpenBSD: patch-security_nss_lib_ckfw_builtins_Makefile,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- security/nss/lib/ckfw/builtins/Makefile.orig	Wed Jan 19 21:25:46 2005
-+++ security/nss/lib/ckfw/builtins/Makefile	Tue Dec 26 08:06:23 2006
-@@ -68,8 +68,8 @@ endif
- else
- 
- EXTRA_LIBS += \
--	$(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
--	$(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
-+	$(LOCALBASE)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-+	$(LOCALBASE)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
- 	$(NULL)
- 
- endif

devel/xulrunner/patches/patch-security_nss_lib_fortcrypt_swfort_pkcs11_Makefile

@@ -1,14 +0,0 @@
-$OpenBSD: patch-security_nss_lib_fortcrypt_swfort_pkcs11_Makefile,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.orig	Sun Apr 25 11:03:08 2004
-+++ security/nss/lib/fortcrypt/swfort/pkcs11/Makefile	Tue Dec 26 08:06:23 2006
-@@ -98,8 +98,8 @@ EXTRA_LIBS += \
- 	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
- 	$(CRYPTO_LIB) \
- 	$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
--	$(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
--	$(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
-+	$(LOCALBASE)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-+	$(LOCALBASE)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
- 	$(NULL)
- 
- endif

devel/xulrunner/patches/patch-security_nss_lib_nss_config_mk

@@ -1,14 +0,0 @@
-$OpenBSD: patch-security_nss_lib_nss_config_mk,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- security/nss/lib/nss/config.mk.orig	Wed Mar  9 18:04:49 2005
-+++ security/nss/lib/nss/config.mk	Tue Dec 26 08:06:23 2006
-@@ -74,9 +74,7 @@ else
- EXTRA_SHARED_LIBS += \
- 	-L$(DIST)/lib/ \
- 	-lsoftokn3 \
--	-lplc4 \
--	-lplds4 \
--	-lnspr4 \
-+	$(NSPR_LIBS) \
- 	$(NULL)
- 
- endif

devel/xulrunner/patches/patch-security_nss_lib_smime_config_mk

@@ -1,14 +0,0 @@
-$OpenBSD: patch-security_nss_lib_smime_config_mk,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- security/nss/lib/smime/config.mk.orig	Mon May 24 20:13:09 2004
-+++ security/nss/lib/smime/config.mk	Tue Dec 26 08:06:23 2006
-@@ -68,9 +68,7 @@ else
- EXTRA_SHARED_LIBS += \
- 	-L$(DIST)/lib/ \
- 	-lnss3 \
--	-lplc4 \
--	-lplds4 \
--	-lnspr4 \
-+	$(NSPR_LIBS) \
- 	$(NULL)
- 
- ifeq ($(OS_ARCH), Darwin)

devel/xulrunner/patches/patch-security_nss_lib_softoken_config_mk

@@ -1,15 +0,0 @@
-$OpenBSD: patch-security_nss_lib_softoken_config_mk,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- security/nss/lib/softoken/config.mk.orig	Mon May 24 20:13:11 2004
-+++ security/nss/lib/softoken/config.mk	Tue Dec 26 08:06:23 2006
-@@ -80,10 +80,7 @@ else
- # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
- # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
- EXTRA_SHARED_LIBS += \
--	-L$(DIST)/lib/ \
--	-lplc4 \
--	-lplds4 \
--	-lnspr4 \
-+	$(NSPR_LIBS) \
- 	$(NULL)
- endif
- 

devel/xulrunner/patches/patch-security_nss_lib_ssl_config_mk

@@ -1,14 +0,0 @@
-$OpenBSD: patch-security_nss_lib_ssl_config_mk,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- security/nss/lib/ssl/config.mk.orig	Mon May 24 20:13:12 2004
-+++ security/nss/lib/ssl/config.mk	Tue Dec 26 08:06:23 2006
-@@ -73,9 +73,7 @@ else
- EXTRA_SHARED_LIBS += \
- 	-L$(DIST)/lib/ \
- 	-lnss3 \
--	-lplc4 \
--	-lplds4 \
--	-lnspr4 \
-+	$(NSPR_LIBS) \
- 	$(NULL)
- 
- ifeq ($(OS_ARCH), BeOS)

devel/xulrunner/patches/patch-widget_src_gtk2_nsSound_cpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-widget_src_gtk2_nsSound_cpp,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- widget/src/gtk2/nsSound.cpp.orig	Wed Nov  3 10:13:04 2004
-+++ widget/src/gtk2/nsSound.cpp	Sat Sep 10 09:47:32 2005
-@@ -110,7 +110,7 @@ nsSound::Init()
+$OpenBSD: patch-widget_src_gtk2_nsSound_cpp,v 1.2 2007/06/28 19:50:05 martynas Exp $
+--- widget/src/gtk2/nsSound.cpp.orig	Fri Aug 25 23:29:26 2006
++++ widget/src/gtk2/nsSound.cpp	Tue Jun  5 23:06:01 2007
+@@ -114,7 +114,7 @@ nsSound::Init()
  
      EsdOpenSoundType EsdOpenSound;
  

devel/xulrunner/patches/patch-xpcom_components_nsNativeComponentLoader_cpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-xpcom_components_nsNativeComponentLoader_cpp,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- xpcom/components/nsNativeComponentLoader.cpp.orig	Thu Jul 14 20:42:57 2005
-+++ xpcom/components/nsNativeComponentLoader.cpp	Sat Sep 10 19:45:17 2005
-@@ -668,7 +668,7 @@ nsNativeComponentLoader::AutoRegisterCom
+$OpenBSD: patch-xpcom_components_nsNativeComponentLoader_cpp,v 1.2 2007/06/28 19:50:05 martynas Exp $
+--- xpcom/components/nsNativeComponentLoader.cpp.orig	Tue Nov 14 23:09:15 2006
++++ xpcom/components/nsNativeComponentLoader.cpp	Tue Jun  5 23:06:01 2007
+@@ -668,7 +668,7 @@ nsNativeComponentLoader::AutoRegisterComponent(PRInt32
          ".shlb",    /* Mac ? */
          ".dso",     /* Unix ? */
          ".dylib",   /* Unix: Mach */

devel/xulrunner/patches/patch-xpcom_glue_standalone_Makefile_in

@@ -1,13 +0,0 @@
-$OpenBSD: patch-xpcom_glue_standalone_Makefile_in,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- xpcom/glue/standalone/Makefile.in.orig	Thu Jan  5 14:35:20 2006
-+++ xpcom/glue/standalone/Makefile.in	Fri Dec 22 23:42:24 2006
-@@ -62,6 +62,9 @@ endif
- ifneq (,$(filter AIX DragonFly FreeBSD Linux NetBSD OpenBSD SunOS,$(OS_ARCH)))
- LINKSRC = nsGlueLinkingDlopen.cpp
- endif
-+ifeq (OpenBSD,$(OS_ARCH))
-+LINKSRC = nsGlueLinkingDlopen.cpp
-+endif
- ifeq (OS2,$(OS_ARCH))
- LINKSRC = nsGlueLinkingOS2.cpp
- endif

devel/xulrunner/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Wed Jun 15 10:32:21 2005
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sat Sep 10 09:48:07 2005
-@@ -67,6 +67,12 @@ CPPSRCS		:= xptcinvoke_unixish_x86.cpp x
+$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.2 2007/06/28 19:50:05 martynas Exp $
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Tue Nov 28 07:29:22 2006
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Tue Jun  5 23:06:52 2007
+@@ -68,6 +68,12 @@ CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixi
  endif
  endif
  #
@@ -14,7 +14,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.1.1.1 2007/01/
  # New code for Linux, et. al., with gcc
  # Migrate other platforms here after testing
  #
-@@ -128,6 +134,12 @@ CPPSRCS		:= xptcinvoke_osf1_alpha.cpp xp
+@@ -129,6 +135,12 @@ CPPSRCS		:= xptcinvoke_osf1_alpha.cpp xptcstubs_osf1_a
  ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
  endif
  #
@@ -27,7 +27,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.1.1.1 2007/01/
  # Linux/Alpha
  #
  ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
-@@ -277,6 +289,14 @@ ASFILES		:= xptcinvoke_asm_ppc_netbsd.s 
+@@ -278,6 +290,14 @@ ASFILES		:= xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_
  endif
  
  #
@@ -42,7 +42,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.1.1.1 2007/01/
  # Darwin/PPC
  #
  ifeq ($(OS_ARCH),Darwin)
-@@ -348,6 +368,20 @@ endif
+@@ -349,6 +369,20 @@ endif
  endif
  
  endif

devel/xulrunner/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h

@@ -1,20 +0,0 @@
-$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig	Thu Jan  8 19:17:07 2004
-+++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	Fri Nov 12 21:09:52 2004
-@@ -107,12 +107,16 @@
- #define THUNK_BASED_THIS_ADJUST
- 
- #elif defined(__OpenBSD__) 
-+#if __GNUC__ >= 3
-+#define THUNK_BASED_THIS_ADJUST
-+#else
- /* OpenBSD instroduces GCC 2.95.x in late May 1999 */
- #include <sys/param.h>
- #if OpenBSD <= 199905
- #define THUNK_BASED_THIS_ADJUST
- #else
- #define CFRONT_STYLE_THIS_ADJUST
-+#endif
- #endif
- 
- #elif defined(__bsdi__) 

devel/xulrunner/patches/patch-xulrunner_app_mozilla_in

@@ -1,6 +1,6 @@
-$OpenBSD: patch-xulrunner_app_mozilla_in,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
---- xulrunner/app/mozilla.in.orig	Tue Sep 20 17:13:06 2005
-+++ xulrunner/app/mozilla.in	Fri Dec 22 23:42:24 2006
+$OpenBSD: patch-xulrunner_app_mozilla_in,v 1.2 2007/06/28 19:50:05 martynas Exp $
+--- xulrunner/app/mozilla.in.orig	Wed Sep 21 00:13:06 2005
++++ xulrunner/app/mozilla.in	Fri Jun  8 17:48:05 2007
 @@ -93,6 +93,7 @@ moz_pis_startstop_scripts()
  #set -x
  
@@ -9,21 +9,13 @@ $OpenBSD: patch-xulrunner_app_mozilla_in,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp
  MRE_HOME=%MREDIR%
  
  # Use run-mozilla.sh in the current dir if it exists
-@@ -130,6 +131,7 @@ if [ $found = 0 ]; then
-   # Check default compile-time libdir
-   if [ -x "$moz_libdir/run-mozilla.sh" ]; then
-     dist_bin="$moz_libdir"
-+    run_moz="$dist_bin/run-mozilla.sh"
-   else 
-     echo "Cannot find mozilla runtime directory. Exiting."
-     exit 1
-@@ -269,7 +271,11 @@ do
+@@ -269,7 +270,11 @@ do
    esac
  done
  
 -export MRE_HOME
-+if [ `_X11BASE_/bin/fc-list | wc -l` -eq 0 ]
-+then export GDK_USE_XFT=0
++if [ `_X11BASE_/bin/fc-list | wc -l` -eq 0 ]; then
++	export GDK_USE_XFT=0
 +fi
 +
 +export MOZ_PLUGIN_PATH MRE_HOME

devel/xulrunner/pkg/DESCR-main

@@ -1,6 +1,6 @@
-XULRunner is a single "gecko runtime" installable package that can be
-used to bootstrap multiple XUL+XPCOM applications that are as rich as
-Firefox and Thunderbird.  It will provide mechanisms for installing,
-upgrading, and uninstalling these applications. XULRunner will also
-provide libxul, a solution which allows the embedding of Mozilla
-technologies in other projects and products.
+XULRunner is a single "gecko runtime" installable package that can
+be used to bootstrap multiple XUL+XPCOM applications that are as
+rich as Firefox and Thunderbird.  It will provide mechanisms for
+installing, upgrading, and uninstalling these applications. XULRunner
+will also provide libxul, a solution which allows the embedding of
+Mozilla technologies in other projects and products.

devel/xulrunner/pkg/PFRAG.shared-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
+@comment $OpenBSD: PFRAG.shared-main,v 1.2 2007/06/28 19:50:05 martynas Exp $
 @lib xulrunner/components/libauth.so.${LIBauth_VERSION}
 @lib xulrunner/components/libautoconfig.so.${LIBautoconfig_VERSION}
 @lib xulrunner/components/libfileview.so.${LIBfileview_VERSION}
@@ -13,10 +13,7 @@
 @lib xulrunner/components/libxulutil.so.${LIBxulutil_VERSION}
 @lib xulrunner/libgtkembedmoz.so.${LIBgtkembedmoz_VERSION}
 @lib xulrunner/libmozjs.so.${LIBmozjs_VERSION}
-@lib xulrunner/libnss3.so.${LIBnss3_VERSION}
-@lib xulrunner/libnssckbi.so.${LIBnssckbi_VERSION}
-@lib xulrunner/libsmime3.so.${LIBsmime3_VERSION}
-@lib xulrunner/libsoftokn3.so.${LIBsoftokn3_VERSION}
-@lib xulrunner/libssl3.so.${LIBssl3_VERSION}
 @lib xulrunner/libxpcom.so.${LIBxpcom_VERSION}
 @lib xulrunner/libxul.so.${LIBxul_VERSION}
+@lib xulrunner/plugins/libnullplugin.so.${LIBnullplugin_VERSION}
+@lib xulrunner/plugins/libunixprintplugin.so.${LIBunixprintplugin_VERSION}

devel/xulrunner/pkg/PLIST-devel

@@ -1,11 +1,10 @@
-@comment $OpenBSD: PLIST-devel,v 1.2 2007/01/12 20:35:15 kurt Exp $
+@comment $OpenBSD: PLIST-devel,v 1.3 2007/06/28 19:50:05 martynas Exp $
 @conflict xulrunner-<1.8.0.4p0
-bin/xulrunner-config
 lib/pkgconfig/
 lib/pkgconfig/xulrunner-gtkmozembed.pc
 lib/pkgconfig/xulrunner-js.pc
 @comment lib/pkgconfig/xulrunner-nspr.pc
-lib/pkgconfig/xulrunner-nss.pc
+@comment lib/pkgconfig/xulrunner-nss.pc
 lib/pkgconfig/xulrunner-plugin.pc
 lib/pkgconfig/xulrunner-xpcom.pc
 xulrunner/idl/
@@ -23,8 +22,23 @@ xulrunner/idl/imgIEncoder.idl
 xulrunner/idl/imgILoad.idl
 xulrunner/idl/imgILoader.idl
 xulrunner/idl/imgIRequest.idl
+xulrunner/idl/inICSSValueSearch.idl
+xulrunner/idl/inIDOMUtils.idl
+xulrunner/idl/inIDOMView.idl
+xulrunner/idl/inIDeepTreeWalker.idl
+xulrunner/idl/inIFileSearch.idl
+xulrunner/idl/inIFlasher.idl
+xulrunner/idl/inISearchObserver.idl
+xulrunner/idl/inISearchProcess.idl
 xulrunner/idl/jsdIDebuggerService.idl
 xulrunner/idl/mozIJSSubScriptLoader.idl
+xulrunner/idl/mozIStorageConnection.idl
+xulrunner/idl/mozIStorageDataSet.idl
+xulrunner/idl/mozIStorageFunction.idl
+xulrunner/idl/mozIStorageService.idl
+xulrunner/idl/mozIStorageStatement.idl
+xulrunner/idl/mozIStorageStatementWrapper.idl
+xulrunner/idl/mozIStorageValueArray.idl
 xulrunner/idl/mozITXTToHTMLConv.idl
 xulrunner/idl/nsCDefaultURIFixup.idl
 xulrunner/idl/nsCDocShell.idl
@@ -74,6 +88,7 @@ xulrunner/idl/nsIAutoCompletePopup.idl
 xulrunner/idl/nsIAutoCompleteResult.idl
 xulrunner/idl/nsIAutoCompleteResultTypes.idl
 xulrunner/idl/nsIAutoCompleteSearch.idl
+xulrunner/idl/nsIAutoCompleteSimpleResult.idl
 xulrunner/idl/nsIAutoConfig.idl
 xulrunner/idl/nsIBadCertListener.idl
 xulrunner/idl/nsIBaseWindow.idl
@@ -94,6 +109,7 @@ xulrunner/idl/nsIByteRangeRequest.idl
 xulrunner/idl/nsICMSDecoder.idl
 xulrunner/idl/nsICMSEncoder.idl
 xulrunner/idl/nsICMSMessage.idl
+xulrunner/idl/nsICMSMessage2.idl
 xulrunner/idl/nsICMSMessageErrors.idl
 xulrunner/idl/nsICMSSecureMessage.idl
 xulrunner/idl/nsICRLInfo.idl
@@ -205,6 +221,7 @@ xulrunner/idl/nsIDOMCSSValueList.idl
 xulrunner/idl/nsIDOMCanvasRenderingContext2D.idl
 xulrunner/idl/nsIDOMCharacterData.idl
 xulrunner/idl/nsIDOMChromeWindow.idl
+xulrunner/idl/nsIDOMClientInformation.idl
 xulrunner/idl/nsIDOMComment.idl
 xulrunner/idl/nsIDOMConstructor.idl
 xulrunner/idl/nsIDOMCounter.idl
@@ -414,6 +431,7 @@ xulrunner/idl/nsIDOMSVGSymbolElement.idl
 xulrunner/idl/nsIDOMSVGTSpanElement.idl
 xulrunner/idl/nsIDOMSVGTextContentElement.idl
 xulrunner/idl/nsIDOMSVGTextElement.idl
+xulrunner/idl/nsIDOMSVGTextPathElement.idl
 xulrunner/idl/nsIDOMSVGTextPositionElem.idl
 xulrunner/idl/nsIDOMSVGTitleElement.idl
 xulrunner/idl/nsIDOMSVGTransform.idl
@@ -421,14 +439,21 @@ xulrunner/idl/nsIDOMSVGTransformList.idl
 xulrunner/idl/nsIDOMSVGTransformable.idl
 xulrunner/idl/nsIDOMSVGURIReference.idl
 xulrunner/idl/nsIDOMSVGUseElement.idl
+xulrunner/idl/nsIDOMSVGViewSpec.idl
 xulrunner/idl/nsIDOMSVGZoomAndPan.idl
 xulrunner/idl/nsIDOMSVGZoomEvent.idl
 xulrunner/idl/nsIDOMScreen.idl
 xulrunner/idl/nsIDOMSerializer.idl
 xulrunner/idl/nsIDOMSmartCardEvent.idl
+xulrunner/idl/nsIDOMStorage.idl
+xulrunner/idl/nsIDOMStorageEvent.idl
+xulrunner/idl/nsIDOMStorageItem.idl
+xulrunner/idl/nsIDOMStorageList.idl
+xulrunner/idl/nsIDOMStorageWindow.idl
 xulrunner/idl/nsIDOMStyleSheet.idl
 xulrunner/idl/nsIDOMStyleSheetList.idl
 xulrunner/idl/nsIDOMText.idl
+xulrunner/idl/nsIDOMToString.idl
 xulrunner/idl/nsIDOMTreeWalker.idl
 xulrunner/idl/nsIDOMUIEvent.idl
 xulrunner/idl/nsIDOMUserDataHandler.idl
@@ -448,6 +473,7 @@ xulrunner/idl/nsIDOMXPathResult.idl
 xulrunner/idl/nsIDOMXULButtonElement.idl
 xulrunner/idl/nsIDOMXULCheckboxElement.idl
 xulrunner/idl/nsIDOMXULCommandDispatcher.idl
+xulrunner/idl/nsIDOMXULCommandEvent.idl
 xulrunner/idl/nsIDOMXULControlElement.idl
 xulrunner/idl/nsIDOMXULDescriptionElement.idl
 xulrunner/idl/nsIDOMXULDocument.idl
@@ -514,6 +540,7 @@ xulrunner/idl/nsIEventTarget.idl
 xulrunner/idl/nsIException.idl
 xulrunner/idl/nsIExceptionService.idl
 xulrunner/idl/nsIExpatSink.idl
+xulrunner/idl/nsIExtendedExpatSink.idl
 xulrunner/idl/nsIExtensionManager.idl
 xulrunner/idl/nsIExternalHelperAppService.idl
 xulrunner/idl/nsIExternalProtocolHandler.idl
@@ -523,6 +550,16 @@ xulrunner/idl/nsIFTPChannel.idl
 xulrunner/idl/nsIFactory.idl
 xulrunner/idl/nsIFastLoadFileControl.idl
 xulrunner/idl/nsIFastLoadService.idl
+xulrunner/idl/nsIFeed.idl
+xulrunner/idl/nsIFeedContainer.idl
+xulrunner/idl/nsIFeedElementBase.idl
+xulrunner/idl/nsIFeedEntry.idl
+xulrunner/idl/nsIFeedGenerator.idl
+xulrunner/idl/nsIFeedListener.idl
+xulrunner/idl/nsIFeedPerson.idl
+xulrunner/idl/nsIFeedProcessor.idl
+xulrunner/idl/nsIFeedResult.idl
+xulrunner/idl/nsIFeedTextConstruct.idl
 xulrunner/idl/nsIFile.idl
 xulrunner/idl/nsIFileChannel.idl
 xulrunner/idl/nsIFilePicker.idl
@@ -550,6 +587,7 @@ xulrunner/idl/nsIGenKeypairInfoDlg.idl
 xulrunner/idl/nsIGenericInterfaceInfoSet.idl
 xulrunner/idl/nsIGlobalHistory.idl
 xulrunner/idl/nsIGlobalHistory2.idl
+xulrunner/idl/nsIGlobalHistory3.idl
 xulrunner/idl/nsIGnomeVFSService.idl
 xulrunner/idl/nsIHTMLAbsPosEditor.idl
 xulrunner/idl/nsIHTMLEditor.idl
@@ -560,6 +598,7 @@ xulrunner/idl/nsIHTTPHeaderListener.idl
 xulrunner/idl/nsIHTTPIndex.idl
 xulrunner/idl/nsIHelperAppLauncherDialog.idl
 xulrunner/idl/nsIHistoryEntry.idl
+xulrunner/idl/nsIHttpActivityObserver.idl
 xulrunner/idl/nsIHttpAuthManager.idl
 xulrunner/idl/nsIHttpAuthenticator.idl
 xulrunner/idl/nsIHttpChannel.idl
@@ -571,6 +610,7 @@ xulrunner/idl/nsIIDNService.idl
 xulrunner/idl/nsIIFrameBoxObject.idl
 xulrunner/idl/nsIINIParser.idl
 xulrunner/idl/nsIIOService.idl
+xulrunner/idl/nsIIOService2.idl
 xulrunner/idl/nsIImageDocument.idl
 xulrunner/idl/nsIImageLoadingContent.idl
 xulrunner/idl/nsIIncrementalDownload.idl
@@ -596,8 +636,8 @@ xulrunner/idl/nsIJVMAuthTools.idl
 xulrunner/idl/nsIJVMConfigManager.idl
 xulrunner/idl/nsIJVMManager.idl
 xulrunner/idl/nsIJVMPluginInstance.idl
+xulrunner/idl/nsIKeyModule.idl
 xulrunner/idl/nsIKeygenThread.idl
-xulrunner/idl/nsILDAPSyncQuery.idl
 xulrunner/idl/nsILineInputStream.idl
 xulrunner/idl/nsIListBoxObject.idl
 xulrunner/idl/nsILoadGroup.idl
@@ -621,6 +661,7 @@ xulrunner/idl/nsINSSCertCache.idl
 xulrunner/idl/nsINativeAppSupport.idl
 xulrunner/idl/nsINativeScrollbar.idl
 xulrunner/idl/nsINetUtil.idl
+xulrunner/idl/nsINetworkLinkService.idl
 xulrunner/idl/nsINonBlockingAlertService.idl
 xulrunner/idl/nsIOCSPResponder.idl
 xulrunner/idl/nsIObjectInputStream.idl
@@ -734,6 +775,15 @@ xulrunner/idl/nsIResProtocolHandler.idl
 xulrunner/idl/nsIResumableChannel.idl
 xulrunner/idl/nsIRollupListener.idl
 xulrunner/idl/nsIRunnable.idl
+xulrunner/idl/nsISAXAttributes.idl
+xulrunner/idl/nsISAXContentHandler.idl
+xulrunner/idl/nsISAXDTDHandler.idl
+xulrunner/idl/nsISAXErrorHandler.idl
+xulrunner/idl/nsISAXLexicalHandler.idl
+xulrunner/idl/nsISAXLocator.idl
+xulrunner/idl/nsISAXMutableAttributes.idl
+xulrunner/idl/nsISAXXMLFilter.idl
+xulrunner/idl/nsISAXXMLReader.idl
 xulrunner/idl/nsISHContainer.idl
 xulrunner/idl/nsISHEntry.idl
 xulrunner/idl/nsISHTransaction.idl
@@ -797,6 +847,7 @@ xulrunner/idl/nsIScriptableInterfaces.idl
 xulrunner/idl/nsIScriptablePlugin.idl
 xulrunner/idl/nsIScriptableRegion.idl
 xulrunner/idl/nsIScriptableUConv.idl
+xulrunner/idl/nsIScriptableUnescapeHTML.idl
 xulrunner/idl/nsIScrollBoxObject.idl
 xulrunner/idl/nsIScrollable.idl
 xulrunner/idl/nsISearchContext.idl
@@ -809,6 +860,7 @@ xulrunner/idl/nsISecurityWarningDialogs.idl
 xulrunner/idl/nsISeekableStream.idl
 xulrunner/idl/nsISelectElement.idl
 xulrunner/idl/nsISelection.idl
+xulrunner/idl/nsISelection2.idl
 xulrunner/idl/nsISelectionController.idl
 xulrunner/idl/nsISelectionDisplay.idl
 xulrunner/idl/nsISelectionImageService.idl
@@ -819,6 +871,7 @@ xulrunner/idl/nsISerializable.idl
 xulrunner/idl/nsIServerSocket.idl
 xulrunner/idl/nsIServiceManager.idl
 xulrunner/idl/nsISessionRoaming.idl
+xulrunner/idl/nsISidebar.idl
 xulrunner/idl/nsISignatureVerifier.idl
 xulrunner/idl/nsISimpleEnumerator.idl
 xulrunner/idl/nsISimpleStreamListener.idl
@@ -831,6 +884,7 @@ xulrunner/idl/nsISound.idl
 xulrunner/idl/nsIStandardURL.idl
 xulrunner/idl/nsIStorageStream.idl
 xulrunner/idl/nsIStreamBufferAccess.idl
+xulrunner/idl/nsIStreamCipher.idl
 xulrunner/idl/nsIStreamConverter.idl
 xulrunner/idl/nsIStreamConverterService.idl
 xulrunner/idl/nsIStreamListener.idl
@@ -890,8 +944,10 @@ xulrunner/idl/nsIURIFixup.idl
 xulrunner/idl/nsIURILoader.idl
 xulrunner/idl/nsIURIRefObject.idl
 xulrunner/idl/nsIURL.idl
+xulrunner/idl/nsIURLFormatter.idl
 xulrunner/idl/nsIURLParser.idl
 xulrunner/idl/nsIUTF8ConverterService.idl
+xulrunner/idl/nsIUUIDGenerator.idl
 xulrunner/idl/nsIUnicharInputStream.idl
 xulrunner/idl/nsIUnicharLineInputStream.idl
 xulrunner/idl/nsIUnicharOutputStream.idl
@@ -919,6 +975,7 @@ xulrunner/idl/nsIWebBrowserPersist.idl
 xulrunner/idl/nsIWebBrowserPrint.idl
 xulrunner/idl/nsIWebBrowserSetup.idl
 xulrunner/idl/nsIWebBrowserStream.idl
+xulrunner/idl/nsIWebContentHandlerRegistrar.idl
 xulrunner/idl/nsIWebNavigation.idl
 xulrunner/idl/nsIWebNavigationInfo.idl
 xulrunner/idl/nsIWebPageDescriptor.idl
@@ -933,12 +990,14 @@ xulrunner/idl/nsIWindowCreator2.idl
 xulrunner/idl/nsIWindowDataSource.idl
 xulrunner/idl/nsIWindowMediator.idl
 xulrunner/idl/nsIWindowMediatorListener.idl
+xulrunner/idl/nsIWindowProvider.idl
 xulrunner/idl/nsIWindowWatcher.idl
 xulrunner/idl/nsIWindowlessPlugInstPeer.idl
 xulrunner/idl/nsIWritablePropertyBag.idl
 xulrunner/idl/nsIWritablePropertyBag2.idl
 xulrunner/idl/nsIWyciwygChannel.idl
 xulrunner/idl/nsIX509Cert.idl
+xulrunner/idl/nsIX509Cert3.idl
 xulrunner/idl/nsIX509CertDB.idl
 xulrunner/idl/nsIX509CertDB2.idl
 xulrunner/idl/nsIX509CertValidity.idl
@@ -958,6 +1017,7 @@ xulrunner/idl/nsIXPointer.idl
 xulrunner/idl/nsIXSLTException.idl
 xulrunner/idl/nsIXSLTProcessor.idl
 xulrunner/idl/nsIXSLTProcessorObsolete.idl
+xulrunner/idl/nsIXSLTProcessorPrivate.idl
 xulrunner/idl/nsIXTFAttributeHandler.idl
 xulrunner/idl/nsIXTFBindableElement.idl
 xulrunner/idl/nsIXTFBindableElementWrapper.idl
@@ -1071,9 +1131,9 @@ xulrunner/include/autocomplete/nsIAutoCompletePopup.h
 xulrunner/include/autocomplete/nsIAutoCompleteResult.h
 xulrunner/include/autocomplete/nsIAutoCompleteResultTypes.h
 xulrunner/include/autocomplete/nsIAutoCompleteSearch.h
+xulrunner/include/autocomplete/nsIAutoCompleteSimpleResult.h
 xulrunner/include/autoconfig/
 xulrunner/include/autoconfig/nsIAutoConfig.h
-xulrunner/include/autoconfig/nsILDAPSyncQuery.h
 xulrunner/include/autoconfig/nsIReadConfig.h
 xulrunner/include/browser/
 xulrunner/include/browser/nsIBrowserInstance.h
@@ -1132,8 +1192,11 @@ xulrunner/include/content/nsIContent.h
 xulrunner/include/content/nsIContentIterator.h
 xulrunner/include/content/nsIContentPolicy.h
 xulrunner/include/content/nsIContentSerializer.h
+xulrunner/include/content/nsIDOMGCParticipant.h
+xulrunner/include/content/nsIDOMParser.h
 xulrunner/include/content/nsIDOMSVGListener.h
 xulrunner/include/content/nsIDOMSVGZoomListener.h
+xulrunner/include/content/nsIDOMSerializer.h
 xulrunner/include/content/nsIDocument.h
 xulrunner/include/content/nsIDocumentEncoder.h
 xulrunner/include/content/nsIDocumentObserver.h
@@ -1170,6 +1233,7 @@ xulrunner/include/content/nsIRadioControlElement.h
 xulrunner/include/content/nsIRadioGroupContainer.h
 xulrunner/include/content/nsIRadioVisitor.h
 xulrunner/include/content/nsIRangeUtils.h
+xulrunner/include/content/nsISVGPathFlatten.h
 xulrunner/include/content/nsISVGTextContentMetrics.h
 xulrunner/include/content/nsISVGValue.h
 xulrunner/include/content/nsISVGValueObserver.h
@@ -1181,6 +1245,7 @@ xulrunner/include/content/nsIScriptLoader.h
 xulrunner/include/content/nsIScriptLoaderObserver.h
 xulrunner/include/content/nsISelectElement.h
 xulrunner/include/content/nsISelection.h
+xulrunner/include/content/nsISelection2.h
 xulrunner/include/content/nsISelectionController.h
 xulrunner/include/content/nsISelectionDisplay.h
 xulrunner/include/content/nsISelectionListener.h
@@ -1196,11 +1261,13 @@ xulrunner/include/content/nsIXBLService.h
 xulrunner/include/content/nsIXMLContent.h
 xulrunner/include/content/nsIXMLContentBuilder.h
 xulrunner/include/content/nsIXMLContentSink.h
+xulrunner/include/content/nsIXMLHttpRequest.h
 xulrunner/include/content/nsIXPathEvaluatorInternal.h
 xulrunner/include/content/nsIXPointer.h
 xulrunner/include/content/nsIXSLTException.h
 xulrunner/include/content/nsIXSLTProcessor.h
 xulrunner/include/content/nsIXSLTProcessorObsolete.h
+xulrunner/include/content/nsIXSLTProcessorPrivate.h
 xulrunner/include/content/nsIXTFAttributeHandler.h
 xulrunner/include/content/nsIXTFBindableElement.h
 xulrunner/include/content/nsIXTFBindableElementWrapper.h
@@ -1250,6 +1317,7 @@ xulrunner/include/docshell/
 xulrunner/include/docshell/nsCDefaultURIFixup.h
 xulrunner/include/docshell/nsCDocShell.h
 xulrunner/include/docshell/nsDocShellCID.h
+xulrunner/include/docshell/nsDocShellLoadTypes.h
 xulrunner/include/docshell/nsIContentViewer.h
 xulrunner/include/docshell/nsIContentViewerEdit.h
 xulrunner/include/docshell/nsIContentViewerFile.h
@@ -1262,6 +1330,7 @@ xulrunner/include/docshell/nsIDocShellTreeOwner.h
 xulrunner/include/docshell/nsIEditorDocShell.h
 xulrunner/include/docshell/nsIGlobalHistory.h
 xulrunner/include/docshell/nsIGlobalHistory2.h
+xulrunner/include/docshell/nsIGlobalHistory3.h
 xulrunner/include/docshell/nsIMarkupDocumentViewer.h
 xulrunner/include/docshell/nsIScrollable.h
 xulrunner/include/docshell/nsITextScroll.h
@@ -1306,6 +1375,7 @@ xulrunner/include/dom/nsIDOMCanvasRenderingContext2D.h
 xulrunner/include/dom/nsIDOMCharacterData.h
 xulrunner/include/dom/nsIDOMChromeWindow.h
 xulrunner/include/dom/nsIDOMClassInfo.h
+xulrunner/include/dom/nsIDOMClientInformation.h
 xulrunner/include/dom/nsIDOMComment.h
 xulrunner/include/dom/nsIDOMCompositionListener.h
 xulrunner/include/dom/nsIDOMConstructor.h
@@ -1526,6 +1596,7 @@ xulrunner/include/dom/nsIDOMSVGSymbolElement.h
 xulrunner/include/dom/nsIDOMSVGTSpanElement.h
 xulrunner/include/dom/nsIDOMSVGTextContentElement.h
 xulrunner/include/dom/nsIDOMSVGTextElement.h
+xulrunner/include/dom/nsIDOMSVGTextPathElement.h
 xulrunner/include/dom/nsIDOMSVGTextPositionElem.h
 xulrunner/include/dom/nsIDOMSVGTitleElement.h
 xulrunner/include/dom/nsIDOMSVGTransform.h
@@ -1533,16 +1604,23 @@ xulrunner/include/dom/nsIDOMSVGTransformList.h
 xulrunner/include/dom/nsIDOMSVGTransformable.h
 xulrunner/include/dom/nsIDOMSVGURIReference.h
 xulrunner/include/dom/nsIDOMSVGUseElement.h
+xulrunner/include/dom/nsIDOMSVGViewSpec.h
 xulrunner/include/dom/nsIDOMSVGZoomAndPan.h
 xulrunner/include/dom/nsIDOMSVGZoomEvent.h
 xulrunner/include/dom/nsIDOMScreen.h
 xulrunner/include/dom/nsIDOMScriptObjectFactory.h
 xulrunner/include/dom/nsIDOMScrollListener.h
 xulrunner/include/dom/nsIDOMSmartCardEvent.h
+xulrunner/include/dom/nsIDOMStorage.h
+xulrunner/include/dom/nsIDOMStorageEvent.h
+xulrunner/include/dom/nsIDOMStorageItem.h
+xulrunner/include/dom/nsIDOMStorageList.h
+xulrunner/include/dom/nsIDOMStorageWindow.h
 xulrunner/include/dom/nsIDOMStyleSheet.h
 xulrunner/include/dom/nsIDOMStyleSheetList.h
 xulrunner/include/dom/nsIDOMText.h
 xulrunner/include/dom/nsIDOMTextListener.h
+xulrunner/include/dom/nsIDOMToString.h
 xulrunner/include/dom/nsIDOMTreeWalker.h
 xulrunner/include/dom/nsIDOMUIEvent.h
 xulrunner/include/dom/nsIDOMUIListener.h
@@ -1563,6 +1641,7 @@ xulrunner/include/dom/nsIDOMXPathResult.h
 xulrunner/include/dom/nsIDOMXULButtonElement.h
 xulrunner/include/dom/nsIDOMXULCheckboxElement.h
 xulrunner/include/dom/nsIDOMXULCommandDispatcher.h
+xulrunner/include/dom/nsIDOMXULCommandEvent.h
 xulrunner/include/dom/nsIDOMXULControlElement.h
 xulrunner/include/dom/nsIDOMXULDescriptionElement.h
 xulrunner/include/dom/nsIDOMXULDocument.h
@@ -1590,6 +1669,9 @@ xulrunner/include/dom/nsIScriptGlobalObjectOwner.h
 xulrunner/include/dom/nsIScriptNameSpaceManager.h
 xulrunner/include/dom/nsIScriptObjectOwner.h
 xulrunner/include/dom/nsIScriptObjectPrincipal.h
+xulrunner/include/dom/nsISidebar.h
+xulrunner/include/dom/nsIWebContentHandlerRegistrar.h
+xulrunner/include/dom/nsPIDOMStorage.h
 xulrunner/include/dom/nsPIDOMWindow.h
 xulrunner/include/dom/nsPIWindowRoot.h
 xulrunner/include/downloads/
@@ -1623,6 +1705,7 @@ xulrunner/include/embed_base/nsEmbedAPI.h
 xulrunner/include/embed_base/nsEmbedCID.h
 xulrunner/include/embed_base/nsIWindowCreator.h
 xulrunner/include/embed_base/nsIWindowCreator2.h
+xulrunner/include/embed_base/nsIWindowProvider.h
 xulrunner/include/embedcomponents/
 xulrunner/include/embedcomponents/nsIAppStartupNotifier.h
 xulrunner/include/expat/
@@ -1638,6 +1721,18 @@ xulrunner/include/exthandler/nsIHelperAppLauncherDialog.h
 xulrunner/include/exthandler/nsOSHelperAppService.h
 xulrunner/include/fastfind/
 xulrunner/include/fastfind/nsITypeAheadFind.h
+xulrunner/include/feeds/
+xulrunner/include/feeds/nsIFeed.h
+xulrunner/include/feeds/nsIFeedContainer.h
+xulrunner/include/feeds/nsIFeedElementBase.h
+xulrunner/include/feeds/nsIFeedEntry.h
+xulrunner/include/feeds/nsIFeedGenerator.h
+xulrunner/include/feeds/nsIFeedListener.h
+xulrunner/include/feeds/nsIFeedPerson.h
+xulrunner/include/feeds/nsIFeedProcessor.h
+xulrunner/include/feeds/nsIFeedResult.h
+xulrunner/include/feeds/nsIFeedTextConstruct.h
+xulrunner/include/feeds/nsIScriptableUnescapeHTML.h
 xulrunner/include/filepicker/
 xulrunner/include/filepicker/nsIFileView.h
 xulrunner/include/find/
@@ -1706,6 +1801,7 @@ xulrunner/include/htmlparser/nsIContentSink.h
 xulrunner/include/htmlparser/nsIDTD.h
 xulrunner/include/htmlparser/nsIElementObserver.h
 xulrunner/include/htmlparser/nsIExpatSink.h
+xulrunner/include/htmlparser/nsIExtendedExpatSink.h
 xulrunner/include/htmlparser/nsIFragmentContentSink.h
 xulrunner/include/htmlparser/nsIHTMLContentSink.h
 xulrunner/include/htmlparser/nsIParser.h
@@ -1729,6 +1825,15 @@ xulrunner/include/imglib2/imgIEncoder.h
 xulrunner/include/imglib2/imgILoad.h
 xulrunner/include/imglib2/imgILoader.h
 xulrunner/include/imglib2/imgIRequest.h
+xulrunner/include/inspector/
+xulrunner/include/inspector/inICSSValueSearch.h
+xulrunner/include/inspector/inIDOMUtils.h
+xulrunner/include/inspector/inIDOMView.h
+xulrunner/include/inspector/inIDeepTreeWalker.h
+xulrunner/include/inspector/inIFileSearch.h
+xulrunner/include/inspector/inIFlasher.h
+xulrunner/include/inspector/inISearchObserver.h
+xulrunner/include/inspector/inISearchProcess.h
 xulrunner/include/intl/
 xulrunner/include/intl/nsIStringBundle.h
 xulrunner/include/intl/nsIStringBundleOverride.h
@@ -1770,6 +1875,7 @@ xulrunner/include/js/jsarena.h
 xulrunner/include/js/jsarray.h
 xulrunner/include/js/jsatom.h
 xulrunner/include/js/jsautocfg.h
+xulrunner/include/js/jsautokw.h
 xulrunner/include/js/jsbit.h
 xulrunner/include/js/jsbool.h
 xulrunner/include/js/jsclist.h
@@ -1784,6 +1890,7 @@ xulrunner/include/js/jsfun.h
 xulrunner/include/js/jsgc.h
 xulrunner/include/js/jshash.h
 xulrunner/include/js/jsinterp.h
+xulrunner/include/js/jsiter.h
 xulrunner/include/js/jslock.h
 xulrunner/include/js/jslong.h
 xulrunner/include/js/jsmath.h
@@ -1795,6 +1902,7 @@ xulrunner/include/js/jsosdep.h
 xulrunner/include/js/jsotypes.h
 xulrunner/include/js/jsparse.h
 xulrunner/include/js/jsprf.h
+xulrunner/include/js/jsproto.tbl
 xulrunner/include/js/jsprvtd.h
 xulrunner/include/js/jspubtd.h
 xulrunner/include/js/jsregexp.h
@@ -1949,6 +2057,7 @@ xulrunner/include/layout/nsLayoutAtomList.h
 xulrunner/include/layout/nsLayoutAtoms.h
 xulrunner/include/layout/nsLayoutCID.h
 xulrunner/include/layout/nsLayoutErrors.h
+xulrunner/include/layout/nsLayoutStatics.h
 xulrunner/include/layout/nsLayoutStylesheetCache.h
 xulrunner/include/layout/nsLayoutUtils.h
 xulrunner/include/layout/nsPIBoxObject.h
@@ -2064,6 +2173,7 @@ xulrunner/include/necko/nsIFileChannel.h
 xulrunner/include/necko/nsIFileProtocolHandler.h
 xulrunner/include/necko/nsIFileStreams.h
 xulrunner/include/necko/nsIFileURL.h
+xulrunner/include/necko/nsIHttpActivityObserver.h
 xulrunner/include/necko/nsIHttpAuthManager.h
 xulrunner/include/necko/nsIHttpAuthenticator.h
 xulrunner/include/necko/nsIHttpChannel.h
@@ -2073,6 +2183,7 @@ xulrunner/include/necko/nsIHttpHeaderVisitor.h
 xulrunner/include/necko/nsIHttpProtocolHandler.h
 xulrunner/include/necko/nsIIDNService.h
 xulrunner/include/necko/nsIIOService.h
+xulrunner/include/necko/nsIIOService2.h
 xulrunner/include/necko/nsIIncrementalDownload.h
 xulrunner/include/necko/nsIInputStreamChannel.h
 xulrunner/include/necko/nsIInputStreamPump.h
@@ -2080,6 +2191,7 @@ xulrunner/include/necko/nsILoadGroup.h
 xulrunner/include/necko/nsIMIMEInputStream.h
 xulrunner/include/necko/nsIMultiPartChannel.h
 xulrunner/include/necko/nsINetUtil.h
+xulrunner/include/necko/nsINetworkLinkService.h
 xulrunner/include/necko/nsIPasswordManager.h
 xulrunner/include/necko/nsIPasswordManagerInternal.h
 xulrunner/include/necko/nsIPermissionManager.h
@@ -2149,99 +2261,6 @@ xulrunner/include/nkcache/nsICacheSession.h
 xulrunner/include/nkcache/nsICacheVisitor.h
 xulrunner/include/nsBuildID.h
 xulrunner/include/nsStaticComponents.h
-xulrunner/include/nss/
-xulrunner/include/nss/base64.h
-xulrunner/include/nss/blapit.h
-xulrunner/include/nss/cert.h
-xulrunner/include/nss/certdb.h
-xulrunner/include/nss/certt.h
-xulrunner/include/nss/ciferfam.h
-xulrunner/include/nss/cmmf.h
-xulrunner/include/nss/cmmft.h
-xulrunner/include/nss/cms.h
-xulrunner/include/nss/cmsreclist.h
-xulrunner/include/nss/cmst.h
-xulrunner/include/nss/crmf.h
-xulrunner/include/nss/crmft.h
-xulrunner/include/nss/cryptohi.h
-xulrunner/include/nss/cryptoht.h
-xulrunner/include/nss/ecl-exp.h
-xulrunner/include/nss/hasht.h
-xulrunner/include/nss/jar-ds.h
-xulrunner/include/nss/jar.h
-xulrunner/include/nss/jarfile.h
-xulrunner/include/nss/key.h
-xulrunner/include/nss/keyhi.h
-xulrunner/include/nss/keyt.h
-xulrunner/include/nss/keythi.h
-xulrunner/include/nss/nss.h
-xulrunner/include/nss/nssb64.h
-xulrunner/include/nss/nssb64t.h
-xulrunner/include/nss/nssbase.h
-xulrunner/include/nss/nssbaset.h
-xulrunner/include/nss/nssck.api
-xulrunner/include/nss/nssckbi.h
-xulrunner/include/nss/nssckepv.h
-xulrunner/include/nss/nssckft.h
-xulrunner/include/nss/nssckfw.h
-xulrunner/include/nss/nssckfwc.h
-xulrunner/include/nss/nssckfwt.h
-xulrunner/include/nss/nssckg.h
-xulrunner/include/nss/nssckmdt.h
-xulrunner/include/nss/nssckt.h
-xulrunner/include/nss/nssilckt.h
-xulrunner/include/nss/nssilock.h
-xulrunner/include/nss/nsslocks.h
-xulrunner/include/nss/nssrwlk.h
-xulrunner/include/nss/nssrwlkt.h
-xulrunner/include/nss/ocsp.h
-xulrunner/include/nss/ocspt.h
-xulrunner/include/nss/p12.h
-xulrunner/include/nss/p12plcy.h
-xulrunner/include/nss/p12t.h
-xulrunner/include/nss/pk11func.h
-xulrunner/include/nss/pk11pqg.h
-xulrunner/include/nss/pk11priv.h
-xulrunner/include/nss/pk11pub.h
-xulrunner/include/nss/pk11sdr.h
-xulrunner/include/nss/pkcs11.h
-xulrunner/include/nss/pkcs11f.h
-xulrunner/include/nss/pkcs11n.h
-xulrunner/include/nss/pkcs11p.h
-xulrunner/include/nss/pkcs11t.h
-xulrunner/include/nss/pkcs11u.h
-xulrunner/include/nss/pkcs12.h
-xulrunner/include/nss/pkcs12t.h
-xulrunner/include/nss/pkcs7t.h
-xulrunner/include/nss/portreg.h
-xulrunner/include/nss/preenc.h
-xulrunner/include/nss/secasn1.h
-xulrunner/include/nss/secasn1t.h
-xulrunner/include/nss/seccomon.h
-xulrunner/include/nss/secder.h
-xulrunner/include/nss/secdert.h
-xulrunner/include/nss/secdig.h
-xulrunner/include/nss/secdigt.h
-xulrunner/include/nss/secerr.h
-xulrunner/include/nss/sechash.h
-xulrunner/include/nss/secitem.h
-xulrunner/include/nss/secmime.h
-xulrunner/include/nss/secmod.h
-xulrunner/include/nss/secmodt.h
-xulrunner/include/nss/secoid.h
-xulrunner/include/nss/secoidt.h
-xulrunner/include/nss/secpkcs5.h
-xulrunner/include/nss/secpkcs7.h
-xulrunner/include/nss/secport.h
-xulrunner/include/nss/shsign.h
-xulrunner/include/nss/smime.h
-xulrunner/include/nss/ssl.h
-xulrunner/include/nss/sslerr.h
-xulrunner/include/nss/sslproto.h
-xulrunner/include/nss/sslt.h
-xulrunner/include/nss/swfort.h
-xulrunner/include/nss/swfortt.h
-xulrunner/include/nss/watcomfx.h
 xulrunner/include/oji/
 xulrunner/include/oji/ProxyJNI.h
 xulrunner/include/oji/jvmmgr.h
@@ -2278,6 +2297,7 @@ xulrunner/include/pipnss/nsIBadCertListener.h
 xulrunner/include/pipnss/nsICMSDecoder.h
 xulrunner/include/pipnss/nsICMSEncoder.h
 xulrunner/include/pipnss/nsICMSMessage.h
+xulrunner/include/pipnss/nsICMSMessage2.h
 xulrunner/include/pipnss/nsICMSMessageErrors.h
 xulrunner/include/pipnss/nsICMSSecureMessage.h
 xulrunner/include/pipnss/nsICRLInfo.h
@@ -2291,6 +2311,7 @@ xulrunner/include/pipnss/nsIClientAuthDialogs.h
 xulrunner/include/pipnss/nsIDOMCryptoDialogs.h
 xulrunner/include/pipnss/nsIFormSigningDialog.h
 xulrunner/include/pipnss/nsIGenKeypairInfoDlg.h
+xulrunner/include/pipnss/nsIKeyModule.h
 xulrunner/include/pipnss/nsIKeygenThread.h
 xulrunner/include/pipnss/nsINSSCertCache.h
 xulrunner/include/pipnss/nsIOCSPResponder.h
@@ -2301,10 +2322,12 @@ xulrunner/include/pipnss/nsIPKCS11ModuleDB.h
 xulrunner/include/pipnss/nsIPKCS11Slot.h
 xulrunner/include/pipnss/nsISMimeCert.h
 xulrunner/include/pipnss/nsISSLStatus.h
+xulrunner/include/pipnss/nsIStreamCipher.h
 xulrunner/include/pipnss/nsITokenDialogs.h
 xulrunner/include/pipnss/nsITokenPasswordDialogs.h
 xulrunner/include/pipnss/nsIUserCertPicker.h
 xulrunner/include/pipnss/nsIX509Cert.h
+xulrunner/include/pipnss/nsIX509Cert3.h
 xulrunner/include/pipnss/nsIX509CertDB.h
 xulrunner/include/pipnss/nsIX509CertDB2.h
 xulrunner/include/pipnss/nsIX509CertValidity.h
@@ -2417,6 +2440,19 @@ xulrunner/include/shistory/nsISHistoryInternal.h
 xulrunner/include/shistory/nsISHistoryListener.h
 xulrunner/include/simple/
 xulrunner/include/simple/nsISimpleTest.h
+xulrunner/include/sqlite3/
+xulrunner/include/sqlite3/sqlite3.h
+xulrunner/include/sqlite3/sqlite3file.h
+xulrunner/include/storage/
+xulrunner/include/storage/mozIStorageConnection.h
+xulrunner/include/storage/mozIStorageDataSet.h
+xulrunner/include/storage/mozIStorageFunction.h
+xulrunner/include/storage/mozIStorageService.h
+xulrunner/include/storage/mozIStorageStatement.h
+xulrunner/include/storage/mozIStorageStatementWrapper.h
+xulrunner/include/storage/mozIStorageValueArray.h
+xulrunner/include/storage/mozStorageCID.h
+xulrunner/include/storage/mozStorageHelper.h
 xulrunner/include/string/
 xulrunner/include/string/nsAString.h
 xulrunner/include/string/nsAlgorithm.h
@@ -2536,6 +2572,8 @@ xulrunner/include/uriloader/nsIWebProgress.h
 xulrunner/include/uriloader/nsIWebProgressListener.h
 xulrunner/include/uriloader/nsIWebProgressListener2.h
 xulrunner/include/uriloader/nsURILoader.h
+xulrunner/include/urlformatter/
+xulrunner/include/urlformatter/nsIURLFormatter.h
 xulrunner/include/util/
 xulrunner/include/util/nsTimer.h
 xulrunner/include/util/stopwatch.h
@@ -2664,14 +2702,23 @@ xulrunner/include/windowwatcher/nsIPromptService.h
 xulrunner/include/windowwatcher/nsIWindowWatcher.h
 xulrunner/include/windowwatcher/nsPIPromptService.h
 xulrunner/include/windowwatcher/nsPIWindowWatcher.h
+xulrunner/include/xml/
 xulrunner/include/xml-rpc/
 xulrunner/include/xml-rpc/nsIDictionary.h
 xulrunner/include/xml-rpc/nsIXmlRpcClient.h
 xulrunner/include/xml-rpc/nsIXmlRpcClientListener.h
-xulrunner/include/xmlextras/
-xulrunner/include/xmlextras/nsIDOMParser.h
-xulrunner/include/xmlextras/nsIDOMSerializer.h
-xulrunner/include/xmlextras/nsIXMLHttpRequest.h
+xulrunner/include/xml/nsISAXAttributes.h
+xulrunner/include/xml/nsISAXContentHandler.h
+xulrunner/include/xml/nsISAXDTDHandler.h
+xulrunner/include/xml/nsISAXErrorHandler.h
+xulrunner/include/xml/nsISAXLexicalHandler.h
+xulrunner/include/xml/nsISAXLocator.h
+xulrunner/include/xml/nsISAXMutableAttributes.h
+xulrunner/include/xml/nsISAXXMLFilter.h
+xulrunner/include/xml/nsISAXXMLReader.h
+xulrunner/include/xml/nsSAXAttributes.h
+xulrunner/include/xml/nsSAXLocator.h
+xulrunner/include/xml/nsSAXXMLReader.h
 xulrunner/include/xpcom/
 xulrunner/include/xpcom/nsAgg.h
 xulrunner/include/xpcom/nsAppDirectoryServiceDefs.h
@@ -2685,6 +2732,7 @@ xulrunner/include/xpcom/nsBaseHashtable.h
 xulrunner/include/xpcom/nsCOMArray.h
 xulrunner/include/xpcom/nsCOMPtr.h
 xulrunner/include/xpcom/nsCRT.h
+xulrunner/include/xpcom/nsCategoryCache.h
 xulrunner/include/xpcom/nsCategoryManagerUtils.h
 xulrunner/include/xpcom/nsCheapSets.h
 xulrunner/include/xpcom/nsClassHashtable.h
@@ -2807,6 +2855,7 @@ xulrunner/include/xpcom/nsITimer.h
 xulrunner/include/xpcom/nsITimerInternal.h
 xulrunner/include/xpcom/nsITimerManager.h
 xulrunner/include/xpcom/nsITraceRefcnt.h
+xulrunner/include/xpcom/nsIUUIDGenerator.h
 xulrunner/include/xpcom/nsIUnicharBuffer.h
 xulrunner/include/xpcom/nsIUnicharInputStream.h
 xulrunner/include/xpcom/nsIUnicharLineInputStream.h
@@ -2849,6 +2898,7 @@ xulrunner/include/xpcom/nsStringIO.h
 xulrunner/include/xpcom/nsStringStream.h
 xulrunner/include/xpcom/nsSupportsArray.h
 xulrunner/include/xpcom/nsSupportsPrimitives.h
+xulrunner/include/xpcom/nsTArray.h
 xulrunner/include/xpcom/nsTHashtable.h
 xulrunner/include/xpcom/nsTextFormatter.h
 xulrunner/include/xpcom/nsTime.h
@@ -2942,8 +2992,6 @@ xulrunner/include/xultmpl/
 xulrunner/include/xultmpl/nsIXULBuilderListener.h
 xulrunner/include/xultmpl/nsIXULSortService.h
 xulrunner/include/xultmpl/nsIXULTemplateBuilder.h
-xulrunner/mangle
-xulrunner/shlibsign
 xulrunner/xpcshell
 xulrunner/xpicleanup
 xulrunner/xpidl

devel/xulrunner/pkg/PLIST-main

@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST-main,v 1.2 2007/01/12 20:35:15 kurt Exp $
+@comment $OpenBSD: PLIST-main,v 1.3 2007/06/28 19:50:05 martynas Exp $
 %%SHARED%%
 bin/xulrunner
+bin/xulrunner-config
 xulrunner/
 xulrunner/LICENSE
 xulrunner/TestGtkEmbed
@@ -20,6 +21,7 @@ xulrunner/chrome/pippki.manifest
 xulrunner/chrome/toolkit.jar
 xulrunner/chrome/toolkit.manifest
 xulrunner/components/
+xulrunner/components/FeedProcessor.js
 xulrunner/components/accessibility-atk.xpt
 xulrunner/components/accessibility.xpt
 xulrunner/components/alerts.xpt
@@ -50,6 +52,8 @@ xulrunner/components/dom_events.xpt
 xulrunner/components/dom_html.xpt
 xulrunner/components/dom_loadsave.xpt
 xulrunner/components/dom_range.xpt
+xulrunner/components/dom_sidebar.xpt
+xulrunner/components/dom_storage.xpt
 xulrunner/components/dom_stylesheets.xpt
 xulrunner/components/dom_svg.xpt
 xulrunner/components/dom_traversal.xpt
@@ -63,6 +67,7 @@ xulrunner/components/embed_base.xpt
 xulrunner/components/extensions.xpt
 xulrunner/components/exthandler.xpt
 xulrunner/components/fastfind.xpt
+xulrunner/components/feeds.xpt
 xulrunner/components/filepicker.xpt
 xulrunner/components/find.xpt
 xulrunner/components/gfx.xpt
@@ -70,6 +75,7 @@ xulrunner/components/gksvgrenderer.xpt
 xulrunner/components/history.xpt
 xulrunner/components/htmlparser.xpt
 xulrunner/components/imglib2.xpt
+xulrunner/components/inspector.xpt
 xulrunner/components/intl.xpt
 xulrunner/components/jar.xpt
 xulrunner/components/jsconsole-clhandler.js
@@ -109,6 +115,7 @@ xulrunner/components/nsKillAll.js
 xulrunner/components/nsProgressDialog.js
 xulrunner/components/nsProxyAutoConfig.js
 xulrunner/components/nsResetPref.js
+xulrunner/components/nsURLFormatter.js
 xulrunner/components/nsUpdateService.js
 xulrunner/components/nsXULAppInstall.js
 xulrunner/components/nsXmlRpcClient.js
@@ -125,7 +132,9 @@ xulrunner/components/progressDlg.xpt
 xulrunner/components/proxyObjInst.xpt
 xulrunner/components/rdf.xpt
 xulrunner/components/satchel.xpt
+xulrunner/components/saxparser.xpt
 xulrunner/components/shistory.xpt
+xulrunner/components/storage.xpt
 xulrunner/components/toolkitprofile.xpt
 xulrunner/components/toolkitremote.xpt
 xulrunner/components/txmgr.xpt
@@ -134,6 +143,7 @@ xulrunner/components/uconv.xpt
 xulrunner/components/unicharutil.xpt
 xulrunner/components/update.xpt
 xulrunner/components/uriloader.xpt
+xulrunner/components/urlformatter.xpt
 xulrunner/components/webBrowser_core.xpt
 xulrunner/components/webbrowserpersist.xpt
 xulrunner/components/webshell_idls.xpt
@@ -142,7 +152,6 @@ xulrunner/components/widget.xpt
 xulrunner/components/windowds.xpt
 xulrunner/components/windowwatcher.xpt
 xulrunner/components/xml-rpc.xpt
-xulrunner/components/xmlextras.xpt
 xulrunner/components/xpcom_base.xpt
 xulrunner/components/xpcom_components.xpt
 xulrunner/components/xpcom_ds.xpt
@@ -172,9 +181,6 @@ xulrunner/defaults/profile/US/localstore.rdf
 xulrunner/defaults/profile/chrome/
 xulrunner/defaults/profile/chrome/userChrome-example.css
 xulrunner/defaults/profile/chrome/userContent-example.css
-xulrunner/defaults/profile/extensions/
-xulrunner/defaults/profile/extensions/Extensions.rdf
-xulrunner/defaults/profile/extensions/installed-extensions.txt
 xulrunner/defaults/profile/localstore.rdf
 xulrunner/greprefs/
 xulrunner/greprefs/all.js
@@ -184,10 +190,9 @@ xulrunner/icons/
 xulrunner/icons/document.png
 xulrunner/icons/mozicon16.xpm
 xulrunner/icons/mozicon50.xpm
-xulrunner/mozicon16.xpm
-xulrunner/mozicon50.xpm
 xulrunner/mozilla-xremote-client
 xulrunner/nsinstall
+xulrunner/plugins/
 xulrunner/regxpcom
 xulrunner/res/
 xulrunner/res/EditorOverride.css