Remove some empty directories. Also convert netscape4-navigator to

use wrapper.

8 files changed, 17 insertions, 2 deletions

diff --git a/www/bsdi-netscape47-communicator/pkg-plist b/www/bsdi-netscape47-communicator/pkg-plist
index 42c9b531948..01e589b9679 100644
--- a/www/bsdi-netscape47-communicator/pkg-plist
+++ b/www/bsdi-netscape47-communicator/pkg-plist
@@ -179,6 +179,7 @@ bin/%%BROWSER%%-%%BROWSER_VER%%
 %%NSUBDIR%%/spell/pen4s324.dat
 %%NSUBDIR%%/vreg
 @dirrm %%NSUBDIR%%/spell
+@dirrm %%NSUBDIR%%/plugins
 @dirrm %%NSUBDIR%%/nethelp/netscape/trouble
 @dirrm %%NSUBDIR%%/nethelp/netscape/shared
 @dirrm %%NSUBDIR%%/nethelp/netscape/news
@@ -194,3 +195,4 @@ bin/%%BROWSER%%-%%BROWSER_VER%%
 @dirrm %%NSUBDIR%%/java/classes/aix
 @dirrm %%NSUBDIR%%/java/classes
 @dirrm %%NSUBDIR%%/java
+@unexec rmdir %D/%%NSUBDIR%% 2>/dev/null || true
diff --git a/www/bsdi-netscape47-navigator/pkg-plist b/www/bsdi-netscape47-navigator/pkg-plist
index 8e674cf3a02..630768588cc 100644
--- a/www/bsdi-netscape47-navigator/pkg-plist
+++ b/www/bsdi-netscape47-navigator/pkg-plist
@@ -140,6 +140,7 @@ bin/navigator-%%BROWSER_VER%%
 %%NSUBDIR%%/plugins/libnullplugin.so
 %%NSUBDIR%%/registry
 %%NSUBDIR%%/vreg
+@dirrm %%NSUBDIR%%/plugins
 @dirrm %%NSUBDIR%%/nethelp/netscape/shared
 @dirrm %%NSUBDIR%%/nethelp/netscape/navigatr
 @dirrm %%NSUBDIR%%/nethelp/netscape/home
@@ -150,3 +151,4 @@ bin/navigator-%%BROWSER_VER%%
 @dirrm %%NSUBDIR%%/java/classes/aix
 @dirrm %%NSUBDIR%%/java/classes
 @dirrm %%NSUBDIR%%/java
+@unexec rmdir %D/%%NSUBDIR%% 2>/dev/null || true
diff --git a/www/netscape3/pkg-plist b/www/netscape3/pkg-plist
index 03a4096bfde..91090250c44 100644
--- a/www/netscape3/pkg-plist
+++ b/www/netscape3/pkg-plist
@@ -7,6 +7,7 @@ lib/netscape/mailcap
 lib/netscape/movemail
 lib/netscape/java_301
 lib/netscape/Netscape.ad
+@unexec rmdir %D/lib/netscape 2>/dev/null || true
 @cwd /usr/X11R6
 lib/X11/nls/C
 lib/X11/nls/nls.dir
diff --git a/www/netscape4-communicator/pkg-plist b/www/netscape4-communicator/pkg-plist
index 560eb8c9e80..f6efd62acb1 100644
--- a/www/netscape4-communicator/pkg-plist
+++ b/www/netscape4-communicator/pkg-plist
@@ -180,6 +180,7 @@ bin/communicator-%%BROWSER_VER%%
 %%NSUBDIR%%/registry
 %%NSUBDIR%%/communicator-%%BROWSER_VER%%.bin
 %%NSUBDIR%%/mailcap
+@dirrm %%NSUBDIR%%/plugins
 @dirrm %%NSUBDIR%%/spell
 @dirrm %%NSUBDIR%%/nethelp/netscape/shared
 @dirrm %%NSUBDIR%%/nethelp/netscape/nscal
@@ -197,3 +198,4 @@ bin/communicator-%%BROWSER_VER%%
 @dirrm %%NSUBDIR%%/java/classes/irix
 @dirrm %%NSUBDIR%%/java/classes
 @dirrm %%NSUBDIR%%/java
+@unexec rmdir %D/%%NSUBDIR%% 2>/dev/null || true
diff --git a/www/netscape4-navigator/pkg-plist b/www/netscape4-navigator/pkg-plist
index 311ecc0d7c1..c580c696aa6 100644
--- a/www/netscape4-navigator/pkg-plist
+++ b/www/netscape4-navigator/pkg-plist
@@ -1,7 +1,7 @@
 bin/navigator-%%BROWSER_VER%%
 @exec ln -sf %f %B/navigator-4
-@exec ln -sf navigator-4 %B/netscape
-@unexec rm -f %B/netscape
+@exec ln -sf navigator-4 %B/netscape.run
+@unexec rm -f %B/netscape.run
 @unexec rm -f %B/navigator-4
 %%NSUBDIR%%/LICENSE
 %%NSUBDIR%%/Netscape.ad
@@ -135,6 +135,7 @@ bin/navigator-%%BROWSER_VER%%
 %%NSUBDIR%%/plugins/libnullplugin.so
 %%NSUBDIR%%/registry
 %%NSUBDIR%%/vreg
+@dirrm %%NSUBDIR%%/plugins
 @dirrm %%NSUBDIR%%/nethelp/netscape/shared
 @dirrm %%NSUBDIR%%/nethelp/netscape/netcastr
 @dirrm %%NSUBDIR%%/nethelp/netscape/navigatr
@@ -147,3 +148,4 @@ bin/navigator-%%BROWSER_VER%%
 @dirrm %%NSUBDIR%%/java/classes/aix
 @dirrm %%NSUBDIR%%/java/classes
 @dirrm %%NSUBDIR%%/java
+@unexec rmdir %D/%%NSUBDIR%% 2>/dev/null || true
diff --git a/www/netscape47-communicator/pkg-plist b/www/netscape47-communicator/pkg-plist
index 42c9b531948..01e589b9679 100644
--- a/www/netscape47-communicator/pkg-plist
+++ b/www/netscape47-communicator/pkg-plist
@@ -179,6 +179,7 @@ bin/%%BROWSER%%-%%BROWSER_VER%%
 %%NSUBDIR%%/spell/pen4s324.dat
 %%NSUBDIR%%/vreg
 @dirrm %%NSUBDIR%%/spell
+@dirrm %%NSUBDIR%%/plugins
 @dirrm %%NSUBDIR%%/nethelp/netscape/trouble
 @dirrm %%NSUBDIR%%/nethelp/netscape/shared
 @dirrm %%NSUBDIR%%/nethelp/netscape/news
@@ -194,3 +195,4 @@ bin/%%BROWSER%%-%%BROWSER_VER%%
 @dirrm %%NSUBDIR%%/java/classes/aix
 @dirrm %%NSUBDIR%%/java/classes
 @dirrm %%NSUBDIR%%/java
+@unexec rmdir %D/%%NSUBDIR%% 2>/dev/null || true
diff --git a/www/netscape47-navigator/pkg-plist b/www/netscape47-navigator/pkg-plist
index 8e674cf3a02..630768588cc 100644
--- a/www/netscape47-navigator/pkg-plist
+++ b/www/netscape47-navigator/pkg-plist
@@ -140,6 +140,7 @@ bin/navigator-%%BROWSER_VER%%
 %%NSUBDIR%%/plugins/libnullplugin.so
 %%NSUBDIR%%/registry
 %%NSUBDIR%%/vreg
+@dirrm %%NSUBDIR%%/plugins
 @dirrm %%NSUBDIR%%/nethelp/netscape/shared
 @dirrm %%NSUBDIR%%/nethelp/netscape/navigatr
 @dirrm %%NSUBDIR%%/nethelp/netscape/home
@@ -150,3 +151,4 @@ bin/navigator-%%BROWSER_VER%%
 @dirrm %%NSUBDIR%%/java/classes/aix
 @dirrm %%NSUBDIR%%/java/classes
 @dirrm %%NSUBDIR%%/java
+@unexec rmdir %D/%%NSUBDIR%% 2>/dev/null || true
diff --git a/www/netscape48-communicator/pkg-plist b/www/netscape48-communicator/pkg-plist
index 560eb8c9e80..f6efd62acb1 100644
--- a/www/netscape48-communicator/pkg-plist
+++ b/www/netscape48-communicator/pkg-plist
@@ -180,6 +180,7 @@ bin/communicator-%%BROWSER_VER%%
 %%NSUBDIR%%/registry
 %%NSUBDIR%%/communicator-%%BROWSER_VER%%.bin
 %%NSUBDIR%%/mailcap
+@dirrm %%NSUBDIR%%/plugins
 @dirrm %%NSUBDIR%%/spell
 @dirrm %%NSUBDIR%%/nethelp/netscape/shared
 @dirrm %%NSUBDIR%%/nethelp/netscape/nscal
@@ -197,3 +198,4 @@ bin/communicator-%%BROWSER_VER%%
 @dirrm %%NSUBDIR%%/java/classes/irix
 @dirrm %%NSUBDIR%%/java/classes
 @dirrm %%NSUBDIR%%/java
+@unexec rmdir %D/%%NSUBDIR%% 2>/dev/null || true