diff --git a/packages/base/Makefile b/packages/base/Makefile
index d7d54843d5..ccce6384aa 100644
--- a/packages/base/Makefile
+++ b/packages/base/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/10/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/03/13]
 #
 default: all
-MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx
+MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos macosx
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
@@ -58,7 +58,7 @@ ifdef inUnix
 PATHSEP=/
 else
 PATHSEP:=$(subst /,\,/)
-ifneq ($(findstring sh.exe,$(SHELL)),)
+ifdef inCygWin
 PATHSEP=/
 endif
 endif
@@ -111,38 +111,11 @@ endif
 override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
 override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
 ifndef FPC_VERSION
-FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)
+FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
 endif
-export FPC FPC_VERSION
+export FPC FPC_VERSION FPC_COMPILERINFO
 unexport CHECKDEPEND ALLDEPENDENCIES
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
-COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
-ifndef CPU_SOURCE
-CPU_SOURCE:=$(word 1,$(COMPILERINFO))
-endif
-ifndef CPU_TARGET
-CPU_TARGET:=$(word 2,$(COMPILERINFO))
-endif
-ifndef OS_SOURCE
-OS_SOURCE:=$(word 3,$(COMPILERINFO))
-endif
-ifndef OS_TARGET
-OS_TARGET:=$(word 4,$(COMPILERINFO))
-endif
-else
-ifndef CPU_SOURCE
-CPU_SOURCE:=$(shell $(FPC) -iSP)
-endif
-ifndef CPU_TARGET
-CPU_TARGET:=$(shell $(FPC) -iTP)
-endif
-ifndef OS_SOURCE
-OS_SOURCE:=$(shell $(FPC) -iSO)
-endif
-ifndef OS_TARGET
-OS_TARGET:=$(shell $(FPC) -iTO)
-endif
-endif
 ifndef CPU_TARGET
 ifdef CPU_TARGET_DEFAULT
 CPU_TARGET=$(CPU_TARGET_DEFAULT)
@@ -153,6 +126,24 @@ ifdef OS_TARGET_DEFAULT
 OS_TARGET=$(OS_TARGET_DEFAULT)
 endif
 endif
+ifneq ($(words $(FPC_COMPILERINFO)),5)
+FPC_COMPILERINFO+=$(shell $(FPC) -iSP)
+FPC_COMPILERINFO+=$(shell $(FPC) -iTP)
+FPC_COMPILERINFO+=$(shell $(FPC) -iSO)
+FPC_COMPILERINFO+=$(shell $(FPC) -iTO)
+endif
+ifndef CPU_SOURCE
+CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))
+endif
+ifndef CPU_TARGET
+CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO))
+endif
+ifndef OS_SOURCE
+OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))
+endif
+ifndef OS_TARGET
+OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))
+endif
 FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
 FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
 ifneq ($(FULL_TARGET),$(FULL_SOURCE))
@@ -223,13 +214,13 @@ ifeq ($(OS_TARGET),win32)
 override TARGET_DIRS+=inet gdbint mysql ibase odbc
 endif
 ifeq ($(OS_TARGET),freebsd)
-override TARGET_DIRS+=inet gdbint libasync mysql ibase postgres oracle
+override TARGET_DIRS+=inet gdbint libasync mysql ibase postgres oracle odbc netdb
 endif
 ifeq ($(OS_TARGET),netbsd)
-override TARGET_DIRS+=inet gdbint libasync mysql ibase postgres oracle
+override TARGET_DIRS+=inet gdbint libasync mysql ibase postgres oracle odbc netdb
 endif
 ifeq ($(OS_TARGET),openbsd)
-override TARGET_DIRS+=inet gdbint libasync mysql ibase postgres oracle
+override TARGET_DIRS+=inet gdbint libasync mysql ibase postgres oracle odbc netdb
 endif
 override INSTALL_FPCPACKAGE=y
 override INSTALL_FPCSUBDIR=packages/base
@@ -562,6 +553,15 @@ FPCMADE=fpcmade.nw
 ZIPSUFFIX=nw
 EXEEXT=.nlm
 endif
+ifeq ($(OS_TARGET),macos)
+PPUEXT=.ppu
+ASMEXT=.s
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+EXEEXT=
+FPCMADE=fpcmade.mcc
+endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -873,6 +873,11 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
 override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
 endif
 endif
+ifeq ($(OS_TARGET),linux)
+ifeq ($(FPC_VERSION),1.0.6)
+override FPCOPTDEF+=HASUNIX
+endif
+endif
 ifdef OPT
 override FPCOPT+=$(OPT)
 endif
@@ -1078,6 +1083,8 @@ TARGET_DIRS_MYSQL=1
 TARGET_DIRS_IBASE=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_ORACLE=1
+TARGET_DIRS_ODBC=1
+TARGET_DIRS_NETDB=1
 endif
 ifeq ($(OS_TARGET),netbsd)
 TARGET_DIRS_INET=1
@@ -1087,6 +1094,8 @@ TARGET_DIRS_MYSQL=1
 TARGET_DIRS_IBASE=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_ORACLE=1
+TARGET_DIRS_ODBC=1
+TARGET_DIRS_NETDB=1
 endif
 ifeq ($(OS_TARGET),openbsd)
 TARGET_DIRS_INET=1
@@ -1096,6 +1105,8 @@ TARGET_DIRS_MYSQL=1
 TARGET_DIRS_IBASE=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_ORACLE=1
+TARGET_DIRS_ODBC=1
+TARGET_DIRS_NETDB=1
 endif
 ifdef TARGET_DIRS_PASZLIB
 paszlib_all:
diff --git a/packages/base/Makefile.fpc b/packages/base/Makefile.fpc
index 036bc3706e..1142a2f4b0 100644
--- a/packages/base/Makefile.fpc
+++ b/packages/base/Makefile.fpc
@@ -10,11 +10,11 @@ dirs_win32=inet gdbint \
            mysql ibase odbc
 dirs_go32v2=gdbint
 dirs_netbsd=inet gdbint libasync \
-            mysql ibase postgres oracle
+            mysql ibase postgres oracle odbc netdb
 dirs_openbsd=inet gdbint libasync \
-            mysql ibase postgres oracle
+            mysql ibase postgres oracle odbc netdb
 dirs_freebsd=inet gdbint libasync \
-             mysql ibase postgres oracle
+             mysql ibase postgres oracle odbc netdb
 
 [install]
 fpcpackage=y