* deb packaging fixes

* make deb NODOCS=1 support added
2025-06-01 19:42:40 +02:00 · 2004-03-19 18:24:31 +00:00 · 2004-03-19 18:24:31 +00:00 · 092692f688
commit 092692f688
parent 29a9254304
38 changed files with 385 additions and 985 deletions
--- a/19
+++ b/19
@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/03/15]
 #
 default: help
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@ -650,7 +650,8 @@ ZIPSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),macos)
 EXEEXT=
-FPCMADE=fpcmade.mcc
+FPCMADE=fpcmade.macos
+ZIPSUFFIX=macos
 endif
 ifeq ($(OS_TARGET),darwin)
 EXEEXT=
@ -949,9 +950,11 @@ ARNAME=$(BINUTILSPREFIX)ar
 RCNAME=$(BINUTILSPREFIX)rc
 ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),win32)
-ASNAME=as
-LDNAME=ld
-ARNAME=ar
+ifeq ($(CROSSBINDIR),)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 endif
 endif
 ifndef ASPROG
@ -2232,7 +2235,9 @@ debcopy: distclean
 	$(COPYTREE) utils $(DEBSRCDIR)
 	$(COPYTREE) demo $(DEBSRCDIR)
 	$(COPYTREE) logs $(DEBSRCDIR)
+ifndef NODOCS
 	$(COPYTREE) docs $(DEBSRCDIR)
+endif
 	$(COPYTREE) Makefile* $(DEBSRCDIR)
 	$(COPYTREE) $(CVSINSTALL)/debian $(DEBSRCDIR)
 	$(COPYTREE) $(CVSINSTALL)/man $(DEBSRCDIR)
@ -2240,7 +2245,11 @@ debcopy: distclean
 	find $(DEBSRCDIR) -name 'CVS*' | xargs -n1 rm -rf
 	chmod 755 $(DEBSRCDIR)/debian/rules
 deb: checkfpcdir debcopy
+ifdef NODOCS
+	cd $(DEBSRCDIR) ; debian/rules binary-arch
+else
 	cd $(DEBSRCDIR) ; debian/rules binary
+endif
 endif   # changelog found
 endif
 ifdef inUnix
--- a/Makefile.fpc
+++ b/Makefile.fpc
@ -565,7 +565,9 @@ debcopy: distclean
        $(COPYTREE) utils $(DEBSRCDIR)
        $(COPYTREE) demo $(DEBSRCDIR)
        $(COPYTREE) logs $(DEBSRCDIR)
+ifndef NODOCS
        $(COPYTREE) docs $(DEBSRCDIR)
+endif
        $(COPYTREE) Makefile* $(DEBSRCDIR)
        $(COPYTREE) $(CVSINSTALL)/debian $(DEBSRCDIR)
        $(COPYTREE) $(CVSINSTALL)/man $(DEBSRCDIR)
@ -574,7 +576,11 @@ debcopy: distclean
        chmod 755 $(DEBSRCDIR)/debian/rules

 deb: checkfpcdir debcopy
+ifdef NODOCS
+        cd $(DEBSRCDIR) ; debian/rules binary-arch
+else
        cd $(DEBSRCDIR) ; debian/rules binary
+endif

 endif   # changelog found

--- a/fcl/Makefile.fpc
+++ b/fcl/Makefile.fpc
@ -33,6 +33,7 @@ units_win32=process fileinfo resolve ssockets syncobjs
 units_netware=resolve ssockets
 rsts=$(CLASSES10) ssockets cachecls resolve custapp cgiapp eventlog registry
 exampledirs=tests
+
 [compiler]
 options=-S2
 targetdir=$(OS_TARGET)
--- a/fcl/db/Makefile
+++ b/fcl/db/Makefile
@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/09/24]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/03/15]
 #
 default: all
-MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx
+MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
@ -10,6 +10,7 @@ SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
 else
 SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
+SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
 PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))
@ -183,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
+override FPCDIR:=$(BASEDIR)
+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
 override FPCDIR=c:/pp
 endif
 endif
 endif
 endif
+endif
 ifndef CROSSDIR
 CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
 endif
@ -224,6 +228,7 @@ ifeq ($(OS_TARGET),darwin)
 override TARGET_DIRS+=mysql interbase sqlite
 endif
 override TARGET_UNITS+=db ddg_ds ddg_rec dbwhtml
+override TARGET_RSTS+=dbwhtml
 override TARGET_EXAMPLEDIRS+=tests
 override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
@ -310,9 +315,17 @@ endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
+ifdef CROSSCOMPILE
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
+else
 INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
+endif
+else
+ifdef CROSSCOMPILE
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
 else
 INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+endif
 ifdef INSTALL_FPCPACKAGE
 INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
 endif
@ -421,16 +434,16 @@ endif
 else
 CROSSBINDIR=
 endif
-ifdef inUnix
+ifeq ($(OS_SOURCE),linux)
 ifndef GCCLIBDIR
-GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
-ifeq ($(OS_TARGET),linux)
 ifndef OTHERLIBDIR
 OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
 endif
 endif
-ifeq ($(OS_TARGET),netbsd)
+ifdef inUnix
+ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR+=/usr/pkg/lib
 endif
 export GCCLIBDIR OTHERLIB
@ -458,6 +471,14 @@ STATICLIBPREFIX=
 FPCMADE=fpcmade.dos
 ZIPSUFFIX=go32
 endif
+ifeq ($(OS_TARGET),watcom)
+STATICLIBPREFIX=
+FPCMADE=fpcmade.wat
+ZIPSUFFIX=watc
+OEXT=.obj
+ASMEXT=.asm
+SHAREDLIBEXT=.dll
+endif
 ifeq ($(OS_TARGET),linux)
 EXEEXT=
 HASSHAREDLIB=1
@ -535,7 +556,8 @@ ZIPSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),macos)
 EXEEXT=
-FPCMADE=fpcmade.mcc
+FPCMADE=fpcmade.macos
+ZIPSUFFIX=macos
 endif
 ifeq ($(OS_TARGET),darwin)
 EXEEXT=
@ -560,6 +582,11 @@ STATICLIBPREFIX=
 FPCMADE=fpcmade.dos
 ZIPSUFFIX=go32
 endif
+ifeq ($(OS_TARGET),watcom)
+STATICLIBPREFIX=
+FPCMADE=fpcmade.dos
+ZIPSUFFIX=watcom
+endif
 ifeq ($(OS_TARGET),linux)
 EXEEXT=
 HASSHAREDLIB=1
@ -748,7 +775,11 @@ endif
 endif
 export MVPROG
 ifndef ECHOREDIR
-ECHOREDIR:=$(subst /,$(PATHSEP),$(ECHO))
+ifndef inUnix
+ECHOREDIR=echo
+else
+ECHOREDIR=$(ECHO)
+endif
 endif
 ifndef COPY
 COPY:=$(CPPROG) -fp
@ -819,15 +850,19 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
-ASNAME=as
-LDNAME=ld
-ARNAME=ar
-RCNAME=rc
+ASNAME=$(BINUTILSPREFIX)as
+LDNAME=$(BINUTILSPREFIX)ld
+ARNAME=$(BINUTILSPREFIX)ar
+RCNAME=$(BINUTILSPREFIX)rc
+ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),win32)
+ifeq ($(CROSSBINDIR),)
 ASNAME=asw
 LDNAME=ldw
 ARNAME=arw
 endif
+endif
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
 ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
@ -940,6 +975,14 @@ REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
 endif
+ifeq ($(OS_TARGET),linux)
+ifeq ($(CPU_TARGET),arm)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_MYSQL=1
+REQUIRE_PACKAGES_IBASE=1
+REQUIRE_PACKAGES_SQLITE=1
+endif
+endif
 ifeq ($(OS_TARGET),go32v2)
 ifeq ($(CPU_TARGET),i386)
 REQUIRE_PACKAGES_RTL=1
@ -995,6 +1038,22 @@ REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
 endif
+ifeq ($(OS_TARGET),netbsd)
+ifeq ($(CPU_TARGET),powerpc)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_MYSQL=1
+REQUIRE_PACKAGES_IBASE=1
+REQUIRE_PACKAGES_SQLITE=1
+endif
+endif
+ifeq ($(OS_TARGET),netbsd)
+ifeq ($(CPU_TARGET),sparc)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_MYSQL=1
+REQUIRE_PACKAGES_IBASE=1
+REQUIRE_PACKAGES_SQLITE=1
+endif
+endif
 ifeq ($(OS_TARGET),amiga)
 ifeq ($(CPU_TARGET),m68k)
 REQUIRE_PACKAGES_RTL=1
@ -1069,6 +1128,11 @@ ifeq ($(CPU_TARGET),i386)
 REQUIRE_PACKAGES_RTL=1
 endif
 endif
+ifeq ($(OS_TARGET),watcom)
+ifeq ($(CPU_TARGET),i386)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@ -1182,6 +1246,14 @@ endif
 ifeq ($(OS_SOURCE),openbsd)
 override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
+ifndef CROSSBOOTSTRAP
+ifneq ($(BINUTILSPREFIX),)
+override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc
+endif
+ifneq ($(BINUTILSPREFIX),)
+override FPCOPT+=-Xr$(RLINKPATH)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@ -1312,7 +1384,7 @@ endif
 .PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
-override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
+override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
@ -1337,7 +1409,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .dpr .pp .rc .res
 %$(PPUEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
@ -1350,10 +1422,14 @@ fpc_release:
 %$(EXEEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
+%$(EXEEXT): %.dpr
+	$(COMPILER) $<
+	$(EXECPPAS)
 %.res: %.rc
 	windres -i $< -o $@
 vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
+vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
--- a/fcl/db/Makefile.fpc
+++ b/fcl/db/Makefile.fpc
@ -15,6 +15,7 @@ dirs_openbsd=mysql interbase sqlite
 dirs_win32=mysql interbase sqlite
 units=db ddg_ds ddg_rec dbwhtml
 exampledirs=tests
+rsts=dbwhtml

 [compiler]
 options=-S2
--- a/fcl/db/memds/Makefile
+++ b/fcl/db/memds/Makefile
@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/09/24]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/03/15]
 #
 default: all
-MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx
+MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
@ -10,6 +10,7 @@ SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
 else
 SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
+SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
 PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))
@ -183,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
+override FPCDIR:=$(BASEDIR)
+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
 override FPCDIR=c:/pp
 endif
 endif
 endif
 endif
+endif
 ifndef CROSSDIR
 CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
 endif
@ -205,6 +209,7 @@ endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=fcl
 override TARGET_UNITS+=memds
+override TARGET_RSTS+=memds
 override TARGET_EXAMPLES+=testpop testopen testld testcp
 override INSTALL_FPCPACKAGE=y
 override COMPILER_TARGETDIR+=../../$(OS_TARGET)
@ -290,9 +295,17 @@ endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
+ifdef CROSSCOMPILE
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
+else
 INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
+endif
+else
+ifdef CROSSCOMPILE
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
 else
 INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+endif
 ifdef INSTALL_FPCPACKAGE
 INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
 endif
@ -424,6 +437,14 @@ STATICLIBPREFIX=
 FPCMADE=fpcmade.dos
 ZIPSUFFIX=go32
 endif
+ifeq ($(OS_TARGET),watcom)
+STATICLIBPREFIX=
+FPCMADE=fpcmade.wat
+ZIPSUFFIX=watc
+OEXT=.obj
+ASMEXT=.asm
+SHAREDLIBEXT=.dll
+endif
 ifeq ($(OS_TARGET),linux)
 EXEEXT=
 HASSHAREDLIB=1
@ -501,7 +522,8 @@ ZIPSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),macos)
 EXEEXT=
-FPCMADE=fpcmade.mcc
+FPCMADE=fpcmade.macos
+ZIPSUFFIX=macos
 endif
 ifeq ($(OS_TARGET),darwin)
 EXEEXT=
@ -526,6 +548,11 @@ STATICLIBPREFIX=
 FPCMADE=fpcmade.dos
 ZIPSUFFIX=go32
 endif
+ifeq ($(OS_TARGET),watcom)
+STATICLIBPREFIX=
+FPCMADE=fpcmade.dos
+ZIPSUFFIX=watcom
+endif
 ifeq ($(OS_TARGET),linux)
 EXEEXT=
 HASSHAREDLIB=1
@ -714,7 +741,11 @@ endif
 endif
 export MVPROG
 ifndef ECHOREDIR
-ECHOREDIR:=$(subst /,$(PATHSEP),$(ECHO))
+ifndef inUnix
+ECHOREDIR=echo
+else
+ECHOREDIR=$(ECHO)
+endif
 endif
 ifndef COPY
 COPY:=$(CPPROG) -fp
@ -785,15 +816,19 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
-ASNAME=as
-LDNAME=ld
-ARNAME=ar
-RCNAME=rc
+ASNAME=$(BINUTILSPREFIX)as
+LDNAME=$(BINUTILSPREFIX)ld
+ARNAME=$(BINUTILSPREFIX)ar
+RCNAME=$(BINUTILSPREFIX)rc
+ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),win32)
+ifeq ($(CROSSBINDIR),)
 ASNAME=asw
 LDNAME=ldw
 ARNAME=arw
 endif
+endif
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
 ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
@ -891,6 +926,11 @@ ifeq ($(CPU_TARGET),x86_64)
 REQUIRE_PACKAGES_RTL=1
 endif
 endif
+ifeq ($(OS_TARGET),linux)
+ifeq ($(CPU_TARGET),arm)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
 ifeq ($(OS_TARGET),go32v2)
 ifeq ($(CPU_TARGET),i386)
 REQUIRE_PACKAGES_RTL=1
@ -931,6 +971,16 @@ ifeq ($(CPU_TARGET),m68k)
 REQUIRE_PACKAGES_RTL=1
 endif
 endif
+ifeq ($(OS_TARGET),netbsd)
+ifeq ($(CPU_TARGET),powerpc)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
+ifeq ($(OS_TARGET),netbsd)
+ifeq ($(CPU_TARGET),sparc)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
 ifeq ($(OS_TARGET),amiga)
 ifeq ($(CPU_TARGET),m68k)
 REQUIRE_PACKAGES_RTL=1
@ -996,6 +1046,11 @@ ifeq ($(CPU_TARGET),i386)
 REQUIRE_PACKAGES_RTL=1
 endif
 endif
+ifeq ($(OS_TARGET),watcom)
+ifeq ($(CPU_TARGET),i386)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@ -1031,6 +1086,14 @@ endif
 ifeq ($(OS_SOURCE),openbsd)
 override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
+ifndef CROSSBOOTSTRAP
+ifneq ($(BINUTILSPREFIX),)
+override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc
+endif
+ifneq ($(BINUTILSPREFIX),)
+override FPCOPT+=-Xr$(RLINKPATH)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@ -1155,7 +1218,7 @@ endif
 .PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
-override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
+override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
@ -1180,7 +1243,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .dpr .pp .rc .res
 %$(PPUEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
@ -1193,10 +1256,14 @@ fpc_release:
 %$(EXEEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
+%$(EXEEXT): %.dpr
+	$(COMPILER) $<
+	$(EXECPPAS)
 %.res: %.rc
 	windres -i $< -o $@
 vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
+vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
--- a/fcl/db/memds/Makefile.fpc
+++ b/fcl/db/memds/Makefile.fpc
@ -8,6 +8,7 @@ main=fcl
 [target]
 units=memds
 examples=testpop testopen testld testcp
+rsts=memds

 [compiler]
 targetdir=../../$(OS_TARGET)
--- a/install/debian/README.Debian
+++ b/install/debian/README.Debian
@ -3,16 +3,15 @@ Free Pascal for DEBIAN

 No changes were necessary to the source tree as checked out from
 CVS at cvs.freepascal.org by
- cvs -d :pserver:cvs@cvs.freepascal.org:/FPC/CVS -z3 co -r RELEASE_1_0_6 fpc
-The Debian Build Directory was created by 'make debcopy FPC_VERSION=1.0.6'
+ cvs -d :pserver:cvs@cvs.freepascal.org:/FPC/CVS -z3 co -r RELEASE_1_0_8 fpc
+The Debian Build Directory was created by 'make debcopy FPC_VERSION=1.0.8'
 and then duplicated to .orig before 'dpkg-buildpackage -sa -rfakeroot' was
 run.

 In order to build the package yourself, you need a ppc386 compiler
-later or equal to 0.99.14. And you need to change the following settings
+later or equal to 1.0.4. And you need to change the following settings
 in /etc/texmf/texmf.cnf to use (at least) the specified values:
 hash_extra = 10000
- pool_size.context = 1500000
 pool_size = 250000
 max_strings = 30000

@ -28,7 +27,7 @@ As shipped, only the .pdf docs are built. You may want to make the HTML
 files with latex2html by yourself, and eventually adapt the doc-base file.

 To create a new config file for fpc (/etc/fpc.cfg) use the command:
- /usr/lib/fpc/1.0.6/samplecfg /usr/lib/fpc/1.0.6
+ /usr/lib/fpc/1.0.8/samplecfg /usr/lib/fpc/1.0.8
 However, you should be aware, that said file /etc/fpc.cfg is
 declared as a conffile since version 1.0.2.

--- a/install/debian/changelog
+++ b/install/debian/changelog
@ -1,16 +1,57 @@
-fpc (1.9.3-1) unstable; urgency=low
+fpc (1.9.3-0) unstable; urgency=low

-  * Third beta release for 2.0
+  * Snapshot release

- -- Mazen NEIFER <mazen@freepascal.org>  Thu,  18 Feb 2004 08:50:00 +0100
+ -- Peter Vreman <peter@freepascal.org>  Thu, 18 Mrt 2004 12:00:00 +0100

-fpc (1.9.0-1) unstable; urgency=low
+fpc (1.0.10-1.2) unstable; urgency=low

-  * First beta release for 2.0
+  * NMU
+  * debian/control: Also had to remove build dependency on latex2html here
+    (Closes: #221316)

- -- Peter Vreman <peter@freepascal.org>  Sat,  1 Nov 2003 22:00:00 +0100
+ -- Roland Stigge <stigge@antcom.de>  Thu, 12 Feb 2004 10:27:20 +0100

-fpc (1.0.6-20020228) unstable; urgency=low
+fpc (1.0.10-1.1) unstable; urgency=low
+
+  * NMU
+  * debian/control.in: Removed Build-Depends: latex2html which moved to
+    non-free (Closes: #221316)
+
+ -- Roland Stigge <stigge@antcom.de>  Sat, 20 Dec 2003 20:45:41 +0100
+
+fpc (1.0.10-1) unstable; urgency=low
+
+  * New upstream release.
+  * Acknowledging Amaya's NMU.  Thanks for the hand.  (Closes: #141439)
+  * Package dependency lists corrected.  (Closes: #84863, #155158)
+  * Example compiles correctly now.  (Closes: #174371)
+  * Fixed vanishing fpc(1) manpage if gpc is installed.  (Closes: #136283)
+  * Fixed manpage error.  (Closes: #191695)
+  * Spelling mistakes are gone.  (Closes: #124637, #124638)
+  * Both bugs (doc-base-file-references-usr-doc and debian-changelog-file-
+    contains-obsolete-user-emacs-settings, in lintian tags) were corrected
+    long ago.  (Closes: #127092)
+  * Upstream have added the AddDisk function.  (Closes: #103163)
+
+ -- Carlos Laviola <claviola@debian.org>  Sat,  2 Aug 2003 04:35:51 -0300
+
+fpc (1.0.6-2) unstable; urgency=low
+
+  * NMU for Debcamp BSP.
+  * Apply a very silly patch (Closes: #141439), which was RC. The PDF file now
+    builds.
+  * Updated versioned-build-depends-on-debhelper. 
+
+ -- Amaya Rodrigo Sastre <amaya@debian.org>  Sat, 12 Jul 2003 17:58:50 +0200
+
+fpc (1.0.6-1) unstable; urgency=low
+
+  * New upstream version.  (Closes: #154199)
+
+ -- Carlos Laviola <claviola@debian.org>  Sat, 10 Aug 2002 04:26:15 -0300
+
+fpc (1.0.4+1.0.6cvs20020228-1) unstable; urgency=low

  * New upstream version.

@ -115,10 +156,10 @@ fpc (0.99.12b-1) unstable; urgency=low

  * New Upstream Release

- -- Peter Vreman <peter@freepascal.org>  Thu, 10 Jun 1999 12:00:00 +0200
+ -- Peter Vreman <pfv@cooldown.demon.nl>  Thu, 10 Jun 1999 12:00:00 +0200

 fpc (0.99.12a-1) unstable; urgency=low

  * Initial Release

- -- Peter Vreman <peter@freepascal.org>  Thu, 10 Jun 1999 12:00:00 +0200
+ -- Peter Vreman <pfv@cooldown.demon.nl>  Thu, 10 Jun 1999 12:00:00 +0200
--- a/install/debian/control
+++ b/install/debian/control
@ -2,14 +2,13 @@ Source: fpc
 Section: devel
 Priority: optional
 Maintainer: Carlos Laviola <claviola@debian.org>
-Standards-Version: 3.1.1
+Standards-Version: 3.6.1
 Build-Depends: fp-compiler, debhelper, tetex-bin, tetex-extra, awk, dvipdfm, latex2html

 Package: fp-compiler
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.6-1)
-Suggests: fp-utils, fp-docs (>= 1.0.6)
-Replaces: fpc
+Depends: fp-units-rtl (= 1.9.3-20040319)
+Suggests: fp-utils, fp-docs (>= 1.9.3)
 Description: Free Pascal Compiler
 The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit
 Pascal Compiler. It comes with fully TP 7.0 compatible run-time library.
@ -21,8 +20,7 @@ Description: Free Pascal Compiler

 Package: fp-utils
 Architecture: i386
-Recommends: fp-compiler (= 1.0.6-1)
-Replaces: fpc
+Recommends: fp-compiler (= 1.9.3-20040319)
 Description: Free Pascal Utils
 This package contains some handy utils for usage with the Free Pascal
 Compiler:
@ -38,22 +36,19 @@ Description: Free Pascal Utils

 Package: fp-docs
 Architecture: all
-Replaces: fpc
 Description: Free Pascal Documentation
 Documentation for the Free Pascal Compiler. The documentation is
 only available in PDF format.

 Package: fp-units-rtl
 Architecture: i386
-Recommends: fp-compiler (= 1.0.6-1)
-Replaces: fpc, fp-rtl, fp-units-api
-Provides: fp-units-api
+Recommends: fp-compiler (= 1.9.3-20040319)
 Description: Free Pascal Runtime Library
 Runtime Libraries for the Free Pascal Compiler.

 Package: fp-units-base
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.6-1)
+Depends: fp-units-rtl (= 1.9.3-20040319)
 Description: Free Pascal base units
 Free Pascal units for common libraries, some of these units are also
 required by the Free Component Library :
@ -63,31 +58,38 @@ Description: Free Pascal base units

 Package: fp-units-fcl
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.6-1), fp-units-base (= 1.0.6-1)
-Replaces: fp-fcl
+Depends: fp-units-rtl (= 1.9.3-20040319), fp-units-base (= 1.9.3-20040319)
 Description: Free Pascal Free Component Library
 Free Component Library for the Free Pascal Compiler.

 Package: fp-units-gtk
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.6-1)
-Replaces: fp-gtk
+Depends: fp-units-rtl (= 1.9.3-20040319), fp-units-fcl (= 1.9.3-20040319)
 Description: Free Pascal units for GTK 1.2.x
 Free Pascal units and examples to create programs with GTK 1.2.x

+Package: fp-units-gnome1
+Architecture: i386
+Depends: fp-units-rtl (= 1.9.3-20040319), fp-units-gtk (= 1.9.3-20040319)
+Description: Free Pascal units for GNOME 1
+ Free Pascal units and examples to create programs for GNOME 1
+
 Package: fp-units-db
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.6-1)
+Depends: fp-units-rtl (= 1.9.3-20040319)
 Description: Free Pascal units for some database libraries
 Free Pascal units with bindings for:
  - Mysql
  - Interbase
  - Postgres
  - Oracle
-
+  - Odbc
+  - GDBM
+  - Sqlite
+  
 Package: fp-units-gfx
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.6-1), fp-units-base (= 1.0.6-1)
+Depends: fp-units-rtl (= 1.9.3-20040319), fp-units-base (= 1.9.3-20040319)
 Description: Free Pascal units for some graphics libraries
 Free Pascal units with bindings for:
  - Forms 0.88
@ -97,7 +99,7 @@ Description: Free Pascal units for some graphics libraries

 Package: fp-units-net
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.6-1)
+Depends: fp-units-rtl (= 1.9.3-20040319)
 Description: Free Pascal units for networking
 Free Pascal units for creating network tools:
  - Inet unit for easier tcp/ip handling
@ -105,7 +107,7 @@ Description: Free Pascal units for networking

 Package: fp-units-misc
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.6-1)
+Depends: fp-units-rtl (= 1.9.3-20040319)
 Description: Free Pascal miscellaneous units
 Free Pascal miscellaneous units for:
  - Utmp
--- a/install/debian/control.in
+++ b/install/debian/control.in
@ -2,14 +2,13 @@ Source: fpc
 Section: devel
 Priority: optional
 Maintainer: Carlos Laviola <claviola@debian.org>
-Standards-Version: 3.1.1
+Standards-Version: 3.6.1
 Build-Depends: fp-compiler, debhelper, tetex-bin, tetex-extra, awk, dvipdfm, latex2html

 Package: fp-compiler
 Architecture: i386
 Depends: fp-units-rtl (= %{packageversion})
 Suggests: fp-utils, fp-docs (>= %{fpcversion})
-Replaces: fpc
 Description: Free Pascal Compiler
 The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit
 Pascal Compiler. It comes with fully TP 7.0 compatible run-time library.
@ -22,7 +21,6 @@ Description: Free Pascal Compiler
 Package: fp-utils
 Architecture: i386
 Recommends: fp-compiler (= %{packageversion})
-Replaces: fpc
 Description: Free Pascal Utils
 This package contains some handy utils for usage with the Free Pascal
 Compiler:
@ -30,7 +28,7 @@ Description: Free Pascal Utils
   - ppufiles    Show needed files for units
   - ppudump     Dump the information stored in a .ppu (unit) file
   - fpcmake     Create Makefile from Makefile.fpc
-   - h2pas       Convert .h files to Pascal units
+   - h2pas       Convert .h files to pascal units
   - ppdep       Create a dependency file which can be used with Makefiles
   - ptop        Source beautifier
   - data2inc    Convert binary/text data to include files
@ -38,7 +36,6 @@ Description: Free Pascal Utils

 Package: fp-docs
 Architecture: all
-Replaces: fpc
 Description: Free Pascal Documentation
 Documentation for the Free Pascal Compiler. The documentation is
 only available in PDF format.
@ -46,15 +43,12 @@ Description: Free Pascal Documentation
 Package: fp-units-rtl
 Architecture: i386
 Recommends: fp-compiler (= %{packageversion})
-Replaces: fpc, fp-rtl, fp-units-api
-Provides: fp-units-api
 Description: Free Pascal Runtime Library
 Runtime Libraries for the Free Pascal Compiler.

 Package: fp-units-base
 Architecture: i386
 Depends: fp-units-rtl (= %{packageversion})
-Suggests: ncurses5-dev, xlibs-dev, zlib1g-dev
 Description: Free Pascal base units
 Free Pascal units for common libraries, some of these units are also
 required by the Free Component Library :
@ -64,34 +58,38 @@ Description: Free Pascal base units

 Package: fp-units-fcl
 Architecture: i386
-Depends: fp-units-rtl (= %{packageversion}), fp-units-base (= %{packageversion}), fp-units-db (= %{packageversion})
-Replaces: fp-fcl
+Depends: fp-units-rtl (= %{packageversion}), fp-units-base (= %{packageversion})
 Description: Free Pascal Free Component Library
 Free Component Library for the Free Pascal Compiler.

 Package: fp-units-gtk
 Architecture: i386
-Depends: fp-units-rtl (= %{packageversion})
-Replaces: fp-gtk
-Suggests: libgtk1.2-dev
+Depends: fp-units-rtl (= %{packageversion}), fp-units-fcl (= %{packageversion})
 Description: Free Pascal units for GTK 1.2.x
 Free Pascal units and examples to create programs with GTK 1.2.x

+Package: fp-units-gnome1
+Architecture: i386
+Depends: fp-units-rtl (= %{packageversion}), fp-units-gtk (= %{packageversion})
+Description: Free Pascal units for GNOME 1
+ Free Pascal units and examples to create programs for GNOME 1
+
 Package: fp-units-db
 Architecture: i386
 Depends: fp-units-rtl (= %{packageversion})
-Suggests: libmysqlclient10-dev, postgresql-dev
 Description: Free Pascal units for some database libraries
 Free Pascal units with bindings for:
  - Mysql
  - Interbase
  - Postgres
  - Oracle
-
+  - Odbc
+  - GDBM
+  - Sqlite
+  
 Package: fp-units-gfx
 Architecture: i386
 Depends: fp-units-rtl (= %{packageversion}), fp-units-base (= %{packageversion})
-Suggests: libggi2-dev, svgalibg1-dev, 
 Description: Free Pascal units for some graphics libraries
 Free Pascal units with bindings for:
  - Forms 0.88
@ -113,4 +111,4 @@ Depends: fp-units-rtl (= %{packageversion})
 Description: Free Pascal miscellaneous units
 Free Pascal miscellaneous units for:
  - Utmp
-  - PasZLib (Pascal only zlib implementation)
+  - PasZLib (pascal only zlib implementation)
--- a/install/debian/copyright
+++ b/install/debian/copyright
@ -2,7 +2,7 @@ The package was originally put together by:
  Peter Vreman <peter@freepascal.org>

 From sources obtained from:
-  ftp://ftp.freepascal.org/pub/fpc/dist/linux/fpc-1.0.6.tar.gz
+  ftp://ftp.freepascal.org/pub/fpc/dist/linux/fpc-1.9.3.tar.gz

 The files and libraries are released under the terms of the GNU Library
 General Public License, which can be found in the file
--- a/install/debian/fixdeb
+++ b/install/debian/fixdeb
@ -12,7 +12,6 @@ fi
 PACKAGEVERSION=`head -n 1 $1/changelog | awk '{ print $2 }' | tr -d '[()]'`
 FPCVERSION=`echo $PACKAGEVERSION | awk -F '-' '{ print $1 }'`
 DEBVERSION=`echo $PACKAGEVERSION | awk -F '-' '{ print $2 }'`
-FPC_MAIN_VERSION=`echo $PACKAGEVERSION | awk -F '\.[0-9]-' '{ print $1 }'`

 # Snapshot ?
 if [ "$DEBVERSION" == "0" ]; then
@ -29,6 +28,6 @@ echo 'DebVersion    : ' $DEBVERSION

 for i in $1/*.in
 do
-  j=${i/.in/}
-  sed -e 's/%{fpc_main_version}/'$FPC_MAIN_VERSION'/g;s/%{fpcversion}/'$FPCVERSION'/g;s/%{packageversion}/'$PACKAGEVERSION'/g' $i > $j
+  j=${i/%.in/}
+  sed -e 's/%{fpcversion}/'$FPCVERSION'/g;s/%{packageversion}/'$PACKAGEVERSION'/g' $i > $j
 done
--- a/install/debian/fp-compiler.install.in
+++ b/install/debian/fp-compiler.install.in
@ -1,8 +1,8 @@
 /etc/fpc.cfg
 /usr/bin/fpc
-/usr/lib/fpc/%{fpc_main_version}/ppc386
-/usr/lib/fpc/%{fpc_main_version}/samplecfg
-/usr/lib/fpc/%{fpc_main_version}/msg
+/usr/lib/fpc/%{fpcversion}/ppc386
+/usr/lib/fpc/%{fpcversion}/samplecfg
+/usr/lib/fpc/%{fpcversion}/msg
 /usr/share/doc/fp-compiler
 /usr/share/man/man1/fpc.1
 /usr/share/man/man1/ppc386.1
--- a/install/debian/fp-units-base.files.in
+++ b/install/debian/fp-units-base.files.in
@ -1,6 +0,0 @@
-/usr/share/doc/fp-units-base
-
-/usr/lib/fpc/%{fpc_main_version}/units/linux/paszlib
-/usr/lib/fpc/%{fpc_main_version}/units/linux/ncurses
-/usr/lib/fpc/%{fpc_main_version}/units/linux/x11
-/usr/lib/fpc/%{fpc_main_version}/units/linux/regexpr
--- a/install/debian/fp-units-base.install.in
+++ b/install/debian/fp-units-base.install.in
@ -0,0 +1,7 @@
+/usr/share/doc/fp-units-base
+
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib
+/usr/lib/fpc/%{fpcversion}/units/linux/pasjpeg
+/usr/lib/fpc/%{fpcversion}/units/linux/ncurses
+/usr/lib/fpc/%{fpcversion}/units/linux/x11
+/usr/lib/fpc/%{fpcversion}/units/linux/regexpr
--- a/install/debian/fp-units-db.files.in
+++ b/install/debian/fp-units-db.files.in
@ -1,6 +0,0 @@
-/usr/share/doc/fp-units-db
-
-/usr/lib/fpc/%{fpc_main_version}/units/linux/mysql
-/usr/lib/fpc/%{fpc_main_version}/units/linux/ibase
-/usr/lib/fpc/%{fpc_main_version}/units/linux/postgres
-/usr/lib/fpc/%{fpc_main_version}/units/linux/oracle
--- a/install/debian/fp-units-db.install.in
+++ b/install/debian/fp-units-db.install.in
@ -0,0 +1,9 @@
+/usr/share/doc/fp-units-db
+
+/usr/lib/fpc/%{fpcversion}/units/linux/mysql
+/usr/lib/fpc/%{fpcversion}/units/linux/ibase
+/usr/lib/fpc/%{fpcversion}/units/linux/postgres
+/usr/lib/fpc/%{fpcversion}/units/linux/oracle
+/usr/lib/fpc/%{fpcversion}/units/linux/odbc
+/usr/lib/fpc/%{fpcversion}/units/linux/gdbm
+/usr/lib/fpc/%{fpcversion}/units/linux/sqlite
--- a/install/debian/fp-units-fcl.files.in
+++ b/install/debian/fp-units-fcl.files.in
@ -1,2 +0,0 @@
-/usr/share/doc/fp-units-fcl
-/usr/lib/fpc/%{fpc_main_version}/units/linux/fcl
--- a/install/debian/fp-units-fcl.install.in
+++ b/install/debian/fp-units-fcl.install.in
@ -0,0 +1,2 @@
+/usr/share/doc/fp-units-fcl
+/usr/lib/fpc/%{fpcversion}/units/linux/fcl
--- a/install/debian/fp-units-gfx.files.in
+++ b/install/debian/fp-units-gfx.files.in
@ -1,10 +0,0 @@
-/usr/share/doc/fp-units-gfx
-
-/usr/lib/fpc/%{fpc_main_version}/units/linux/opengl
-/usr/lib/fpc/%{fpc_main_version}/units/linux/forms
-/usr/lib/fpc/%{fpc_main_version}/units/linux/svgalib
-/usr/lib/fpc/%{fpc_main_version}/units/linux/ggi
-/usr/lib/fpc/%{fpc_main_version}/units/linux/libgd
-/usr/lib/fpc/%{fpc_main_version}/units/linux/libpng
-
-/usr/bin/fd2pascal
--- a/install/debian/fp-units-gfx.install.in
+++ b/install/debian/fp-units-gfx.install.in
@ -0,0 +1,10 @@
+/usr/share/doc/fp-units-gfx
+
+/usr/lib/fpc/%{fpcversion}/units/linux/opengl
+/usr/lib/fpc/%{fpcversion}/units/linux/forms
+/usr/lib/fpc/%{fpcversion}/units/linux/svgalib
+/usr/lib/fpc/%{fpcversion}/units/linux/ggi
+/usr/lib/fpc/%{fpcversion}/units/linux/libgd
+/usr/lib/fpc/%{fpcversion}/units/linux/libpng
+
+/usr/bin/fd2pascal
--- a/install/debian/fp-units-gfx.undocumented
+++ b/install/debian/fp-units-gfx.undocumented
@ -1 +0,0 @@
-fd2pascal.1
--- a/install/debian/fp-units-gnome1.install.in
+++ b/install/debian/fp-units-gnome1.install.in
@ -0,0 +1,6 @@
+/usr/share/doc/fp-units-gnome1
+
+/usr/lib/fpc/%{fpcversion}/units/linux/imlib
+/usr/lib/fpc/%{fpcversion}/units/linux/gnome
+/usr/lib/fpc/%{fpcversion}/units/linux/gconf
+/usr/lib/fpc/%{fpcversion}/units/linux/zvt
--- a/install/debian/fp-units-gtk.files.in
+++ b/install/debian/fp-units-gtk.files.in
@ -1,3 +0,0 @@
-/usr/share/doc/fp-units-gtk
-
-/usr/lib/fpc/%{fpc_main_version}/units/linux/gtk
--- a/install/debian/fp-units-gtk.install.in
+++ b/install/debian/fp-units-gtk.install.in
@ -0,0 +1,4 @@
+/usr/share/doc/fp-units-gtk
+
+/usr/lib/fpc/%{fpcversion}/units/linux/gtk
+/usr/lib/fpc/%{fpcversion}/units/linux/fpgtk
--- a/install/debian/fp-units-misc.files.in
+++ b/install/debian/fp-units-misc.files.in
@ -1,8 +0,0 @@
-/usr/share/doc/fp-units-misc
-
-/usr/lib/fpc/%{fpc_main_version}/units/linux/cmem
-/usr/lib/fpc/%{fpc_main_version}/units/linux/utmp
-/usr/lib/fpc/%{fpc_main_version}/units/linux/zlib
-/usr/lib/fpc/%{fpc_main_version}/units/linux/syslog
-/usr/lib/fpc/%{fpc_main_version}/units/linux/gdbint
-/usr/lib/fpc/%{fpc_main_version}/units/linux/unzip
--- a/install/debian/fp-units-misc.install.in
+++ b/install/debian/fp-units-misc.install.in
@ -0,0 +1,13 @@
+/usr/share/doc/fp-units-misc
+
+/usr/lib/fpc/%{fpcversion}/units/linux/utmp
+/usr/lib/fpc/%{fpcversion}/units/linux/libc
+/usr/lib/fpc/%{fpcversion}/units/linux/pthreads
+/usr/lib/fpc/%{fpcversion}/units/linux/unixutil
+/usr/lib/fpc/%{fpcversion}/units/linux/zlib
+/usr/lib/fpc/%{fpcversion}/units/linux/tcl
+/usr/lib/fpc/%{fpcversion}/units/linux/cdrom
+/usr/lib/fpc/%{fpcversion}/units/linux/bfd
+/usr/lib/fpc/%{fpcversion}/units/linux/syslog
+/usr/lib/fpc/%{fpcversion}/units/linux/gdbint
+/usr/lib/fpc/%{fpcversion}/units/linux/unzip
--- a/install/debian/fp-units-net.files.in
+++ b/install/debian/fp-units-net.files.in
@ -1,4 +0,0 @@
-/usr/share/doc/fp-units-net
-
-/usr/lib/fpc/%{fpc_main_version}/units/linux/inet
-/usr/lib/fpc/%{fpc_main_version}/units/linux/uncgi
--- a/install/debian/fp-units-net.install.in
+++ b/install/debian/fp-units-net.install.in
@ -0,0 +1,5 @@
+/usr/share/doc/fp-units-net
+
+/usr/lib/fpc/%{fpcversion}/units/linux/inet
+/usr/lib/fpc/%{fpcversion}/units/linux/netdb
+/usr/lib/fpc/%{fpcversion}/units/linux/libasync
--- a/install/debian/fp-units-rtl.files.in
+++ b/install/debian/fp-units-rtl.files.in
@ -1 +0,0 @@
-/usr/lib/fpc/%{fpc_main_version}/units/linux/rtl
--- a/install/debian/fp-units-rtl.install.in
+++ b/install/debian/fp-units-rtl.install.in
@ -0,0 +1 @@
+/usr/lib/fpc/%{fpcversion}/units/linux/rtl
--- a/install/debian/fp-utils.install.in
+++ b/install/debian/fp-utils.install.in
@ -14,10 +14,12 @@
 /usr/bin/postw32
 /usr/bin/fpcmake
 /usr/bin/fprcp
-/usr/lib/fpc/%{fpc_main_version}/units/linux/lexlib.ppu
-/usr/lib/fpc/%{fpc_main_version}/units/linux/yacclib.ppu
-/usr/lib/fpc/%{fpc_main_version}/units/linux/lexlib.o
-/usr/lib/fpc/%{fpc_main_version}/units/linux/yacclib.o
+/usr/bin/fpdoc
+/usr/bin/makeskel
+/usr/lib/fpc/%{fpcversion}/units/linux/lexlib.ppu
+/usr/lib/fpc/%{fpcversion}/units/linux/yacclib.ppu
+/usr/lib/fpc/%{fpcversion}/units/linux/lexlib.o
+/usr/lib/fpc/%{fpcversion}/units/linux/yacclib.o
 /usr/lib/fpc/lexyacc/yylex.cod
 /usr/lib/fpc/lexyacc/yyparse.cod
 /usr/share/man/man1/delp.1
@ -31,5 +33,6 @@
 /usr/share/man/man1/ptop.1
 /usr/share/man/man1/pyacc.1
 /usr/share/man/man1/rstconv.1
+/usr/share/man/man1/fpdoc.1
 /usr/share/man/man5/fpcmake.5
 /usr/share/man/man5/ptop.cfg.5
--- a/install/debian/fp-utils.undocumented
+++ b/install/debian/fp-utils.undocumented
@ -1,4 +0,0 @@
-bin2obj.1
-fprcp.1
-data2inc.1
-h2paspp.1
--- a/install/debian/rules
+++ b/install/debian/rules
@ -10,15 +10,15 @@ FPCDIR=
 # Get Package version and FPC version out of changelog file
 PACKAGEVERSION:=$(shell head -n 1 debian/changelog | awk '{ print $$2 }' | tr -d '[()]')
 FPCVERSION:=$(shell echo $(PACKAGEVERSION) | awk -F '-' '{ print $$1 }')
-FPC_MAIN_VERSION:=$(shell echo $(PACKAGEVERSION) | awk -F '\.[0-9]-' '{ print $$1 }')
 # Get directories	
 PWD:=$(shell pwd)
 BUILD_DIR=$(PWD)/debian/build
 INSTALL_DIR=$(PWD)/debian/tmp
 DOC_DIR=$(INSTALL_DIR)/usr/share/doc
-EXAMPLE_TEMP=$(INSTALL_DIR)/usr/doc/fpc-$(FPC_MAIN_VERSION)/examples
+EXAMPLE_TEMP=$(INSTALL_DIR)/usr/doc/fpc-$(FPCVERSION)/examples
 # Get utils
 NEWPP=$(PWD)/compiler/ppc386
+NEWFPDOC=$(PWD)/utils/fpdoc/fpdoc
 # Create default options
 BUILDOPTS=PP=$(NEWPP)
 INSTALLOPTS=PP=$(NEWPP) INSTALL_PREFIX=$(INSTALL_DIR)/usr
@ -50,8 +50,6 @@ clean:

 	-(find . -name \*.a | xargs rm)

-	rm -f docs/syntax.sty
-
 	dh_clean

 # Cannot do that because the control-file is often needed after a cleanup
@ -105,20 +103,27 @@ install-arch-stamp: build-arch-stamp debian-files-stamp
 	$(MAKE) utils_distinstall $(INSTALLOPTS)

 # Copy examples to the correct doc dir
-	install -d -m755 $(DOC_DIR)/fp-units-base/examples
-	install -d -m755 $(DOC_DIR)/fp-units-db/examples
 	install -d -m755 $(DOC_DIR)/fp-units-fcl/examples
-	install -d -m755 $(DOC_DIR)/fp-units-gfx/examples
 	install -d -m755 $(DOC_DIR)/fp-units-gtk/examples
-	install -d -m755 $(DOC_DIR)/fp-units-misc/examples
+	install -d -m755 $(DOC_DIR)/fp-units-gnome1/examples
+	install -d -m755 $(DOC_DIR)/fp-units-gfx/examples
+	install -d -m755 $(DOC_DIR)/fp-units-db/examples
 	install -d -m755 $(DOC_DIR)/fp-units-net/examples
-	install -d -m755 $(DOC_DIR)/fp-units-extra/examples
+	install -d -m755 $(DOC_DIR)/fp-units-misc/examples
+	install -d -m755 $(DOC_DIR)/fp-units-base/examples

 	mv -f $(EXAMPLE_TEMP)/fcl $(DOC_DIR)/fp-units-fcl/examples

 	mv -f $(EXAMPLE_TEMP)/gtk $(DOC_DIR)/fp-units-gtk/examples
+#	mv -f $(EXAMPLE_TEMP)/fpgtk $(DOC_DIR)/fp-units-gtk/examples
+
+#	mv -f $(EXAMPLE_TEMP)/imlib $(DOC_DIR)/fp-units-gnome1/examples
+	mv -f $(EXAMPLE_TEMP)/zvt $(DOC_DIR)/fp-units-gnome1/examples
+#	mv -f $(EXAMPLE_TEMP)/gnome $(DOC_DIR)/fp-units-gnome1/examples
+	mv -f $(EXAMPLE_TEMP)/gconf $(DOC_DIR)/fp-units-gnome1/examples

 	mv -f $(EXAMPLE_TEMP)/paszlib $(DOC_DIR)/fp-units-base/examples
+	mv -f $(EXAMPLE_TEMP)/pasjpeg $(DOC_DIR)/fp-units-base/examples
 	mv -f $(EXAMPLE_TEMP)/regexpr $(DOC_DIR)/fp-units-base/examples
 	mv -f $(EXAMPLE_TEMP)/ncurses $(DOC_DIR)/fp-units-base/examples

@ -133,28 +138,23 @@ install-arch-stamp: build-arch-stamp debian-files-stamp
 	mv -f $(EXAMPLE_TEMP)/oracle $(DOC_DIR)/fp-units-db/examples
 	mv -f $(EXAMPLE_TEMP)/postgres $(DOC_DIR)/fp-units-db/examples
 	mv -f $(EXAMPLE_TEMP)/gdbm $(DOC_DIR)/fp-units-db/examples
-	mv -f $(EXAMPLE_TEMP)/netdb $(DOC_DIR)/fp-units-db/examples
 	mv -f $(EXAMPLE_TEMP)/odbc $(DOC_DIR)/fp-units-db/examples

-	mv -f $(EXAMPLE_TEMP)/cmem $(DOC_DIR)/fp-units-misc/examples
 	mv -f $(EXAMPLE_TEMP)/gdbint $(DOC_DIR)/fp-units-misc/examples
 	mv -f $(EXAMPLE_TEMP)/utmp $(DOC_DIR)/fp-units-misc/examples
 	mv -f $(EXAMPLE_TEMP)/syslog $(DOC_DIR)/fp-units-misc/examples
+	mv -f $(EXAMPLE_TEMP)/cdrom $(DOC_DIR)/fp-units-misc/examples
+	mv -f $(EXAMPLE_TEMP)/tcl $(DOC_DIR)/fp-units-misc/examples

 	mv -f $(EXAMPLE_TEMP)/inet $(DOC_DIR)/fp-units-net/examples
-	mv -f $(EXAMPLE_TEMP)/uncgi $(DOC_DIR)/fp-units-net/examples
-	
-	mv -f $(EXAMPLE_TEMP)/cdrom $(DOC_DIR)/fp-units-extra/examples
-	mv -f $(EXAMPLE_TEMP)/gconf $(DOC_DIR)/fp-units-extra/examples
-	mv -f $(EXAMPLE_TEMP)/tcl $(DOC_DIR)/fp-units-extra/examples
-	mv -f $(EXAMPLE_TEMP)/zvt $(DOC_DIR)/fp-units-extra/examples
+	mv -f $(EXAMPLE_TEMP)/netdb $(DOC_DIR)/fp-units-net/examples

 # Check if all examples are removed, if not then the rmdir will fail
 	rmdir $(EXAMPLE_TEMP)

 # Install man pages and RTL demos and whatsnew and readme
 	$(MAKE) man_install $(INSTALLOPTS) INSTALL_PREFIX=$(INSTALL_DIR)/usr/share
-	$(MAKE) demo_install $(INSTALLOPTS) INSTALL_DOCDIR=$(DOC_DIR)/fp-compiler
+	$(MAKE) demo_install $(INSTALLOPTS) INSTALL_SOURCEDIR=$(DOC_DIR)/fp-compiler
 	$(MAKE) doc_install $(INSTALLOPTS) INSTALL_DOCDIR=$(DOC_DIR)/fp-compiler

 # Create fpc.cfg which is included as conffile
@ -167,7 +167,7 @@ arrange-arch: arrange-arch-stamp
 arrange-arch-stamp: install-arch-stamp debian-files-stamp
 	dh_testdir
 	dh_testroot
-	dh_movefiles -a
+	dh_install -a --sourcedir=debian/tmp --list-missing

 	touch arrange-arch-stamp

@ -177,14 +177,12 @@ arrange-arch-stamp: install-arch-stamp debian-files-stamp
 #

 build-indep: build-indep-stamp
-build-indep-stamp: debian-files-stamp
+# We depend on the new fpdoc
+build-indep-stamp: debian-files-stamp build-arch-stamp
 	@echo "--- Building Documentation"
 	dh_testdir

-# We need our own syntax.sty (v1.9) which is not in the current tetex and
-# on ctan.org (PFV)
-	cp debian/syntax.sty docs
-	$(MAKE) -C docs $(DOCTYPE)
+	$(MAKE) -C docs $(DOCTYPE) FPDOC=$(NEWFPDOC) 

 	touch build-indep-stamp

@ -209,7 +207,7 @@ build: build-arch build-indep

 install: install-arch install-indep

-binary: binary-indep binary-arch
+binary: binary-arch binary-indep 


 ###################
@ -223,7 +221,7 @@ binary-indep: build-indep install-indep debian-files
 	dh_installdocs -i
 	dh_installchangelogs -i
 	dh_installchangelogs -pfp-docs logs/Changes.docs
-	dh_movefiles -i
+	dh_install -i --sourcedir=debian/tmp --list-missing
 	dh_compress -i -X.pdf
 	dh_fixperms -i
 	dh_installdeb -i
@ -243,7 +241,6 @@ binary-arch: build-arch arrange-arch debian-files
 	dh_installchangelogs -pfp-units-fcl logs/Changes.fcl
 	dh_installchangelogs -pfp-utils logs/Changes.utils

-	dh_undocumented -a
 	dh_installexamples -a
 	dh_compress -a
 	dh_fixperms -a
--- a/install/debian/syntax.sty
+++ b/install/debian/syntax.sty
@ -1,817 +0,0 @@
-%%
-%% This is file `syntax.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% syntax.dtx  (with options: `package')
-%% doafter.dtx  (with options: `macro')
-%% 
-%% IMPORTANT NOTICE
-%%
-%% syntax package -- typesetting syntax descriptions
-%% Copyright (c) 1996 Mark Wooding
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the GNU General Public License as published by
-%% the Free Software Foundation; either version 2 of the License, or
-%% (at your option) any later version.
-%%
-%% This program is distributed in the hope that it will be useful,
-%% but WITHOUT ANY WARRANTY; without even the implied warranty of
-%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%% GNU General Public License for more details.
-%%
-%% You should have received a copy of the GNU General Public License
-%% along with this program; if not, write to the Free Software
-%% Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%%
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{syntax}
-                [1996/05/17 1.9 Syntax typesetting (MDW)]
-%% \CharacterTable
-%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
-%%
-\DeclareOption{rounded}{\sd@roundtrue}
-\DeclareOption{square}{\sd@roundfalse}
-\DeclareOption{nounderscore}{\@uscorefalse}
-\newif\ifsd@round
-\newif\if@uscore\@uscoretrue
-\ExecuteOptions{square}
-\ProcessOptions
-\def\addspecial#1{%
-  \remspecial{#1}%
-  \expandafter\def\expandafter\dospecials\expandafter{\dospecials\do#1}%
-  \expandafter\def\expandafter\@santize\expandafter{%
-    \@sanitize\@makeother#1}%
-}
-\def\remspecial#1{%
-  \def\do##1{\ifnum`#1=`##1 \else\noexpand\do\noexpand##1\fi}%
-  \edef\dospecials{\dospecials}%
-  \def\@makeother##1{\ifnum`#1=`##1 \else%
-    \noexpand\@makeother\noexpand##1\fi}%
-  \edef\@sanitize{\@sanitize}%
-  \def\@makeother##1{\catcode`##112}%
-}
-\def\underscore{%
-  \leavevmode%
-  \kern.06em%
-  \vbox{%
-    \hrule\@width.6em\@depth.4ex\@height-.34ex%
-  }%
-  \ifdim\fontdimen\@ne\font=\z@%
-    \kern.06em%
-  \fi%
-}
-\let\usc@builtindischyphen\-
-\def\@uscore.{%
-  \ifmmode%
-    \expandafter\@firstoftwo%
-  \else%
-    \expandafter\@secondoftwo%
-  \fi%
-  \sb%
-  {\textunderscore\@ifnextchar_{}{\usc@builtindischyphen}}%
-}
-\if@uscore
-  \AtBeginDocument{%
-    \catcode`\_\active%
-    \begingroup%
-    \lccode`\~`\_%
-    \lowercase{\endgroup\def~{\protect\@uscore.}}%
-  }
-\fi
-\expandafter\let\csname?\string\textunderscore\endcsname\underscore
-\def\shortverb#1{%
-  \@ifundefined{cc@\string#1}{%
-    \addspecial#1%
-    \begingroup%
-    \lccode`\~`#1%
-    \lowercase{%
-      \endgroup%
-      \expandafter\let\csname mn@\string#1\endcsname~%
-      \expandafter\edef\csname cc@\string#1\endcsname{%
-        \catcode`\noexpand#1\the\catcode`#1%
-        \let\noexpand~\expandafter\noexpand%
-          \csname mn@\string#1\endcsname%
-        \noexpand\remspecial\noexpand#1%
-        \let\csname cc@\string#1\endcsname\relax%
-      }%
-      \def~{\verb~\syn@ttspace}%
-    }%
-    \catcode`#1\active%
-  }{%
-    \PackageWarning{syntax}{Character `\expandafter\@gobble\string#1'
-                            is already a verbatim\MessageBreak
-                            delimiter}%
-  }%
-}
-\def\unverb#1{%
-  \@ifundefined{cc@\string#1}{%
-    \PackageWarning{syntax}{Character `\expandafter\@gobble\string#1'
-                            is not a verbatim\MessageBreak
-                            delimiter}%
-  }{%
-    \csname cc@\string#1\endcsname%
-  }%
-}
-\newcommand{\syntleft}{$\langle$\normalfont\itshape}
-\newcommand{\syntright}{$\rangle$}
-\newcommand{\ulitleft}{\normalfont\ttfamily\syn@ttspace\frenchspacing}
-\newcommand{\ulitright}{}
-\newcommand{\litleft}{`\bgroup\ulitleft}
-\newcommand{\litright}{\ulitright\egroup'}
-\def\synt#1{\mbox{\syntleft{#1\/}\syntright}}
-\def\lit{\@ifstar{\lit@i\ulitleft\ulitright}{\lit@i\litleft\litright}}
-\def\lit@i#1#2#3{\mbox{#1{#3\/}#2}}
-\def\syn@ttspace@{\spaceskip.35em\@plus.2em\@minus.15em\relax}
-\def\ttthinspace{\let\syn@ttspace\syn@ttspace@}
-\def\ttthickspace{\let\syn@ttspace\@empty}
-\ttthinspace
-\def\readupto#1#2#3{%
-  \bgroup%
-  \verb@eol@error%
-  \let\do\@makeother\dospecials%
-  #2%
-  \catcode`#1\active%
-  \lccode`\~`#1%
-  \gdef\verb@balance@group{\verb@egroup%
-     \@latex@error{\noexpand\verb illegal in command argument}\@ehc}%
-  \def\@vhook{\verb@egroup#3}%
-  \aftergroup\verb@balance@group%
-  \lowercase{\let~\@vhook}%
-}
-\def\syn@assist#1#2#3#4#5{%
-  \mbox\bgroup%
-  \chardef\\`\\%
-  \chardef\>`\>%
-  \chardef\'`\'%
-  \chardef\"`\"%
-  \chardef\ `\ %
-  \def\ch##1{\char`##1}%
-  \def\act##1{%
-    \catcode`##1\active%
-    \begingroup%
-    \lccode`\~`##1%
-    \lowercase{\endgroup\def~}%
-  }%
-  #1%
-  \begingroup%
-  \readupto#3{%
-    \catcode`\\0%
-    \catcode`\ 10%
-    #2%
-  }{%
-    \/\endgroup#4\egroup#5%
-  }%
-}
-\begingroup
-\catcode`\<\active
-\catcode`\|\active
-\catcode`\"\active
-\catcode`\`\active
-\gdef\syn@shorts#1#2{%
-  \def<{%
-    #1%
-    \syn@assist%
-      \syntleft%
-      {\act_{\@foundunderscore}}%
-      >%
-      \syntright%
-      {#2}%
-  }%
-  \def`{%
-    #1%
-    \syn@assist%
-      \litleft%
-      \relax%
-      '%
-      \litright%
-      {#2}%
-  }%
-  \def"{%
-    #1%
-    \syn@assist%
-      \ulitleft%
-      \relax%
-      "%
-      \ulitright%
-      {#2}%
-  }%
-  \def|{\textbar}%
-}
-\endgroup
-\def\syntaxShortcuts#1#2{%
-  \syn@shorts{#1}{#2}%
-  \addspecial\`%
-  \addspecial\<%
-  \addspecial\|%
-  \addspecial\"%
-  \catcode`\|\active%
-  \catcode`\<\active%
-  \catcode`\"\active%
-  \catcode`\`\active%
-}
-\def\synshorts{\syntaxShortcuts\relax\relax}
-\def\synshortsoff{%
-  \catcode`\|12%
-  \catcode`\<12%
-  \catcode`\"12%
-  \catcode`\`12%
-}
-\def\syntax#{\bgroup\syntaxShortcuts\relax\relax\let\@let@token}
-\newskip\grammarparsep
-  \grammarparsep8\p@\@plus\p@\@minus\p@
-\newdimen\grammarindent
-  \grammarindent2em
-\newcommand{\grammarlabel}[2]{%
-  \synt{#1} \hfill#2%
-}
-\def\gr@implitem<#1> #2 {%
-  \sbox\z@{\hskip\labelsep\grammarlabel{#1}{#2}}%
-  \strut\@@par%
-  \vskip-\parskip%
-  \vskip-\baselineskip%
-  \hrule\@height\z@\@depth\z@\relax%
-  \item[\unhbox\z@]%
-  \catcode`\<\active%
-}
-\let\gr@leftsq\[
-\let\gr@rightsq\]
-\def\[{\gr@leftsq}
-\def\]{\gr@rightsq}
-\newenvironment{grammar}{%
-  \list{}{%
-    \labelwidth\grammarindent%
-    \leftmargin\grammarindent%
-    \advance\grammarindent\labelsep
-    \itemindent\z@%
-    \listparindent\z@%
-    \parsep\grammarparsep%
-  }%
-  \let\\\@normalcr
-  \syntaxShortcuts\relax\relax%
-  \def\alt{\\\llap{\textbar\quad}}%
-  \def\gr@setpar{%
-    \def\par{%
-      \parshape\@ne\@totalleftmargin\linewidth%
-      \@@par%
-      \catcode`\<12%
-      \everypar{%
-        \everypar{}%
-        \catcode`\<\active%
-        \gr@implitem%
-      }%
-    }%
-  }%
-  \gr@setpar%
-  \par%
-  \def\gr@endsyntdiag]{\end{syntdiag}\gr@setpar\par}%
-  \def\[{\@ifnextchar[{\begin{syntdiag}\@gobble}\gr@leftsq}%
-  \def\]{\@ifnextchar]\gr@endsyntdiag\gr@rightsq}%
-}{%
-  \@newlistfalse%
-  \everypar{}%
-  \endlist%
-}
-\newskip\sdstartspace
-\newskip\sdendspace
-\newskip\sdmidskip
-\newskip\sdtokskip
-\newskip\sdfinalskip
-\newdimen\sdrulewidth
-\newdimen\sdcirclediam
-\newdimen\sdindent
-\dimendef\sd@lower\z@
-\dimendef\sd@upper\tw@
-\dimendef\sd@mid4
-\dimendef\sd@topcirc6
-\dimendef\sd@botcirc8
-\def\sd@setsize{%
-  \sd@mid\ht\strutbox%
-  \advance\sd@mid-\dp\strutbox%
-  \sd@mid.5\sd@mid%
-  \sd@upper\sdrulewidth%
-    \advance\sd@upper\sd@mid%
-  \sd@lower\sdrulewidth%
-    \advance\sd@lower-\sd@mid%
-  \sd@topcirc-.5\sdcirclediam%
-    \advance\sd@topcirc\sd@mid%
-  \sd@botcirc-.5\sdcirclediam%
-    \advance\sd@botcirc-\sd@mid%
-}
-\newcommand{\sdsize}{%
-  \small%
-}
-\newcommand{\sdlengths}{%
-  \setlength{\sdstartspace}{1em minus 10pt}%
-  \setlength{\sdendspace}{1em minus 10pt}%
-  \setlength{\sdmidskip}{0.5em plus 0.0001fil}%
-  \setlength{\sdtokskip}{0.25em plus 0.0001fil}%
-  \setlength{\sdfinalskip}{0.5em plus 10000fil}%
-  \setlength{\sdrulewidth}{0.2pt}%
-  \setlength{\sdcirclediam}{8pt}%
-  \setlength{\sdindent}{0pt}%
-}
-\newif\ifsd@base
-\newif\ifsd@top
-\newif\ifsd@toplayer
-\newif\ifsd@backwards
-\def\sd@err{\PackageError{syntax}}
-\def\sd@arrow{%
-  \ht\tw@\z@%
-  \dp\tw@\z@%
-  \raise\sd@mid\box\tw@%
-  \egroup%
-}
-\def\sd@rightarr{%
-  \bgroup%
-  \setbox\tw@\hbox{\kern-6\p@\@linefnt\char'55}%
-  \sd@arrow%
-}
-\def\sd@leftarr{%
-  \bgroup%
-  \raise\sd@mid\hbox{\@linefnt\char'33\kern-6\p@}%
-  \sd@arrow%
-}
-\def\sd@uparr{%
-  \bgroup%
-  \setbox\tw@\hb@xt@\z@{\kern-\sdrulewidth\@linefnt\char'66\hss}%
-  \setbox\tw@\hbox{\lower10\p@\box\tw@}%
-  \sd@arrow%
-}
-\def\sd@downarr{%
-  \bgroup%
-  \setbox\tw@\hb@xt@\z@{\kern-\sdrulewidth\@linefnt\char'77\hss}%
-  \sd@arrow%
-}
-\def\sd@circ#1{%
-  \@getcirc\sdcirclediam%
-  \advance\@tempcnta#1%
-  \setbox\tw@\hbox{\lower\sdrulewidth%
-    \hbox{\@circlefnt\char\@tempcnta}}%
-  \wd\tw@\z@%
-  \leavevmode%
-}
-\def\sd@tlcirc{{%
-  \sd@circ3%
-  \ht\tw@\sdrulewidth%
-  \dp\tw@.5\sdcirclediam%
-  \kern-\tw@\sdrulewidth%
-  \raise\sd@mid\box\tw@%
-  \kern.5\sdcirclediam%
-}}
-\def\sd@trcirc{{%
-  \sd@circ0%
-  \ht\tw@\sdrulewidth%
-  \dp\tw@.5\sdcirclediam%
-  \kern.5\sdcirclediam%
-  \raise\sd@mid\box\tw@%
-}}
-\def\sd@blcirc{{%
-  \sd@circ2%
-  \ht\tw@.5\sdcirclediam%
-  \dp\tw@\sdrulewidth%
-  \kern-\tw@\sdrulewidth%
-  \raise\sd@mid\box\tw@%
-  \kern.5\sdcirclediam%
-}}
-\def\sd@brcirc{{%
-  \sd@circ1%
-  \ht\tw@.5\sdcirclediam%
-  \dp\tw@\sdrulewidth%
-  \kern.5\sdcirclediam%
-  \raise\sd@mid\box\tw@%
-}}
-\def\sd@llc#1{%
-  \hb@xt@.5\sdcirclediam{%
-    \sd@rule\hskip.5\sdcirclediam%
-    \hss%
-    #1%
-  }%
-}
-\def\sd@rlc#1{%
-  \hb@xt@.5\sdcirclediam{%
-    #1%
-    \hss%
-    \sd@rule\hskip.5\sdcirclediam%
-  }%
-}
-\def\sd@rule{\leaders\hrule\@height\sd@upper\@depth\sd@lower}
-\def\sd@gap#1{%
-  \ifsd@base%
-    \skip@#1%
-      \divide\skip\z@\tw@%
-    \nobreak\sd@rule\hskip\skip@%
-    \discretionary{%
-      \sd@qarrow{->}%
-    }{%
-      \hbox{%
-        \sd@qarrow{>-}%
-        \sd@rule\hskip\sdstartspace%
-        \sd@rule\hskip3.5\p@%
-      }%
-    }{%
-    }%
-    \nobreak\sd@rule\hskip\skip@%
-  \else%
-    \sd@rule\hskip#1%
-  \fi%
-}
-\def\syntdiag{%
-  \syntaxShortcuts\sd@tok@i\sd@tok@ii%
-  \@ifnextchar[\syntdiag@i{\syntdiag@i[]}%
-}
-\def\syntdiag@i[#1]{%
-  \sdsize\sdlengths%
-  #1%
-  \sd@setsize%
-  \list{}{%
-    \leftmargin\sdindent%
-    \rightmargin\leftmargin%
-    \labelsep\z@%
-    \labelwidth\z@%
-  }%
-  \item[]%
-  \parfillskip\z@%
-  \noindent%
-  \sd@qarrow{>>-}%
-  \nobreak\sd@rule\hskip\sdstartspace%
-  \sd@basetrue%
-  \sloppy%
-  \interlinepenalty100%
-  \hyphenpenalty0%
-  \catcode`\ 9%
-  \catcode`\^^M9%
-  \def\gr@leftsq{\begin{stack}\\}%
-  \def\gr@rightsq{\end{stack}}%
-  \def\({\begin{stack}}%
-  \def\){\end{stack}}%
-  \def\<{\begin{rep}}%
-  \def\>{\end{rep}}%
-  \let\\\sd@newline%
-  \ignorespaces%
-}
-\def\endsyntdiag{%
-  \unskip%
-  \nobreak\sd@rule\hskip\sdmidskip%
-  \sd@rule\hskip\sdfinalskip%
-  \sd@qarrow{-><}%
-  \endlist%
-}
-\@namedef{syntdiag*}{%
-  \syntaxShortcuts\sd@tok@i\sd@tok@ii%
-  \@ifnextchar[\syntdiag@s@i{\syntdiag@s@i[]}%
-}
-\def\syntdiag@s@i[#1]{%
-  \@ifnextchar[{\syntdiag@s@ii{#1}}{\syntdiag@s@iii{#1}{\hbox}}%
-}
-\def\syntdiag@s@ii#1[#2]{\syntdiag@s@iii{#1}{\hb@xt@#2}}
-\def\syntdiag@s@iii#1#2{%
-  \leavevmode%
-  #2\bgroup%
-  \let\@@left\left%
-  \let\@@right\right%
-  \def\left##1{\def\sd@startarr{##1}}%
-  \def\right##1{\def\sd@endarr{##1}}%
-  \left{>-}\right{->}%
-  \sdsize\sdlengths%
-  #1%
-  \sd@setsize%
-  \let\left\@@left%
-  \let\right\@@right%
-  \sd@qarrow\sd@startarr%
-  \sd@rule\hskip\sdmidskip%
-  \sd@basefalse%
-  \catcode`\ 9%
-  \catcode`\^^M9%
-  \ignorespaces%
-}
-\@namedef{endsyntdiag*}{%
-  \unskip%
-  \sd@rule\hskip\sdmidskip%
-  \sd@rule\hskip\sdfinalskip%
-  \sd@qarrow\sd@endarr%
-  \egroup%
-}
-\def\sd@qarrow#1{%
-  \begingroup%
-  \lccode`\~=`\<\lowercase{\def~{<}}%
-  \hbox{\csname sd@arr@#1\endcsname}%
-  \endgroup%
-}
-\@namedef{sd@arr@>>-}{\sd@rightarr\kern-.5\p@\sd@rightarr\kern-\p@}
-\@namedef{sd@arr@>-}{\sd@rightarr\kern-\p@}
-\@namedef{sd@arr@->}{\sd@rightarr}
-\@namedef{sd@arr@-><}{\sd@rightarr\kern-\p@\sd@leftarr}
-\@namedef{sd@arr@...}{$\cdots$}
-\@namedef{sd@arr@-}{}
-\def\sd@newline{\@ifstar{\vadjust{\penalty\@M}\sd@nl@i}\sd@nl@i}
-\def\sd@nl@i{\@ifnextchar[\sd@nl@ii\sd@nl@iii}
-\def\sd@nl@ii[#1]{\vspace{#1}\sd@nl@iii}
-\def\sd@nl@iii{%
-  \nobreak\sd@rule\hskip\sdmidskip%
-  \sd@rule\hskip\sdfinalskip%
-  \kern-3\p@%
-  \sd@rightarr%
-  \newline%
-  \sd@rightarr%
-  \nobreak\sd@rule\hskip\sdstartspace%
-  \sd@rule\hskip3.5\p@%
-}
-\def\sdbox#1{%
-  \@tempskipa#1\relax%
-  \sd@gap\@tempskipa%
-  \setbox\z@\hbox\bgroup%
-    \begingroup%
-    \catcode`\ 10%
-    \catcode`\^^M5%
-    \synshortsoff%
-}
-\def\endsdbox{%
-    \endgroup%
-  \egroup%
-  \@tempdima\ht\z@%
-  \advance\@tempdima-\dp\z@%
-  \advance\@tempdima-\tw@\sd@mid%
-  \lower.5\@tempdima\box\z@%
-  \sd@gap\@tempskipa%
-}
-\def\sd@tok@i{%
-  \sdbox\sdtokskip%
-  \strut%
-  \space%
-}
-\def\sd@tok@ii{%
-  \space%
-  \endsdbox%
-}
-\def\tok#{%
-  \sdbox\sdtokskip%
-  \strut%
-  \enspace%
-  \syntaxShortcuts\relax\relax%
-  \doafter\sd@tok%
-}
-\def\sd@tok{%
-  \enspace%
-  \endsdbox%
-}
-\newcommand\stack[1][t]{%
-  \sd@gap\sdmidskip%
-  \begingroup\sd@basefalse%
-  \sd@toplayertrue%
-  \let\\\sd@stackcr%
-  \if#1t%
-    \let\@tempa\vtop%
-    \sd@toptrue%
-    \ifsd@round\llap{\sd@trcirc\kern\tw@\sdrulewidth}\fi%
-  \else\if#1b%
-    \let\@tempa\vbox%
-    \sd@topfalse%
-    \ifsd@round\llap{\sd@brcirc\kern\tw@\sdrulewidth}\fi%
-  \else%
-    \sd@err{Bad position argument passed to stack}%
-           {The positioning argument must be one of `t' or `b'.  I%
-            have^^Jassumed you meant to type `t'.}%
-    \let\@tempa\vtop%
-  \fi\fi%
-  \@tempa\bgroup%
-  \offinterlineskip%
-  \ialign\bgroup%
-    ##\cr%
-  \setbox\z@\hbox\bgroup%
-    \strut%
-}
-\def\endstack{%
-  \egroup%
-  \ifsd@toplayer%
-    \sd@dostack\sd@upper\sd@lower\relax\relax%
-  \else%
-    \ifsd@round%
-      \ifsd@top%
-        \sd@dostack{\ht\z@}\sd@botcirc\sd@blcirc\sd@brcirc%
-      \else%
-        \sd@dostack{\ht\z@}\sd@botcirc\relax\relax%
-      \fi%
-    \else%
-      \sd@dostack{\ht\z@}\sd@lower\relax\relax%
-    \fi%
-  \fi%
-  \egroup%
-  \egroup%
-  \ifsd@round%
-    \ifsd@top
-      \rlap{\kern\tw@\sdrulewidth\sd@tlcirc}%
-    \else%
-      \rlap{\kern\tw@\sdrulewidth\sd@blcirc}%
-    \fi%
-  \fi%
-  \endgroup\sd@gap\sdmidskip%
-}
-\def\sd@stackcr{%
-  \egroup%
-  \ifsd@toplayer%
-    \ifsd@round%
-      \ifsd@top%
-        \sd@dostack\sd@topcirc{\dp\z@}\relax\relax%
-      \else%
-        \sd@dostack\sd@topcirc{\dp\z@}\sd@tlcirc\sd@trcirc%
-      \fi%
-    \else%
-      \sd@dostack\sd@upper{\dp\z@}\relax\relax%
-    \fi%
-  \else%
-    \ifsd@round%
-      \ifsd@top%
-        \sd@dostack{\ht\z@}{\dp\z@}\sd@blcirc\sd@brcirc%
-      \else%
-        \sd@dostack{\ht\z@}{\dp\z@}\sd@tlcirc\sd@trcirc%
-      \fi%
-    \else%
-      \sd@dostack{\ht\z@}{\dp\z@}\relax\relax%
-    \fi%
-  \fi%
-  \sd@toplayerfalse%
-  \setbox\z@\hbox\bgroup%
-    \strut%
-}
-\def\sd@dostack#1#2#3#4{%
-  \@tempdima#1%
-  \@tempdimb#2%
-  \kern-\tw@\sdrulewidth%
-  \vrule\@height\@tempdima\@depth\@tempdimb\@width\tw@\sdrulewidth%
-  #3%
-  \sd@rule\hfill%
-  \sd@gap\sdtokskip%
-  \unhbox\z@%
-  \sd@gap\sdtokskip%
-  \sd@rule\hfill%
-  #4%
-  \vrule\@height\@tempdima\@depth\@tempdimb\@width\tw@\sdrulewidth%
-  \kern-\tw@\sdrulewidth%
-  \cr%
-}
-\newcommand\rep[1][t]{%
-  \sd@gap\sdmidskip%
-  \begingroup\sd@basefalse%
-  \ifsd@backwards\sd@backwardsfalse\else\sd@backwardstrue\fi%
-   \let\\\sd@loop%
-  \if#1t%
-    \let\@tempa\vbox%
-    \sd@toptrue%
-  \else\if#1b%
-    \let\@tempa\vtop%
-    \sd@topfalse%
-  \else%
-    \sd@err{Bad position argument passed to loop}%
-           {The positioning argument must be `t' or `b'.  I have^^J%
-            assumed you meant to type `t'.}%
-    \let\@tempa\vbox%
-    \sd@toptrue%
-  \fi\fi%
-  \@tempa\bgroup%
-  \setbox\tw@\copy\strutbox%
-  \setbox\z@\hbox\bgroup\strut%
-}
-\def\endrep{%
-  \egroup%
-  \ifsd@top%
-    \ifsd@round%
-      \sd@doloop\tw@\z@\relax\relax%
-        \sd@tlcirc\sd@trcirc{\sd@rlc\sd@blcirc}{\sd@llc\sd@brcirc}%
-    \else%
-      \sd@doloop\tw@\z@\relax\sd@downarr\relax\relax\relax\relax%
-    \fi%
-  \else%
-    \ifsd@round%
-      \sd@doloop\z@\tw@\relax\relax%
-        {\sd@rlc\sd@tlcirc}{\sd@llc\sd@trcirc}\sd@blcirc\sd@brcirc%
-    \else%
-      \sd@doloop\z@\tw@\sd@uparr\relax\relax\relax\relax\relax%
-    \fi%
-  \fi%
-  \egroup%
-  \endgroup\sd@gap\sdmidskip%
-}
-\def\sd@loop{%
-  \egroup%
-  \def\\{\sd@err{Too many \string\\\space commands in loop}\@ehc}%
-  \setbox\tw@\hbox\bgroup\strut%
-}
-\def\sd@doloop#1#2#3#4#5#6#7#8{%
-  \@tempdima\dp#1\relax%
-  \@tempdimb\ht#2\relax%
-  \offinterlineskip%
-  \ialign{%
-    ##\cr%
-    \ifsd@round%
-      \sd@doloop@i#1#3\sd@topcirc\@tempdima{#5}{#6}%
-      \sd@doloop@i#2#4\@tempdimb\sd@botcirc{#7}{#8}%
-    \else%
-      \sd@doloop@i#1#3\sd@upper\@tempdima{#5}{#6}%
-      \sd@doloop@i#2#4\@tempdimb\sd@lower{#7}{#8}%
-    \fi%
-  }%
-}
-\def\sd@doloop@i#1#2#3#4#5#6{%
-  \ifsd@backwards#2\fi%
-  \kern-\tw@\sdrulewidth%
-  \vrule\@height#3\@depth#4\@width\tw@\sdrulewidth%
-  #5%
-  \sd@rule\hfill%
-  \sd@gap\sdtokskip%
-  \unhbox#1%
-  \sd@gap\sdtokskip%
-  \sd@rule\hfill%
-  #6%
-  \vrule\@height#3\@depth#4\@width\tw@\sdrulewidth%
-  \ifsd@backwards\else#2\fi%
-  \kern-\tw@\sdrulewidth%
-  \cr%
-}
-%%
-%% doafter package -- insert a token really after a group
-%% Copyright (c) 1996 Peter Schmitt and Mark Wooding
-%%
-\let\@@aftergroup\aftergroup
-\def\doafter#1{%
-  \def\@tempa{\@@aftergroup#1}%
-  \afterassignment\doafter@i\let\@let@token%
-}
-\def\doafter@i{%
-  \@let@token%
-  \let\aftergroup\@my@aftergroup%
-  \@@aftergroup\@prepare@after\@tempa%
-}
-\def\ag@cnt@local{0 }
-\let\ag@cnt@global\ag@cnt@local
-\def\@my@aftergroup{%
-  \begingroup%
-    \count@\ag@cnt@local%
-    \advance\count@\@ne%
-    \xdef\ag@cnt@global{\the\count@\space}%
-  \endgroup%
-  \let\ag@cnt@local\ag@cnt@global%
-  \@@aftergroup\@after@token\@@aftergroup%
-}
-\def\@after@token{%
-  \@start@after@group%
-  \@after@token%
-}
-\def\@start@after@group{%
-  \begingroup%
-  \count@\ag@cnt@global%
-  \clubpenalty\ag@cnt@local%
-  \let\@after@token\@after@token@i%
-}
-\def\@after@token@i{%
-  \advance\count@\m@ne%
-  \ifnum\count@=\clubpenalty%
-    \global\let\ag@cnt@global\ag@cnt@local%
-    \expandafter\@after@aftertoken\expandafter\@after@all%
-  \else%
-    \expandafter\@@aftergroup%
-  \fi%
-}
-\let\@after@all\endgroup
-\def\@prepare@after{%
-  \ifx\ag@cnt@local\ag@cnt@global\else%
-    \expandafter\@prepare@after@i%
-  \fi%
-}
-\def\@prepare@after@i#1{%
-  \@start@after@group%
-  \def\@after@all{\@@aftergroup#1\endgroup}%
-}
-\def\@after@aftertoken#1{%
-  \let\bgroup\relax\let\egroup\relax%
-  \toks@{#1}%
-  \futurelet\@let@token\@after@aftertoken@i%
-}
-\def\@after@aftertoken@i{%
-  \ifcat\noexpand\@let@token{%
-    \@@aftergroup{%
-  \else\ifcat\noexpand\@let@token}%
-    \@@aftergroup}%
-  \else%
-    \def\@tempa##1{\@@aftergroup##1\the\toks@}%
-    \expandafter\expandafter\expandafter\@tempa%
-  \fi\fi%
-}
-\endinput
-%%
-%% End of file `syntax.sty'.
--- a/utils/Makefile
+++ b/utils/Makefile
@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/03/15]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@ -214,6 +214,7 @@ ifeq ($(OS_TARGET),win32)
 override TARGET_DIRS+=fpmc
 endif
 override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
+override TARGET_RSTS+=rstconv
 override CLEAN_UNITS+=ptopu
 override INSTALL_FPCPACKAGE=y
 ifdef REQUIRE_UNITSDIR
@ -539,7 +540,8 @@ ZIPSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),macos)
 EXEEXT=
-FPCMADE=fpcmade.mcc
+FPCMADE=fpcmade.macos
+ZIPSUFFIX=macos
 endif
 ifeq ($(OS_TARGET),darwin)
 EXEEXT=
@ -838,9 +840,11 @@ ARNAME=$(BINUTILSPREFIX)ar
 RCNAME=$(BINUTILSPREFIX)rc
 ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),win32)
-ASNAME=as
-LDNAME=ld
-ARNAME=ar
+ifeq ($(CROSSBINDIR),)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 endif
 endif
 ifndef ASPROG
--- a/utils/Makefile.fpc
+++ b/utils/Makefile.fpc
@ -10,6 +10,7 @@ version=1.9.2
 dirs=fpcm tply h2pas fprcp dxegen fpdoc
 programs=ppdep ptop rstconv data2inc delp bin2obj postw32
 dirs_win32=fpmc
+rsts=rstconv

 [require]
 packages=fcl
				`@ -1 +0,0 @@`
				`/usr/lib/fpc/%{fpc_main_version}/units/linux/rtl`