Index: general/general.ent
===================================================================
--- general/general.ent	(revision 0e9e6d33cdab562b8e9efc3f0f0c8efa0b6ed743)
+++ general/general.ent	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
@@ -90,5 +90,6 @@
 <!ENTITY % hdparm SYSTEM "sysutils/hdparm/hdparm.ent">
 <!ENTITY % which SYSTEM "sysutils/which/which.ent">
-<!ENTITY % infozip SYSTEM "sysutils/infozip/infozip.ent">
+<!ENTITY % unzip SYSTEM "sysutils/unzip/unzip.ent">
+<!ENTITY % zip SYSTEM "sysutils/zip/zip.ent">
 <!ENTITY % pciutils SYSTEM "sysutils/pciutils/pciutils.ent">
 <!ENTITY % pkgconfig SYSTEM "sysutils/pkgconfig/pkgconfig.ent">
@@ -99,5 +100,6 @@
 %hdparm;
 %which;
-%infozip;
+%unzip;
+%zip;
 %pciutils;
 %pkgconfig;
Index: general/sysutils/unzip/unzip-desc.xml
===================================================================
--- general/sysutils/unzip/unzip-desc.xml	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
+++ general/sysutils/unzip/unzip-desc.xml	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
@@ -0,0 +1,36 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application>UnZip</application> package contains <command>unzip
+</command>, <command>funzip</command>, <command>unzipfsx</command>, 
+<command>zipgrep</command> and <command>zipinfo</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>unzip</title>
+<para><command>unzip</command> lists, tests or extracts files from a
+<filename>ZIP</filename> archive.</para></sect3> 
+
+<sect3><title>funzip</title>
+<para><command>funzip</command> allows the output of <command>unzip</command> 
+commands to be redirected.</para></sect3>
+
+<sect3><title>unzipfsx</title>
+<para><command>unzipfsx</command> is the self-extracting stub that can be 
+prepended to a <filename>ZIP</filename> archive.  Files in this format allow 
+the recipient to decompress the archive without installing
+<application>UnZip</application>.</para></sect3>
+
+<sect3><title>zipgrep</title>
+<para><command>zipgrep</command> is a grep for <filename>ZIP</filename> 
+archives.</para></sect3>
+
+<sect3><title>zipinfo</title>
+<para><command>zipinfo</command> produces technical information about the files 
+in a <filename>ZIP</filename> archive, including file access permissions, 
+encryption status, type of compression, etc.</para></sect3>
+
+</sect2>
+
Index: general/sysutils/unzip/unzip-exp.xml
===================================================================
--- general/sysutils/unzip/unzip-exp.xml	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
+++ general/sysutils/unzip/unzip-exp.xml	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><command>make prefix=/usr linux</command>: This command
+overrides the prefix variable that is set to
+<filename class='directory'>/usr/local</filename> in the
+<filename>Makefile</filename>
+and builds the executables for a linux system.  The alternatives to
+'linux' can be seen with a 'make list' command.</para>
+
+<para><command>make prefix=/usr linux_shlibz</command>: Build shared
+<filename>libunzip</filename> and link <application>UnZip</application> against 
+it and <application>zlib</application>.</para>
+
+</sect2>
+
Index: general/sysutils/unzip/unzip-inst.xml
===================================================================
--- general/sysutils/unzip/unzip-inst.xml	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
+++ general/sysutils/unzip/unzip-inst.xml	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
@@ -0,0 +1,23 @@
+<sect2>
+<title>Installation of <application>UnZip</application></title>
+
+<para>By default, <application>UnZip</application> does not support shrink
+decompression. To enable it or to obtain more information, check out the
+<application>UnZip</application> <acronym>FAQ</acronym> at
+<ulink url="http://www.info-zip.org/pub/infozip/FAQ.html#unshrink"/>.</para>
+
+<para>Install <application>UnZip</application> by running the following 
+commands:</para>
+
+<screen><userinput><command>patch -Np1 -i ../unzip-5.50-fix-Makefile.patch &amp;&amp;
+patch -Np1 -i ../unzip-5.50-fix-libz.patch &amp;&amp;
+patch -Np1 -i ../unzip-5.50-dont-make-noise.patch &amp;&amp;
+patch -Np1 -i ../unzip-5.50-dotdot.patch &amp;&amp;
+cp unix/Makefile . &amp;&amp;
+make prefix=/usr linux &amp;&amp;
+make prefix=/usr linux_shlibz &amp;&amp;
+make prefix=/usr install &amp;&amp;
+cp -a libunzip.so* /usr/lib</command></userinput></screen>
+
+</sect2>
+
Index: general/sysutils/unzip/unzip-intro.xml
===================================================================
--- general/sysutils/unzip/unzip-intro.xml	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
+++ general/sysutils/unzip/unzip-intro.xml	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
@@ -0,0 +1,36 @@
+<sect2>
+<title>Introduction to <application>UnZip</application></title>
+
+<para>The <application>UnZip</application> package contains <filename>ZIP
+</filename> extraction utilities. These are useful for extracting files from 
+<filename>ZIP</filename> archives.  <filename>ZIP</filename> archives are 
+created with <application>PKZIP</application> or <application>Info-ZIP
+</application> utilities primarily in a <acronym>DOS</acronym> environment.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&unzip-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&unzip-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &unzip-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&unzip-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&unzip-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch: <ulink
+url="&patch-root;/unzip-5.50-fix-Makefile.patch"/></para></listitem>
+<listitem><para>Required patch: <ulink
+url="&patch-root;/unzip-5.50-fix-libz.patch"/></para></listitem>
+<listitem><para>Recommended patch: <ulink
+url="&patch-root;/unzip-5.50-dotdot.patch"/></para></listitem>
+<listitem><para>Recommended patch: <ulink
+url="&patch-root;/unzip-5.50-dont-make-noise.patch"/></para></listitem></itemizedlist>
+</sect3>
+
+</sect2>
Index: general/sysutils/unzip/unzip.ent
===================================================================
--- general/sysutils/unzip/unzip.ent	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
+++ general/sysutils/unzip/unzip.ent	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
@@ -0,0 +1,11 @@
+<!ENTITY unzip SYSTEM "../unzip.xml">
+<!ENTITY unzip-intro SYSTEM "unzip-intro.xml">
+<!ENTITY unzip-inst SYSTEM "unzip-inst.xml">
+<!ENTITY unzip-exp SYSTEM "unzip-exp.xml">
+<!ENTITY unzip-desc SYSTEM "unzip-desc.xml">
+<!ENTITY unzip-version "5.50">
+<!ENTITY unzip-download-http "http://www.mirror.ac.uk/sites/ftp.info-zip.org/pub/infozip/src/unzip550.tar.gz">
+<!ENTITY unzip-download-ftp "ftp://ftp.info-zip.org/pub/infozip/src/unzip550.tar.gz">
+<!ENTITY unzip-size "1.1 MB">
+<!ENTITY unzip-buildsize "5.8 MB">
+<!ENTITY unzip-time "0.42 SBU">
Index: general/sysutils/zip/zip-desc.xml
===================================================================
--- general/sysutils/zip/zip-desc.xml	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
+++ general/sysutils/zip/zip-desc.xml	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
@@ -0,0 +1,32 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Zip</application> package contains <command>zip
+</command>, <command>zipcloak</command>, <command>zipnote</command> and 
+<command>zipsplit</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>zip</title>
+<para><command>zip</command> compresses files into a
+<filename>ZIP</filename> archive.</para></sect3> 
+
+<sect3><title>zipcloak</title>
+<para><command>zipcloak</command> is disabled in this version of
+<application>Zip</application>.  It will 
+display a message about how to support encryption by recompiling with
+<filename>zcrypt27.zip</filename>.</para></sect3>
+
+<sect3><title>zipnote</title>
+<para><command>zipnote</command> reads or writes comments stored in a
+<filename>ZIP</filename> file .</para></sect3>
+
+<sect3><title>zipsplit</title>
+<para><command>zipsplit</command> is a utility to split
+<filename>ZIP</filename> files into smaller files.</para></sect3>
+
+
+</sect2>
+
Index: general/sysutils/zip/zip-exp.xml
===================================================================
--- general/sysutils/zip/zip-exp.xml	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
+++ general/sysutils/zip/zip-exp.xml	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><command>make prefix=/usr generic_gcc</command>: This command
+overrides the prefix variable that is set to
+<filename class='directory'>/usr/local</filename> in the
+<filename>Makefile</filename>
+and builds the executables for a linux system.  The alternatives to
+'generic_gcc' can be seen with a 'make list' command.</para>
+
+</sect2>
+
Index: general/sysutils/zip/zip-inst.xml
===================================================================
--- general/sysutils/zip/zip-inst.xml	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
+++ general/sysutils/zip/zip-inst.xml	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of <application>Zip</application></title>
+
+<para>Install <application>Zip</application> by running the following commands:
+</para>
+
+<screen><userinput><command>cp unix/Makefile . &amp;&amp;
+make prefix=/usr generic_gcc &amp;&amp;
+make prefix=/usr install</command></userinput></screen>
+
+</sect2>
+
Index: general/sysutils/zip/zip-intro.xml
===================================================================
--- general/sysutils/zip/zip-intro.xml	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
+++ general/sysutils/zip/zip-intro.xml	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
@@ -0,0 +1,23 @@
+<sect2>
+<title>Introduction to <application>Zip</application></title>
+
+
+<para>The <application>Zip</application> package contains
+<application>Zip</application> utilities. These 
+are useful for compressing files into <filename>ZIP</filename> archives.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&zip-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&zip-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &zip-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&zip-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&zip-time;</para></listitem></itemizedlist>
+</sect3>
+
+
+</sect2>
Index: general/sysutils/zip/zip.ent
===================================================================
--- general/sysutils/zip/zip.ent	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
+++ general/sysutils/zip/zip.ent	(revision 0ee500d8fc0980e378c33917e95b7b53ae852d8d)
@@ -0,0 +1,11 @@
+<!ENTITY zip SYSTEM "../zip.xml">
+<!ENTITY zip-intro SYSTEM "zip-intro.xml">
+<!ENTITY zip-inst SYSTEM "zip-inst.xml">
+<!ENTITY zip-exp SYSTEM "zip-exp.xml">
+<!ENTITY zip-desc SYSTEM "zip-desc.xml">
+<!ENTITY zip-version "2.3">
+<!ENTITY zip-download-http "http://www.mirror.ac.uk/sites/ftp.info-zip.org/pub/infozip/src/zip23.tar.gz">
+<!ENTITY zip-download-ftp "ftp://ftp.info-zip.org/pub/infozip/src/zip23.tar.gz">
+<!ENTITY zip-size "839 KB">
+<!ENTITY zip-buildsize "3.6 MB">
+<!ENTITY zip-time "0.05 SBU">
