* Moved fppkg units to package

git-svn-id: trunk@17446 -

.gitattributes

@@ -2571,6 +2571,20 @@ packages/fpmkunit/Makefile.fpc svneol=native#text/plain
 packages/fpmkunit/examples/ppu2fpmake.sh svneol=native#text/plain
 packages/fpmkunit/fpmake.pp svneol=native#text/plain
 packages/fpmkunit/src/fpmkunit.pp svneol=native#text/plain
+packages/fppkg/Makefile.fpc svneol=native#text/plain
+packages/fppkg/fpmkunitsrc.inc svneol=native#text/plain
+packages/fppkg/fprepos.pp svneol=native#text/plain
+packages/fppkg/fpxmlrep.pp svneol=native#text/plain
+packages/fppkg/pkgcommands.pp svneol=native#text/plain
+packages/fppkg/pkgdownload.pp svneol=native#text/plain
+packages/fppkg/pkgfpmake.pp svneol=native#text/plain
+packages/fppkg/pkgglobals.pp svneol=native#text/plain
+packages/fppkg/pkghandler.pp svneol=native#text/plain
+packages/fppkg/pkgmessages.pp svneol=native#text/plain
+packages/fppkg/pkgmkconv.pp svneol=native#text/plain
+packages/fppkg/pkgoptions.pp svneol=native#text/plain
+packages/fppkg/pkgrepos.pp svneol=native#text/plain
+packages/fppkg/pkgwget.pp svneol=native#text/plain
 packages/fpvectorial/Makefile svneol=native#text/plain
 packages/fpvectorial/Makefile.fpc svneol=native#text/plain
 packages/fpvectorial/examples/fpce_mainform.lfm svneol=native#text/plain
@@ -12508,11 +12522,8 @@ utils/fppkg/examples/rep2xml.lpi svneol=native#text/plain
 utils/fppkg/examples/rep2xml.lpr svneol=native#text/plain
 utils/fppkg/examples/testdownload.pp svneol=native#text/plain
 utils/fppkg/examples/testrep.pp svneol=native#text/plain
-utils/fppkg/fpmkunitsrc.inc svneol=native#text/plain
 utils/fppkg/fppkg.lpi svneol=native#text/plain
 utils/fppkg/fppkg.pp svneol=native#text/plain
-utils/fppkg/fprepos.pp svneol=native#text/plain
-utils/fppkg/fpxmlrep.pp svneol=native#text/plain
 utils/fppkg/lnet/LICENSE -text
 utils/fppkg/lnet/LICENSE.ADDON -text
 utils/fppkg/lnet/fastcgi_base.pp svneol=native#text/plain
@@ -12544,17 +12555,7 @@ utils/fppkg/lnet/sys/lkqueueeventerh.inc svneol=native#text/plain
 utils/fppkg/lnet/sys/lspawnfcgiunix.inc svneol=native#text/plain
 utils/fppkg/lnet/sys/lspawnfcgiwin.inc svneol=native#text/plain
 utils/fppkg/lnet/sys/osunits.inc svneol=native#text/plain
-utils/fppkg/pkgcommands.pp svneol=native#text/plain
-utils/fppkg/pkgdownload.pp svneol=native#text/plain
-utils/fppkg/pkgfpmake.pp svneol=native#text/plain
-utils/fppkg/pkgglobals.pp svneol=native#text/plain
-utils/fppkg/pkghandler.pp svneol=native#text/plain
 utils/fppkg/pkglnet.pp svneol=native#text/plain
-utils/fppkg/pkgmessages.pp svneol=native#text/plain
-utils/fppkg/pkgmkconv.pp svneol=native#text/plain
-utils/fppkg/pkgoptions.pp svneol=native#text/plain
-utils/fppkg/pkgrepos.pp svneol=native#text/plain
-utils/fppkg/pkgwget.pp svneol=native#text/plain
 utils/fprcp/Makefile svneol=native#text/plain
 utils/fprcp/Makefile.fpc svneol=native#text/plain
 utils/fprcp/Readme.txt svneol=native#text/plain

packages/fppkg/Makefile.fpc

@@ -0,0 +1,54 @@
+#
+#   Makefile.fpc for fppkg
+#
+
+[package]
+name=fppkg
+version=2.5.1
+
+[target]
+units=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
+units_linux=pkgwget  
+units_beos=pkgwget 
+units_haiku=pkgwget
+units_freebsd=pkgwget 
+units_netbsd=pkgwget
+nits_openbsd=pkgwget
+units_darwin=pkgwget 
+units_iphonesim=pkgwget 
+units_solaris=pkgwget 
+units_win32=pkgwget 
+units_win64=pkgwget 
+units_wince=pkgwget 
+rsts=fprepos fpxmlrep pkgmessages
+
+
+[compiler]
+unitdir=lnet
+includedir=lnet/sys
+
+[clean]
+units=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer
+
+[install]
+fpcpackage=y
+
+[default]
+fpcdir=../..
+
+[require]
+packages=fcl-base fcl-xml fcl-process fcl-net paszlib libcurl
+tools=data2inc
+packages_darwin=univint
+packages_iphonesim=univint
+
+[rules]
+.NOTPARALLEL:
+ifneq ($(DATA2INC),)
+fpmkunitsrc.inc: $(DEFAULT_FPCDIR)/packages/fpmkunit/src/fpmkunit.pp
+        $(DATA2INC) -b -s $(DEFAULT_FPCDIR)/packages/fpmkunit/src/fpmkunit.pp fpmkunitsrc.inc fpmkunitsrc
+endif
+
+# Don't include the dependency on fpmkunitsrc.inc by default so we can control
+# better when we want to update the internal fpmkunitsrc
+fppkg$(EXEEXT): $(wildcard pkg*.pp)

utils/fppkg/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/02/20]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/03/21]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx haiku
 LIMIT83fs = go32v2 os2 emx watcom
@@ -377,6 +377,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 override TARGET_PROGRAMS+=fppkg
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override TARGET_PROGRAMS+=fppkg
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override TARGET_PROGRAMS+=fppkg
 endif
@@ -453,376 +456,97 @@ ifeq ($(FULL_TARGET),mipsel-linux)
 override TARGET_PROGRAMS+=fppkg
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget  pkglnet
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget  pkglnet
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget  pkglnet
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget  pkglnet
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget  pkglnet
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget  pkglnet
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget  pkglnet
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget pkglnet
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget  pkglnet
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos  pkgwget  pkglnet
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_RSTS+=fprepos fpxmlrep pkgmessages
+override TARGET_UNITS+=pkglnet
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer
@@ -935,6 +659,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer
 endif
@@ -1122,6 +849,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 override COMPILER_INCLUDEDIR+=lnet/sys
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override COMPILER_INCLUDEDIR+=lnet/sys
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override COMPILER_INCLUDEDIR+=lnet/sys
 endif
@@ -1308,6 +1038,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 override COMPILER_UNITDIR+=lnet
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override COMPILER_UNITDIR+=lnet
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override COMPILER_UNITDIR+=lnet
 endif
@@ -1760,6 +1493,11 @@ ifeq ($(OS_TARGET),NativeNT)
 SHAREDLIBEXT=.dll
 SHORTSUFFIX=nativent
 endif
+ifeq ($(OS_TARGET),wii)
+EXEEXT=.dol
+SHAREDLIBEXT=.so
+SHORTSUFFIX=wii
+endif
 else
 ifeq ($(OS_TARGET),go32v1)
 PPUEXT=.pp1
@@ -2184,7 +1922,7 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl fcl-base fcl-xml fcl-process fcl-net paszlib libcurl
+override REQUIRE_PACKAGES=rtl fcl-base fcl-xml fcl-process fcl-net paszlib libcurl fppkg
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FCL-BASE=1
@@ -2197,6 +1935,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
@@ -2209,6 +1948,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
@@ -2221,6 +1961,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
@@ -2233,6 +1974,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2246,6 +1988,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
@@ -2259,6 +2002,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
@@ -2272,6 +2016,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2284,6 +2029,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
@@ -2296,6 +2042,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
@@ -2308,6 +2055,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
@@ -2320,6 +2068,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2332,6 +2081,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
@@ -2344,6 +2094,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -2358,6 +2109,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
@@ -2370,6 +2122,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
@@ -2382,6 +2135,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
@@ -2394,6 +2148,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
@@ -2406,6 +2161,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2418,6 +2174,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
@@ -2430,6 +2187,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
@@ -2442,6 +2200,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
@@ -2456,6 +2215,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2469,6 +2229,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2482,6 +2243,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2494,6 +2256,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
@@ -2506,6 +2269,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
@@ -2518,6 +2282,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2530,6 +2295,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
@@ -2542,6 +2308,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2554,6 +2321,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2567,6 +2335,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2579,6 +2348,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
@@ -2591,6 +2361,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
@@ -2603,6 +2374,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -2617,6 +2389,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
@@ -2629,6 +2402,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2641,6 +2415,20 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
+endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FCL-PASSRC=1
+REQUIRE_PACKAGES_FCL-ASYNC=1
+REQUIRE_PACKAGES_FCL-NET=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2654,6 +2442,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2666,6 +2455,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
@@ -2678,6 +2468,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2690,6 +2481,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2703,6 +2495,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2716,6 +2509,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
@@ -2728,6 +2522,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -2742,6 +2537,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
@@ -2754,6 +2550,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2766,6 +2563,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2779,6 +2577,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
@@ -2791,6 +2590,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -2805,6 +2605,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
@@ -2817,6 +2618,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
@@ -2829,6 +2631,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
@@ -2841,6 +2644,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2853,6 +2657,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
@@ -2865,6 +2670,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2878,6 +2684,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -2892,6 +2699,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2904,6 +2712,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2916,6 +2725,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2929,6 +2739,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2941,6 +2752,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2954,6 +2766,7 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_LIBCURL=1
+REQUIRE_PACKAGES_FPPKG=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -3241,6 +3054,32 @@ ifdef UNITDIR_LIBCURL
 override COMPILER_UNITDIR+=$(UNITDIR_LIBCURL)
 endif
 endif
+ifdef REQUIRE_PACKAGES_FPPKG
+PACKAGEDIR_FPPKG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fppkg/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FPPKG),)
+ifneq ($(wildcard $(PACKAGEDIR_FPPKG)/units/$(TARGETSUFFIX)),)
+UNITDIR_FPPKG=$(PACKAGEDIR_FPPKG)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FPPKG=$(PACKAGEDIR_FPPKG)
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FPPKG)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FPPKG) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FPPKG)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FPPKG=
+UNITDIR_FPPKG:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fppkg/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FPPKG),)
+UNITDIR_FPPKG:=$(firstword $(UNITDIR_FPPKG))
+else
+UNITDIR_FPPKG=
+endif
+endif
+ifdef UNITDIR_FPPKG
+override COMPILER_UNITDIR+=$(UNITDIR_FPPKG)
+endif
+endif
 ifdef REQUIRE_PACKAGES_UNIVINT
 PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_UNIVINT),)

utils/fppkg/Makefile.fpc

@@ -9,20 +9,18 @@ version=2.5.1
 [target]
 programs=fppkg
 
-units=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos
-units_linux=pkgwget  pkglnet
-units_beos=pkgwget pkglnet
-units_haiku=pkgwget pkglnet
-units_freebsd=pkgwget pkglnet
-units_netbsd=pkgwget pkglnet
-nits_openbsd=pkgwget pkglnet
-units_darwin=pkgwget pkglnet
-units_iphonesim=pkgwget pkglnet
-units_solaris=pkgwget pkglnet
-units_win32=pkgwget pkglnet
-units_win64=pkgwget pkglnet
-units_wince=pkgwget pkglnet
-rsts=fprepos fpxmlrep pkgmessages
+units_linux=pkglnet
+units_beos=pkglnet
+units_haiku=pkglnet
+units_freebsd=pkglnet
+units_netbsd=pkglnet
+nits_openbsd=pkglnet
+units_darwin=pkglnet
+units_iphonesim=pkglnet
+units_solaris=pkglnet
+units_win32=pkglnet
+units_win64=pkglnet
+units_wince=pkglnet
 
 [compiler]
 unitdir=lnet
@@ -38,7 +36,7 @@ fpcpackage=y
 fpcdir=../..
 
 [require]
-packages=fcl-base fcl-xml fcl-process fcl-net paszlib libcurl
+packages=fcl-base fcl-xml fcl-process fcl-net paszlib libcurl fppkg
 tools=data2inc
 packages_darwin=univint
 packages_iphonesim=univint