* 1.9.8

Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/07]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: help
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=fpc
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifndef inOS2
 override FPCDIR:=$(BASEDIR)
 export FPCDIR
@@ -349,7 +349,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_DIRS+=compiler rtl utils fcl fv packages ide installer
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_DIRS+=compiler rtl utils fcl fv packages ide installer
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -415,7 +415,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_DIRS+=compiler rtl utils fcl fv packages ide installer
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_DIRS+=compiler rtl utils fcl fv packages ide installer
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -712,7 +712,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -838,7 +838,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1684,7 +1684,7 @@ TARGET_DIRS_PACKAGES=1
 TARGET_DIRS_IDE=1
 TARGET_DIRS_INSTALLER=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_DIRS_COMPILER=1
 TARGET_DIRS_RTL=1
 TARGET_DIRS_UTILS=1
@@ -1904,7 +1904,7 @@ TARGET_DIRS_PACKAGES=1
 TARGET_DIRS_IDE=1
 TARGET_DIRS_INSTALLER=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_DIRS_COMPILER=1
 TARGET_DIRS_RTL=1
 TARGET_DIRS_UTILS=1
@@ -2547,6 +2547,11 @@ ifneq ($(wildcard $(CVSINSTALL)/debian/changelog),)
 DEBPACKAGEVERSION:=$(shell head -n 1 $(CVSINSTALL)/debian/changelog | awk '{ print $$2 }' | tr -d '[()]')
 DEBFPCVERSION:=$(shell echo $(DEBPACKAGEVERSION) | awk -F '-' '{ print $$1 }')
 DEBSRCDIR:=$(BUILDDIR)/fpc-$(DEBFPCVERSION)
+debcheck:
+ifneq ($(DEBFPCVERSION),$(PACKAGE_VERSION))
+	@$(ECHO) "Debian version ($(DEBFPCVERSION)) is not correct, expect $(PACKAGE_VERSION)"
+	@exit 1
+endif
 debcopy: distclean
 	rm -rf $(DEBSRCDIR)
 	install -d $(DEBSRCDIR)
@@ -2580,7 +2585,7 @@ debclean:
 	-rmdir $(BUILDDIR)
 debtargz: checkfpcdir
 	$(MAKE) fpc_zipinstall USETAR=y ZIPTARGET=debcopy PACKDIR=$(DEBSRCDIR) FULLZIPNAME=fpc-$(DEBFPCVERSION).orig
-deb: checkfpcdir debcopy debbuild debclean
+deb: checkfpcdir debcheck debcopy debbuild debclean
 endif   # changelog found
 endif
 ifdef inUnix
@@ -2588,14 +2593,13 @@ RPM:=$(strip $(wildcard $(addsuffix /rpm$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(RPM),)
 ifneq ($(wildcard $(CVSINSTALL)/fpc.spec),)
 .PHONY: rpmcopy rpm
-RPMFPCVERSION:=$(shell grep '^Version:' $(CVSINSTALL)/fpc.spec | awk '{ print $$2 }')
 RPMBUILD=$(strip $(wildcard $(addsuffix /rpmbuild,$(SEARCHPATH))))
 ifeq ($(RPMBUILD),)
 RPMBUILD=$(strip $(wildcard $(addsuffix /rpm,$(SEARCHPATH))))
 endif
 RPMDIR=$(BUILDDIR)/rpm
-RPMSPECFILE:=$(RPMDIR)/SPECS/fpc-$(RPMFPCVERSION).spec
-RPMSOURCEFILE:=$(RPMDIR)/SOURCES/fpc-$(RPMFPCVERSION)-src.tar.gz
+RPMSPECFILE:=$(RPMDIR)/SPECS/fpc-$(PACKAGE_VERSION).spec
+RPMSOURCEFILE:=$(RPMDIR)/SOURCES/fpc-$(PACKAGE_VERSION)-src.tar.gz
 RPMSRCDIR:=$(RPMDIR)/SOURCES/fpc
 rpmcopy: distclean
 	false || [ -d $(RPMDIR) ] || install -d $(RPMDIR)
@@ -2610,7 +2614,7 @@ rpmcopy: distclean
 	echo "%define _builddir $(RPMDIR)/BUILD" >> $(RPMSPECFILE)
 	echo "%define _rpmdir $(RPMDIR)/RPMS" >> $(RPMSPECFILE)
 	echo "%define _srcrpmdir $(RPMDIR)/SRPMS" >> $(RPMSPECFILE)
-	cat $(CVSINSTALL)/fpc.spec >> $(RPMSPECFILE)
+	sed "s+%FPCVERSION%+$(PACKAGE_VERSION)+" $(CVSINSTALL)/fpc.spec >> $(RPMSPECFILE)
 ifndef NODOCS
 	cat $(CVSINSTALL)/fpcdoc.spec >> $(RPMSPECFILE)
 endif

Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=fpc
-version=1.9.7
+version=1.9.8
 
 [target]
 dirs=compiler rtl utils fcl fv packages ide installer
@@ -531,6 +531,12 @@ DEBPACKAGEVERSION:=$(shell head -n 1 $(CVSINSTALL)/debian/changelog | awk '{ pri
 DEBFPCVERSION:=$(shell echo $(DEBPACKAGEVERSION) | awk -F '-' '{ print $$1 }')
 DEBSRCDIR:=$(BUILDDIR)/fpc-$(DEBFPCVERSION)
 
+debcheck:
+ifneq ($(DEBFPCVERSION),$(PACKAGE_VERSION))
+        @$(ECHO) "Debian version ($(DEBFPCVERSION)) is not correct, expect $(PACKAGE_VERSION)"
+        @exit 1
+endif
+
 debcopy: distclean
         rm -rf $(DEBSRCDIR)
         install -d $(DEBSRCDIR)
@@ -568,7 +574,7 @@ debclean:
 debtargz: checkfpcdir
         $(MAKE) fpc_zipinstall USETAR=y ZIPTARGET=debcopy PACKDIR=$(DEBSRCDIR) FULLZIPNAME=fpc-$(DEBFPCVERSION).orig
 
-deb: checkfpcdir debcopy debbuild debclean
+deb: checkfpcdir debcheck debcopy debbuild debclean
 
 endif   # changelog found
 
@@ -589,16 +595,14 @@ ifneq ($(wildcard $(CVSINSTALL)/fpc.spec),)
 
 .PHONY: rpmcopy rpm
 
-RPMFPCVERSION:=$(shell grep '^Version:' $(CVSINSTALL)/fpc.spec | awk '{ print $$2 }')
-
 # Only the recent rpms have rpmbuild
 RPMBUILD=$(strip $(wildcard $(addsuffix /rpmbuild,$(SEARCHPATH))))
 ifeq ($(RPMBUILD),)
 RPMBUILD=$(strip $(wildcard $(addsuffix /rpm,$(SEARCHPATH))))
 endif
 RPMDIR=$(BUILDDIR)/rpm
-RPMSPECFILE:=$(RPMDIR)/SPECS/fpc-$(RPMFPCVERSION).spec
-RPMSOURCEFILE:=$(RPMDIR)/SOURCES/fpc-$(RPMFPCVERSION)-src.tar.gz
+RPMSPECFILE:=$(RPMDIR)/SPECS/fpc-$(PACKAGE_VERSION).spec
+RPMSOURCEFILE:=$(RPMDIR)/SOURCES/fpc-$(PACKAGE_VERSION)-src.tar.gz
 RPMSRCDIR:=$(RPMDIR)/SOURCES/fpc
 rpmcopy: distclean
         # false || is needed to workaround fpcmake sections
@@ -611,11 +615,11 @@ rpmcopy: distclean
         rm -rf $(RPMSRCDIR)
         # Create fpc.spec, include our own builddir
         echo "%define _topdir $(RPMDIR)" > $(RPMSPECFILE)
-	echo "%define _sourcedir $(RPMDIR)/SOURCES" >> $(RPMSPECFILE)
-	echo "%define _builddir $(RPMDIR)/BUILD" >> $(RPMSPECFILE)
-	echo "%define _rpmdir $(RPMDIR)/RPMS" >> $(RPMSPECFILE)
-	echo "%define _srcrpmdir $(RPMDIR)/SRPMS" >> $(RPMSPECFILE)
-        cat $(CVSINSTALL)/fpc.spec >> $(RPMSPECFILE)
+        echo "%define _sourcedir $(RPMDIR)/SOURCES" >> $(RPMSPECFILE)
+        echo "%define _builddir $(RPMDIR)/BUILD" >> $(RPMSPECFILE)
+        echo "%define _rpmdir $(RPMDIR)/RPMS" >> $(RPMSPECFILE)
+        echo "%define _srcrpmdir $(RPMDIR)/SRPMS" >> $(RPMSPECFILE)
+        sed "s+%FPCVERSION%+$(PACKAGE_VERSION)+" $(CVSINSTALL)/fpc.spec >> $(RPMSPECFILE)
 ifndef NODOCS
         cat $(CVSINSTALL)/fpcdoc.spec >> $(RPMSPECFILE)
 endif
@@ -682,14 +686,14 @@ innocheck:
 ifndef NODOCS
 # Check for docs-pdf.zip
 ifeq ($(wildcard docs-pdf.zip),)
-	@$(ECHO) "No documentation available. Please copy the file docs-pdf.zip to this directory."
-	@exit 1
+        @$(ECHO) "No documentation available. Please copy the file docs-pdf.zip to this directory."
+        @exit 1
 endif
 endif
 # Check for libgdb
 ifeq ($(wildcard libgdb/win32/libgdb.a),)
-	@$(ECHO) "Libgdb not available. Please get and unzip libgdb-<version>.i386-win32.zip in this directory."
-	@exit 1
+        @$(ECHO) "Libgdb not available. Please get and unzip libgdb-<version>.i386-win32.zip in this directory."
+        @exit 1
 endif
 
 innobuild: innocheck build
@@ -699,9 +703,9 @@ ifndef NODOCS
         unzip -d $(INNODIR) docs-pdf.zip
 endif
         $(MAKE) install INSTALL_PREFIX=$(INNODIR)
-	compiler/utils/fpcsubst -i install/fpc.ist -o $(INNODIR)/fpc.iss $(FPCISSSUBST)
-	$(INNOCMD_ISCC)
-      	$(MOVE) $(INNODIR)/Output/setup.exe fpc-$(PACKAGE_VERSION).$(FULL_TARGET).exe
+        compiler/utils/fpcsubst -i install/fpc.ist -o $(INNODIR)/fpc.iss $(FPCISSSUBST)
+        $(INNOCMD_ISCC)
+        $(MOVE) $(INNODIR)/Output/setup.exe fpc-$(PACKAGE_VERSION).$(FULL_TARGET).exe
 
 innoclean:
         $(DELTREE) $(INNODIR)

compiler/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=compiler
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 unexport FPC_VERSION FPC_COMPILERINFO
 CYCLETARGETS=i386 powerpc sparc arm x86_64
 ifdef ALPHA
@@ -354,7 +354,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_DIRS+=utils
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_DIRS+=utils
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -420,7 +420,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_DIRS+=utils
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_DIRS+=utils
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -453,7 +453,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_PROGRAMS+=pp
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_PROGRAMS+=pp
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -519,7 +519,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_PROGRAMS+=pp
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_PROGRAMS+=pp
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -553,7 +553,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_INCLUDEDIR+=$(PPC_TARGET)
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_INCLUDEDIR+=$(PPC_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -619,7 +619,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_INCLUDEDIR+=$(PPC_TARGET)
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_INCLUDEDIR+=$(PPC_TARGET)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -652,7 +652,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -718,7 +718,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -751,7 +751,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_TARGETDIR+=.
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -817,7 +817,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_TARGETDIR+=.
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -850,7 +850,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -916,7 +916,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -1212,7 +1212,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -1338,7 +1338,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1678,7 +1678,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1744,7 +1744,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -2319,7 +2319,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_DIRS_UTILS=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_DIRS_UTILS=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -2385,7 +2385,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 TARGET_DIRS_UTILS=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_DIRS_UTILS=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

compiler/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=compiler
-version=1.9.7
+version=1.9.8
 
 [target]
 programs=pp

compiler/utils/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -251,7 +251,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -317,7 +317,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst fpcmkcfg
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -350,7 +350,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override CLEAN_UNITS+=ppu crc usubst
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override CLEAN_UNITS+=ppu crc usubst
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -416,7 +416,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override CLEAN_UNITS+=ppu crc usubst
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override CLEAN_UNITS+=ppu crc usubst
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -450,7 +450,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_UNITDIR+=..
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_UNITDIR+=..
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -516,7 +516,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_UNITDIR+=..
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_UNITDIR+=..
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -549,7 +549,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_SOURCEDIR+=..
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_SOURCEDIR+=..
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -615,7 +615,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_SOURCEDIR+=..
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_SOURCEDIR+=..
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -911,7 +911,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -1037,7 +1037,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1377,7 +1377,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1443,7 +1443,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

compiler/version.pas

@@ -30,7 +30,7 @@ interface
        { version string }
        version_nr = '1';
        release_nr = '9';
-       patch_nr   = '7';
+       patch_nr   = '8';
        minorpatch = '';
 
        { word version for ppu file }
@@ -90,7 +90,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.31  2005-02-14 17:13:09  peter
+  Revision 1.32  2005-02-15 22:28:29  peter
+    * 1.9.8
+
+  Revision 1.31  2005/02/14 17:13:09  peter
     * truncate log
 
   Revision 1.30  2005/01/19 21:10:15  peter

demo/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=demo
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_DIRS+=text  linux graph
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_DIRS+=text
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_DIRS+=text
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_DIRS+=text
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_DIRS+=text
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -616,7 +616,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -742,7 +742,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1547,7 +1547,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_DIRS_TEXT=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_DIRS_TEXT=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1622,7 +1622,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 TARGET_DIRS_TEXT=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_DIRS_TEXT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

demo/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=demo
-version=1.9.7
+version=1.9.8
 
 [target]
 dirs=text

demo/graph/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -254,7 +254,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -320,7 +320,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -353,7 +353,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=gameunit
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=gameunit
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -419,7 +419,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=gameunit
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=gameunit
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -715,7 +715,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -841,7 +841,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1181,7 +1181,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1247,7 +1247,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

demo/linux/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -553,7 +553,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -679,7 +679,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1019,7 +1019,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1085,7 +1085,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

demo/modex/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -517,7 +517,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -643,7 +643,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -983,7 +983,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1049,7 +1049,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

demo/morphos/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -517,7 +517,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -643,7 +643,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -983,7 +983,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1049,7 +1049,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

demo/netware/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -517,7 +517,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -643,7 +643,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -983,7 +983,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1049,7 +1049,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

demo/netwlibc/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -518,7 +518,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -644,7 +644,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -984,7 +984,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1050,7 +1050,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

demo/os2/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -517,7 +517,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -643,7 +643,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -983,7 +983,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1049,7 +1049,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

demo/text/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -251,7 +251,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -317,7 +317,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -613,7 +613,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -739,7 +739,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1079,7 +1079,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1145,7 +1145,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

demo/win32/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -517,7 +517,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -643,7 +643,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -983,7 +983,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1049,7 +1049,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

fcl/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/12]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=fcl
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
 CLASSES10=classes
 endif
@@ -256,7 +256,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -322,7 +322,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -355,7 +355,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=$(CLASSES10) contnrs inifiles ezcgi pipes rtfpars idea base64 gettext iostream zstream cachecls avl_tree xmlreg registry eventlog custapp cgiapp wformat whtml wtex rttiutils bufstream  process ssockets resolve fpasync
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=$(CLASSES10) contnrs inifiles ezcgi pipes rtfpars idea base64 gettext iostream zstream cachecls avl_tree xmlreg registry eventlog custapp cgiapp wformat whtml wtex rttiutils bufstream
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -421,7 +421,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=$(CLASSES10) contnrs inifiles ezcgi pipes rtfpars idea base64 gettext iostream zstream cachecls avl_tree xmlreg registry eventlog custapp cgiapp wformat whtml wtex rttiutils bufstream  process ssockets resolve fpasync
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=$(CLASSES10) contnrs inifiles ezcgi pipes rtfpars idea base64 gettext iostream zstream cachecls avl_tree xmlreg registry eventlog custapp cgiapp wformat whtml wtex rttiutils bufstream
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -454,7 +454,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_RSTS+=$(CLASSES10) ssockets cachecls resolve custapp cgiapp eventlog registry
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_RSTS+=$(CLASSES10) ssockets cachecls resolve custapp cgiapp eventlog registry
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -520,7 +520,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_RSTS+=$(CLASSES10) ssockets cachecls resolve custapp cgiapp eventlog registry
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_RSTS+=$(CLASSES10) ssockets cachecls resolve custapp cgiapp eventlog registry
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -553,7 +553,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLEDIRS+=tests
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLEDIRS+=tests
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -619,7 +619,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLEDIRS+=tests
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLEDIRS+=tests
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -652,7 +652,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override CLEAN_UNITS+=adler gzcrc gzio infblock infcodes inffast inftrees infutil minigzip paszlib trees zbase zcompres zdeflate zinflate zuncompr zutil pthreads streamio
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override CLEAN_UNITS+=adler gzcrc gzio infblock infcodes inffast inftrees infutil minigzip paszlib trees zbase zcompres zdeflate zinflate zuncompr zutil pthreads streamio
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -718,7 +718,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override CLEAN_UNITS+=adler gzcrc gzio infblock infcodes inffast inftrees infutil minigzip paszlib trees zbase zcompres zdeflate zinflate zuncompr zutil pthreads streamio
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override CLEAN_UNITS+=adler gzcrc gzio infblock infcodes inffast inftrees infutil minigzip paszlib trees zbase zcompres zdeflate zinflate zuncompr zutil pthreads streamio
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -752,7 +752,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -818,7 +818,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -851,8 +851,8 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  posix
+ifeq ($(FULL_TARGET),i386-solaris)
+override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  posix
@@ -917,8 +917,8 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  posix
+ifeq ($(FULL_TARGET),sparc-solaris)
+override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
@@ -950,7 +950,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1016,7 +1016,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -1338,7 +1338,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -1464,7 +1464,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1850,7 +1850,7 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_PASJPEG=1
@@ -2049,7 +2049,7 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_PASJPEG=1
@@ -2568,12 +2568,16 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
+ifneq ($(UNITTARGETDIRPREFIX),)
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
 ifdef INSTALLEXEFILES
-override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
+ifneq ($(TARGETDIRPREFIX),)
+override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(INSTALLEXEFILES)))
+endif
 endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
@@ -2587,7 +2591,7 @@ ifdef INSTALL_CREATEPACKAGEFPC
 ifdef FPCMAKE
 ifdef PACKAGE_VERSION
 ifneq ($(wildcard Makefile.fpc),)
-	$(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc
+	$(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc
 	$(MKDIR) $(INSTALL_UNITDIR)
 	$(INSTALL) Package.fpc $(INSTALL_UNITDIR)
 endif
@@ -2943,7 +2947,7 @@ TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_DIRS_XML=1
 TARGET_DIRS_IMAGE=1
 TARGET_DIRS_DB=1
@@ -3141,7 +3145,7 @@ TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_DIRS_XML=1
 TARGET_DIRS_IMAGE=1
 TARGET_DIRS_DB=1
@@ -3513,7 +3517,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_EXAMPLEDIRS_TESTS=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_EXAMPLEDIRS_TESTS=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -3579,7 +3583,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 TARGET_EXAMPLEDIRS_TESTS=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_EXAMPLEDIRS_TESTS=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

fcl/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=fcl
-version=1.9.7
+version=1.9.8
 
 [require]
 packages=paszlib

fcl/db/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_DIRS+=sdf memds sqldb  mysql interbase sqlite
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_DIRS+=sdf memds sqldb
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_DIRS+=sdf memds sqldb  mysql interbase sqlite
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_DIRS+=sdf memds sqldb
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=dbconst db ddg_ds ddg_rec dbwhtml
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=dbconst db ddg_ds ddg_rec dbwhtml
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=dbconst db ddg_ds ddg_rec dbwhtml
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=dbconst db ddg_ds ddg_rec dbwhtml
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -451,7 +451,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_RSTS+=dbwhtml dbconst
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_RSTS+=dbwhtml dbconst
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -517,7 +517,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_RSTS+=dbwhtml dbconst
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_RSTS+=dbwhtml dbconst
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -550,7 +550,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLEDIRS+=tests
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLEDIRS+=tests
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -616,7 +616,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLEDIRS+=tests
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLEDIRS+=tests
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -650,7 +650,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -716,7 +716,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -1038,7 +1038,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -1164,7 +1164,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1520,7 +1520,7 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1626,7 +1626,7 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -2280,7 +2280,7 @@ TARGET_DIRS_MYSQL=1
 TARGET_DIRS_INTERBASE=1
 TARGET_DIRS_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_DIRS_SDF=1
 TARGET_DIRS_MEMDS=1
 TARGET_DIRS_SQLDB=1
@@ -2424,7 +2424,7 @@ TARGET_DIRS_MYSQL=1
 TARGET_DIRS_INTERBASE=1
 TARGET_DIRS_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_DIRS_SDF=1
 TARGET_DIRS_MEMDS=1
 TARGET_DIRS_SQLDB=1
@@ -2792,7 +2792,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_EXAMPLEDIRS_TESTS=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_EXAMPLEDIRS_TESTS=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -2858,7 +2858,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 TARGET_EXAMPLEDIRS_TESTS=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_EXAMPLEDIRS_TESTS=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

fcl/db/dbase/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -259,7 +259,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=dbf
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=dbf
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -304,7 +304,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=testdbf
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=testdbf
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -349,7 +349,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -415,7 +415,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -448,7 +448,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override INSTALL_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override INSTALL_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -494,7 +494,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2 -Sh
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2 -Sh
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -560,7 +560,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2 -Sh
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2 -Sh
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -856,7 +856,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -982,7 +982,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1322,7 +1322,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1388,7 +1388,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

fcl/db/interbase/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=interbase
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=interbase
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=interbase
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=interbase
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=testib
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=testib
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=testib
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=testib
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -451,7 +451,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override CLEAN_UNITS+=ibas40 ibase60
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override CLEAN_UNITS+=ibas40 ibase60
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -517,7 +517,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override CLEAN_UNITS+=ibas40 ibase60
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override CLEAN_UNITS+=ibas40 ibase60
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -551,7 +551,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -617,7 +617,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -939,7 +939,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -1065,7 +1065,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1412,7 +1412,7 @@ ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_IBASE=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_IBASE=1
 endif
@@ -1500,7 +1500,7 @@ ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_IBASE=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_IBASE=1
 endif

fcl/db/memds/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=memds
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=memds
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=memds
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=memds
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_RSTS+=memds
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_RSTS+=memds
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_RSTS+=memds
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_RSTS+=memds
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -451,7 +451,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=testpop testopen testld testcp
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=testpop testopen testld testcp
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -517,7 +517,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=testpop testopen testld testcp
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=testpop testopen testld testcp
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -814,7 +814,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -940,7 +940,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1280,7 +1280,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1346,7 +1346,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

fcl/db/mysql/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=mysqldb4 mysqldb3
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=mysqldb4 mysqldb3
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=mysqldb4 mysqldb3
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=mysqldb4 mysqldb3
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_RSTS+=mysqldb
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_RSTS+=mysqldb
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_RSTS+=mysqldb
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_RSTS+=mysqldb
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -451,7 +451,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=mtest
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=mtest
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -517,7 +517,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=mtest
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=mtest
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -550,7 +550,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override CLEAN_UNITS+=mysql mysql_com mysql_version
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override CLEAN_UNITS+=mysql mysql_com mysql_version
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -616,7 +616,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override CLEAN_UNITS+=mysql mysql_com mysql_version
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override CLEAN_UNITS+=mysql mysql_com mysql_version
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -650,7 +650,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -716,7 +716,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -1038,7 +1038,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -1164,7 +1164,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1511,7 +1511,7 @@ ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_MYSQL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_MYSQL=1
 endif
@@ -1599,7 +1599,7 @@ ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_MYSQL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_MYSQL=1
 endif

fcl/db/odbc/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=fpodbc
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=fpodbc
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=fpodbc
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=fpodbc
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=testbcon testcon testdrcon testenv testfl testpa testpktestpr testsql testst testtl
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=testbcon testcon testdrcon testenv testfl testpa testpktestpr testsql testst testtl
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=testbcon testcon testdrcon testenv testfl testpa testpktestpr testsql testst testtl
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=testbcon testcon testdrcon testenv testfl testpa testpktestpr testsql testst testtl
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -452,7 +452,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -518,7 +518,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -840,7 +840,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -966,7 +966,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1313,7 +1313,7 @@ ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_ODBC=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_ODBC=1
 endif
@@ -1401,7 +1401,7 @@ ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_ODBC=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_ODBC=1
 endif

fcl/db/sdf/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=sdfdata
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=sdfdata
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=sdfdata
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=sdfdata
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=testsdf testfix
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=testsdf testfix
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=testsdf testfix
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=testsdf testfix
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -715,7 +715,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -841,7 +841,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1181,7 +1181,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1247,7 +1247,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

fcl/db/sqldb/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -304,7 +304,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=sqldb
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=sqldb
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -370,7 +370,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=sqldb
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=sqldb
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -403,7 +403,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_RSTS+=sqldb
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_RSTS+=sqldb
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -469,7 +469,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_RSTS+=sqldb
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_RSTS+=sqldb
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -503,7 +503,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -569,7 +569,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -891,7 +891,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -1017,7 +1017,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1369,7 +1369,7 @@ REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1465,7 +1465,7 @@ REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

fcl/db/sqldb/interbase/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=ibconnection
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=ibconnection
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=ibconnection
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=ibconnection
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -353,7 +353,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -419,7 +419,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -741,7 +741,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -867,7 +867,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1214,7 +1214,7 @@ ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_IBASE=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_IBASE=1
 endif
@@ -1302,7 +1302,7 @@ ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_IBASE=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_IBASE=1
 endif

fcl/db/sqldb/mysql/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=mysql4conn
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=mysql4conn
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=mysql4conn
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=mysql4conn
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -353,7 +353,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -419,7 +419,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -741,7 +741,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -867,7 +867,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1214,7 +1214,7 @@ ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_MYSQL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_MYSQL=1
 endif
@@ -1302,7 +1302,7 @@ ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_MYSQL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_MYSQL=1
 endif

fcl/db/sqldb/postgres/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=pqconnection
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=pqconnection
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=pqconnection
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=pqconnection
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_RSTS+=pqconnection
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_RSTS+=pqconnection
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_RSTS+=pqconnection
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_RSTS+=pqconnection
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -452,7 +452,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -518,7 +518,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -840,7 +840,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -966,7 +966,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1313,7 +1313,7 @@ ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_POSTGRES=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_POSTGRES=1
 endif
@@ -1401,7 +1401,7 @@ ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_POSTGRES=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_POSTGRES=1
 endif

fcl/db/sqlite/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=sqliteds
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=sqliteds
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=sqliteds
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=sqliteds
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -616,7 +616,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -742,7 +742,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1089,7 +1089,7 @@ ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
@@ -1177,7 +1177,7 @@ ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif

fcl/db/tests/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -251,7 +251,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_PROGRAMS+=testds createds tested
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_PROGRAMS+=testds createds tested
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -317,7 +317,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_PROGRAMS+=testds createds tested
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_PROGRAMS+=testds createds tested
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -351,7 +351,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -417,7 +417,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -739,7 +739,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -865,7 +865,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1258,7 +1258,7 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
@@ -1479,7 +1479,7 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1

fcl/fpcunit/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=fpcunit  testregistry  testreport testutils
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=fpcunit  testregistry  testreport testutils
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=fpcunit  testregistry  testreport testutils
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=fpcunit  testregistry  testreport testutils
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLEDIRS+=exampletests
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLEDIRS+=exampletests
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLEDIRS+=exampletests
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLEDIRS+=exampletests
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -452,7 +452,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2h
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2h
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -518,7 +518,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2h
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2h
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -551,7 +551,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_TARGETDIR+=../$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_TARGETDIR+=../$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -617,7 +617,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_TARGETDIR+=../$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_TARGETDIR+=../$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -913,7 +913,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -1039,7 +1039,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1379,7 +1379,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1445,7 +1445,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -1948,7 +1948,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_EXAMPLEDIRS_EXAMPLETESTS=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_EXAMPLEDIRS_EXAMPLETESTS=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -2014,7 +2014,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 TARGET_EXAMPLEDIRS_EXAMPLETESTS=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_EXAMPLEDIRS_EXAMPLETESTS=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

fcl/fpcunit/exampletests/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=fpcunittests  money  moneytest
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=fpcunittests  money  moneytest
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=fpcunittests  money  moneytest
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=fpcunittests  money  moneytest
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -353,7 +353,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2h
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2h
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -419,7 +419,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2h
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2h
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -452,7 +452,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_TARGETDIR+=../../$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_TARGETDIR+=../../$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -518,7 +518,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_TARGETDIR+=../../$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_TARGETDIR+=../../$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -814,7 +814,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -940,7 +940,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1280,7 +1280,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1346,7 +1346,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

fcl/fpcunit/tests/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=asserttest frameworktest suitetest
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=asserttest frameworktest suitetest
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=asserttest frameworktest suitetest
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=asserttest frameworktest suitetest
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -353,7 +353,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2h
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2h
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -419,7 +419,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2h
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2h
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -452,7 +452,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_TARGETDIR+=../../$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_TARGETDIR+=../../$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -518,7 +518,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_TARGETDIR+=../../$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_TARGETDIR+=../../$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -814,7 +814,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -940,7 +940,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1280,7 +1280,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1346,7 +1346,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

fcl/image/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg targacmn fpreadtga fpwritetga ellipses
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg targacmn fpreadtga fpwritetga ellipses
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg targacmn fpreadtga fpwritetga ellipses
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg targacmn fpreadtga fpwritetga ellipses
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_RSTS+=pscanvas
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_RSTS+=pscanvas
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_RSTS+=pscanvas
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_RSTS+=pscanvas
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -451,7 +451,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=imgconv
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=imgconv
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -517,7 +517,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=imgconv
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=imgconv
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -814,7 +814,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -940,7 +940,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1294,7 +1294,7 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_PASJPEG=1
@@ -1404,7 +1404,7 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_PASJPEG=1

fcl/net/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -301,7 +301,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=servlets  fpsock httpbase httpclient httpsvlt xmlrpc
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -367,7 +367,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=servlets  fpsock httpbase httpclient httpsvlt xmlrpc
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -497,7 +497,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2h
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2h
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -563,7 +563,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2h
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2h
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -859,7 +859,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -985,7 +985,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1339,7 +1339,7 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@@ -1449,7 +1449,7 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1

fcl/net/tests/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -251,7 +251,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_PROGRAMS+=rpcserv rpccli
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_PROGRAMS+=rpcserv rpccli
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -317,7 +317,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_PROGRAMS+=rpcserv rpccli
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_PROGRAMS+=rpcserv rpccli
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -350,7 +350,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=svrclass svrclass_xmlrpc
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=svrclass svrclass_xmlrpc
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -416,7 +416,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=svrclass svrclass_xmlrpc
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=svrclass svrclass_xmlrpc
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -450,7 +450,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2h
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2h
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -516,7 +516,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2h
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2h
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -838,7 +838,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -964,7 +964,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1357,7 +1357,7 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
@@ -1578,7 +1578,7 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1

fcl/passrc/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=pastree pscanner pparser paswrite
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=pastree pscanner pparser paswrite
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=pastree pscanner pparser paswrite
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=pastree pscanner pparser paswrite
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_RSTS+=pscanner pparser pastree
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_RSTS+=pscanner pparser pastree
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_RSTS+=pscanner pparser pastree
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_RSTS+=pscanner pparser pastree
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -452,7 +452,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2h
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2h
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -518,7 +518,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2h
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2h
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -814,7 +814,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -940,7 +940,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1280,7 +1280,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1346,7 +1346,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

fcl/shedit/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=doc_text shedit sh_xml sh_pas
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=doc_text shedit sh_xml sh_pas
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=doc_text shedit sh_xml sh_pas
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=doc_text shedit sh_xml sh_pas
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLEDIRS+=gtk
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLEDIRS+=gtk
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLEDIRS+=gtk
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLEDIRS+=gtk
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -452,7 +452,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -518,7 +518,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -814,7 +814,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -940,7 +940,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1280,7 +1280,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1346,7 +1346,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -1849,7 +1849,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_EXAMPLEDIRS_GTK=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_EXAMPLEDIRS_GTK=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1915,7 +1915,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 TARGET_EXAMPLEDIRS_GTK=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_EXAMPLEDIRS_GTK=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

fcl/shedit/gtk/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -251,7 +251,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_PROGRAMS+=gtkdemo
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_PROGRAMS+=gtkdemo
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -317,7 +317,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_PROGRAMS+=gtkdemo
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_PROGRAMS+=gtkdemo
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -350,7 +350,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=gtkshedit
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=gtkshedit
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -416,7 +416,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=gtkshedit
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=gtkshedit
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -739,7 +739,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -865,7 +865,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1275,7 +1275,7 @@ REQUIRE_PACKAGES_SQLITE=1
 REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_OPENGL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
@@ -1550,7 +1550,7 @@ REQUIRE_PACKAGES_SQLITE=1
 REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_OPENGL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1

fcl/tests/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -251,7 +251,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_PROGRAMS+=stringl dparser fstream mstream list threads testrtf cfgtest xmldump htdump testez tidea b64test b64test2 b64enc b64dec restest testz testz2 istream doecho testol testcont txmlreg testreg tstelcmd testapp testcgi testbs
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_PROGRAMS+=stringl dparser fstream mstream list threads testrtf cfgtest xmldump htdump testez tidea b64test b64test2 b64enc b64dec restest testz testz2 istream doecho testol testcont txmlreg testreg tstelcmd testapp testcgi testbs
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -317,7 +317,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_PROGRAMS+=stringl dparser fstream mstream list threads testrtf cfgtest xmldump htdump testez tidea b64test b64test2 b64enc b64dec restest testz testz2 istream doecho testol testcont txmlreg testreg tstelcmd testapp testcgi testbs
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_PROGRAMS+=stringl dparser fstream mstream list threads testrtf cfgtest xmldump htdump testez tidea b64test b64test2 b64enc b64dec restest testz testz2 istream doecho testol testcont txmlreg testreg tstelcmd testapp testcgi testbs
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -351,7 +351,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -417,7 +417,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -739,7 +739,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -865,7 +865,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1258,7 +1258,7 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
@@ -1479,7 +1479,7 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1

fcl/xml/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=sax dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmldefs htmwrite xpath
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=sax dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmldefs htmwrite xpath
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=sax dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmldefs htmwrite xpath
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=sax dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmldefs htmwrite xpath
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_RSTS+=sax xpath
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_RSTS+=sax xpath
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_RSTS+=sax xpath
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_RSTS+=sax xpath
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -452,7 +452,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2h
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2h
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -518,7 +518,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2h
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2h
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -814,7 +814,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -940,7 +940,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1280,7 +1280,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1346,7 +1346,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

fv/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=fv
-override PACKAGE_VERSION=1.9.6
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=buildfv
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=buildfv
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=buildfv
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=buildfv
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=buildfv
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox resource statuses stddlg tabs time validate views sysmsg asciitab timeddlg
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox resource statuses stddlg tabs time validate views sysmsg asciitab timeddlg
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox resource statuses stddlg tabs time validate views sysmsg asciitab timeddlg
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox resource statuses stddlg tabs time validate views sysmsg asciitab timeddlg
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -451,7 +451,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLEDIRS+=test
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLEDIRS+=test
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -517,7 +517,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLEDIRS+=test
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLEDIRS+=test
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -552,7 +552,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_TARGETDIR+=.
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -618,7 +618,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_TARGETDIR+=.
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -914,7 +914,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -1040,7 +1040,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1380,7 +1380,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1446,7 +1446,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -2031,7 +2031,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_EXAMPLEDIRS_TEST=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_EXAMPLEDIRS_TEST=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -2097,7 +2097,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 TARGET_EXAMPLEDIRS_TEST=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_EXAMPLEDIRS_TEST=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

fv/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=fv
-version=1.9.6
+version=1.9.8
 
 [target]
 units=buildfv
@@ -16,7 +16,7 @@ exampledirs=test
 
 [libs]
 libname=libfpfv.so
-libversion=1.0
+libversion=1.9.8
 
 [compiler]
 targetdir=.

fv/test/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -251,7 +251,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_PROGRAMS+=tfileio testapp
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_PROGRAMS+=tfileio testapp
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -317,7 +317,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_PROGRAMS+=tfileio testapp
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_PROGRAMS+=tfileio testapp
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -613,7 +613,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -739,7 +739,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1086,7 +1086,7 @@ ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 endif
@@ -1174,7 +1174,7 @@ ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 endif

ide/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=ide
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifndef NOGDB
 ifdef GDBLIBDIR
 override LIBGDBFILE:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
@@ -275,7 +275,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_DIRS+=compiler
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_DIRS+=compiler
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -341,7 +341,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_DIRS+=compiler
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_DIRS+=compiler
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -374,7 +374,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_PROGRAMS+=fp
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_PROGRAMS+=fp
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -440,7 +440,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_PROGRAMS+=fp
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_PROGRAMS+=fp
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -475,7 +475,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-Sg
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-Sg
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -541,7 +541,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-Sg
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-Sg
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -863,7 +863,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -989,7 +989,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1350,7 +1350,7 @@ REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_GDBINT=1
 REQUIRE_PACKAGES_REGEXPR=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_GDBINT=1
@@ -1482,7 +1482,7 @@ REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_GDBINT=1
 REQUIRE_PACKAGES_REGEXPR=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_GDBINT=1
@@ -2153,7 +2153,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_DIRS_COMPILER=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_DIRS_COMPILER=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -2219,7 +2219,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 TARGET_DIRS_COMPILER=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_DIRS_COMPILER=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

ide/Makefile.fpc

@@ -6,7 +6,7 @@
 
 [package]
 name=ide
-version=1.9.7
+version=1.9.8
 
 [target]
 dirs=compiler
@@ -184,7 +184,10 @@ clean_compiler:
 
 #
 # $Log$
-# Revision 1.30  2005-01-10 22:49:56  armin
+# Revision 1.31  2005-02-15 22:28:29  peter
+#   * 1.9.8
+#
+# Revision 1.30  2005/01/10 22:49:56  armin
 # * updated makefile.fpc versions to 1.9.7, regenerated makefiles
 #
 # Revision 1.29  2004/12/30 20:57:39  hajny

ide/compiler/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -267,7 +267,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=compunit
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=compunit
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -333,7 +333,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=compunit
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=compunit
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -367,7 +367,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-Ur -dNOCATCH
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-Ur -dNOCATCH
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -433,7 +433,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-Ur -dNOCATCH
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-Ur -dNOCATCH
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -466,7 +466,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET)
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -532,7 +532,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET)
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -565,7 +565,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -631,7 +631,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -927,7 +927,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -1053,7 +1053,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1393,7 +1393,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1459,7 +1459,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

ide/fakegdb/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=gdbcon gdbint
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=gdbcon gdbint
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=gdbcon gdbint
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=gdbcon gdbint
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -616,7 +616,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -742,7 +742,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1082,7 +1082,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1148,7 +1148,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

install/debian/changelog

@@ -1,8 +1,8 @@
-fpc (1.9.7-0) unstable; urgency=low
+fpc (1.9.8-1) unstable; urgency=low
 
-  * Snapshot
+  * New release
 
- -- Peter Vreman <[email protected]>  Thu, 31 Dec 2004 12:00:00 +0100
+ -- Peter Vreman <[email protected]>  Thu, 14 Feb 2005 12:00:00 +0100
 
 fpc (1.9.6-1) unstable; urgency=low
 

install/fpc.spec

@@ -1,5 +1,5 @@
 Name: fpc
-Version: 1.9.7
+Version: %FPCVERSION%
 Release: 0
 ExclusiveArch: i386 i586 i686 ppc amd64 x86_64
 Copyright: GPL

install/makepack

@@ -85,15 +85,7 @@ if [ ! "$CROSS" = "cross" ]; then
   fi
 fi
 
-
-# Build everything using the makefiles
-${MAKE} distclean CPU_TARGET=$TARGETCPU OS_TARGET=$TARGETOS
-${MAKE} ${CROSS}zipinstall CPU_TARGET=$TARGETCPU OS_TARGET=$TARGETOS
-if [ $? != 0 ]; then
-  echo "Failed to make distribution archive."
-  exit 1
-fi
-
+# First check for docs.tar.gz before building anything
 if [ "$CROSS" = "" ]; then
   if [ ! -f docs.tar.gz ]; then
     if [ "$MAKEDOCS" != "yes" ]; then
@@ -114,6 +106,14 @@ if [ "$CROSS" = "" ]; then
   fi
 fi
 
+# Build everything using the makefiles
+${MAKE} distclean CPU_TARGET=$TARGETCPU OS_TARGET=$TARGETOS
+${MAKE} ${CROSS}zipinstall CPU_TARGET=$TARGETCPU OS_TARGET=$TARGETOS
+if [ $? != 0 ]; then
+  echo "Failed to make distribution archive."
+  exit 1
+fi
+
 # Files to be in the release
 RELFILES="install.sh"
 

installer/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=installer
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_PROGRAMS+=installer
 endif
@@ -280,7 +280,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override CLEAN_UNITS+=scroll
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override CLEAN_UNITS+=scroll
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -346,7 +346,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override CLEAN_UNITS+=scroll
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override CLEAN_UNITS+=scroll
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -398,7 +398,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_UNITDIR+=../ide
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_UNITDIR+=../ide
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -464,7 +464,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_UNITDIR+=../ide
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_UNITDIR+=../ide
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -760,7 +760,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -886,7 +886,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1240,7 +1240,7 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
@@ -1350,7 +1350,7 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1

installer/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=installer
-version=1.9.7
+version=1.9.8
 
 [target]
 programs_go32v2=install

packages/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -251,7 +251,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_DIRS+=base extra
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_DIRS+=base extra
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -317,7 +317,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_DIRS+=base extra
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_DIRS+=base extra
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -615,7 +615,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -741,7 +741,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1393,7 +1393,7 @@ ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_DIRS_BASE=1
 TARGET_DIRS_EXTRA=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_DIRS_BASE=1
 TARGET_DIRS_EXTRA=1
 endif
@@ -1481,7 +1481,7 @@ ifeq ($(FULL_TARGET),sparc-netbsd)
 TARGET_DIRS_BASE=1
 TARGET_DIRS_EXTRA=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_DIRS_BASE=1
 TARGET_DIRS_EXTRA=1
 endif

packages/base/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -251,7 +251,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_DIRS+=paszlib pasjpeg regexpr netdb md5  gdbint libasync mysql ibase postgres oracle odbc
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_DIRS+=paszlib pasjpeg regexpr netdb md5
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -317,7 +317,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_DIRS+=paszlib pasjpeg regexpr netdb md5  gdbint libasync mysql ibase postgres oracle odbc
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_DIRS+=paszlib pasjpeg regexpr netdb md5
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -615,7 +615,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -741,7 +741,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1447,7 +1447,7 @@ TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_DIRS_PASZLIB=1
 TARGET_DIRS_PASJPEG=1
 TARGET_DIRS_REGEXPR=1
@@ -1683,7 +1683,7 @@ TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_DIRS_PASZLIB=1
 TARGET_DIRS_PASJPEG=1
 TARGET_DIRS_REGEXPR=1

packages/base/gdbint/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=gdbint
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifdef inUnix
 CURRDIR=./
 else
@@ -273,7 +273,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=gdbint gdbcon
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=gdbint gdbcon
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -339,7 +339,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=gdbint gdbcon
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=gdbint gdbcon
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -372,7 +372,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=testgdb symify
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=testgdb symify
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -438,7 +438,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=testgdb symify
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=testgdb symify
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -472,7 +472,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -538,7 +538,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -571,7 +571,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -637,7 +637,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -959,7 +959,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -1085,7 +1085,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1425,7 +1425,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1491,7 +1491,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/base/gdbint/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=gdbint
-version=1.9.7
+version=1.9.8
 
 [target]
 units=gdbint gdbcon

packages/base/ibase/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=ibase
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=ibase40 ibase60 ibase60dyn
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=ibase40 ibase60 ibase60dyn
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=ibase40 ibase60 ibase60dyn
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=ibase40 ibase60 ibase60dyn
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=ibase40 ibase60 ibase60dyn
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=testib40 testib60
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=testib40 testib60
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=testib40 testib60
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=testib40 testib60
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -741,7 +741,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -867,7 +867,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1207,7 +1207,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1273,7 +1273,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/base/ibase/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=ibase
-version=1.9.7
+version=1.9.8
 
 [target]
 units=ibase40 ibase60 ibase60dyn

packages/base/libasync/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=libasync
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=libasync
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=libasync
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=libasync
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=libasync
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=libasync
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -664,7 +664,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -790,7 +790,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1130,7 +1130,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1196,7 +1196,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/base/libasync/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=libasync
-version=1.9.7
+version=1.9.8
 
 [target]
 units=libasync

packages/base/libc/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=libc
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=kerneldefs kernelioctl libc
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=kerneldefs kernelioctl libc
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=kerneldefs kernelioctl libc
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=kerneldefs kernelioctl libc
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=kerneldefs kernelioctl libc
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -642,7 +642,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -768,7 +768,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1108,7 +1108,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1174,7 +1174,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/base/libc/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=libc
-version=1.9.7
+version=1.9.8
 
 [target]
 units=kerneldefs kernelioctl libc

packages/base/md5/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=md5
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=md5
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=md5
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=md5
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=md5
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=md5
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=md5test
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=md5test
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=md5test
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=md5test
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -715,7 +715,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -841,7 +841,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1181,7 +1181,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1247,7 +1247,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/base/md5/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=md5
-version=1.9.7
+version=1.9.8
 
 [target]
 units=md5

packages/base/mysql/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=mysql
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=testdb4 testdb3
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=testdb4 testdb3
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=testdb4 testdb3
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=testdb4 testdb3
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -741,7 +741,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -867,7 +867,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1207,7 +1207,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1273,7 +1273,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/base/mysql/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=mysql
-version=1.9.7
+version=1.9.8
 
 [target]
 units=mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3

packages/base/netdb/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=netdb
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=uriparser  netdb
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=uriparser  netdb
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=uriparser
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=uriparser  netdb
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=uriparser
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=testuri  testdns testhst testsvc testnet
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=testuri
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=testuri  testdns testhst testsvc testnet
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=testuri
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -715,7 +715,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -841,7 +841,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1181,7 +1181,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1247,7 +1247,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/base/netdb/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=netdb
-version=1.9.7
+version=1.9.8
 
 [target]
 units=uriparser

packages/base/odbc/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=odbc
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=odbcsql
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=odbcsql
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=odbcsql
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=odbcsql
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=odbcsql
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=testodbc
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=testodbc
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=testodbc
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=testodbc
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -741,7 +741,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -867,7 +867,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1207,7 +1207,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1273,7 +1273,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/base/odbc/Makefile.fpc

@@ -3,7 +3,7 @@
 #
 [package]
 name=odbc
-version=1.9.7
+version=1.9.8
 
 [target]
 units=odbcsql

packages/base/oracle/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=oracle
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=oraoci
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=oraoci
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=oraoci
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=oraoci
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=oraoci
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLEDIRS+=example
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLEDIRS+=example
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLEDIRS+=example
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLEDIRS+=example
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -741,7 +741,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -867,7 +867,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1207,7 +1207,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1273,7 +1273,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -1864,7 +1864,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_EXAMPLEDIRS_EXAMPLE=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_EXAMPLEDIRS_EXAMPLE=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1930,7 +1930,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 TARGET_EXAMPLEDIRS_EXAMPLE=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_EXAMPLEDIRS_EXAMPLE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/base/oracle/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=oracle
-version=1.9.7
+version=1.9.8
 
 [target]
 units=oraoci

packages/base/oracle/example/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -251,7 +251,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=oraclew
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=oraclew
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -317,7 +317,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=oraclew
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=oraclew
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -350,7 +350,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=test01
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=test01
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -416,7 +416,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=test01
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=test01
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -739,7 +739,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -865,7 +865,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1265,7 +1265,7 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_ORACLE=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -1508,7 +1508,7 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_ORACLE=1
 REQUIRE_PACKAGES_PASZLIB=1

packages/base/pasjpeg/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=pasjpeg
-override PACKAGE_VERSION=1.9.3
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -715,7 +715,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -841,7 +841,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1181,7 +1181,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1247,7 +1247,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/base/pasjpeg/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=pasjpeg
-version=1.9.3
+version=1.9.8
 
 [target]
 units=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct \

packages/base/paszlib/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=paszlib
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=paszlib adler gzcrc gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr zutil
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=paszlib adler gzcrc gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr zutil
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=paszlib adler gzcrc gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr zutil
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=paszlib adler gzcrc gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr zutil
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=paszlib adler gzcrc gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr zutil
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=example minigzip
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=example minigzip
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=example minigzip
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=example minigzip
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -715,7 +715,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -841,7 +841,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1181,7 +1181,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1247,7 +1247,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/base/paszlib/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=paszlib
-version=1.9.7
+version=1.9.8
 
 [target]
 units=paszlib adler gzcrc gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr zutil

packages/base/postgres/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=postgres
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=testpg1 testpg2
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=testpg1 testpg2
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=testpg1 testpg2
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=testpg1 testpg2
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -741,7 +741,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -867,7 +867,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1207,7 +1207,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1273,7 +1273,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/base/postgres/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=postgres
-version=1.9.7
+version=1.9.8
 
 [target]
 units=dllist dllistdyn postgres postgres3 postgres3dyn

packages/base/pthreads/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=pthreads
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=pthreads
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=pthreads
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=pthreads
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=pthreads
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=pthreads
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -616,7 +616,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -742,7 +742,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1082,7 +1082,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1148,7 +1148,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/base/pthreads/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=pthreads
-version=1.9.7
+version=1.9.8
 
 [target]
 units=pthreads

packages/base/regexpr/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=regexpr
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=regexpr
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=regexpr
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=regexpr
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=regexpr
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=regexpr
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=testreg1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=testreg1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=testreg1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=testreg1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -452,7 +452,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -518,7 +518,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -814,7 +814,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -940,7 +940,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1280,7 +1280,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1346,7 +1346,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/base/regexpr/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=regexpr
-version=1.9.7
+version=1.9.8
 
 [target]
 units=regexpr

packages/base/sqlite/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=sqlite
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=sqlite
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=sqlite
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=sqlite
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=sqlite
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=sqlite
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -616,7 +616,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -742,7 +742,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1082,7 +1082,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1148,7 +1148,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/base/sqlite/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=sqlite
-version=1.9.7
+version=1.9.8
 
 [target]
 units=sqlite

packages/extra/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -588,7 +588,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -714,7 +714,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s

packages/extra/amunits/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=amunits
-override PACKAGE_VERSION=1.0.10
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_DIRS+=units utilunits
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_DIRS+=units utilunits
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_DIRS+=units utilunits
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_DIRS+=units utilunits
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_DIRS+=units utilunits
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -353,7 +353,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_INCLUDEDIR+=inc
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_INCLUDEDIR+=inc
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -419,7 +419,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_INCLUDEDIR+=inc
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_INCLUDEDIR+=inc
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -452,7 +452,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_SOURCEDIR+=units utilunits
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_SOURCEDIR+=units utilunits
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -518,7 +518,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_SOURCEDIR+=units utilunits
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_SOURCEDIR+=units utilunits
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -814,7 +814,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -940,7 +940,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1744,7 +1744,7 @@ ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_DIRS_UNITS=1
 TARGET_DIRS_UTILUNITS=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_DIRS_UNITS=1
 TARGET_DIRS_UTILUNITS=1
 endif
@@ -1832,7 +1832,7 @@ ifeq ($(FULL_TARGET),sparc-netbsd)
 TARGET_DIRS_UNITS=1
 TARGET_DIRS_UTILUNITS=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_DIRS_UNITS=1
 TARGET_DIRS_UTILUNITS=1
 endif

packages/extra/amunits/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=amunits
-version=1.0.10
+version=1.9.8
 
 [target]
 dirs=units utilunits

packages/extra/amunits/units/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=amunits
-override PACKAGE_VERSION=1.0.10
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=amigados amigaguide amigalib amigaprinter asl audio bootblock bullet cd clipboard colorwheel commodities configregs configvars console conunit datatypes diskfont expansion expansionbase gadtools gameport gradientslider graphics hardblocks hardware icon iffparse input inputevent intuition keyboard keymap layers locale lowlevel nonvolatile parallel prefs prtbase prtgfx realtime rexx romboot_base scsidisk serial tapedeck timer trackdisk translator utility workbench exec
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=amigados amigaguide amigalib amigaprinter asl audio bootblock bullet cd clipboard colorwheel commodities configregs configvars console conunit datatypes diskfont expansion expansionbase gadtools gameport gradientslider graphics hardblocks hardware icon iffparse input inputevent intuition keyboard keymap layers locale lowlevel nonvolatile parallel prefs prtbase prtgfx realtime rexx romboot_base scsidisk serial tapedeck timer trackdisk translator utility workbench exec
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=amigados amigaguide amigalib amigaprinter asl audio bootblock bullet cd clipboard colorwheel commodities configregs configvars console conunit datatypes diskfont expansion expansionbase gadtools gameport gradientslider graphics hardblocks hardware icon iffparse input inputevent intuition keyboard keymap layers locale lowlevel nonvolatile parallel prefs prtbase prtgfx realtime rexx romboot_base scsidisk serial tapedeck timer trackdisk translator utility workbench exec
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=amigados amigaguide amigalib amigaprinter asl audio bootblock bullet cd clipboard colorwheel commodities configregs configvars console conunit datatypes diskfont expansion expansionbase gadtools gameport gradientslider graphics hardblocks hardware icon iffparse input inputevent intuition keyboard keymap layers locale lowlevel nonvolatile parallel prefs prtbase prtgfx realtime rexx romboot_base scsidisk serial tapedeck timer trackdisk translator utility workbench exec
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=amigados amigaguide amigalib amigaprinter asl audio bootblock bullet cd clipboard colorwheel commodities configregs configvars console conunit datatypes diskfont expansion expansionbase gadtools gameport gradientslider graphics hardblocks hardware icon iffparse input inputevent intuition keyboard keymap layers locale lowlevel nonvolatile parallel prefs prtbase prtgfx realtime rexx romboot_base scsidisk serial tapedeck timer trackdisk translator utility workbench exec
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -353,7 +353,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_INCLUDEDIR+=../inc
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_INCLUDEDIR+=../inc
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -419,7 +419,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_INCLUDEDIR+=../inc
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_INCLUDEDIR+=../inc
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -452,7 +452,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_UNITDIR+=../utilunits
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_UNITDIR+=../utilunits
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -518,7 +518,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_UNITDIR+=../utilunits
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_UNITDIR+=../utilunits
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -551,7 +551,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_SOURCEDIR+=.
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_SOURCEDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -617,7 +617,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_SOURCEDIR+=.
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_SOURCEDIR+=.
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -913,7 +913,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -1039,7 +1039,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1379,7 +1379,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1445,7 +1445,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/extra/amunits/units/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=amunits
-version=1.0.10
+version=1.9.8
 
 [target]
 units=amigados amigaguide amigalib amigaprinter asl audio bootblock \

packages/extra/amunits/utilunits/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=amunits
-override PACKAGE_VERSION=1.0.10
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -353,7 +353,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_INCLUDEDIR+=../inc
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_INCLUDEDIR+=../inc
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -419,7 +419,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_INCLUDEDIR+=../inc
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_INCLUDEDIR+=../inc
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -452,7 +452,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_UNITDIR+=../units
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_UNITDIR+=../units
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -518,7 +518,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_UNITDIR+=../units
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_UNITDIR+=../units
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -551,7 +551,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_SOURCEDIR+=.
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_SOURCEDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -617,7 +617,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_SOURCEDIR+=.
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_SOURCEDIR+=.
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -913,7 +913,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -1039,7 +1039,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1379,7 +1379,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1445,7 +1445,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/extra/amunits/utilunits/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=amunits
-version=1.0.10
+version=1.9.8
 
 [target]
 units=amigautils consoleio deadkeys doublebuffer easyasl hisoft \

packages/extra/bfd/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=bfd
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=bfd
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=bfd
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=bfd
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=bfd
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=bfd
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -616,7 +616,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -742,7 +742,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1082,7 +1082,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1148,7 +1148,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/extra/bfd/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=bfd
-version=1.9.7
+version=1.9.8
 
 [target]
 units=bfd

packages/extra/cdrom/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=cdrom
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=cdrom discid
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=cdrom discid
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=cdrom discid
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=cdrom discid
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=cdrom discid
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -373,7 +373,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=showcds getdiscid
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLES+=showcds getdiscid
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -439,7 +439,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLES+=showcds getdiscid
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=showcds getdiscid
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -736,7 +736,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -862,7 +862,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1202,7 +1202,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -1268,7 +1268,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)

packages/extra/cdrom/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=cdrom
-version=1.9.7
+version=1.9.8
 
 [target]
 units=cdrom discid

packages/extra/forms/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=forms
-override PACKAGE_VERSION=1.9.7
+override PACKAGE_VERSION=1.9.8
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_PROGRAMS+=fd2pascal
 endif
@@ -253,7 +253,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_PROGRAMS+=fd2pascal
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_PROGRAMS+=fd2pascal
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -319,7 +319,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_PROGRAMS+=fd2pascal
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_PROGRAMS+=fd2pascal
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -352,7 +352,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=xforms
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=xforms
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -418,7 +418,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=xforms
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=xforms
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -451,7 +451,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLEDIRS+=demo
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_EXAMPLEDIRS+=demo
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -517,7 +517,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_EXAMPLEDIRS+=demo
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLEDIRS+=demo
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -840,7 +840,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -966,7 +966,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1313,7 +1313,7 @@ ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_X11=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_X11=1
 endif
@@ -1401,7 +1401,7 @@ ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_X11=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_X11=1
 endif
@@ -2039,7 +2039,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_EXAMPLEDIRS_DEMO=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_EXAMPLEDIRS_DEMO=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -2105,7 +2105,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 TARGET_EXAMPLEDIRS_DEMO=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_EXAMPLEDIRS_DEMO=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)