From 4f1d0b1e21b9f089cd5e1ea89fc02be606603201 Mon Sep 17 00:00:00 2001
From: wilfried <wilfried@openbsd.org>
Date: Sat, 9 Apr 2005 15:43:47 +0000
Subject: [PATCH] - bump major shlib version - move INSTALL/DEINSTALL code to
 PLIST - remove unused ldap config/patches

---
 www/mozilla-firefox/Makefile                  |  32 +++--
 .../patches/patch-configure_in                |  13 +-
 .../patch-directory_c-sdk_config_rules_mk     |  12 --
 .../patches/patch-nsprpub_configure_in        |  14 +-
 .../patch-nsprpub_pr_include_md__openbsd_h    |  12 ++
 .../patch-security_coreconf_OpenBSD_mk        |  15 +-
 ...com_components_nsNativeComponentLoader_cpp |  12 ++
 www/mozilla-firefox/pkg/DEINSTALL             |  35 -----
 www/mozilla-firefox/pkg/INSTALL               |  39 -----
 www/mozilla-firefox/pkg/MESSAGE               |  11 ++
 www/mozilla-firefox/pkg/PFRAG.shared          | 136 +++++++++---------
 www/mozilla-firefox/pkg/PLIST                 |  13 +-
 12 files changed, 165 insertions(+), 179 deletions(-)
 delete mode 100644 www/mozilla-firefox/patches/patch-directory_c-sdk_config_rules_mk
 create mode 100644 www/mozilla-firefox/patches/patch-nsprpub_pr_include_md__openbsd_h
 create mode 100644 www/mozilla-firefox/patches/patch-xpcom_components_nsNativeComponentLoader_cpp
 delete mode 100644 www/mozilla-firefox/pkg/DEINSTALL
 delete mode 100644 www/mozilla-firefox/pkg/INSTALL
 create mode 100644 www/mozilla-firefox/pkg/MESSAGE

diff --git a/www/mozilla-firefox/Makefile b/www/mozilla-firefox/Makefile
index e8af20aba28..facfa30338f 100644
--- a/www/mozilla-firefox/Makefile
+++ b/www/mozilla-firefox/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2005/04/04 21:24:00 kurt Exp $
+# $OpenBSD: Makefile,v 1.25 2005/04/09 15:43:47 wilfried Exp $
 
 ONLY_FOR_ARCHS=	alpha amd64 i386 powerpc sparc sparc64
 
@@ -6,7 +6,10 @@ COMMENT=	"redesign of Mozilla's browser component"
 
 VER=		1.0.2
 DISTNAME=	mozilla
-PKGNAME=	mozilla-firefox-${VER}p1
+PKGNAME=	mozilla-firefox-${VER}p2
+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.
 
 CATEGORIES=	www
 
@@ -45,11 +48,10 @@ USE_X11=	Yes
 USE_GMAKE=	Yes
 # Regression tests are too hard to adapt to run here
 NO_REGRESS=	Yes
-SUBST_VARS=	LOCALBASE
+SUBST_VARS=	LOCALBASE SO_VERSION
 
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/build/autoconf \
-				${WRKSRC}/nsprpub/build/autoconf \
-				${WRKSRC}/directory/c-sdk/config/autoconf
+				${WRKSRC}/nsprpub/build/autoconf
 
 AUTOCONF_VERSION= 2.13
 CONFIGURE_STYLE= autoconf no-autoheader
@@ -75,9 +77,11 @@ CONFIGURE_ARGS+=--disable-ldap			\
 		--disable-profilesharing
 
 CONFIGURE_ENV=	MOZ_PHOENIX=1 \
-		PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig"
+		PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig" \
+		SO_VERSION="${SO_VERSION}"
 MAKE_ENV=	MOZ_PHOENIX=1 \
-		LD_LIBRARY_PATH="${WRKSRC}/dist/bin"
+		LD_LIBRARY_PATH="${WRKSRC}/dist/bin" \
+		SO_VERSION="${SO_VERSION}"
 
 MOB=		${WRKSRC}/dist/bin
 MOZ=		${PREFIX}/mozilla-firefox
@@ -87,10 +91,12 @@ post-extract:
 	@cp ${FILESDIR}/xptc* ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix/
 
 pre-configure:
-	@cd ${WRKSRC}/nsprpub && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
-	@cd ${WRKSRC}/directory/c-sdk && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
+	@cd ${WRKSRC}/nsprpub && ${_SYSTRACE_CMD} ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
 	@perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g; s|_X11BASE_|${X11BASE}|g' \
 		${WRKSRC}/browser/app/mozilla.in
+	@perl -pi -e 's|_SO_VERSION_|${SO_VERSION}|g' \
+		${WRKSRC}/nsprpub/pr/include/md/_openbsd.h \
+		${WRKSRC}/xpcom/components/nsNativeComponentLoader.cpp
 
 do-install:
 .for dir in chrome components defaults greprefs res searchplugins
@@ -98,14 +104,14 @@ do-install:
 	@cd ${MOB} && ${TAR} -chf - ${dir} | \
 		${TAR} -xf - -C ${MOZ}
 .endfor
-	@cd ${MOB} && ${TAR} -chf - *.so.1.0 | \
+	@cd ${MOB} && ${TAR} -chf - *.so.?.? | \
 		${TAR} -xf - -C ${MOZ}
-	@chmod 444 ${MOZ}/*.so.1.0 ${MOZ}/components/*.so.1.0 ${MOZ}/components/*.js
+	@chmod 444 ${MOZ}/*.so.?.? ${MOZ}/components/*.so.?.? ${MOZ}/components/*.js
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${MOZ}
 	${INSTALL_DATA} ${WRKSRC}/browser/app/mozicon16.xpm ${WRKSRC}/browser/app/mozicon50.xpm ${MOZ}
-	${INSTALL_SCRIPT} ${MOB}/firefox ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${MOB}/firefox ${MOB}/firefox-config ${PREFIX}/bin/
 	ln -f ${PREFIX}/bin/firefox ${PREFIX}/bin/mozilla-firefox
-	${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${MOB}/firefox-config ${MOZ}
+	${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${MOZ}
 	${INSTALL_PROGRAM} ${MOB}/regchrome ${MOB}/regxpcom ${MOB}/firefox-bin ${MOB}/mozilla-xremote-client ${MOZ}
 	ln -f ${MOZ}/firefox-bin ${MOZ}/mozilla-firefox-bin
 
diff --git a/www/mozilla-firefox/patches/patch-configure_in b/www/mozilla-firefox/patches/patch-configure_in
index d6d3ef172ed..33b02f4f686 100644
--- a/www/mozilla-firefox/patches/patch-configure_in
+++ b/www/mozilla-firefox/patches/patch-configure_in
@@ -1,6 +1,15 @@
-$OpenBSD: patch-configure_in,v 1.3 2005/01/13 15:57:26 wilfried Exp $
+$OpenBSD: patch-configure_in,v 1.4 2005/04/09 15:43:47 wilfried Exp $
 --- configure.in.orig	Sun Oct 31 08:17:58 2004
-+++ configure.in	Fri Jan  7 11:44:14 2005
++++ configure.in	Wed Apr  6 19:06:20 2005
+@@ -1349,7 +1349,7 @@ case "$target" in
+ 	;;
+ 
+ *-openbsd*)
+-    DLL_SUFFIX=".so.1.0"
++    DLL_SUFFIX=".so.${SO_VERSION}"
+     DSO_CFLAGS=''
+     DSO_PIC_CFLAGS='-fPIC'
+     DSO_LDOPTS='-shared -fPIC'
 @@ -3103,7 +3103,7 @@ _SAVE_LIBS=$LIBS
  CFLAGS="$ZLIB_CFLAGS $CFLAGS"
  LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS"
diff --git a/www/mozilla-firefox/patches/patch-directory_c-sdk_config_rules_mk b/www/mozilla-firefox/patches/patch-directory_c-sdk_config_rules_mk
deleted file mode 100644
index 99a8acef87e..00000000000
--- a/www/mozilla-firefox/patches/patch-directory_c-sdk_config_rules_mk
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-directory_c-sdk_config_rules_mk,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $
---- directory/c-sdk/config/rules.mk.orig	2004-02-15 11:03:01.000000000 +0100
-+++ directory/c-sdk/config/rules.mk	2004-02-15 11:18:42.000000000 +0100
-@@ -225,7 +225,7 @@ ifdef RELEASE_HEADERS
- 	$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)
- endif
- ifdef RELEASE_LIBS
--	$(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)
-+	$(NSINSTALL) -t -m 0444 $(RELEASE_LIBS) $(DESTDIR)$(libdir)
- endif
- 	+$(LOOP_OVER_DIRS)
- 
diff --git a/www/mozilla-firefox/patches/patch-nsprpub_configure_in b/www/mozilla-firefox/patches/patch-nsprpub_configure_in
index 1151075acaa..62242849e84 100644
--- a/www/mozilla-firefox/patches/patch-nsprpub_configure_in
+++ b/www/mozilla-firefox/patches/patch-nsprpub_configure_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-nsprpub_configure_in,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
---- nsprpub/configure.in.orig	Fri Oct 22 16:48:52 2004
-+++ nsprpub/configure.in	Fri Oct 22 16:47:30 2004
-@@ -1493,6 +1493,8 @@ mips-sony-newsos*)
+$OpenBSD: patch-nsprpub_configure_in,v 1.3 2005/04/09 15:43:47 wilfried Exp $
+--- nsprpub/configure.in.orig	Tue Sep 14 22:59:41 2004
++++ nsprpub/configure.in	Wed Apr  6 19:06:48 2005
+@@ -1493,9 +1493,11 @@ mips-sony-newsos*)
      AC_DEFINE(OPENBSD)
      AC_DEFINE(HAVE_BSD_FLOCK)
      AC_DEFINE(HAVE_SOCKLEN_T)
@@ -9,4 +9,8 @@ $OpenBSD: patch-nsprpub_configure_in,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
 +    AC_DEFINE(_PR_HAVE_GETPROTO_R_INT)
      CFLAGS="$CFLAGS -ansi -Wall"
      CXXFLAGS="$CXXFLAGS -ansi -Wall"
-     DLL_SUFFIX=so.1.0
+-    DLL_SUFFIX=so.1.0
++    DLL_SUFFIX="so.${SO_VERSION}"
+     DSO_CFLAGS=-fPIC
+     MDCPUCFG_H=_openbsd.cfg
+     PR_MD_CSRCS=openbsd.c
diff --git a/www/mozilla-firefox/patches/patch-nsprpub_pr_include_md__openbsd_h b/www/mozilla-firefox/patches/patch-nsprpub_pr_include_md__openbsd_h
new file mode 100644
index 00000000000..0de082c9b12
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_include_md__openbsd_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-nsprpub_pr_include_md__openbsd_h,v 1.7 2005/04/09 15:43:47 wilfried Exp $
+--- nsprpub/pr/include/md/_openbsd.h.orig	Wed Mar 10 08:51:37 2004
++++ nsprpub/pr/include/md/_openbsd.h	Wed Apr  6 22:38:21 2005
+@@ -53,7 +53,7 @@
+ #define _PR_SI_ARCHITECTURE "sparc"
+ #endif
+ 
+-#define PR_DLL_SUFFIX		".so.1.0"
++#define PR_DLL_SUFFIX		".so._SO_VERSION_"
+ 
+ #define _PR_VMBASE              0x30000000
+ #define _PR_STACK_VMBASE	0x50000000
diff --git a/www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk b/www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk
index 682e893b15b..0459851b22c 100644
--- a/www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk
+++ b/www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk
@@ -1,6 +1,6 @@
-$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.2 2004/03/01 07:14:48 pvalchev Exp $
---- security/coreconf/OpenBSD.mk.orig	2003-09-16 22:50:50.000000000 +0200
-+++ security/coreconf/OpenBSD.mk	2004-02-28 14:07:55.000000000 +0100
+$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.3 2005/04/09 15:43:47 wilfried Exp $
+--- security/coreconf/OpenBSD.mk.orig	Tue Sep 16 22:50:50 2003
++++ security/coreconf/OpenBSD.mk	Wed Apr  6 21:19:25 2005
 @@ -35,12 +35,12 @@
  
  include $(CORE_DEPTH)/coreconf/UNIX.mk
@@ -18,6 +18,15 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.2 2004/03/01 07:14:48 pvalchev
  ifeq ($(CPU_ARCH),i386)
  OS_REL_CFLAGS		= -Di386
  CPU_ARCH		= x86
+@@ -53,7 +53,7 @@ OS_LIBS			+= -pthread
+ DSO_LDOPTS		+= -pthread
+ endif
+ 
+-DLL_SUFFIX		= so.1.0
++DLL_SUFFIX		= so.${SO_VERSION}
+ 
+ OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DOPENBSD
+ 
 @@ -62,7 +62,7 @@ OS_LIBS			= 
  ARCH			= openbsd
  
diff --git a/www/mozilla-firefox/patches/patch-xpcom_components_nsNativeComponentLoader_cpp b/www/mozilla-firefox/patches/patch-xpcom_components_nsNativeComponentLoader_cpp
new file mode 100644
index 00000000000..a5f5020943e
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-xpcom_components_nsNativeComponentLoader_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-xpcom_components_nsNativeComponentLoader_cpp,v 1.1 2005/04/09 15:43:47 wilfried Exp $
+--- xpcom/components/nsNativeComponentLoader.cpp.orig	Mon Jun  7 19:12:08 2004
++++ xpcom/components/nsNativeComponentLoader.cpp	Wed Apr  6 22:50:29 2005
+@@ -656,7 +656,7 @@ nsNativeComponentLoader::AutoRegisterCom
+         ".shlb",    /* Mac ? */
+         ".dso",     /* Unix ? */
+         ".dylib",   /* Unix: Mach */
+-        ".so.1.0",  /* Unix: BSD */
++        ".so._SO_VERSION_",  /* Unix: BSD */
+         ".sl",      /* Unix: HP-UX */
+ #if defined(VMS)
+         ".exe",     /* Open VMS */
diff --git a/www/mozilla-firefox/pkg/DEINSTALL b/www/mozilla-firefox/pkg/DEINSTALL
deleted file mode 100644
index 6bca1b60427..00000000000
--- a/www/mozilla-firefox/pkg/DEINSTALL
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.5 2005/03/16 08:59:04 wilfried Exp $
-#
-# De-installation setup of mozilla-firefox
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-MOZ=${PREFIX}/mozilla-firefox
-
-# Verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname DEINSTALL" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    DEINSTALL)
-	cd ${MOZ}/components
-	rm -f compreg.dat xpti.dat
-	cd ${MOZ}/chrome
-	rm -rf chrome.rdf overlayinfo
-	;;
-    *)
-	echo "usage: $0 distname DEINSTALL" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/www/mozilla-firefox/pkg/INSTALL b/www/mozilla-firefox/pkg/INSTALL
deleted file mode 100644
index 58fb083aeaa..00000000000
--- a/www/mozilla-firefox/pkg/INSTALL
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# $OpenBSD: INSTALL,v 1.4 2005/03/16 08:59:04 wilfried Exp $
-#
-# Pre/post-installation setup of mozilla
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-MOZ=${PREFIX}/mozilla-firefox
-
-# Verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    PRE-INSTALL)
-	: nothing to pre-install for this port
-	;;
-    POST-INSTALL)
-	cd ${MOZ}
-	rm -rf /tmp/.mozilla
-	env HOME=/tmp LD_LIBRARY_PATH=${MOZ} ./regxpcom
-	env HOME=/tmp LD_LIBRARY_PATH=${MOZ} ./regchrome
-	rm -rf /tmp/.mozilla
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/www/mozilla-firefox/pkg/MESSAGE b/www/mozilla-firefox/pkg/MESSAGE
new file mode 100644
index 00000000000..552f6e5a906
--- /dev/null
+++ b/www/mozilla-firefox/pkg/MESSAGE
@@ -0,0 +1,11 @@
+If you encounter strange problems relating to bookmarks, downloads,
+window placement, toolbars, history, or other settings, it is
+recommended that you try creating a new profile and attempting to
+reproduce the problem before filing bugs.
+In order to create a new profile, start Firefox with the the 
+-profilemanager switch, e.g. firefox -profilemanager
+
+If firefox doesn't start at all, first try and remove compreg.dat
+and xpti.dat in your profile-dir, or you could just wack the old
+profile-dir,
+    rm -r ~/.mozilla/firefox/<profile-dir>
diff --git a/www/mozilla-firefox/pkg/PFRAG.shared b/www/mozilla-firefox/pkg/PFRAG.shared
index 844c7e62e55..b82c63b7aa0 100644
--- a/www/mozilla-firefox/pkg/PFRAG.shared
+++ b/www/mozilla-firefox/pkg/PFRAG.shared
@@ -1,68 +1,68 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2004/11/26 18:29:15 pvalchev Exp $
-@lib mozilla-firefox/components/libaccessibility.so.1.0
-@lib mozilla-firefox/components/libappcomps.so.1.0
-@lib mozilla-firefox/components/libautoconfig.so.1.0
-@lib mozilla-firefox/components/libbrowsercomps.so.1.0
-@lib mozilla-firefox/components/libcaps.so.1.0
-@lib mozilla-firefox/components/libchrome.so.1.0
-@lib mozilla-firefox/components/libcomposer.so.1.0
-@lib mozilla-firefox/components/libcookie.so.1.0
-@lib mozilla-firefox/components/libdocshell.so.1.0
-@lib mozilla-firefox/components/libeditor.so.1.0
-@lib mozilla-firefox/components/libembedcomponents.so.1.0
-@lib mozilla-firefox/components/libfileview.so.1.0
-@lib mozilla-firefox/components/libgfx_gtk.so.1.0
-@lib mozilla-firefox/components/libgfxps.so.1.0
-@lib mozilla-firefox/components/libgfxxprint.so.1.0
-@lib mozilla-firefox/components/libgklayout.so.1.0
-@lib mozilla-firefox/components/libgkplugin.so.1.0
-@lib mozilla-firefox/components/libhtmlpars.so.1.0
-@lib mozilla-firefox/components/libi18n.so.1.0
-@lib mozilla-firefox/components/libimglib2.so.1.0
-@lib mozilla-firefox/components/libinspector.so.1.0
-@lib mozilla-firefox/components/libjar50.so.1.0
-@lib mozilla-firefox/components/libjsd.so.1.0
-@lib mozilla-firefox/components/libmork.so.1.0
-@lib mozilla-firefox/components/libmozfind.so.1.0
-@lib mozilla-firefox/components/libnecko.so.1.0
-@lib mozilla-firefox/components/libnecko2.so.1.0
-@lib mozilla-firefox/components/libnsappshell.so.1.0
-@lib mozilla-firefox/components/liboji.so.1.0
-@lib mozilla-firefox/components/libpipboot.so.1.0
-@lib mozilla-firefox/components/libpipnss.so.1.0
-@lib mozilla-firefox/components/libpippki.so.1.0
-@lib mozilla-firefox/components/libpref.so.1.0
-@lib mozilla-firefox/components/librdf.so.1.0
-@lib mozilla-firefox/components/libtoolkitcomps.so.1.0
-@lib mozilla-firefox/components/libtransformiix.so.1.0
-@lib mozilla-firefox/components/libtxmgr.so.1.0
-@lib mozilla-firefox/components/libuconv.so.1.0
-@lib mozilla-firefox/components/libucvmath.so.1.0
-@lib mozilla-firefox/components/libuniversalchardet.so.1.0
-@lib mozilla-firefox/components/libwebbrwsr.so.1.0
-@lib mozilla-firefox/components/libwebsrvcs.so.1.0
-@lib mozilla-firefox/components/libwidget_gtk.so.1.0
-@lib mozilla-firefox/components/libxmlextras.so.1.0
-@lib mozilla-firefox/components/libxpcom_compat_c.so.1.0
-@lib mozilla-firefox/components/libxpconnect.so.1.0
-@lib mozilla-firefox/components/libxpinstall.so.1.0
-@lib mozilla-firefox/components/libxremote_client.so.1.0
-@lib mozilla-firefox/components/libxremoteservice.so.1.0
-@lib mozilla-firefox/libgkgfx.so.1.0
-@lib mozilla-firefox/libgtkembedmoz.so.1.0
-@lib mozilla-firefox/libgtksuperwin.so.1.0
-@lib mozilla-firefox/libgtkxtbin.so.1.0
-@lib mozilla-firefox/libjsj.so.1.0
-@lib mozilla-firefox/libmozjs.so.1.0
-@lib mozilla-firefox/libnspr4.so.1.0
-@lib mozilla-firefox/libnss3.so.1.0
-@lib mozilla-firefox/libnssckbi.so.1.0
-@lib mozilla-firefox/libplc4.so.1.0
-@lib mozilla-firefox/libplds4.so.1.0
-@lib mozilla-firefox/libsmime3.so.1.0
-@lib mozilla-firefox/libsoftokn3.so.1.0
-@lib mozilla-firefox/libssl3.so.1.0
-@lib mozilla-firefox/libxlibrgb.so.1.0
-@lib mozilla-firefox/libxpcom.so.1.0
-@lib mozilla-firefox/libxpcom_compat.so.1.0
-@lib mozilla-firefox/libxpistub.so.1.0
+@comment $OpenBSD: PFRAG.shared,v 1.4 2005/04/09 15:43:47 wilfried Exp $
+@lib mozilla-firefox/components/libaccessibility.so.${SO_VERSION}
+@lib mozilla-firefox/components/libappcomps.so.${SO_VERSION}
+@lib mozilla-firefox/components/libautoconfig.so.${SO_VERSION}
+@lib mozilla-firefox/components/libbrowsercomps.so.${SO_VERSION}
+@lib mozilla-firefox/components/libcaps.so.${SO_VERSION}
+@lib mozilla-firefox/components/libchrome.so.${SO_VERSION}
+@lib mozilla-firefox/components/libcomposer.so.${SO_VERSION}
+@lib mozilla-firefox/components/libcookie.so.${SO_VERSION}
+@lib mozilla-firefox/components/libdocshell.so.${SO_VERSION}
+@lib mozilla-firefox/components/libeditor.so.${SO_VERSION}
+@lib mozilla-firefox/components/libembedcomponents.so.${SO_VERSION}
+@lib mozilla-firefox/components/libfileview.so.${SO_VERSION}
+@lib mozilla-firefox/components/libgfx_gtk.so.${SO_VERSION}
+@lib mozilla-firefox/components/libgfxps.so.${SO_VERSION}
+@lib mozilla-firefox/components/libgfxxprint.so.${SO_VERSION}
+@lib mozilla-firefox/components/libgklayout.so.${SO_VERSION}
+@lib mozilla-firefox/components/libgkplugin.so.${SO_VERSION}
+@lib mozilla-firefox/components/libhtmlpars.so.${SO_VERSION}
+@lib mozilla-firefox/components/libi18n.so.${SO_VERSION}
+@lib mozilla-firefox/components/libimglib2.so.${SO_VERSION}
+@lib mozilla-firefox/components/libinspector.so.${SO_VERSION}
+@lib mozilla-firefox/components/libjar50.so.${SO_VERSION}
+@lib mozilla-firefox/components/libjsd.so.${SO_VERSION}
+@lib mozilla-firefox/components/libmork.so.${SO_VERSION}
+@lib mozilla-firefox/components/libmozfind.so.${SO_VERSION}
+@lib mozilla-firefox/components/libnecko.so.${SO_VERSION}
+@lib mozilla-firefox/components/libnecko2.so.${SO_VERSION}
+@lib mozilla-firefox/components/libnsappshell.so.${SO_VERSION}
+@lib mozilla-firefox/components/liboji.so.${SO_VERSION}
+@lib mozilla-firefox/components/libpipboot.so.${SO_VERSION}
+@lib mozilla-firefox/components/libpipnss.so.${SO_VERSION}
+@lib mozilla-firefox/components/libpippki.so.${SO_VERSION}
+@lib mozilla-firefox/components/libpref.so.${SO_VERSION}
+@lib mozilla-firefox/components/librdf.so.${SO_VERSION}
+@lib mozilla-firefox/components/libtoolkitcomps.so.${SO_VERSION}
+@lib mozilla-firefox/components/libtransformiix.so.${SO_VERSION}
+@lib mozilla-firefox/components/libtxmgr.so.${SO_VERSION}
+@lib mozilla-firefox/components/libuconv.so.${SO_VERSION}
+@lib mozilla-firefox/components/libucvmath.so.${SO_VERSION}
+@lib mozilla-firefox/components/libuniversalchardet.so.${SO_VERSION}
+@lib mozilla-firefox/components/libwebbrwsr.so.${SO_VERSION}
+@lib mozilla-firefox/components/libwebsrvcs.so.${SO_VERSION}
+@lib mozilla-firefox/components/libwidget_gtk.so.${SO_VERSION}
+@lib mozilla-firefox/components/libxmlextras.so.${SO_VERSION}
+@lib mozilla-firefox/components/libxpcom_compat_c.so.${SO_VERSION}
+@lib mozilla-firefox/components/libxpconnect.so.${SO_VERSION}
+@lib mozilla-firefox/components/libxpinstall.so.${SO_VERSION}
+@lib mozilla-firefox/components/libxremote_client.so.${SO_VERSION}
+@lib mozilla-firefox/components/libxremoteservice.so.${SO_VERSION}
+@lib mozilla-firefox/libgkgfx.so.${SO_VERSION}
+@lib mozilla-firefox/libgtkembedmoz.so.${SO_VERSION}
+@lib mozilla-firefox/libgtksuperwin.so.${SO_VERSION}
+@lib mozilla-firefox/libgtkxtbin.so.${SO_VERSION}
+@lib mozilla-firefox/libjsj.so.${SO_VERSION}
+@lib mozilla-firefox/libmozjs.so.${SO_VERSION}
+@lib mozilla-firefox/libnspr4.so.${SO_VERSION}
+@lib mozilla-firefox/libnss3.so.${SO_VERSION}
+@lib mozilla-firefox/libnssckbi.so.${SO_VERSION}
+@lib mozilla-firefox/libplc4.so.${SO_VERSION}
+@lib mozilla-firefox/libplds4.so.${SO_VERSION}
+@lib mozilla-firefox/libsmime3.so.${SO_VERSION}
+@lib mozilla-firefox/libsoftokn3.so.${SO_VERSION}
+@lib mozilla-firefox/libssl3.so.${SO_VERSION}
+@lib mozilla-firefox/libxlibrgb.so.${SO_VERSION}
+@lib mozilla-firefox/libxpcom.so.${SO_VERSION}
+@lib mozilla-firefox/libxpcom_compat.so.${SO_VERSION}
+@lib mozilla-firefox/libxpistub.so.${SO_VERSION}
diff --git a/www/mozilla-firefox/pkg/PLIST b/www/mozilla-firefox/pkg/PLIST
index 357437522a1..935976c8d4d 100644
--- a/www/mozilla-firefox/pkg/PLIST
+++ b/www/mozilla-firefox/pkg/PLIST
@@ -1,7 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.6 2005/03/26 19:05:27 wilfried Exp $
+@comment $OpenBSD: PLIST,v 1.7 2005/04/09 15:43:47 wilfried Exp $
 @conflict mozilla-firebird-*
 %%SHARED%%
 bin/firefox
+bin/firefox-config
 bin/mozilla-firefox
 mozilla-firefox/
 mozilla-firefox/LICENSE
@@ -354,7 +355,6 @@ mozilla-firefox/extensions/installed-extensions-processed.txt
 mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/
 mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 mozilla-firefox/firefox-bin
-mozilla-firefox/firefox-config
 mozilla-firefox/greprefs/
 mozilla-firefox/greprefs/all.js
 mozilla-firefox/greprefs/security-prefs.js
@@ -550,3 +550,12 @@ mozilla-firefox/searchplugins/google.gif
 mozilla-firefox/searchplugins/google.src
 mozilla-firefox/searchplugins/yahoo.gif
 mozilla-firefox/searchplugins/yahoo.src
+@cwd ${LOCALBASE}/mozilla-firefox
+@exec rm -rf /tmp/.mozilla
+@exec cd %D && env HOME=/tmp LD_LIBRARY_PATH=%D ./regxpcom
+@exec cd %D && env HOME=/tmp LD_LIBRARY_PATH=%D ./regchrome
+@exec rm -rf /tmp/.mozilla
+@unexec rm -f %D/components/compreg.dat
+@unexec rm -f %D/components/xpti.dat
+@unexec rm -f %D/chrome/chrome.rdf
+@unexec rm -rf %D/chrome/overlayinfo