Fix the following problems:

        Move files in share/* to share/zephyr/
        Fix bogus path to xzwrite.bitmap in XZwrite
        Remove appropriate directories in PLIST

PR:		10139
Submitted by:	Sheldon Hearn <sheldonh@iafrica.com>

4 files changed, 61 insertions, 8 deletions

diff --git a/net/zephyr/files/patch-aa b/net/zephyr/files/patch-aa
index 28269190c3a6..53bf45a7093a 100644
--- a/net/zephyr/files/patch-aa
+++ b/net/zephyr/files/patch-aa
@@ -1,7 +1,24 @@
-*** configure	Sun Jul 23 09:11:27 1995
---- configure	Tue Aug  1 21:51:42 1995
+*** configure.orig	Wed Mar  3 20:37:09 1999
+--- configure	Wed Mar  3 20:39:35 1999
 ***************
-*** 430,446 ****
+*** 44,50 ****
+  bindir='${exec_prefix}/bin'
+  sbindir='${exec_prefix}/sbin'
+  libexecdir='${exec_prefix}/libexec'
+! datadir='${prefix}/share'
+  sysconfdir='${prefix}/etc'
+  sharedstatedir='${prefix}/com'
+  localstatedir='${prefix}/var'
+--- 44,50 ----
+  bindir='${exec_prefix}/bin'
+  sbindir='${exec_prefix}/sbin'
+  libexecdir='${exec_prefix}/libexec'
+! datadir='${prefix}/share/zephyr'
+  sysconfdir='${prefix}/etc'
+  sharedstatedir='${prefix}/com'
+  localstatedir='${prefix}/var'
+***************
+*** 547,563 ****
   	       confdir=${confdir-'$(prefix)/etc/zephyr'}
   	       sbindir=${sbindir-'$(exec_prefix)/sbin'}
   	       lsbindir=${lsbindir-'$(exec_prefix)/sbin'}
@@ -19,7 +36,7 @@
   fi
   
   
---- 430,449 ----
+--- 547,566 ----
   	       confdir=${confdir-'$(prefix)/etc/zephyr'}
   	       sbindir=${sbindir-'$(exec_prefix)/sbin'}
   	       lsbindir=${lsbindir-'$(exec_prefix)/sbin'}
diff --git a/net/zephyr/files/patch-ab b/net/zephyr/files/patch-ab
new file mode 100644
index 000000000000..c4d2bb673dcc
--- /dev/null
+++ b/net/zephyr/files/patch-ab
@@ -0,0 +1,20 @@
+--- clients/xzwrite/Makefile.in.orig	Fri Jul  7 23:55:14 1995
++++ clients/xzwrite/Makefile.in	Wed Mar  3 19:29:01 1999
+@@ -17,6 +17,7 @@
+ VPATH=@srcdir@
+ CC=@CC@
+ INSTALL=@INSTALL@
++SED=/usr/bin/sed
+ 
+ DEBUG=-O
+ CFLAGS=$(DEBUG) -DDATADIR=\"$(datadir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \
+@@ -41,7 +42,8 @@
+ install: xzwrite XZwrite
+ 	$(INSTALL) -m 755 -s xzwrite $(bindir)
+ 	$(INSTALL) -m 644 $(srcdir)/xzwrite.1 $(mandir)/man1
+-	$(INSTALL) -m 644 XZwrite $(datadir)
++	$(SED) -e 's#XX_PREFIX_XX#$(prefix)#' < XZwrite >XZwrite.tmp
++	$(INSTALL) -m 644 XZwrite.tmp $(datadir)/XZwrite
+ 	$(INSTALL) -m 644 $(srcdir)/xzwrite.bitmap $(datadir)
+ 
+ clean:
diff --git a/net/zephyr/files/patch-ac b/net/zephyr/files/patch-ac
new file mode 100644
index 000000000000..af98ae5bcc71
--- /dev/null
+++ b/net/zephyr/files/patch-ac
@@ -0,0 +1,11 @@
+--- clients/xzwrite/XZwrite.in.orig	Wed Mar  3 19:57:39 1999
++++ clients/xzwrite/XZwrite.in	Wed Mar  3 20:05:46 1999
+@@ -17,7 +17,7 @@
+ *readAnyone:		on
+ *readXzwrite:		on
+ 
+-*icon.bitmap:		@datadir@/xzwrite.bitmap
++*icon.bitmap:		XX_PREFIX_XX/share/zephyr/xzwrite.bitmap
+ *icon.translations:	#override\
+ 	<BtnDown>:	set() \n\
+ 	<Btn1Up>:	OpenSend() unset() \n\
diff --git a/net/zephyr/pkg-plist b/net/zephyr/pkg-plist
index 66b14a7b4d23..efacbcb52bf6 100644
--- a/net/zephyr/pkg-plist
+++ b/net/zephyr/pkg-plist
@@ -66,12 +66,17 @@ sbin/zhm
 sbin/zmailnotify
 sbin/zpopnotify
 sbin/zshutdown_notify
-share/XZwrite
+share/zephyr/XZwrite
 share/doc/zephyr/INSTALL
 share/doc/zephyr/NOTES
 share/doc/zephyr/OPERATING
 share/doc/zephyr/README
 share/doc/zephyr/USING
-share/xzwrite.bitmap
-share/zwgc.desc
-share/zwgc_resources
+share/zephyr/xzwrite.bitmap
+share/zephyr/zwgc.desc
+share/zephyr/zwgc_resources
+@dirrm etc/zephyr/acl
+@dirrm etc/zephyr
+@dirrm include/zephyr
+@dirrm share/doc/zephyr
+@dirrm share/zephyr