install elsewhere, don't conflict with mozilla

www/mozilla-firebird/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2003/05/21 06:54:54 marcm Exp $
+# $OpenBSD: Makefile,v 1.4 2003/05/21 11:09:03 wilfried Exp $
 
 COMMENT=	"redesign of Mozilla's browser component"
 
@@ -54,7 +54,7 @@ MAKE_ENV=	LD_LIBRARY_PATH="${WRKSRC}/dist/bin" \
 		CFLAGS="" CXXFLAGS="" MOZ_PHOENIX=1
 
 MOB=		${WRKSRC}/dist/bin
-MOZ=		${PREFIX}/mozilla
+MOZ=		${PREFIX}/mozilla-firebird
 
 pre-configure:
 	@cd ${WRKSRC}/nsprpub && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
@@ -67,8 +67,8 @@ do-install:
 .endfor
 	@cd ${MOB} && ${TAR} -chf - *.so.1.0 | \
 		${TAR} -xf - -C ${MOZ}
-	${INSTALL_SCRIPT} ${MOB}/MozillaFirebird ${MOB}/run-mozilla.sh ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${MOB}/MozillaFirebird-bin ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${MOB}/regxpcom ${MOZ}
+	${INSTALL_SCRIPT} ${MOB}/MozillaFirebird ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${PREFIX}/bin/run-mozilla-firebird.sh
+	${INSTALL_PROGRAM} ${MOB}/regxpcom  ${MOB}/MozillaFirebird-bin ${MOZ}
 
 .include <bsd.port.mk>

www/mozilla-firebird/patches/patch-browser_app_mozilla_in

@@ -1,12 +1,39 @@
-$OpenBSD: patch-browser_app_mozilla_in,v 1.2 2003/05/21 10:18:58 wilfried Exp $
+$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:13:09 2003
++++ 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.sh $script_args /usr/local/mozilla/$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.sh" $script_args "/usr/local/mozilla/$MOZILLA_BIN" "$@"
++exec "$dist_bin/run-mozilla-firebird.sh" $script_args "/usr/local/mozilla-firebird/$MOZILLA_BIN" "$@"

www/mozilla-firebird/patches/patch-build_unix_run-mozilla_sh

@@ -1,12 +1,12 @@
-$OpenBSD: patch-build_unix_run-mozilla_sh,v 1.1.1.1 2003/05/18 20:43:49 wilfried Exp $
---- build/unix/run-mozilla.sh.orig	Fri Apr 18 21:12:28 2003
-+++ build/unix/run-mozilla.sh	Sun May 18 04:45:33 2003
+$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
++MOZ_DIST_BIN=/usr/local/mozilla-firebird
  MOZ_DEFAULT_NAME="./${cmdname}-bin"
  MOZ_APPRUNNER_NAME="./mozilla-bin"
  MOZ_VIEWER_NAME="./viewer"