* Unzip moved

git-svn-id: trunk@9931 -

.gitattributes

@@ -3556,12 +3556,8 @@ packages/extra/unixutil/fpmake.inc svneol=native#text/plain
 packages/extra/unixutil/fpmake.pp svneol=native#text/plain
 packages/extra/unixutil/unixutils.pp svneol=native#text/plain
 packages/extra/unzip/Makefile svneol=native#text/plain
-packages/extra/unzip/Makefile.fpc svneol=native#text/plain
 packages/extra/unzip/fpmake.inc svneol=native#text/plain
 packages/extra/unzip/fpmake.pp svneol=native#text/plain
-packages/extra/unzip/unzip.pp svneol=native#text/plain
-packages/extra/unzip/unzipdll.pp svneol=native#text/plain
-packages/extra/unzip/ziptypes.pp svneol=native#text/plain
 packages/extra/users/fpmake.pp svneol=native#text/plain
 packages/extra/users/grp.pp svneol=native#text/plain
 packages/extra/users/pwd.pp svneol=native#text/plain
@@ -4431,6 +4427,11 @@ packages/paszlib/src/zipper.pp svneol=native#text/plain
 packages/paszlib/src/ziputils.pas svneol=native#text/plain
 packages/paszlib/src/zstream.pp svneol=native#text/plain
 packages/paszlib/src/zuncompr.pas svneol=native#text/plain
+packages/unzip/Makefile.fpc svneol=native#text/plain
+packages/unzip/fpmake.pp svneol=native#text/plain
+packages/unzip/src/unzip.pp svneol=native#text/plain
+packages/unzip/src/unzipdll.pp svneol=native#text/plain
+packages/unzip/src/ziptypes.pp svneol=native#text/plain
 packages/winunits-base/Makefile svneol=native#text/plain
 packages/winunits-base/Makefile.fpc svneol=native#text/plain
 packages/winunits-base/fpmake.pp svneol=native#text/plain

packages/Makefile.fpc

@@ -3,13 +3,13 @@
 #
 
 [target]
-dirs=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process 
+dirs=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip
 dirs_freebsd=fcl-web fcl-async ibase mysql ncurses
 dirs_darwin=fcl-web fcl-async ibase mysql ncurses
 dirs_solaris=fcl-web fcl-async ibase mysql ncurses
 dirs_netbsd=fcl-web fcl-async ibase mysql ncurses
 dirs_openbsd=fcl-web fcl-async ibase mysql ncurses
-dirs_linux=fcl-web fcl-async ibase mysql ncurses
+dirs_linux=fcl-web fcl-async ibase mysql ncurses unzip
 dirs_win32=winunits-base winunits-jedi fcl-web ibase mysql
 dirs_win64=winunits-base winunits-jedi fcl-web ibase mysql
 dirs_wince=fcl-web ibase mysql

packages/extra/Makefile.fpc

@@ -3,7 +3,7 @@
 #
 [target]
 dirs=chm
-dirs_linux=unzip zlib fftw \
+dirs_linux= zlib fftw \
            x11 opengl gtk gtk2 syslog \
            forms svgalib ggi libpng libgd \
            utmp bfd gdbm  tcl cdrom \
@@ -17,53 +17,53 @@ dirs_powerpc64_linux=graph
 dirs_sparc_linux=graph
 dirs_arm_linux=graph
 dirs_m68k_linux=graph
-dirs_netbsd=unzip zlib \
+dirs_netbsd= zlib \
             x11 opengl gtk syslog \
             forms svgalib ggi libpng libgd \
             utmp bfd gdbm  fpgtk \
             tcl imlib gnome1 openssl pcap libcurl cairo aspell
-dirs_freebsd=unzip zlib fftw \
+dirs_freebsd= zlib fftw \
              x11 opengl gtk gtk2 syslog \
              forms svgalib ggi libpng libgd \
              utmp bfd gdbm  fpgtk \
              tcl imlib gnome1 openssl pcap libcurl cairo sdl graph aspell
-dirs_openbsd=unzip zlib \
+dirs_openbsd= zlib \
              x11 opengl gtk syslog \
              forms svgalib ggi libpng libgd \
              utmp bfd gdbm  fpgtk \
              tcl imlib gnome1 openssl pcap libcurl cairo aspell
 # libcurl should work on Win32 too, but I haven't tested this. Skip it for now. MVC.
-dirs_win32=unzip opengl gtk gtk2 zlib tcl cdrom fpgtk fftw \
+dirs_win32= opengl gtk gtk2 zlib tcl cdrom fpgtk fftw \
              mad openal oggvorbis a52 libpng openssl pcap sdl lua graph
-dirs_win64=unzip opengl gtk gtk2 zlib tcl cdrom fpgtk fftw openssl sdl
-dirs_wince=unzip zlib tcl fftw
+dirs_win64= opengl gtk gtk2 zlib tcl cdrom fpgtk fftw openssl sdl
+dirs_wince= zlib tcl fftw
 dirs_os2=os2units \
          rexx \
-         unzip zlib \
+          zlib \
          x11 gtk \
          libpng \
          tcl \
          imlib fpgtk
 dirs_emx=os2units \
          rexx \
-         unzip zlib \
+          zlib \
          x11 gtk \
          libpng \
          tcl \
          imlib fpgtk
-dirs_go32v2=unzip graph
+dirs_go32v2= graph
 dirs_amiga=amunits
 dirs_palmos=palmunits
-dirs_netware=unzip zlib
-dirs_netwlibc=unzip zlib
-dirs_darwin= unzip zlib fftw \
+dirs_netware= zlib
+dirs_netwlibc= zlib
+dirs_darwin=  zlib fftw \
              x11 opengl gtk gtk2 syslog \
              forms libpng libgd \
              utmp bfd gdbm  fpgtk tcl imlib gnome1 \
              openssl libcurl cairo aspell
 dirs_powerpc_darwin=univint sdl graph
 dirs_i386_darwin=univint sdl graph
-dirs_solaris= unzip zlib fftw \
+dirs_solaris=  zlib fftw \
              x11 opengl gtk gtk2 syslog \
              forms svgalib ggi libpng libgd \
              utmp bfd gdbm  fpgtk tcl imlib gnome1 \

packages/extra/unzip/Makefile.fpc → packages/unzip/Makefile.fpc

@@ -11,11 +11,15 @@ units=ziptypes unzip
 units_emx=unzipdll
 units_os2=unzipdll
 
+[compiler]
+includedir=src
+sourcedir=src tests
+
 [install]
 fpcpackage=y
 
 [default]
-fpcdir=../../..
+fpcdir=../..
 
 [rules]
 .NOTPARALLEL:

packages/unzip/fpmake.pp

@@ -0,0 +1,33 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+
+Var
+  P : TPackage;
+  T : TTarget;
+begin
+  With Installer do
+    begin
+{$endif ALLPACKAGES}
+
+    P:=AddPackage('unzip');
+{$ifdef ALLPACKAGES}
+    P.Directory:='unzip';
+{$endif ALLPACKAGES}
+    P.Version:='2.0.0';
+    P.SourcePath.Add('src');
+
+    T:=P.Targets.AddUnit('unzip.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('ziptypes');
+        end;
+    T:=P.Targets.AddUnit('ziptypes.pp');
+//    T:=P.Targets.AddUnit('unzipdll.pp',[emx,os2]);
+{$ifndef ALLPACKAGES}
+    Run;
+    end;
+end.
+{$endif ALLPACKAGES}