Fix the startup script so that it can accept option arguments. This fixes

a problem with starting Mozilla from the KDE dock if another instance of
Mozilla is already running.

Tested by:	Vivek Khera <vivek@khera.org>
Approved by:	portmgr (kris)

10 files changed, 43 insertions, 28 deletions

diff --git a/www/mozilla-devel-gtk1/Makefile b/www/mozilla-devel-gtk1/Makefile
index cf8dbe4eecd2..a4b3989f42b5 100644
--- a/www/mozilla-devel-gtk1/Makefile
+++ b/www/mozilla-devel-gtk1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	0
 CATEGORIES=	www
 
diff --git a/www/mozilla-devel-gtk2/Makefile b/www/mozilla-devel-gtk2/Makefile
index cf8dbe4eecd2..a4b3989f42b5 100644
--- a/www/mozilla-devel-gtk2/Makefile
+++ b/www/mozilla-devel-gtk2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	0
 CATEGORIES=	www
 
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 7ef9a86ffacd..48cc223aeaf7 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mozilla
 PORTVERSION=	1.2b
-PORTREVISION?=	2
+PORTREVISION?=	3
 PORTEPOCH?=	1
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
diff --git a/www/mozilla-devel/files/mozilla.sh b/www/mozilla-devel/files/mozilla.sh
index 0e34950cd32c..bbc7d2568bc6 100644
--- a/www/mozilla-devel/files/mozilla.sh
+++ b/www/mozilla-devel/files/mozilla.sh
@@ -6,13 +6,18 @@ LOCATION='new-tab'
 
 cd $MOZILLA_DIR                                     || exit 1
 
-# catch calls for mozilla mail
-if [ "$1" = "-mail" ]; then
-   REMOTE_COMMAND="xfeDoCommand (openInbox)"
-else
-   REMOTE_COMMAND="openURL($@, $LOCATION)"
-fi
-
+case $1 in
+    -mail)
+    	REMOTE_COMMAND="xfeDoCommand (openInbox)"
+	;;
+    -*)
+    	exec ./$MOZILLA_EXEC "$@"
+	;;
+    *)
+    	REMOTE_COMMAND="openURL($@, $LOCATION)"
+	;;
+esac
+    
 # process found
 ./$MOZILLA_EXEC -remote "ping()"                    &&
 ./$MOZILLA_EXEC -remote "$REMOTE_COMMAND"           && exit 0
diff --git a/www/mozilla-gtk1/Makefile b/www/mozilla-gtk1/Makefile
index cf8dbe4eecd2..a4b3989f42b5 100644
--- a/www/mozilla-gtk1/Makefile
+++ b/www/mozilla-gtk1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	0
 CATEGORIES=	www
 
diff --git a/www/mozilla-gtk2/Makefile b/www/mozilla-gtk2/Makefile
index cf8dbe4eecd2..a4b3989f42b5 100644
--- a/www/mozilla-gtk2/Makefile
+++ b/www/mozilla-gtk2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	0
 CATEGORIES=	www
 
diff --git a/www/mozilla-vendor/Makefile b/www/mozilla-vendor/Makefile
index 02db100a7b79..079f12661a5b 100644
--- a/www/mozilla-vendor/Makefile
+++ b/www/mozilla-vendor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		http://people.FreeBSD.org/~marcus/:local
diff --git a/www/mozilla-vendor/files/mozilla.sh b/www/mozilla-vendor/files/mozilla.sh
index 05783d57373f..7e441ab0e3fd 100644
--- a/www/mozilla-vendor/files/mozilla.sh
+++ b/www/mozilla-vendor/files/mozilla.sh
@@ -6,13 +6,18 @@ LOCATION='new-tab'
 
 cd $MOZILLA_DIR                                     || exit 1
 
-# catch calls for mozilla mail
-if [ "$1" = "-mail" ]; then
-   REMOTE_COMMAND="xfeDoCommand (openInbox)"
-else
-   REMOTE_COMMAND="openURL($@, $LOCATION)"
-fi
-
+case $1 in
+    -mail)
+    	REMOTE_COMMAND="xfeDoCommand (openInbox)"
+	;;
+    -*)
+    	exec ./$MOZILLA_EXEC "$@"
+	;;
+    *)
+    	REMOTE_COMMAND="openURL($@, $LOCATION)"
+	;;
+esac
+    
 # process found
 ./$MOZILLA_EXEC -remote "ping()"                    &&
 ./$MOZILLA_EXEC -remote "$REMOTE_COMMAND"           && exit 0
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 6709dbfb12d1..408ceded0a2f 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
diff --git a/www/mozilla/files/mozilla.sh b/www/mozilla/files/mozilla.sh
index cc1eff88a0b1..898fccbc6128 100644
--- a/www/mozilla/files/mozilla.sh
+++ b/www/mozilla/files/mozilla.sh
@@ -6,13 +6,18 @@ LOCATION='new-tab'
 
 cd $MOZILLA_DIR                                     || exit 1
 
-# catch calls for mozilla mail
-if [ "$1" = "-mail" ]; then
-   REMOTE_COMMAND="xfeDoCommand (openInbox)"
-else
-   REMOTE_COMMAND="openURL($@, $LOCATION)"
-fi
-
+case $1 in
+    -mail)
+    	REMOTE_COMMAND="xfeDoCommand (openInbox)"
+	;;
+    -*)
+    	exec ./$MOZILLA_EXEC "$@"
+	;;
+    *)
+    	REMOTE_COMMAND="openURL($@, $LOCATION)"
+	;;
+esac
+    
 # process found
 ./$MOZILLA_EXEC -remote "ping()"                    &&
 ./$MOZILLA_EXEC -remote "$REMOTE_COMMAND"           && exit 0