From 92b7be8e755e68b42a6c0215ba9205e5efac1902 Mon Sep 17 00:00:00 2001
From: wilfried <wilfried@openbsd.org>
Date: Fri, 23 May 2003 10:05:35 +0000
Subject: [PATCH] simplify patches move run-mozilla to private dir use
 PFRAG.shared

---
 www/mozilla-firebird/Makefile                 |  4 +-
 .../patches/patch-browser_app_mozilla_in      | 39 ---------
 .../patches/patch-build_unix_run-mozilla_sh   | 17 ----
 .../patches/patch-config_autoconf_mk_in       | 15 +++-
 www/mozilla-firebird/pkg/PFRAG.shared         | 80 ++++++++++++++++++
 www/mozilla-firebird/pkg/PLIST                | 84 +------------------
 6 files changed, 97 insertions(+), 142 deletions(-)
 delete mode 100644 www/mozilla-firebird/patches/patch-browser_app_mozilla_in
 delete mode 100644 www/mozilla-firebird/patches/patch-build_unix_run-mozilla_sh
 create mode 100644 www/mozilla-firebird/pkg/PFRAG.shared

diff --git a/www/mozilla-firebird/Makefile b/www/mozilla-firebird/Makefile
index 05375c60b96..e32226ce795 100644
--- a/www/mozilla-firebird/Makefile
+++ b/www/mozilla-firebird/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2003/05/21 11:09:03 wilfried Exp $
+# $OpenBSD: Makefile,v 1.5 2003/05/23 10:05:35 wilfried Exp $
 
 COMMENT=	"redesign of Mozilla's browser component"
 
@@ -68,7 +68,7 @@ do-install:
 	@cd ${MOB} && ${TAR} -chf - *.so.1.0 | \
 		${TAR} -xf - -C ${MOZ}
 	${INSTALL_SCRIPT} ${MOB}/MozillaFirebird ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${PREFIX}/bin/run-mozilla-firebird.sh
+	${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${MOZ}
 	${INSTALL_PROGRAM} ${MOB}/regxpcom  ${MOB}/MozillaFirebird-bin ${MOZ}
 
 .include <bsd.port.mk>
diff --git a/www/mozilla-firebird/patches/patch-browser_app_mozilla_in b/www/mozilla-firebird/patches/patch-browser_app_mozilla_in
deleted file mode 100644
index 9f2b01fce0e..00000000000
--- a/www/mozilla-firebird/patches/patch-browser_app_mozilla_in
+++ /dev/null
@@ -1,39 +0,0 @@
-$OpenBSD: patch-browser_app_mozilla_in,v 1.3 2003/05/21 11:09:03 wilfried Exp $
---- browser/app/mozilla.in.orig	Wed Aug 21 21:21:36 2002
-+++ browser/app/mozilla.in	Wed May 21 12:55:39 2003
-@@ -44,7 +44,7 @@ else
-   found=0
-   progname=$0
-   curdir=`dirname "$progname"`
--  run_moz="$curdir/run-mozilla.sh"
-+  run_moz="$curdir/run-mozilla-firebird.sh"
-   if test -x "$run_moz"; then
-     dist_bin=$curdir
-     found=1
-@@ -58,7 +58,7 @@ else
-         break
-       fi
-       curdir=`dirname "$progname"`
--      run_moz="$curdir/run-mozilla.sh"
-+      run_moz="$curdir/run-mozilla-firebird.sh"
-       if [ -x "$run_moz" ]; then
-         cd "$curdir"
-         dist_bin=`pwd`
-@@ -70,7 +70,7 @@ else
-   fi
-   if [ $found = 0 ]; then
-     # Check default compile-time libdir
--    if [ -x "$moz_libdir/run-mozilla.sh" ]; then
-+    if [ -x "$moz_libdir/run-mozilla-firebird.sh" ]; then
-       dist_bin=$moz_libdir
-     else 
-       echo "Cannot find mozilla runtime directory. Exiting."
-@@ -115,6 +115,6 @@ export MRE_HOME
- eval "set -- $moreargs"
- if [ $debugging = 1 ]
- then
--  echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
-+  echo $dist_bin/run-mozilla-firebird.sh $script_args /usr/local/mozilla-firebird/$MOZILLA_BIN "$@"
- fi
--exec "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
-+exec "$dist_bin/run-mozilla-firebird.sh" $script_args "/usr/local/mozilla-firebird/$MOZILLA_BIN" "$@"
diff --git a/www/mozilla-firebird/patches/patch-build_unix_run-mozilla_sh b/www/mozilla-firebird/patches/patch-build_unix_run-mozilla_sh
deleted file mode 100644
index 64808de9c73..00000000000
--- a/www/mozilla-firebird/patches/patch-build_unix_run-mozilla_sh
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-build_unix_run-mozilla_sh,v 1.2 2003/05/21 11:09:03 wilfried Exp $
---- build/unix/run-mozilla.sh.orig	Sat Apr 19 05:12:28 2003
-+++ build/unix/run-mozilla.sh	Wed May 21 12:24:37 2003
-@@ -64,11 +64,12 @@
- ##
- #
- cmdname=`basename "$0"`
--MOZ_DIST_BIN=`dirname "$0"`
-+MOZ_DIST_BIN=/usr/local/mozilla-firebird
- MOZ_DEFAULT_NAME="./${cmdname}-bin"
- MOZ_APPRUNNER_NAME="./mozilla-bin"
- MOZ_VIEWER_NAME="./viewer"
- MOZ_PROGRAM=""
-+cd $MOZ_DIST_BIN
- 
- exitcode=0
- #
diff --git a/www/mozilla-firebird/patches/patch-config_autoconf_mk_in b/www/mozilla-firebird/patches/patch-config_autoconf_mk_in
index 7a7b9305ad1..b8bffc8d975 100644
--- a/www/mozilla-firebird/patches/patch-config_autoconf_mk_in
+++ b/www/mozilla-firebird/patches/patch-config_autoconf_mk_in
@@ -1,6 +1,15 @@
-$OpenBSD: patch-config_autoconf_mk_in,v 1.1.1.1 2003/05/18 20:43:49 wilfried Exp $
---- config/autoconf.mk.in.orig	Fri May  2 15:38:10 2003
-+++ config/autoconf.mk.in	Sun May 18 04:46:09 2003
+$OpenBSD: patch-config_autoconf_mk_in,v 1.2 2003/05/23 10:05:36 wilfried Exp $
+--- config/autoconf.mk.in.orig	Fri May  2 23:38:10 2003
++++ config/autoconf.mk.in	Thu May 22 13:36:32 2003
+@@ -35,7 +35,7 @@ datadir		= @datadir@
+ mandir		= @mandir@
+ idldir		= @datadir@/idl/mozilla-$(MOZILLA_VERSION)
+ 
+-mozappdir	= $(libdir)/mozilla-$(MOZILLA_VERSION)
++mozappdir	= $(prefix)/mozilla-firebird
+ mredir		= $(libdir)/mre/mre-$(MOZILLA_VERSION)
+ mrelibdir	= $(mredir)/lib
+ 
 @@ -169,7 +169,7 @@ OS_LDFLAGS	= @LDFLAGS@
  OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
  OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
diff --git a/www/mozilla-firebird/pkg/PFRAG.shared b/www/mozilla-firebird/pkg/PFRAG.shared
new file mode 100644
index 00000000000..bb4a309e59a
--- /dev/null
+++ b/www/mozilla-firebird/pkg/PFRAG.shared
@@ -0,0 +1,80 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1 2003/05/23 10:05:36 wilfried Exp $
+mozilla-firebird/components/libaccessibility.so.1.0
+mozilla-firebird/components/libappcomps.so.1.0
+mozilla-firebird/components/libautoconfig.so.1.0
+mozilla-firebird/components/libbrowsercomps.so.1.0
+mozilla-firebird/components/libcaps.so.1.0
+mozilla-firebird/components/libchrome.so.1.0
+mozilla-firebird/components/libcookie.so.1.0
+mozilla-firebird/components/libdocshell.so.1.0
+mozilla-firebird/components/libeditor.so.1.0
+mozilla-firebird/components/libembedcomponents.so.1.0
+mozilla-firebird/components/libfileview.so.1.0
+mozilla-firebird/components/libgfx_gtk.so.1.0
+mozilla-firebird/components/libgfxps.so.1.0
+mozilla-firebird/components/libgfxxprint.so.1.0
+mozilla-firebird/components/libgklayout.so.1.0
+mozilla-firebird/components/libgkplugin.so.1.0
+mozilla-firebird/components/libhtmlpars.so.1.0
+mozilla-firebird/components/libi18n.so.1.0
+mozilla-firebird/components/libimglib2.so.1.0
+mozilla-firebird/components/libimgmng.so.1.0
+mozilla-firebird/components/libipcdc.so.1.0
+mozilla-firebird/components/libjar50.so.1.0
+mozilla-firebird/components/libjsd.so.1.0
+mozilla-firebird/components/libjsdom.so.1.0
+mozilla-firebird/components/libmork.so.1.0
+mozilla-firebird/components/libmozfind.so.1.0
+mozilla-firebird/components/libnecko.so.1.0
+mozilla-firebird/components/libnecko2.so.1.0
+mozilla-firebird/components/libnsappshell.so.1.0
+mozilla-firebird/components/libnsprefm.so.1.0
+mozilla-firebird/components/liboji.so.1.0
+mozilla-firebird/components/libp3p.so.1.0
+mozilla-firebird/components/libpipboot.so.1.0
+mozilla-firebird/components/libpipnss.so.1.0
+mozilla-firebird/components/libpippki.so.1.0
+mozilla-firebird/components/libpref.so.1.0
+mozilla-firebird/components/libprofile.so.1.0
+mozilla-firebird/components/librdf.so.1.0
+mozilla-firebird/components/libtoolkitcomps.so.1.0
+mozilla-firebird/components/libtransformiix.so.1.0
+mozilla-firebird/components/libtransmngr_client.so.1.0
+mozilla-firebird/components/libtxmgr.so.1.0
+mozilla-firebird/components/libtypeaheadfind.so.1.0
+mozilla-firebird/components/libuconv.so.1.0
+mozilla-firebird/components/libucvmath.so.1.0
+mozilla-firebird/components/libuniversalchardet.so.1.0
+mozilla-firebird/components/libwallet.so.1.0
+mozilla-firebird/components/libwalletviewers.so.1.0
+mozilla-firebird/components/libwebbrwsr.so.1.0
+mozilla-firebird/components/libwebsrvcs.so.1.0
+mozilla-firebird/components/libwidget_gtk.so.1.0
+mozilla-firebird/components/libxmlextras.so.1.0
+mozilla-firebird/components/libxpcom_compat_c.so.1.0
+mozilla-firebird/components/libxpconnect.so.1.0
+mozilla-firebird/components/libxpinstall.so.1.0
+mozilla-firebird/components/libxremote_client.so.1.0
+mozilla-firebird/components/libxremoteservice.so.1.0
+mozilla-firebird/ipc/modules/liblockmodule.so.1.0
+mozilla-firebird/ipc/modules/libtestmodule.so.1.0
+mozilla-firebird/ipc/modules/libtransmngr.so.1.0
+mozilla-firebird/libgkgfx.so.1.0
+mozilla-firebird/libgtkembedmoz.so.1.0
+mozilla-firebird/libgtksuperwin.so.1.0
+mozilla-firebird/libgtkxtbin.so.1.0
+mozilla-firebird/libjsj.so.1.0
+mozilla-firebird/libmozjs.so.1.0
+mozilla-firebird/libnspr4.so.1.0
+mozilla-firebird/libnss3.so.1.0
+mozilla-firebird/libnssckbi.so.1.0
+mozilla-firebird/libplc4.so.1.0
+mozilla-firebird/libplds4.so.1.0
+mozilla-firebird/libsmime3.so.1.0
+mozilla-firebird/libsoftokn3.so.1.0
+mozilla-firebird/libssl3.so.1.0
+mozilla-firebird/libxlibrgb.so.1.0
+mozilla-firebird/libxpcom.so.1.0
+mozilla-firebird/libxpcom_compat.so.1.0
+mozilla-firebird/libxpistub.so.1.0
+mozilla-firebird/plugins/libnullplugin.so.1.0
diff --git a/www/mozilla-firebird/pkg/PLIST b/www/mozilla-firebird/pkg/PLIST
index 240a82e601b..214ac051ee6 100644
--- a/www/mozilla-firebird/pkg/PLIST
+++ b/www/mozilla-firebird/pkg/PLIST
@@ -1,6 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2003/05/21 11:09:03 wilfried Exp $
+@comment $OpenBSD: PLIST,v 1.5 2003/05/23 10:05:36 wilfried Exp $
 bin/MozillaFirebird
-bin/run-mozilla-firebird.sh
 mozilla-firebird/MozillaFirebird-bin
 mozilla-firebird/chrome/US.jar
 mozilla-firebird/chrome/browser.jar
@@ -352,89 +351,12 @@ mozilla-firebird/res/ua.css
 mozilla-firebird/res/unixcharset.properties
 mozilla-firebird/res/viewer.properties
 mozilla-firebird/res/viewsource.css
+mozilla-firebird/run-mozilla.sh
 mozilla-firebird/searchplugins/dmoz.gif
 mozilla-firebird/searchplugins/dmoz.src
 mozilla-firebird/searchplugins/google.gif
 mozilla-firebird/searchplugins/google.src
-mozilla-firebird/components/libaccessibility.so.1.0
-mozilla-firebird/components/libappcomps.so.1.0
-mozilla-firebird/components/libautoconfig.so.1.0
-mozilla-firebird/components/libbrowsercomps.so.1.0
-mozilla-firebird/components/libcaps.so.1.0
-mozilla-firebird/components/libchrome.so.1.0
-mozilla-firebird/components/libcookie.so.1.0
-mozilla-firebird/components/libdocshell.so.1.0
-mozilla-firebird/components/libeditor.so.1.0
-mozilla-firebird/components/libembedcomponents.so.1.0
-mozilla-firebird/components/libfileview.so.1.0
-mozilla-firebird/components/libgfx_gtk.so.1.0
-mozilla-firebird/components/libgfxps.so.1.0
-mozilla-firebird/components/libgfxxprint.so.1.0
-mozilla-firebird/components/libgklayout.so.1.0
-mozilla-firebird/components/libgkplugin.so.1.0
-mozilla-firebird/components/libhtmlpars.so.1.0
-mozilla-firebird/components/libi18n.so.1.0
-mozilla-firebird/components/libimglib2.so.1.0
-mozilla-firebird/components/libimgmng.so.1.0
-mozilla-firebird/components/libipcdc.so.1.0
-mozilla-firebird/components/libjar50.so.1.0
-mozilla-firebird/components/libjsd.so.1.0
-mozilla-firebird/components/libjsdom.so.1.0
-mozilla-firebird/components/libmork.so.1.0
-mozilla-firebird/components/libmozfind.so.1.0
-mozilla-firebird/components/libnecko.so.1.0
-mozilla-firebird/components/libnecko2.so.1.0
-mozilla-firebird/components/libnsappshell.so.1.0
-mozilla-firebird/components/libnsprefm.so.1.0
-mozilla-firebird/components/liboji.so.1.0
-mozilla-firebird/components/libp3p.so.1.0
-mozilla-firebird/components/libpipboot.so.1.0
-mozilla-firebird/components/libpipnss.so.1.0
-mozilla-firebird/components/libpippki.so.1.0
-mozilla-firebird/components/libpref.so.1.0
-mozilla-firebird/components/libprofile.so.1.0
-mozilla-firebird/components/librdf.so.1.0
-mozilla-firebird/components/libtoolkitcomps.so.1.0
-mozilla-firebird/components/libtransformiix.so.1.0
-mozilla-firebird/components/libtransmngr_client.so.1.0
-mozilla-firebird/components/libtxmgr.so.1.0
-mozilla-firebird/components/libtypeaheadfind.so.1.0
-mozilla-firebird/components/libuconv.so.1.0
-mozilla-firebird/components/libucvmath.so.1.0
-mozilla-firebird/components/libuniversalchardet.so.1.0
-mozilla-firebird/components/libwallet.so.1.0
-mozilla-firebird/components/libwalletviewers.so.1.0
-mozilla-firebird/components/libwebbrwsr.so.1.0
-mozilla-firebird/components/libwebsrvcs.so.1.0
-mozilla-firebird/components/libwidget_gtk.so.1.0
-mozilla-firebird/components/libxmlextras.so.1.0
-mozilla-firebird/components/libxpcom_compat_c.so.1.0
-mozilla-firebird/components/libxpconnect.so.1.0
-mozilla-firebird/components/libxpinstall.so.1.0
-mozilla-firebird/components/libxremote_client.so.1.0
-mozilla-firebird/components/libxremoteservice.so.1.0
-mozilla-firebird/ipc/modules/liblockmodule.so.1.0
-mozilla-firebird/ipc/modules/libtestmodule.so.1.0
-mozilla-firebird/ipc/modules/libtransmngr.so.1.0
-mozilla-firebird/libgkgfx.so.1.0
-mozilla-firebird/libgtkembedmoz.so.1.0
-mozilla-firebird/libgtksuperwin.so.1.0
-mozilla-firebird/libgtkxtbin.so.1.0
-mozilla-firebird/libjsj.so.1.0
-mozilla-firebird/libmozjs.so.1.0
-mozilla-firebird/libnspr4.so.1.0
-mozilla-firebird/libnss3.so.1.0
-mozilla-firebird/libnssckbi.so.1.0
-mozilla-firebird/libplc4.so.1.0
-mozilla-firebird/libplds4.so.1.0
-mozilla-firebird/libsmime3.so.1.0
-mozilla-firebird/libsoftokn3.so.1.0
-mozilla-firebird/libssl3.so.1.0
-mozilla-firebird/libxlibrgb.so.1.0
-mozilla-firebird/libxpcom.so.1.0
-mozilla-firebird/libxpcom_compat.so.1.0
-mozilla-firebird/libxpistub.so.1.0
-mozilla-firebird/plugins/libnullplugin.so.1.0
+%%SHARED%%
 @dirrm mozilla-firebird/searchplugins
 @dirrm mozilla-firebird/res/throbber
 @dirrm mozilla-firebird/res/samples/sampleimages