* zlib moved

git-svn-id: trunk@9932 -

.gitattributes

@@ -3606,10 +3606,8 @@ packages/extra/x11/xutil.pp svneol=native#text/plain
 packages/extra/x11/xv.pp svneol=native#text/plain
 packages/extra/x11/xvlib.pp svneol=native#text/plain
 packages/extra/zlib/Makefile svneol=native#text/plain
-packages/extra/zlib/Makefile.fpc svneol=native#text/plain
 packages/extra/zlib/fpmake.inc svneol=native#text/plain
 packages/extra/zlib/fpmake.pp svneol=native#text/plain
-packages/extra/zlib/zlib.pp svneol=native#text/plain
 packages/fcl-async/Makefile svneol=native#text/plain
 packages/fcl-async/Makefile.fpc svneol=native#text/plain
 packages/fcl-async/fpmake.pp svneol=native#text/plain
@@ -4684,6 +4682,9 @@ packages/winunits-jedi/src/jwawsrm.pas svneol=native#text/plain
 packages/winunits-jedi/src/jwawsvns.pas svneol=native#text/plain
 packages/winunits-jedi/src/jwawtsapi32.pas svneol=native#text/plain
 packages/winunits-jedi/src/jwazmouse.pas svneol=native#text/plain
+packages/zlib/Makefile.fpc svneol=native#text/plain
+packages/zlib/fpmake.pp svneol=native#text/plain
+packages/zlib/src/zlib.pp svneol=native#text/plain
 rtl/COPYING -text
 rtl/COPYING.FPC -text
 rtl/Makefile svneol=native#text/plain

packages/Makefile.fpc

@@ -4,15 +4,20 @@
 
 [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 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 unzip
-dirs_win32=winunits-base winunits-jedi fcl-web ibase mysql
-dirs_win64=winunits-base winunits-jedi fcl-web ibase mysql
+dirs_freebsd=fcl-web fcl-async ibase mysql ncurses zlib
+dirs_darwin=fcl-web fcl-async ibase mysql ncurses zlib
+dirs_solaris=fcl-web fcl-async ibase mysql ncurses zlib
+dirs_netbsd=fcl-web fcl-async ibase mysql ncurses zlib
+dirs_openbsd=fcl-web fcl-async ibase mysql ncurses zlib
+dirs_linux=fcl-web fcl-async ibase mysql ncurses unzip zlib
+dirs_win32=winunits-base winunits-jedi fcl-web ibase mysql zlib
+dirs_win64=winunits-base winunits-jedi fcl-web ibase mysql zlib
 dirs_wince=fcl-web ibase mysql
+dirs_os2=zlib
+dirs_emx=zlib
+dirs_netware=zlib
+dirs_netwlibc= zlib
+
 
 [install]
 fpcpackage=y

packages/extra/Makefile.fpc

@@ -3,7 +3,7 @@
 #
 [target]
 dirs=chm
-dirs_linux= zlib fftw \
+dirs_linux= fftw \
            x11 opengl gtk gtk2 syslog \
            forms svgalib ggi libpng libgd \
            utmp bfd gdbm  tcl cdrom \
@@ -17,36 +17,34 @@ dirs_powerpc64_linux=graph
 dirs_sparc_linux=graph
 dirs_arm_linux=graph
 dirs_m68k_linux=graph
-dirs_netbsd= zlib \
+dirs_netbsd= \
             x11 opengl gtk syslog \
             forms svgalib ggi libpng libgd \
             utmp bfd gdbm  fpgtk \
             tcl imlib gnome1 openssl pcap libcurl cairo aspell
-dirs_freebsd= zlib fftw \
+dirs_freebsd= 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= zlib \
+dirs_openbsd= \
              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= opengl gtk gtk2 zlib tcl cdrom fpgtk fftw \
+dirs_win32= opengl gtk gtk2 tcl cdrom fpgtk fftw \
              mad openal oggvorbis a52 libpng openssl pcap sdl lua graph
-dirs_win64= opengl gtk gtk2 zlib tcl cdrom fpgtk fftw openssl sdl
-dirs_wince= zlib tcl fftw
+dirs_win64= opengl gtk gtk2 tcl cdrom fpgtk fftw openssl sdl
+dirs_wince= tcl fftw
 dirs_os2=os2units \
          rexx \
-          zlib \
          x11 gtk \
          libpng \
          tcl \
          imlib fpgtk
 dirs_emx=os2units \
          rexx \
-          zlib \
          x11 gtk \
          libpng \
          tcl \
@@ -54,16 +52,14 @@ dirs_emx=os2units \
 dirs_go32v2= graph
 dirs_amiga=amunits
 dirs_palmos=palmunits
-dirs_netware= zlib
-dirs_netwlibc= zlib
-dirs_darwin=  zlib fftw \
+dirs_darwin=  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=  zlib fftw \
+dirs_solaris= fftw \
              x11 opengl gtk gtk2 syslog \
              forms svgalib ggi libpng libgd \
              utmp bfd gdbm  fpgtk tcl imlib gnome1 \

packages/extra/zlib/Makefile.fpc → packages/zlib/Makefile.fpc

@@ -15,8 +15,12 @@ libc=y
 [install]
 fpcpackage=y
 
+[compiler]
+includedir=src
+sourcedir=src tests
+
 [default]
-fpcdir=../../..
+fpcdir=../..
 
 [rules]
 .NOTPARALLEL:

packages/zlib/fpmake.pp

@@ -0,0 +1,29 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+
+Var
+  P : TPackage;
+  T : TTarget;
+begin
+  With Installer do
+    begin
+{$endif ALLPACKAGES}
+
+    P:=AddPackage('ibase');
+{$ifdef ALLPACKAGES}
+    P.Directory:='ibase';
+{$endif ALLPACKAGES}
+    P.Version:='2.0.0';
+    P.SourcePath.Add('src');
+
+    T:=P.Targets.AddUnit('zlib.pp');
+
+
+{$ifndef ALLPACKAGES}
+    Run;
+    end;
+end.
+{$endif ALLPACKAGES}