Browse Source

* make deb no works to generate 1.1.0-1 packages

mazen 22 years ago
parent
commit
26fd8fad6b

+ 6 - 0
install/debian/changelog

@@ -1,3 +1,9 @@
+fpc (1.1.0-1) unstable; urgency=low
+
+  * New Snapshot.
+
+ -- Mazen NEIFER <[email protected]>  Thu,  14 Aug 2003 11:54:50 +0100
+
 fpc (1.0.6-20020228) unstable; urgency=low
 fpc (1.0.6-20020228) unstable; urgency=low
 
 
   * New upstream version.
   * New upstream version.

+ 2 - 1
install/debian/fixdeb

@@ -12,6 +12,7 @@ fi
 PACKAGEVERSION=`head -n 1 $1/changelog | awk '{ print $2 }' | tr -d '[()]'`
 PACKAGEVERSION=`head -n 1 $1/changelog | awk '{ print $2 }' | tr -d '[()]'`
 FPCVERSION=`echo $PACKAGEVERSION | awk -F '-' '{ print $1 }'`
 FPCVERSION=`echo $PACKAGEVERSION | awk -F '-' '{ print $1 }'`
 DEBVERSION=`echo $PACKAGEVERSION | awk -F '-' '{ print $2 }'`
 DEBVERSION=`echo $PACKAGEVERSION | awk -F '-' '{ print $2 }'`
+FPC_MAIN_VERSION=`echo $PACKAGEVERSION | awk -F '\.[0-9]-' '{ print $1 }'`
 
 
 # Snapshot ?
 # Snapshot ?
 if [ "$DEBVERSION" == "0" ]; then
 if [ "$DEBVERSION" == "0" ]; then
@@ -29,5 +30,5 @@ echo 'DebVersion    : ' $DEBVERSION
 for i in $1/*.in
 for i in $1/*.in
 do
 do
   j=${i/.in/}
   j=${i/.in/}
-  sed -e 's/%{fpcversion}/'$FPCVERSION'/g;s/%{packageversion}/'$PACKAGEVERSION'/g' $i > $j
+  sed -e 's/%{fpc_main_version}/'$FPC_MAIN_VERSION'/g;s/%{fpcversion}/'$FPCVERSION'/g;s/%{packageversion}/'$PACKAGEVERSION'/g' $i > $j
 done
 done

+ 3 - 3
install/debian/fp-compiler.files.in

@@ -1,8 +1,8 @@
 /etc/fpc.cfg
 /etc/fpc.cfg
 /usr/bin/fpc
 /usr/bin/fpc
-/usr/lib/fpc/%{fpcversion}/ppc386
-/usr/lib/fpc/%{fpcversion}/samplecfg
-/usr/lib/fpc/%{fpcversion}/msg
+/usr/lib/fpc/%{fpc_main_version}/ppc386
+/usr/lib/fpc/%{fpc_main_version}/samplecfg
+/usr/lib/fpc/%{fpc_main_version}/msg
 /usr/share/doc/fp-compiler
 /usr/share/doc/fp-compiler
 /usr/share/man/man1/fpc.1
 /usr/share/man/man1/fpc.1
 /usr/share/man/man1/ppc386.1
 /usr/share/man/man1/ppc386.1

+ 4 - 4
install/debian/fp-units-base.files.in

@@ -1,6 +1,6 @@
 /usr/share/doc/fp-units-base
 /usr/share/doc/fp-units-base
 
 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib
-/usr/lib/fpc/%{fpcversion}/units/linux/ncurses
-/usr/lib/fpc/%{fpcversion}/units/linux/x11
-/usr/lib/fpc/%{fpcversion}/units/linux/regexpr
+/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

+ 4 - 4
install/debian/fp-units-db.files.in

@@ -1,6 +1,6 @@
 /usr/share/doc/fp-units-db
 /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/%{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

+ 1 - 1
install/debian/fp-units-fcl.files.in

@@ -1,2 +1,2 @@
 /usr/share/doc/fp-units-fcl
 /usr/share/doc/fp-units-fcl
-/usr/lib/fpc/%{fpcversion}/units/linux/fcl
+/usr/lib/fpc/%{fpc_main_version}/units/linux/fcl

+ 6 - 6
install/debian/fp-units-gfx.files.in

@@ -1,10 +1,10 @@
 /usr/share/doc/fp-units-gfx
 /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/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
 /usr/bin/fd2pascal

+ 1 - 1
install/debian/fp-units-gtk.files.in

@@ -1,3 +1,3 @@
 /usr/share/doc/fp-units-gtk
 /usr/share/doc/fp-units-gtk
 
 
-/usr/lib/fpc/%{fpcversion}/units/linux/gtk
+/usr/lib/fpc/%{fpc_main_version}/units/linux/gtk

+ 6 - 6
install/debian/fp-units-misc.files.in

@@ -1,8 +1,8 @@
 /usr/share/doc/fp-units-misc
 /usr/share/doc/fp-units-misc
 
 
-/usr/lib/fpc/%{fpcversion}/units/linux/cmem
-/usr/lib/fpc/%{fpcversion}/units/linux/utmp
-/usr/lib/fpc/%{fpcversion}/units/linux/zlib
-/usr/lib/fpc/%{fpcversion}/units/linux/syslog
-/usr/lib/fpc/%{fpcversion}/units/linux/gdbint
-/usr/lib/fpc/%{fpcversion}/units/linux/unzip
+/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

+ 2 - 2
install/debian/fp-units-net.files.in

@@ -1,4 +1,4 @@
 /usr/share/doc/fp-units-net
 /usr/share/doc/fp-units-net
 
 
-/usr/lib/fpc/%{fpcversion}/units/linux/inet
-/usr/lib/fpc/%{fpcversion}/units/linux/uncgi
+/usr/lib/fpc/%{fpc_main_version}/units/linux/inet
+/usr/lib/fpc/%{fpc_main_version}/units/linux/uncgi

+ 1 - 1
install/debian/fp-units-rtl.files.in

@@ -1 +1 @@
-/usr/lib/fpc/%{fpcversion}/units/linux/rtl
+/usr/lib/fpc/%{fpc_main_version}/units/linux/rtl

+ 4 - 4
install/debian/fp-utils.files.in

@@ -14,10 +14,10 @@
 /usr/bin/postw32
 /usr/bin/postw32
 /usr/bin/fpcmake
 /usr/bin/fpcmake
 /usr/bin/fprcp
 /usr/bin/fprcp
-/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/%{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/lib/fpc/lexyacc/yylex.cod
 /usr/lib/fpc/lexyacc/yylex.cod
 /usr/lib/fpc/lexyacc/yyparse.cod
 /usr/lib/fpc/lexyacc/yyparse.cod
 /usr/share/man/man1/delp.1
 /usr/share/man/man1/delp.1

+ 14 - 5
install/debian/rules

@@ -10,12 +10,13 @@ FPCDIR=
 # Get Package version and FPC version out of changelog file
 # Get Package version and FPC version out of changelog file
 PACKAGEVERSION:=$(shell head -n 1 debian/changelog | awk '{ print $$2 }' | tr -d '[()]')
 PACKAGEVERSION:=$(shell head -n 1 debian/changelog | awk '{ print $$2 }' | tr -d '[()]')
 FPCVERSION:=$(shell echo $(PACKAGEVERSION) | awk -F '-' '{ print $$1 }')
 FPCVERSION:=$(shell echo $(PACKAGEVERSION) | awk -F '-' '{ print $$1 }')
+FPC_MAIN_VERSION:=$(shell echo $(PACKAGEVERSION) | awk -F '\.[0-9]-' '{ print $$1 }')
 # Get directories	
 # Get directories	
 PWD:=$(shell pwd)
 PWD:=$(shell pwd)
 BUILD_DIR=$(PWD)/debian/build
 BUILD_DIR=$(PWD)/debian/build
 INSTALL_DIR=$(PWD)/debian/tmp
 INSTALL_DIR=$(PWD)/debian/tmp
 DOC_DIR=$(INSTALL_DIR)/usr/share/doc
 DOC_DIR=$(INSTALL_DIR)/usr/share/doc
-EXAMPLE_TEMP=$(INSTALL_DIR)/usr/doc/fpc-$(FPCVERSION)/examples
+EXAMPLE_TEMP=$(INSTALL_DIR)/usr/doc/fpc-$(FPC_MAIN_VERSION)/examples
 # Get utils
 # Get utils
 NEWPP=$(PWD)/compiler/ppc386
 NEWPP=$(PWD)/compiler/ppc386
 # Create default options
 # Create default options
@@ -104,13 +105,14 @@ install-arch-stamp: build-arch-stamp debian-files-stamp
 	$(MAKE) utils_distinstall $(INSTALLOPTS)
 	$(MAKE) utils_distinstall $(INSTALLOPTS)
 
 
 # Copy examples to the correct doc dir
 # 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-fcl/examples
-	install -d -m755 $(DOC_DIR)/fp-units-gtk/examples
 	install -d -m755 $(DOC_DIR)/fp-units-gfx/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-gtk/examples
 	install -d -m755 $(DOC_DIR)/fp-units-misc/examples
 	install -d -m755 $(DOC_DIR)/fp-units-misc/examples
-	install -d -m755 $(DOC_DIR)/fp-units-base/examples
+	install -d -m755 $(DOC_DIR)/fp-units-net/examples
+	install -d -m755 $(DOC_DIR)/fp-units-extra/examples
 
 
 	mv -f $(EXAMPLE_TEMP)/fcl $(DOC_DIR)/fp-units-fcl/examples
 	mv -f $(EXAMPLE_TEMP)/fcl $(DOC_DIR)/fp-units-fcl/examples
 
 
@@ -131,6 +133,8 @@ install-arch-stamp: build-arch-stamp debian-files-stamp
 	mv -f $(EXAMPLE_TEMP)/oracle $(DOC_DIR)/fp-units-db/examples
 	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)/postgres $(DOC_DIR)/fp-units-db/examples
 	mv -f $(EXAMPLE_TEMP)/gdbm $(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)/cmem $(DOC_DIR)/fp-units-misc/examples
 	mv -f $(EXAMPLE_TEMP)/gdbint $(DOC_DIR)/fp-units-misc/examples
 	mv -f $(EXAMPLE_TEMP)/gdbint $(DOC_DIR)/fp-units-misc/examples
@@ -139,6 +143,11 @@ install-arch-stamp: build-arch-stamp debian-files-stamp
 
 
 	mv -f $(EXAMPLE_TEMP)/inet $(DOC_DIR)/fp-units-net/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)/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
 
 
 # Check if all examples are removed, if not then the rmdir will fail
 # Check if all examples are removed, if not then the rmdir will fail
 	rmdir $(EXAMPLE_TEMP)
 	rmdir $(EXAMPLE_TEMP)

+ 46 - 410
packages/extra/Makefile

@@ -1,8 +1,8 @@
 #
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/06/14]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/08/08]
 #
 #
 default: all
 default: all
-MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx
+MAKEFILETARGETS=linux
 override PATH:=$(subst \,/,$(PATH))
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
 inUnix=1
@@ -203,33 +203,10 @@ else
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
+override TARGET_DIRS+=uncgi
 ifeq ($(OS_TARGET),linux)
 ifeq ($(OS_TARGET),linux)
 override TARGET_DIRS+=unzip x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses tcl cdrom imlib gnome1 fpgtk
 override TARGET_DIRS+=unzip x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses tcl cdrom imlib gnome1 fpgtk
 endif
 endif
-ifeq ($(OS_TARGET),go32v2)
-override TARGET_DIRS+=unzip
-endif
-ifeq ($(OS_TARGET),win32)
-override TARGET_DIRS+=unzip opengl gtk zlib mmsystem tcl cdrom fpgtk winver
-endif
-ifeq ($(OS_TARGET),os2)
-override TARGET_DIRS+=os2units rexx unzip x11 gtk libpng zlib tcl imlib fpgtk
-endif
-ifeq ($(OS_TARGET),freebsd)
-override TARGET_DIRS+=unzip x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses fpgtk tcl imlib gnome1
-endif
-ifeq ($(OS_TARGET),netbsd)
-override TARGET_DIRS+=unzip x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses fpgtk tcl imlib gnome1
-endif
-ifeq ($(OS_TARGET),netware)
-override TARGET_DIRS+=cmem zlib
-endif
-ifeq ($(OS_TARGET),openbsd)
-override TARGET_DIRS+=unzip  x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses fpgtk tcl imlib gnome1
-endif
-ifeq ($(OS_TARGET),emx)
-override TARGET_DIRS+=os2units rexx unzip x11 gtk libpng zlib tcl imlib fpgtk
-endif
 override INSTALL_FPCPACKAGE=y
 override INSTALL_FPCPACKAGE=y
 override INSTALL_FPCSUBDIR=packages/extra
 override INSTALL_FPCSUBDIR=packages/extra
 ifdef REQUIRE_UNITSDIR
 ifdef REQUIRE_UNITSDIR
@@ -915,111 +892,6 @@ ifeq ($(CPU_TARGET),x86_64)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_RTL=1
 endif
 endif
 endif
 endif
-ifeq ($(OS_TARGET),go32v2)
-ifeq ($(CPU_TARGET),i386)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),win32)
-ifeq ($(CPU_TARGET),i386)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),os2)
-ifeq ($(CPU_TARGET),i386)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),freebsd)
-ifeq ($(CPU_TARGET),i386)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),freebsd)
-ifeq ($(CPU_TARGET),m68k)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),beos)
-ifeq ($(CPU_TARGET),i386)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),netbsd)
-ifeq ($(CPU_TARGET),i386)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),netbsd)
-ifeq ($(CPU_TARGET),m68k)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),amiga)
-ifeq ($(CPU_TARGET),m68k)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),atari)
-ifeq ($(CPU_TARGET),m68k)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),sunos)
-ifeq ($(CPU_TARGET),i386)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),sunos)
-ifeq ($(CPU_TARGET),sparc)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),qnx)
-ifeq ($(CPU_TARGET),i386)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),netware)
-ifeq ($(CPU_TARGET),i386)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),openbsd)
-ifeq ($(CPU_TARGET),i386)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),openbsd)
-ifeq ($(CPU_TARGET),m68k)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),wdosx)
-ifeq ($(CPU_TARGET),i386)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),palmos)
-ifeq ($(CPU_TARGET),m68k)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),macos)
-ifeq ($(CPU_TARGET),powerpc)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),darwin)
-ifeq ($(CPU_TARGET),powerpc)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
-ifeq ($(OS_TARGET),emx)
-ifeq ($(CPU_TARGET),i386)
-REQUIRE_PACKAGES_RTL=1
-endif
-endif
 ifdef REQUIRE_PACKAGES_RTL
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
 ifneq ($(PACKAGEDIR_RTL),)
@@ -1315,6 +1187,7 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
+TARGET_DIRS_UNCGI=1
 ifeq ($(OS_TARGET),linux)
 ifeq ($(OS_TARGET),linux)
 TARGET_DIRS_UNZIP=1
 TARGET_DIRS_UNZIP=1
 TARGET_DIRS_X11=1
 TARGET_DIRS_X11=1
@@ -1338,113 +1211,48 @@ TARGET_DIRS_IMLIB=1
 TARGET_DIRS_GNOME1=1
 TARGET_DIRS_GNOME1=1
 TARGET_DIRS_FPGTK=1
 TARGET_DIRS_FPGTK=1
 endif
 endif
-ifeq ($(OS_TARGET),go32v2)
-TARGET_DIRS_UNZIP=1
-endif
-ifeq ($(OS_TARGET),win32)
-TARGET_DIRS_UNZIP=1
-TARGET_DIRS_OPENGL=1
-TARGET_DIRS_GTK=1
-TARGET_DIRS_ZLIB=1
-TARGET_DIRS_MMSYSTEM=1
-TARGET_DIRS_TCL=1
-TARGET_DIRS_CDROM=1
-TARGET_DIRS_FPGTK=1
-TARGET_DIRS_WINVER=1
-endif
-ifeq ($(OS_TARGET),os2)
-TARGET_DIRS_OS2UNITS=1
-TARGET_DIRS_REXX=1
-TARGET_DIRS_UNZIP=1
-TARGET_DIRS_X11=1
-TARGET_DIRS_GTK=1
-TARGET_DIRS_LIBPNG=1
-TARGET_DIRS_ZLIB=1
-TARGET_DIRS_TCL=1
-TARGET_DIRS_IMLIB=1
-TARGET_DIRS_FPGTK=1
-endif
-ifeq ($(OS_TARGET),freebsd)
-TARGET_DIRS_UNZIP=1
-TARGET_DIRS_X11=1
-TARGET_DIRS_OPENGL=1
-TARGET_DIRS_GTK=1
-TARGET_DIRS_SYSLOG=1
-TARGET_DIRS_FORMS=1
-TARGET_DIRS_SVGALIB=1
-TARGET_DIRS_GGI=1
-TARGET_DIRS_LIBPNG=1
-TARGET_DIRS_LIBGD=1
-TARGET_DIRS_UTMP=1
-TARGET_DIRS_CMEM=1
-TARGET_DIRS_BFD=1
-TARGET_DIRS_ZLIB=1
-TARGET_DIRS_GDBM=1
-TARGET_DIRS_NCURSES=1
-TARGET_DIRS_FPGTK=1
-TARGET_DIRS_TCL=1
-TARGET_DIRS_IMLIB=1
-TARGET_DIRS_GNOME1=1
-endif
-ifeq ($(OS_TARGET),netbsd)
-TARGET_DIRS_UNZIP=1
-TARGET_DIRS_X11=1
-TARGET_DIRS_OPENGL=1
-TARGET_DIRS_GTK=1
-TARGET_DIRS_SYSLOG=1
-TARGET_DIRS_FORMS=1
-TARGET_DIRS_SVGALIB=1
-TARGET_DIRS_GGI=1
-TARGET_DIRS_LIBPNG=1
-TARGET_DIRS_LIBGD=1
-TARGET_DIRS_UTMP=1
-TARGET_DIRS_CMEM=1
-TARGET_DIRS_BFD=1
-TARGET_DIRS_ZLIB=1
-TARGET_DIRS_GDBM=1
-TARGET_DIRS_NCURSES=1
-TARGET_DIRS_FPGTK=1
-TARGET_DIRS_TCL=1
-TARGET_DIRS_IMLIB=1
-TARGET_DIRS_GNOME1=1
-endif
-ifeq ($(OS_TARGET),netware)
-TARGET_DIRS_CMEM=1
-TARGET_DIRS_ZLIB=1
-endif
-ifeq ($(OS_TARGET),openbsd)
-TARGET_DIRS_UNZIP=1
-TARGET_DIRS_X11=1
-TARGET_DIRS_OPENGL=1
-TARGET_DIRS_GTK=1
-TARGET_DIRS_SYSLOG=1
-TARGET_DIRS_FORMS=1
-TARGET_DIRS_SVGALIB=1
-TARGET_DIRS_GGI=1
-TARGET_DIRS_LIBPNG=1
-TARGET_DIRS_LIBGD=1
-TARGET_DIRS_UTMP=1
-TARGET_DIRS_CMEM=1
-TARGET_DIRS_BFD=1
-TARGET_DIRS_ZLIB=1
-TARGET_DIRS_GDBM=1
-TARGET_DIRS_NCURSES=1
-TARGET_DIRS_FPGTK=1
-TARGET_DIRS_TCL=1
-TARGET_DIRS_IMLIB=1
-TARGET_DIRS_GNOME1=1
-endif
-ifeq ($(OS_TARGET),emx)
-TARGET_DIRS_OS2UNITS=1
-TARGET_DIRS_REXX=1
-TARGET_DIRS_UNZIP=1
-TARGET_DIRS_X11=1
-TARGET_DIRS_GTK=1
-TARGET_DIRS_LIBPNG=1
-TARGET_DIRS_ZLIB=1
-TARGET_DIRS_TCL=1
-TARGET_DIRS_IMLIB=1
-TARGET_DIRS_FPGTK=1
+ifdef TARGET_DIRS_UNCGI
+uncgi_all:
+	$(MAKE) -C uncgi all
+uncgi_debug:
+	$(MAKE) -C uncgi debug
+uncgi_smart:
+	$(MAKE) -C uncgi smart
+uncgi_release:
+	$(MAKE) -C uncgi release
+uncgi_examples:
+	$(MAKE) -C uncgi examples
+uncgi_shared:
+	$(MAKE) -C uncgi shared
+uncgi_install:
+	$(MAKE) -C uncgi install
+uncgi_sourceinstall:
+	$(MAKE) -C uncgi sourceinstall
+uncgi_exampleinstall:
+	$(MAKE) -C uncgi exampleinstall
+uncgi_distinstall:
+	$(MAKE) -C uncgi distinstall
+uncgi_zipinstall:
+	$(MAKE) -C uncgi zipinstall
+uncgi_zipsourceinstall:
+	$(MAKE) -C uncgi zipsourceinstall
+uncgi_zipexampleinstall:
+	$(MAKE) -C uncgi zipexampleinstall
+uncgi_zipdistinstall:
+	$(MAKE) -C uncgi zipdistinstall
+uncgi_clean:
+	$(MAKE) -C uncgi clean
+uncgi_distclean:
+	$(MAKE) -C uncgi distclean
+uncgi_cleanall:
+	$(MAKE) -C uncgi cleanall
+uncgi_info:
+	$(MAKE) -C uncgi info
+uncgi_makefiles:
+	$(MAKE) -C uncgi makefiles
+uncgi:
+	$(MAKE) -C uncgi all
+.PHONY: uncgi_all uncgi_debug uncgi_smart uncgi_release uncgi_examples uncgi_shared uncgi_install uncgi_sourceinstall uncgi_exampleinstall uncgi_distinstall uncgi_zipinstall uncgi_zipsourceinstall uncgi_zipexampleinstall uncgi_zipdistinstall uncgi_clean uncgi_distclean uncgi_cleanall uncgi_info uncgi_makefiles uncgi
 endif
 endif
 ifdef TARGET_DIRS_UNZIP
 ifdef TARGET_DIRS_UNZIP
 unzip_all:
 unzip_all:
@@ -2349,178 +2157,6 @@ fpgtk:
 	$(MAKE) -C fpgtk all
 	$(MAKE) -C fpgtk all
 .PHONY: fpgtk_all fpgtk_debug fpgtk_smart fpgtk_release fpgtk_examples fpgtk_shared fpgtk_install fpgtk_sourceinstall fpgtk_exampleinstall fpgtk_distinstall fpgtk_zipinstall fpgtk_zipsourceinstall fpgtk_zipexampleinstall fpgtk_zipdistinstall fpgtk_clean fpgtk_distclean fpgtk_cleanall fpgtk_info fpgtk_makefiles fpgtk
 .PHONY: fpgtk_all fpgtk_debug fpgtk_smart fpgtk_release fpgtk_examples fpgtk_shared fpgtk_install fpgtk_sourceinstall fpgtk_exampleinstall fpgtk_distinstall fpgtk_zipinstall fpgtk_zipsourceinstall fpgtk_zipexampleinstall fpgtk_zipdistinstall fpgtk_clean fpgtk_distclean fpgtk_cleanall fpgtk_info fpgtk_makefiles fpgtk
 endif
 endif
-ifdef TARGET_DIRS_MMSYSTEM
-mmsystem_all:
-	$(MAKE) -C mmsystem all
-mmsystem_debug:
-	$(MAKE) -C mmsystem debug
-mmsystem_smart:
-	$(MAKE) -C mmsystem smart
-mmsystem_release:
-	$(MAKE) -C mmsystem release
-mmsystem_examples:
-	$(MAKE) -C mmsystem examples
-mmsystem_shared:
-	$(MAKE) -C mmsystem shared
-mmsystem_install:
-	$(MAKE) -C mmsystem install
-mmsystem_sourceinstall:
-	$(MAKE) -C mmsystem sourceinstall
-mmsystem_exampleinstall:
-	$(MAKE) -C mmsystem exampleinstall
-mmsystem_distinstall:
-	$(MAKE) -C mmsystem distinstall
-mmsystem_zipinstall:
-	$(MAKE) -C mmsystem zipinstall
-mmsystem_zipsourceinstall:
-	$(MAKE) -C mmsystem zipsourceinstall
-mmsystem_zipexampleinstall:
-	$(MAKE) -C mmsystem zipexampleinstall
-mmsystem_zipdistinstall:
-	$(MAKE) -C mmsystem zipdistinstall
-mmsystem_clean:
-	$(MAKE) -C mmsystem clean
-mmsystem_distclean:
-	$(MAKE) -C mmsystem distclean
-mmsystem_cleanall:
-	$(MAKE) -C mmsystem cleanall
-mmsystem_info:
-	$(MAKE) -C mmsystem info
-mmsystem_makefiles:
-	$(MAKE) -C mmsystem makefiles
-mmsystem:
-	$(MAKE) -C mmsystem all
-.PHONY: mmsystem_all mmsystem_debug mmsystem_smart mmsystem_release mmsystem_examples mmsystem_shared mmsystem_install mmsystem_sourceinstall mmsystem_exampleinstall mmsystem_distinstall mmsystem_zipinstall mmsystem_zipsourceinstall mmsystem_zipexampleinstall mmsystem_zipdistinstall mmsystem_clean mmsystem_distclean mmsystem_cleanall mmsystem_info mmsystem_makefiles mmsystem
-endif
-ifdef TARGET_DIRS_WINVER
-winver_all:
-	$(MAKE) -C winver all
-winver_debug:
-	$(MAKE) -C winver debug
-winver_smart:
-	$(MAKE) -C winver smart
-winver_release:
-	$(MAKE) -C winver release
-winver_examples:
-	$(MAKE) -C winver examples
-winver_shared:
-	$(MAKE) -C winver shared
-winver_install:
-	$(MAKE) -C winver install
-winver_sourceinstall:
-	$(MAKE) -C winver sourceinstall
-winver_exampleinstall:
-	$(MAKE) -C winver exampleinstall
-winver_distinstall:
-	$(MAKE) -C winver distinstall
-winver_zipinstall:
-	$(MAKE) -C winver zipinstall
-winver_zipsourceinstall:
-	$(MAKE) -C winver zipsourceinstall
-winver_zipexampleinstall:
-	$(MAKE) -C winver zipexampleinstall
-winver_zipdistinstall:
-	$(MAKE) -C winver zipdistinstall
-winver_clean:
-	$(MAKE) -C winver clean
-winver_distclean:
-	$(MAKE) -C winver distclean
-winver_cleanall:
-	$(MAKE) -C winver cleanall
-winver_info:
-	$(MAKE) -C winver info
-winver_makefiles:
-	$(MAKE) -C winver makefiles
-winver:
-	$(MAKE) -C winver all
-.PHONY: winver_all winver_debug winver_smart winver_release winver_examples winver_shared winver_install winver_sourceinstall winver_exampleinstall winver_distinstall winver_zipinstall winver_zipsourceinstall winver_zipexampleinstall winver_zipdistinstall winver_clean winver_distclean winver_cleanall winver_info winver_makefiles winver
-endif
-ifdef TARGET_DIRS_OS2UNITS
-os2units_all:
-	$(MAKE) -C os2units all
-os2units_debug:
-	$(MAKE) -C os2units debug
-os2units_smart:
-	$(MAKE) -C os2units smart
-os2units_release:
-	$(MAKE) -C os2units release
-os2units_examples:
-	$(MAKE) -C os2units examples
-os2units_shared:
-	$(MAKE) -C os2units shared
-os2units_install:
-	$(MAKE) -C os2units install
-os2units_sourceinstall:
-	$(MAKE) -C os2units sourceinstall
-os2units_exampleinstall:
-	$(MAKE) -C os2units exampleinstall
-os2units_distinstall:
-	$(MAKE) -C os2units distinstall
-os2units_zipinstall:
-	$(MAKE) -C os2units zipinstall
-os2units_zipsourceinstall:
-	$(MAKE) -C os2units zipsourceinstall
-os2units_zipexampleinstall:
-	$(MAKE) -C os2units zipexampleinstall
-os2units_zipdistinstall:
-	$(MAKE) -C os2units zipdistinstall
-os2units_clean:
-	$(MAKE) -C os2units clean
-os2units_distclean:
-	$(MAKE) -C os2units distclean
-os2units_cleanall:
-	$(MAKE) -C os2units cleanall
-os2units_info:
-	$(MAKE) -C os2units info
-os2units_makefiles:
-	$(MAKE) -C os2units makefiles
-os2units:
-	$(MAKE) -C os2units all
-.PHONY: os2units_all os2units_debug os2units_smart os2units_release os2units_examples os2units_shared os2units_install os2units_sourceinstall os2units_exampleinstall os2units_distinstall os2units_zipinstall os2units_zipsourceinstall os2units_zipexampleinstall os2units_zipdistinstall os2units_clean os2units_distclean os2units_cleanall os2units_info os2units_makefiles os2units
-endif
-ifdef TARGET_DIRS_REXX
-rexx_all:
-	$(MAKE) -C rexx all
-rexx_debug:
-	$(MAKE) -C rexx debug
-rexx_smart:
-	$(MAKE) -C rexx smart
-rexx_release:
-	$(MAKE) -C rexx release
-rexx_examples:
-	$(MAKE) -C rexx examples
-rexx_shared:
-	$(MAKE) -C rexx shared
-rexx_install:
-	$(MAKE) -C rexx install
-rexx_sourceinstall:
-	$(MAKE) -C rexx sourceinstall
-rexx_exampleinstall:
-	$(MAKE) -C rexx exampleinstall
-rexx_distinstall:
-	$(MAKE) -C rexx distinstall
-rexx_zipinstall:
-	$(MAKE) -C rexx zipinstall
-rexx_zipsourceinstall:
-	$(MAKE) -C rexx zipsourceinstall
-rexx_zipexampleinstall:
-	$(MAKE) -C rexx zipexampleinstall
-rexx_zipdistinstall:
-	$(MAKE) -C rexx zipdistinstall
-rexx_clean:
-	$(MAKE) -C rexx clean
-rexx_distclean:
-	$(MAKE) -C rexx distclean
-rexx_cleanall:
-	$(MAKE) -C rexx cleanall
-rexx_info:
-	$(MAKE) -C rexx info
-rexx_makefiles:
-	$(MAKE) -C rexx makefiles
-rexx:
-	$(MAKE) -C rexx all
-.PHONY: rexx_all rexx_debug rexx_smart rexx_release rexx_examples rexx_shared rexx_install rexx_sourceinstall rexx_exampleinstall rexx_distinstall rexx_zipinstall rexx_zipsourceinstall rexx_zipexampleinstall rexx_zipdistinstall rexx_clean rexx_distclean rexx_cleanall rexx_info rexx_makefiles rexx
-endif
 all: $(addsuffix _all,$(TARGET_DIRS))
 all: $(addsuffix _all,$(TARGET_DIRS))
 debug: $(addsuffix _debug,$(TARGET_DIRS))
 debug: $(addsuffix _debug,$(TARGET_DIRS))
 smart: $(addsuffix _smart,$(TARGET_DIRS))
 smart: $(addsuffix _smart,$(TARGET_DIRS))

+ 2 - 0
packages/extra/Makefile.fpc

@@ -2,11 +2,13 @@
 #   Makefile.fpc for Free Pascal Packages
 #   Makefile.fpc for Free Pascal Packages
 #
 #
 [target]
 [target]
+dirs=uncgi
 dirs_linux=unzip \
 dirs_linux=unzip \
            x11 opengl gtk syslog \
            x11 opengl gtk syslog \
            forms svgalib ggi libpng libgd \
            forms svgalib ggi libpng libgd \
            utmp cmem bfd zlib gdbm ncurses tcl cdrom \
            utmp cmem bfd zlib gdbm ncurses tcl cdrom \
            imlib gnome1 fpgtk
            imlib gnome1 fpgtk
+					 
 dirs_netbsd=unzip \
 dirs_netbsd=unzip \
             x11 opengl gtk syslog \
             x11 opengl gtk syslog \
             forms svgalib ggi libpng libgd \
             forms svgalib ggi libpng libgd \