* ncurses moved. makefile.fpc + fpmake included, makefile in separate commit

git-svn-id: trunk@9930 -

.gitattributes

@@ -2590,25 +2590,8 @@ packages/extra/modplug/Makefile svneol=native#text/plain
 packages/extra/modplug/Makefile.fpc svneol=native#text/plain
 packages/extra/modplug/modplug.pas svneol=native#text/plain
 packages/extra/ncurses/Makefile svneol=native#text/plain
-packages/extra/ncurses/Makefile.fpc svneol=native#text/plain
-packages/extra/ncurses/db_demo.pp svneol=native#text/plain
-packages/extra/ncurses/edit_demo.pp svneol=native#text/plain
-packages/extra/ncurses/eti.inc svneol=native#text/plain
-packages/extra/ncurses/firework.pp svneol=native#text/plain
 packages/extra/ncurses/fpmake.inc svneol=native#text/plain
 packages/extra/ncurses/fpmake.pp svneol=native#text/plain
-packages/extra/ncurses/menu.pp svneol=native#text/plain
-packages/extra/ncurses/menu_demo.pp svneol=native#text/plain
-packages/extra/ncurses/ncrt.inc svneol=native#text/plain
-packages/extra/ncurses/ncrt.pp svneol=native#text/plain
-packages/extra/ncurses/ncurses.pp svneol=native#text/plain
-packages/extra/ncurses/ocrt.pp svneol=native#text/plain
-packages/extra/ncurses/ocrt_demo.pp svneol=native#text/plain
-packages/extra/ncurses/panel.pp svneol=native#text/plain
-packages/extra/ncurses/pxpic.inc svneol=native#text/plain
-packages/extra/ncurses/pxpic.txt svneol=native#text/plain
-packages/extra/ncurses/screen_demo.pp svneol=native#text/plain
-packages/extra/ncurses/testn.pp svneol=native#text/plain
 packages/extra/newt/Makefile svneol=native#text/plain
 packages/extra/newt/Makefile.fpc svneol=native#text/plain
 packages/extra/newt/README -text
@@ -4303,6 +4286,24 @@ packages/mysql/tests/mysqls.c svneol=native#text/plain
 packages/mysql/tests/mysqls.pp svneol=native#text/plain
 packages/mysql/tests/testdb3.pp svneol=native#text/plain
 packages/mysql/tests/testdb4.pp svneol=native#text/plain
+packages/ncurses/Makefile.fpc svneol=native#text/plain
+packages/ncurses/examples/db_demo.pp svneol=native#text/plain
+packages/ncurses/examples/edit_demo.pp svneol=native#text/plain
+packages/ncurses/examples/firework.pp svneol=native#text/plain
+packages/ncurses/examples/menu_demo.pp svneol=native#text/plain
+packages/ncurses/examples/ocrt_demo.pp svneol=native#text/plain
+packages/ncurses/examples/screen_demo.pp svneol=native#text/plain
+packages/ncurses/fpmake.pp svneol=native#text/plain
+packages/ncurses/src/eti.inc svneol=native#text/plain
+packages/ncurses/src/menu.pp svneol=native#text/plain
+packages/ncurses/src/ncrt.inc svneol=native#text/plain
+packages/ncurses/src/ncrt.pp svneol=native#text/plain
+packages/ncurses/src/ncurses.pp svneol=native#text/plain
+packages/ncurses/src/ocrt.pp svneol=native#text/plain
+packages/ncurses/src/panel.pp svneol=native#text/plain
+packages/ncurses/src/pxpic.inc svneol=native#text/plain
+packages/ncurses/src/pxpic.txt svneol=native#text/plain
+packages/ncurses/tests/testn.pp svneol=native#text/plain
 packages/pasjpeg/Makefile svneol=native#text/plain
 packages/pasjpeg/Makefile.fpc svneol=native#text/plain
 packages/pasjpeg/examples/cderror.pas svneol=native#text/plain

packages/Makefile.fpc

@@ -4,12 +4,12 @@
 
 [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_freebsd=fcl-web fcl-async ibase mysql
-dirs_darwin=fcl-web fcl-async ibase mysql
-dirs_solaris=fcl-web fcl-async ibase mysql
-dirs_netbsd=fcl-web fcl-async ibase mysql
-dirs_openbsd=fcl-web fcl-async ibase mysql
-dirs_linux=fcl-web fcl-async ibase mysql 
+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_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

@@ -6,7 +6,7 @@ dirs=chm
 dirs_linux=unzip zlib fftw \
            x11 opengl gtk gtk2 syslog \
            forms svgalib ggi libpng libgd \
-           utmp bfd gdbm ncurses tcl cdrom \
+           utmp bfd gdbm  tcl cdrom \
            imlib gnome1 fpgtk newt uuid \
            ldap openal mad oggvorbis a52 \
            modplug dts openssl pcap libcurl cairo aspell
@@ -20,17 +20,17 @@ dirs_m68k_linux=graph
 dirs_netbsd=unzip zlib \
             x11 opengl gtk syslog \
             forms svgalib ggi libpng libgd \
-            utmp bfd gdbm ncurses fpgtk \
+            utmp bfd gdbm  fpgtk \
             tcl imlib gnome1 openssl pcap libcurl cairo aspell
 dirs_freebsd=unzip zlib fftw \
              x11 opengl gtk gtk2 syslog \
              forms svgalib ggi libpng libgd \
-             utmp bfd gdbm ncurses fpgtk \
+             utmp bfd gdbm  fpgtk \
              tcl imlib gnome1 openssl pcap libcurl cairo sdl graph aspell
 dirs_openbsd=unzip zlib \
              x11 opengl gtk syslog \
              forms svgalib ggi libpng libgd \
-             utmp bfd gdbm ncurses fpgtk \
+             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 \
@@ -59,14 +59,14 @@ dirs_netwlibc=unzip zlib
 dirs_darwin= unzip zlib fftw \
              x11 opengl gtk gtk2 syslog \
              forms libpng libgd \
-             utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 \
+             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 \
              x11 opengl gtk gtk2 syslog \
              forms svgalib ggi libpng libgd \
-             utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 \
+             utmp bfd gdbm  fpgtk tcl imlib gnome1 \
              openssl pcap libcurl cairo
 dirs_beos=graph
 

packages/extra/ncurses/Makefile.fpc → packages/ncurses/Makefile.fpc

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

packages/ncurses/fpmake.pp

@@ -0,0 +1,54 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+
+Var
+  P : TPackage;
+  T : TTarget;
+begin
+  With Installer do
+    begin
+{$endif ALLPACKAGES}
+
+    P:=AddPackage('ncurses');
+{$ifdef ALLPACKAGES}
+    P.Directory:='ncurses';
+{$endif ALLPACKAGES}
+    P.Version:='2.0.0';
+    P.SourcePath.Add('src');
+
+    T:=P.Targets.AddUnit('menu.pp');
+      with T.Dependencies do
+        begin
+          AddInclude('eti.inc');
+          AddUnit('ncurses');
+        end;
+    T:=P.Targets.AddUnit('ncrt.pp');
+      with T.Dependencies do
+        begin
+          AddInclude('ncrt.inc');
+          AddUnit('ncurses');
+        end;
+    T:=P.Targets.AddUnit('ncurses.pp');
+    T:=P.Targets.AddUnit('ocrt.pp');
+      with T.Dependencies do
+        begin
+          AddInclude('ncrt.inc');
+          AddInclude('pxpic.inc');
+          AddUnit('ncurses');
+          AddUnit('panel');
+          AddUnit('menu');
+        end;
+    T:=P.Targets.AddUnit('panel.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('ncurses');
+        end;
+
+{$ifndef ALLPACKAGES}
+    Run;
+    end;
+end.
+{$endif ALLPACKAGES}