* remove aspell from windows for now (need some registry crap and I have no idea how to do it)

git-svn-id: trunk@8386 -

packages/extra/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/09/03]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/08/28]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -237,7 +237,7 @@ ifeq ($(FULL_TARGET),i386-go32v2)
 override TARGET_DIRS+=chm  unzip graph
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_DIRS+=chm  unzip opengl gtk gtk2 zlib tcl cdrom fpgtk fftw mad openal oggvorbis a52 libpng openssl pcap sdl lua graph aspell
+override TARGET_DIRS+=chm  unzip opengl gtk gtk2 zlib tcl cdrom fpgtk fftw mad openal oggvorbis a52 libpng openssl pcap sdl lua graph
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 override TARGET_DIRS+=chm  os2units rexx unzip zlib x11 gtk libpng tcl imlib fpgtk
@@ -380,9 +380,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_DIRS+=chm  unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo aspell graph
 endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_DIRS+=chm  unzip zlib fftw x11 opengl gtk gtk2 syslog forms libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl libcurl cairo aspell
-endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override TARGET_DIRS+=chm
 endif
@@ -1530,7 +1527,6 @@ TARGET_DIRS_PCAP=1
 TARGET_DIRS_SDL=1
 TARGET_DIRS_LUA=1
 TARGET_DIRS_GRAPH=1
-TARGET_DIRS_ASPELL=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 TARGET_DIRS_CHM=1
@@ -2277,32 +2273,6 @@ TARGET_DIRS_CAIRO=1
 TARGET_DIRS_ASPELL=1
 TARGET_DIRS_GRAPH=1
 endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-TARGET_DIRS_CHM=1
-TARGET_DIRS_UNZIP=1
-TARGET_DIRS_ZLIB=1
-TARGET_DIRS_FFTW=1
-TARGET_DIRS_X11=1
-TARGET_DIRS_OPENGL=1
-TARGET_DIRS_GTK=1
-TARGET_DIRS_GTK2=1
-TARGET_DIRS_SYSLOG=1
-TARGET_DIRS_FORMS=1
-TARGET_DIRS_LIBPNG=1
-TARGET_DIRS_LIBGD=1
-TARGET_DIRS_UTMP=1
-TARGET_DIRS_BFD=1
-TARGET_DIRS_GDBM=1
-TARGET_DIRS_NCURSES=1
-TARGET_DIRS_FPGTK=1
-TARGET_DIRS_TCL=1
-TARGET_DIRS_IMLIB=1
-TARGET_DIRS_GNOME1=1
-TARGET_DIRS_OPENSSL=1
-TARGET_DIRS_LIBCURL=1
-TARGET_DIRS_CAIRO=1
-TARGET_DIRS_ASPELL=1
-endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 TARGET_DIRS_CHM=1
 endif

packages/extra/Makefile.fpc

@@ -34,7 +34,7 @@ dirs_openbsd=unzip zlib \
              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 \
-             mad openal oggvorbis a52 libpng openssl pcap sdl lua graph aspell
+             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_os2=os2units \

packages/extra/aspell/aspell.pp

@@ -130,6 +130,11 @@ procedure delete_aspell_speller (ths:aspellspeller); cdecl; external aspelllib;
 
 implementation
 
+{$ifdef windows}
+uses
+  SysUtils;
+{$endif}
+
 {$IFDEF Dynamic}
 function loadsymbol (name:pchar;proc:pointer):longbool;
 var addr:pointer;     
@@ -165,7 +170,7 @@ var
  bversion:=RegistryQueryValue (regLocalMachine,'SOFTWARE\Aspell','AspellVersion');
  move (bversion[1],version,4);
  path:=RegistryQueryValue (regLocalMachine,'SOFTWARE\Aspell','Path');
- mylib:=path+slash+replace(aspelllib,num2str(version));
+ mylib:=path + PathDelim + StringReplace(aspelllib, '%s', IntToStr(Version), [rfReplaceAll]);
 {$ENDIF}
 
  alib := LoadLibrary(mylib);

packages/extra/aspell/fpmake.inc

@@ -4,7 +4,7 @@
     {$ELSEIF defined(EXTRAPACKAGES)}
     Directory:='pcp';
     {$ENDIF}
-    OS:=[linux,netbsd,freebsd,openbsd,win32,solaris,darwin];
+    OS:=[linux,netbsd,freebsd,openbsd,solaris,darwin];
     T:=Targets.AddUnit('aspell');
     T:=Targets.AddUnit('scheck');
     EndPackage;