From 5032cf0ec662b3eac8b855e061b0f29eb32f6643 Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Sun, 17 Oct 2004 22:52:36 +0000
Subject: [PATCH 01/16] added ntp package

---
 doc/CHANGELOG             | 4 ++++
 packages/net/ntp/ntp      | 7 +++++++
 packages/net/ntp/ntp.init | 3 +++
 3 files changed, 14 insertions(+)
 create mode 100644 packages/net/ntp/ntp
 create mode 100644 packages/net/ntp/ntp.init

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 0228d4d..e0684f4 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,3 +1,7 @@
+*) 2004-10-16
+
+- added ntp package
+
 *) 2004-08-20
 
 - added povray package
diff --git a/packages/net/ntp/ntp b/packages/net/ntp/ntp
new file mode 100644
index 0000000..400921d
--- /dev/null
+++ b/packages/net/ntp/ntp
@@ -0,0 +1,7 @@
+# hdw - linux ntp package
+#
+# author: hackbard@hackdaworld.dyndns.org
+#
+# [V] 4.2.0
+# [S] 3-1
+# [D] ntp-4.2.0.tar.gz ftp://ftp.udel.edu/pub/ntp/ntp4/
diff --git a/packages/net/ntp/ntp.init b/packages/net/ntp/ntp.init
new file mode 100644
index 0000000..f544abf
--- /dev/null
+++ b/packages/net/ntp/ntp.init
@@ -0,0 +1,3 @@
+bin=ntpd
+run=ntpd
+s_value=70
-- 
2.20.1


From 7da8a19a46c67c5daadabc870268f67b45d1eec0 Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Wed, 20 Oct 2004 20:27:57 +0000
Subject: [PATCH 02/16] updated kernel, fixed hdw-get bug, added wvstreams/dial
 package & slmodem

---
 doc/CHANGELOG                         |  7 +++++
 misc/arch/ia32/linux.config           | 41 ++++++++++++++++++---------
 misc/hdw-tools/hdw-get                |  2 +-
 packages/hackbard/slmodem/slmodem     | 20 +++++++++++++
 packages/hackbard/wvdial/wvdial       | 12 ++++++++
 packages/hackbard/wvstreams/wvstreams |  9 ++++++
 6 files changed, 77 insertions(+), 14 deletions(-)
 create mode 100644 packages/hackbard/slmodem/slmodem
 create mode 100644 packages/hackbard/wvdial/wvdial
 create mode 100644 packages/hackbard/wvstreams/wvstreams

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index e0684f4..ad953e0 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,3 +1,10 @@
+*) 2004-10-20
+
+- updated linux kernel -> 2.6.9
+- added wvstreams and wvdial package
+- added slmodem package
+- bugfix in hdw-get script
+
 *) 2004-10-16
 
 - added ntp package
diff --git a/misc/arch/ia32/linux.config b/misc/arch/ia32/linux.config
index db9d4e2..72e1c7e 100644
--- a/misc/arch/ia32/linux.config
+++ b/misc/arch/ia32/linux.config
@@ -1,10 +1,13 @@
 #
 # Automatically generated make config: don't edit
+# Linux kernel version: 2.6.9
+# Wed Oct 20 22:24:45 2004
 #
 CONFIG_X86=y
 CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
 
 #
 # Code maturity level options
@@ -17,6 +20,7 @@ CONFIG_BROKEN_ON_SMP=y
 #
 # General setup
 #
+CONFIG_LOCALVERSION=""
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_POSIX_MQUEUE is not set
@@ -38,6 +42,8 @@ CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SHMEM=y
+# CONFIG_TINY_SHMEM is not set
 
 #
 # Loadable module support
@@ -113,12 +119,13 @@ CONFIG_MTRR=y
 # Power management options (ACPI, APM)
 #
 # CONFIG_PM is not set
+# CONFIG_PM_DEBUG is not set
 
 #
 # ACPI (Advanced Configuration and Power Interface) Support
 #
 # CONFIG_ACPI is not set
-CONFIG_ACPI_BOOT=y
+CONFIG_ACPI_BLACKLIST_YEAR=0
 
 #
 # CPU Frequency scaling
@@ -135,7 +142,6 @@ CONFIG_PCI=y
 CONFIG_PCI_GOANY=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCI_NAMES=y
 CONFIG_ISA=y
@@ -215,6 +221,7 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_CRYPTOLOOP=y
 CONFIG_BLK_DEV_NBD=y
 # CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_INITRD=y
@@ -258,7 +265,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
 CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_IDEDMA_ONLYDISK is not set
-CONFIG_BLK_DEV_ADMA=y
 # CONFIG_BLK_DEV_AEC62XX is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
 # CONFIG_BLK_DEV_AMD74XX is not set
@@ -332,7 +338,6 @@ CONFIG_SCSI_AIC7XXX_OLD=y
 CONFIG_SCSI_AIC79XX=y
 CONFIG_AIC79XX_CMDS_PER_DEVICE=32
 CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
 # CONFIG_AIC79XX_ENABLE_RD_STRM is not set
 CONFIG_AIC79XX_DEBUG_ENABLE=y
 CONFIG_AIC79XX_DEBUG_MASK=0
@@ -340,7 +345,8 @@ CONFIG_AIC79XX_REG_PRETTY_PRINT=y
 # CONFIG_SCSI_DPT_I2O is not set
 CONFIG_SCSI_ADVANSYS=y
 # CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_MEGARAID is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_CPQFCTS is not set
@@ -449,6 +455,7 @@ CONFIG_ARPD=y
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_TUNNEL is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETFILTER is not set
 
@@ -567,6 +574,7 @@ CONFIG_NS83820=y
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
 CONFIG_R8169=y
+# CONFIG_R8169_NAPI is not set
 # CONFIG_SK98LIN is not set
 CONFIG_TIGON3=y
 
@@ -641,6 +649,7 @@ CONFIG_SERIO_I8042=y
 # CONFIG_SERIO_SERPORT is not set
 # CONFIG_SERIO_CT82C710 is not set
 # CONFIG_SERIO_PCIPS2 is not set
+# CONFIG_SERIO_RAW is not set
 
 #
 # Input Device Drivers
@@ -686,7 +695,6 @@ CONFIG_SERIAL_CORE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-# CONFIG_QIC02_TAPE is not set
 
 #
 # IPMI
@@ -750,6 +758,7 @@ CONFIG_LEGACY_PTY_COUNT=256
 # Graphics support
 #
 CONFIG_FB=y
+CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_CYBER2000 is not set
@@ -760,6 +769,7 @@ CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_RIVA is not set
+# CONFIG_FB_I810 is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON_OLD is not set
 # CONFIG_FB_RADEON is not set
@@ -816,6 +826,7 @@ CONFIG_USB=y
 CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
 
 #
 # USB Host Controller Drivers
@@ -994,7 +1005,7 @@ CONFIG_NFS_V4=y
 CONFIG_NFSD=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V4=y
-# CONFIG_NFSD_TCP is not set
+CONFIG_NFSD_TCP=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
@@ -1002,6 +1013,7 @@ CONFIG_EXPORTFS=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
 CONFIG_RPCSEC_GSS_KRB5=y
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
@@ -1067,17 +1079,19 @@ CONFIG_NLS_ISO8859_1=y
 # Kernel hacking
 #
 CONFIG_DEBUG_KERNEL=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_SLAB is not set
 CONFIG_MAGIC_SYSRQ=y
+# CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_INFO is not set
 CONFIG_FRAME_POINTER=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_KPROBES is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_4KSTACKS is not set
+# CONFIG_SCHEDSTATS is not set
 
 #
 # Security options
@@ -1095,6 +1109,7 @@ CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_SHA1=y
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
diff --git a/misc/hdw-tools/hdw-get b/misc/hdw-tools/hdw-get
index 6c9987c..0aa2a3b 100644
--- a/misc/hdw-tools/hdw-get
+++ b/misc/hdw-tools/hdw-get
@@ -66,7 +66,7 @@ mkdir -p /tmp/.hdw-get
 if [ "$remove" = "1" ] ; then
 	# looking for flist file
 	fl_pris=""
-	for fl_file in $inst_root/var/adm/flists/$package-[0-9]*; do
+	for fl_file in $inst_root/var/adm/flists/$package-[x,0-9]*; do
 		fl_pris="`echo $fl_file | awk -F- '{ print $NF }'` $fl_pris"
 	done
 	fl_max="0"
diff --git a/packages/hackbard/slmodem/slmodem b/packages/hackbard/slmodem/slmodem
new file mode 100644
index 0000000..6dd927d
--- /dev/null
+++ b/packages/hackbard/slmodem/slmodem
@@ -0,0 +1,20 @@
+# hdw - linux slmodem package
+#
+# author: hackbard@hackdaworld.dyndns.org
+#
+# [V] 2.9.9
+# [S] 3-1
+# [D] slmodem-2.9.9.tar.gz http://linmodems.technion.ac.il/packages/smartlink/
+
+pre_install()	{
+	rm -rf $docdir ; mkdir $docdir
+	cp README $docdir
+		}
+
+#build_main()	{
+#	cd modem && make SUPPORT_ALSA=1
+#	rm -rf $docdir
+#	mkdir -p $prefix/bin $docdir
+#	cp slmodemd modem_test $prefix/bin
+#	cp ../README $docdir
+#		}
diff --git a/packages/hackbard/wvdial/wvdial b/packages/hackbard/wvdial/wvdial
new file mode 100644
index 0000000..d675cfa
--- /dev/null
+++ b/packages/hackbard/wvdial/wvdial
@@ -0,0 +1,12 @@
+# hdw - linux wvdial package
+#
+# author: hackbard@hackdaworld.dyndns.org
+#
+# [V] 1.54.0
+# [S] 3-9
+# [D] wvdial-1.54.0.tar.gz http://open.nit.ca/download/
+
+pre_install()	{
+	sed "s%/usr/local%$prefix%g" Makefile > M~
+	mv M~ Makefile
+		}
diff --git a/packages/hackbard/wvstreams/wvstreams b/packages/hackbard/wvstreams/wvstreams
new file mode 100644
index 0000000..44219cb
--- /dev/null
+++ b/packages/hackbard/wvstreams/wvstreams
@@ -0,0 +1,9 @@
+# hdw - linux wvstreams package
+#
+# author: hackbard@hackdaworld.dyndns.org
+#
+# [V] 4.0
+# [S] 3-8
+# [D] wvstreams-4.0.tar.gz http://people.nit.ca/~sfllaw/
+
+confopt="$confopt --without-speex --with-fftw --with-bdb --with-ogg"
-- 
2.20.1


From 52b1e20feeb11f2f8606f277faae77907b846602 Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Thu, 21 Oct 2004 11:00:13 +0000
Subject: [PATCH 03/16] added zvbi package

---
 doc/CHANGELOG                 | 4 ++++
 packages/multimedia/zvbi/zvbi | 7 +++++++
 2 files changed, 11 insertions(+)
 create mode 100644 packages/multimedia/zvbi/zvbi

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index ad953e0..7607f72 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,3 +1,7 @@
+*) 2004-10-21
+
+- added zvbi library package
+
 *) 2004-10-20
 
 - updated linux kernel -> 2.6.9
diff --git a/packages/multimedia/zvbi/zvbi b/packages/multimedia/zvbi/zvbi
new file mode 100644
index 0000000..6eb8277
--- /dev/null
+++ b/packages/multimedia/zvbi/zvbi
@@ -0,0 +1,7 @@
+# hdw - linux zvbi package
+#
+# author: hackbard@hackdaworld.dyndns.org
+#
+# [V] 0.2.8
+# [S] 3-7
+# [D] zvbi-0.2.8.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/zapping/
-- 
2.20.1


From 47c7711d90d010b666dcb3c2d392aeb7fb640e1e Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Fri, 29 Oct 2004 17:46:06 +0000
Subject: [PATCH 04/16] forgotten checkin

---
 packages/base/linux/linux      | 4 ++--
 packages/toolchain/linux/linux | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/base/linux/linux b/packages/base/linux/linux
index 6c6c13d..7da1206 100644
--- a/packages/base/linux/linux
+++ b/packages/base/linux/linux
@@ -2,9 +2,9 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 2.6.8.1
+# [V] 2.6.9
 # [S] 2-2
-# [D] linux-2.6.8.1.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/
+# [D] linux-2.6.9.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/
 
 custmain="1"
 custmain()	{
diff --git a/packages/toolchain/linux/linux b/packages/toolchain/linux/linux
index 802ab1e..db6198d 100644
--- a/packages/toolchain/linux/linux
+++ b/packages/toolchain/linux/linux
@@ -2,9 +2,9 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 2.6.8.1
+# [V] 2.6.9
 # [S] 0-2
-# [D] linux-2.6.8.1.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/
+# [D] linux-2.6.9.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/
 
 build_main()	{
 	make mrproper && 
-- 
2.20.1


From 173274383447f84f061832b27e433e3c25c9a336 Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Sat, 30 Oct 2004 04:31:37 +0000
Subject: [PATCH 05/16] some fixes

---
 Config | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Config b/Config
index 261c813..9350fe0 100644
--- a/Config
+++ b/Config
@@ -16,7 +16,8 @@ export hdw_target="default"	# which target to build
 				#	mobile - my mobile hackstation (stable)
 				#	desktop - all packages (stable)
 				#	router	- packages need for routers 
-				#					(stable)				#	fai-server - packages needed for
+				#					(stable)
+				#	fai-server - packages needed for
 				#		     automated install of hdw
 				#					(devel)
 				#	all-dev	- all possible packages (devel)
@@ -28,7 +29,7 @@ export hdw_arch="ia32"		# which architecture to build for
 				#		sparc64	- 64bit sparc
 				#		ppc	- powerpc's
 	
-export hdw_arch_opt="i686"		# choose optimization
+export hdw_arch_opt="i686"	# choose optimization
 				# currently:	ia32	: i[3-6]86
 				#		sparc64 : sparc_v9
 				#		sparc	: sparc_v[7-8]
-- 
2.20.1


From 5932a45326c8148e9a3c8193214ecffeea7a5b08 Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Sun, 31 Oct 2004 18:40:46 +0000
Subject: [PATCH 06/16] 31.10.2004

---
 doc/CHANGELOG  |  5 +++++
 scripts/Build  | 11 ++++++-----
 scripts/Config |  3 +++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 7607f72..61c73dd 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,3 +1,8 @@
+*) 2004-10-31
+
+- some lines adding general mips support
+- very beginning of new crossbuild implementation ;)
+
 *) 2004-10-21
 
 - added zvbi library package
diff --git a/scripts/Build b/scripts/Build
index 1dbe2fe..1f8fbf2 100755
--- a/scripts/Build
+++ b/scripts/Build
@@ -150,15 +150,16 @@ echo "found $package config file ..."
 	confopt="$confopt --datadir=$prefix/share"
 	confopt="$confopt --infodir=$prefix/info"
 	confopt="$confopt --mandir=$prefix/man"
-	confopt="$confopt --build=$hdw_arch_build"
-	confopt="$confopt --host=$hdw_arch_target"
-	# crosscompiling
-	[ "$hdw_crossbuild" != "0" ] && \
-		confopt="$confopt --target=$hdw_arch_target"
 	if [ "$hdw_status" -gt "1" ] ; then
 		confopt="$confopt --localstatedir=$localstatedir"
 		confopt="$confopt --sysconfdir=$sysconfdir"
 	fi
+	# architecture specific stuff
+	confopt="$confopt --build=$hdw_arch_build"
+	confopt="$confopt --host=$hdw_arch_target"
+	# crosscompiling
+	[ "$package" = "gcc" -o "$package" = "binutils" ] && \
+		confopt="$confopt --target=$hdw_arch_target"
 
 	# buildfunctions
 	pre_install()	{ 
diff --git a/scripts/Config b/scripts/Config
index b059d61..9e7d704 100755
--- a/scripts/Config
+++ b/scripts/Config
@@ -95,6 +95,9 @@ case "$hdw_arch" in
 		hdw_arch_target="powerpc-unknown-linux-gnu"
 		[ ! -z "$hdw_arch_opt" ] && hdw_cflags="-march=${hdw_arch_opt}"
 		hdw_arch_build=${hdw_arch_build//ppc/powerpc} ;;
+	mips)	hdw_arch_target="mips-unknown-linux-gnu"
+		[ ! -z "$hdw_arch_opt" ] && hdw_cflags="-march=${hdw_arch_opt}"
+		;;
 	*)      echo "not supported yet"
 		echo "please choose a valid optimization and build platform."
 		exit 1 ;;
-- 
2.20.1


From 279a8b0643080f522eb4b0eb515229f21159ea2f Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Sun, 5 Dec 2004 23:59:22 +0000
Subject: [PATCH 07/16] CHANGELOG 2004-12-06

---
 doc/CHANGELOG                   |   6 ++
 doc/FAI                         |  15 ++---
 misc/hdw-tools/hdw-get          |   1 +
 packages/ia32/syslinux/syslinux |   4 +-
 packages/net/tftp-hpa/tftp-hpa  |   4 +-
 scripts/Create-FAI              | 107 ++++++++++++++++++++++++++++++--
 6 files changed, 118 insertions(+), 19 deletions(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 61c73dd..f461cc8 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,3 +1,9 @@
+*) 2004-12-6
+
+- further work on fai
+- updated tftp-hpa and syslinux package
+- added exit statement to hdw-get file
+
 *) 2004-10-31
 
 - some lines adding general mips support
diff --git a/doc/FAI b/doc/FAI
index 2cbfa00..180ae6e 100644
--- a/doc/FAI
+++ b/doc/FAI
@@ -16,7 +16,6 @@ procedure
 ---------
 
 	1) install mnimal nfsroot binaries
-	   (as described in INSTALL chapter 2.)
 
 		vi Config [enter default as a target, specify arch*]
 
@@ -25,17 +24,9 @@ procedure
 	      the install process. fai-server is actually the target you will
 	      need as a running system to have pxeboot/nfsutils and stuff.
 
-		./scripts/Helper -create_dist_files
-		./misc/hdw-tools/hdw-get dist-install /mnt/fai-root \
-			./distro/default
+		./scripts/Create-FAI
 
-	2) prepare nfsroot & mount ./fai dir via loopback for configurations
-
-		./scripts/Create-FAI /mnt/fai-root
-
-	4) adapt configs in ./fai (see chapter "fai config files")
-
-	3) edit the following files to match your needs, and restart services
+	2) edit the following files to match your needs, and restart services
 
 		/etc/dhcpd.conf
 		/etc/inetd.conf
@@ -44,6 +35,8 @@ procedure
 
 		(have a look at chapter "fai server configuration")
 
+	3) adapt configs in ./fai (see chapter "fai config files")
+
 	4) pxeboot your install candidates and watch installation
 
 
diff --git a/misc/hdw-tools/hdw-get b/misc/hdw-tools/hdw-get
index 0aa2a3b..10be612 100644
--- a/misc/hdw-tools/hdw-get
+++ b/misc/hdw-tools/hdw-get
@@ -170,6 +170,7 @@ elif [ "$install" = "1" ] ; then
 		retval=$?
 		if [ "$retval" != "0" ] ; then
 			echo "package not found at $net_addr, aborting ..."
+			exit
 		else
 			echo "extracting $package to $inst_root ..."	
 			tar --use-compress-program=bzip2 \
diff --git a/packages/ia32/syslinux/syslinux b/packages/ia32/syslinux/syslinux
index 297c61c..fce7ebc 100644
--- a/packages/ia32/syslinux/syslinux
+++ b/packages/ia32/syslinux/syslinux
@@ -2,9 +2,9 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 2.10
+# [V] 2.11
 # [S] 3-6
-# [D] syslinux-2.10.tar.bz2 http://kernel.org/pub/linux/utils/boot/syslinux/
+# [D] syslinux-2.11.tar.bz2 http://kernel.org/pub/linux/utils/boot/syslinux/
 
 post_install()	{
 	rm -rf $docdir
diff --git a/packages/net/tftp-hpa/tftp-hpa b/packages/net/tftp-hpa/tftp-hpa
index e29796e..46f0ad2 100644
--- a/packages/net/tftp-hpa/tftp-hpa
+++ b/packages/net/tftp-hpa/tftp-hpa
@@ -3,5 +3,5 @@
 # author: hackbard
 
 # [S] 3-2
-# [V] 0.36
-# [D] tftp-hpa-0.36.tar.bz2 ftp://www.kernel.org/pub/software/network/tftp/
+# [V] 0.40
+# [D] tftp-hpa-0.40.tar.bz2 ftp://www.kernel.org/pub/software/network/tftp/
diff --git a/scripts/Create-FAI b/scripts/Create-FAI
index cc3e6e6..1b3366e 100755
--- a/scripts/Create-FAI
+++ b/scripts/Create-FAI
@@ -6,17 +6,116 @@
 #
 
 fairoot="$1"
+myip="`ifconfig eth0 | grep inet\ addr | awk '{ print $3 }' | awk -F: '{ print $2 }'`"
+home_dir=$PWD
 
 usage()	{
 	echo
 	echo "usage:"
-	echo "$1 <fai-root>"
+	echo "$0 <fai-root>"
 	echo
 	exit
 	}
 
-if [ ! -d $fairoot -o ] ; then
-	usage
+[ "$#" != "1" ] && usage
+[ ! -d $fairoot ] && usage
+
+echo "reading config ..."
+if [ ! -f ./Config ] ; then
+	echo "config file not found, aborting"
+	exit
+fi
+. ./Config
+
+if [ ! -d ./fai ] ; then
+	echo "creating fai directory"
+	mkdir ./fai
+fi
+
+if [ ! -f ./fai/nfsroot-packages ] ; then
+	echo "storing $hdw_target as original target"
+	hdw_orig_target=$hdw_target
+
+	echo "pretending default target for nfsroot install now"
+	export hdw_target=default
+
+	./scripts/Helper -create_dist_files
+
+	export hdw_target=$hdw_orig_target
+	echo "orig target restored to $hdw_target"
+
+	cp ./distro/default ./fai/nfsroot-packages
+fi
+
+echo "deleting some packages from list now"
+del="linux-libc-headers man-pages binutils gcc m4 autoconf automake"
+del="$del man make patch bin86 nasm lilo cvs"
+del="$del bootdisk" # just by now - may contain kernel image later
+for package in $del; do
+	grep -v ^$package ./fai/nfsroot-packages > ./fai/tmp~
+	mv ./fai/tmp~ ./fai/nfsroot-packages
+done
+
+if [ ! -f $fairoot/packages_installed ] ; then
+	echo "creating nfsroot..."
+	chmod 755 ./misc/hdw-tools/hdw-get
+	./misc/hdw-tools/hdw-get dist-install $fairoot ./fai/nfsroot-packages
+	touch $fairoot/packages_installed
+	echo "done"
+else
+	echo "nfsroot seems to be available already"
+	echo "(del $fairoot/packages_installed to recreate it)"
 fi
 
-echo "preparing 
+
+echo "preparing nfsroot for automated install routine ..."
+
+cd $fairoot
+
+mknod -m 0666 dev/null c 1 3
+mknod -m 0600 dev/console c 5 1
+
+grep -v swap etc/fstab > tmp~
+mv tmp~ etc/fstab
+
+for i in sysklogd network inetd nscd; do
+	rm -f etc/init.d/rc2.d/*${i}
+done
+
+cd $home_dir
+
+echo "done"
+
+echo "checking pxe/nfs environment ..."
+mkdir -p /tftpboot
+cp $fairoot/boot/vmlinuz_hdw /tftpboot
+if [ ! -f /tftpboot/pxelinux.0 ] ; then
+	if [ ! -f /usr/lib/syslinux/pxelinux.0 ] ; then
+		echo "pxelinux (syslinux) not found, fix this manually now :p"
+	fi
+	cp /usr/lib/syslinux/pxelinux.0 /tftpboot
+fi
+mkdir -p /tftpboot/pxelinux.cfg
+echo -e "LABEL fai" > /tftpboot/pxelinux.cfg/fai
+echo -e "\tKERNEL vmlinuz_hdw" >> /tftpboot/pxelinux.cfg/fai
+echo -e "\tAPPEND root=/dev/nfs nfsroot=$myip:$fairoot \\" >> \
+	/tftpboot/pxelinux.cfg/fai
+echo -e "\tip=dhcp" >> /tftpboot/pxelinux.cfg/fai
+echo -e "\tPROMPT 1" >> /tftpboot/pxelinux.cfg/fai
+echo -e "$fairoot\tfoobar(async,ro,no_root_squash)" >> /etc/exports
+
+echo "mounting configuration dir to nfsroot export ..."
+mkdir -p $fairoot/fai-config
+mount --bind $PWD/fai $fairoot/fai-config
+
+echo "everything should work now. now do the following:"
+echo "1) edit /etc/exports to allow your clients to mount the nfsroot"
+echo "2) link the ipaddr in hex of the client to fai in pxe config dir"
+echo "3) tell your dhcpd (see syslinux docs for more help)"
+echo "4) make sure inetd/nfs/dhcpd are up running"
+echo "5) do the configuration stuff (see doc/FAI)"
+echo
+echo "note: tftp must support tsize option (use e.g. tftp-hpa package)
+echo
+
+echo "done"
-- 
2.20.1


From 6e75bb527068d620fe1811b09bb09e76ab29e856 Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Tue, 7 Dec 2004 10:11:05 +0000
Subject: [PATCH 08/16] more fai stuff

---
 doc/CHANGELOG         |  7 +++++-
 fai/scripts/rc_fai.sh | 54 +++++++++++++++++++++++++++++++++++++++++
 scripts/Create-FAI    | 56 +++++++++++++++++++------------------------
 3 files changed, 85 insertions(+), 32 deletions(-)
 create mode 100755 fai/scripts/rc_fai.sh

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index f461cc8..f61aaff 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,4 +1,9 @@
-*) 2004-12-6
+*) 2004-12-07
+
+- added fai directory including new rc_fai.sh script
+- some modifications in fai nfsroot creation
+
+*) 2004-12-06
 
 - further work on fai
 - updated tftp-hpa and syslinux package
diff --git a/fai/scripts/rc_fai.sh b/fai/scripts/rc_fai.sh
new file mode 100755
index 0000000..e297052
--- /dev/null
+++ b/fai/scripts/rc_fai.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+#
+# author: hackbard@hackdaworld.dyndns.org
+#
+# automated install rc_fai.sh script
+#
+
+root=/trg
+croot=/fai/config
+myip="`ifconfig eth0 | grep inet\ addr | awk '{ print $2 }' | awk -F: '{ print $2 }'`"
+myconf=$croot/$myip
+
+if [ ! -d $myconf ] ; then
+	echo "no config found, aborting fai"
+	exit
+fi
+
+disk=0
+disk=`grep '#\ disk' $myconf/disk | awk '{ print $3 }'`
+if [ ! -b $disk ] ; then
+	echo "disk $disk not found, aborting fai"
+	exit
+fi
+swap=0
+swap=`grep '#\ swap' $myconf/disk | awk '{ print $3 }'`
+if [ "$swap" != "0" -a -b ${disk}${swap} ] ; then
+	echo "creating swap device ..."
+	mkswap ${disk}${swap}
+	echo "done"
+fi
+
+cat $myconf/disk | grep -v '^#' | while read nr mp; do
+	if [ -b ${disk}${nr} ] ; then
+		echo "making filesystem for $mp"
+		mke2fs -j ${disk}${nr}
+		if [ "$mp" = "/" ] ; then
+			echo "mounting root partition"
+			mount ${disk}${nr} $root
+		fi
+	fi
+done
+
+cat $myconf/disk | grep -v '^#' | while read nr mp; do
+	if [ "$mp" != "/" ] ; then
+		if [ -b ${disk}${nr} ] ; then
+			mkdir -p $root/$mp
+			mount ${disk}${nr} $root/$mp
+		fi
+	fi
+done
+
+echo "to be continued ...."
+
+exit 0
diff --git a/scripts/Create-FAI b/scripts/Create-FAI
index 1b3366e..046b1d3 100755
--- a/scripts/Create-FAI
+++ b/scripts/Create-FAI
@@ -6,7 +6,7 @@
 #
 
 fairoot="$1"
-myip="`ifconfig eth0 | grep inet\ addr | awk '{ print $3 }' | awk -F: '{ print $2 }'`"
+myip="`ifconfig eth0 | grep inet\ addr | awk '{ print $2 }' | awk -F: '{ print $2 }'`"
 home_dir=$PWD
 
 usage()	{
@@ -27,11 +27,6 @@ if [ ! -f ./Config ] ; then
 fi
 . ./Config
 
-if [ ! -d ./fai ] ; then
-	echo "creating fai directory"
-	mkdir ./fai
-fi
-
 if [ ! -f ./fai/nfsroot-packages ] ; then
 	echo "storing $hdw_target as original target"
 	hdw_orig_target=$hdw_target
@@ -67,24 +62,27 @@ else
 	echo "(del $fairoot/packages_installed to recreate it)"
 fi
 
-
-echo "preparing nfsroot for automated install routine ..."
-
-cd $fairoot
-
-mknod -m 0666 dev/null c 1 3
-mknod -m 0600 dev/console c 5 1
-
-grep -v swap etc/fstab > tmp~
-mv tmp~ etc/fstab
-
-for i in sysklogd network inetd nscd; do
-	rm -f etc/init.d/rc2.d/*${i}
-done
-
-cd $home_dir
-
-echo "done"
+if [ ! -f $fairoot/prepared_nfsroot ] ; then
+	echo "preparing nfsroot for automated install routine ..."
+	cd $fairoot
+	mknod -m 0666 dev/null c 1 3
+	mknod -m 0600 dev/console c 5 1
+	grep -v swap etc/fstab > tmp~
+	mv tmp~ etc/fstab
+	mkdir -p ./trg
+	for i in sysklogd network inetd nscd; do
+		rm -f etc/init.d/rc2.d/*${i}
+	done
+	sed "s%^exit\ 0%mount -tnfs $myip:/$home_dir/fai /fai%" \
+		etc/init.d/rc > tmp~
+	mv tmp~ etc/init.d/rc
+	chmod 755 etc/init.d/rc
+	echo "/fai/scripts/rc_fai.sh" >> etc/init.d/rc
+	echo "shutdown -r now" >> etc/init.d/rc
+	cd $home_dir
+	echo "done"
+	touch $fairoot/prepared_nfsroot
+fi
 
 echo "checking pxe/nfs environment ..."
 mkdir -p /tftpboot
@@ -98,15 +96,11 @@ fi
 mkdir -p /tftpboot/pxelinux.cfg
 echo -e "LABEL fai" > /tftpboot/pxelinux.cfg/fai
 echo -e "\tKERNEL vmlinuz_hdw" >> /tftpboot/pxelinux.cfg/fai
-echo -e "\tAPPEND root=/dev/nfs nfsroot=$myip:$fairoot \\" >> \
+echo -e "\tAPPEND root=/dev/nfs nfsroot=$myip:$fairoot ip=dhcp" >> \
 	/tftpboot/pxelinux.cfg/fai
-echo -e "\tip=dhcp" >> /tftpboot/pxelinux.cfg/fai
 echo -e "\tPROMPT 1" >> /tftpboot/pxelinux.cfg/fai
 echo -e "$fairoot\tfoobar(async,ro,no_root_squash)" >> /etc/exports
-
-echo "mounting configuration dir to nfsroot export ..."
-mkdir -p $fairoot/fai-config
-mount --bind $PWD/fai $fairoot/fai-config
+echo -e "$home_dir/fai\tfoobar(async,ro,no_root_squash)" >> /etc/exports
 
 echo "everything should work now. now do the following:"
 echo "1) edit /etc/exports to allow your clients to mount the nfsroot"
@@ -115,7 +109,7 @@ echo "3) tell your dhcpd (see syslinux docs for more help)"
 echo "4) make sure inetd/nfs/dhcpd are up running"
 echo "5) do the configuration stuff (see doc/FAI)"
 echo
-echo "note: tftp must support tsize option (use e.g. tftp-hpa package)
+echo "note: tftp must support tsize option (use e.g. tftp-hpa package)"
 echo
 
 echo "done"
-- 
2.20.1


From b827aab00491c32a3fc9f8debaad6995d5391d83 Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Wed, 8 Dec 2004 02:56:26 +0000
Subject: [PATCH 09/16] finished minimal fai procedure + docu

---
 doc/CHANGELOG         |   5 ++
 doc/FAI               | 127 ++++++++++++++++++++++++++++++++++++++++-
 fai/scripts/rc_fai.sh | 128 +++++++++++++++++++++++++++++++++++++++---
 misc/fai/fai_boot     |  81 ++++++++++++++++++++++++++
 misc/fai/fai_rc       |  91 ++++++++++++++++++++++++++++++
 scripts/Create-FAI    |  73 ++++++++++++++++--------
 6 files changed, 472 insertions(+), 33 deletions(-)
 create mode 100755 misc/fai/fai_boot
 create mode 100755 misc/fai/fai_rc

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index f61aaff..a7fdaf9 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,3 +1,8 @@
+*) 2004-12-08
+
+- finished minimal fai concepts
+- added some documentation for fai
+
 *) 2004-12-07
 
 - added fai directory including new rc_fai.sh script
diff --git a/doc/FAI b/doc/FAI
index 180ae6e..85ccef8 100644
--- a/doc/FAI
+++ b/doc/FAI
@@ -10,6 +10,7 @@ files:
 ------
 
 ./scripts/Create-FAI
+./fai/*
 ./doc/FAI
 
 procedure
@@ -24,7 +25,12 @@ procedure
 	      the install process. fai-server is actually the target you will
 	      need as a running system to have pxeboot/nfsutils and stuff.
 
-		./scripts/Create-FAI
+	note: you might want to fetch hdw binaries from a mirror.
+	      edit your /etc/hdw-get.conf file.
+
+		./scripts/Create-FAI <nfsroot>
+
+		where <nfsroot> is the directory to install the fairoot.
 
 	2) edit the following files to match your needs, and restart services
 
@@ -35,15 +41,130 @@ procedure
 
 		(have a look at chapter "fai server configuration")
 
+	note: again you might want to use a mirror. edit hdw-get.conf, but make
+	      sure it is the one from fairoot.
+
 	3) adapt configs in ./fai (see chapter "fai config files")
 
-	4) pxeboot your install candidates and watch installation
+	4) pxeboot your install candidates. this is actually not fully
+	   automated.
+
+		- type "fai" on pxeboot prompt
+		- after first bootup, use cfdisk to partition your harddisk
+		- touch a disk_ready file in configuration space
+		  (after using cfdisk, sync to disk file!)
+		- reboot and finaly wathc your target system to get hdw'ed :)
+
+	5) login, build a new kernel. copy new bzImage to /boot/vmlinuz_hdw
+	   and run lilo again. reboot and enjoy! good luck.
 
 
 fai config files
 ----------------
 
+	config files reside in 1) ./fai/config/<client_ip>/ and 2) ./fai/files/
+	directories.
+
+	config dir:
+
+		- the files reside in a subdirectory, which is simply the
+		  clients ip address, as different clients may need different
+		  config.
+		- files:
+			1) disk
+			2) packages
+
+			disk file is used to determine the partition layout and
+			used harddisk. the format: (example, its intuitive!)
+
+			# disk /dev/hda
+			# swap 7
+			1	/boot	ext3	format
+			5	/	ext3	format
+			6	/home	ext3	preserve
+
+			packages file contains packages to get installed. you
+			may use ./scripts/Helper -create_dist_files to create
+			one. make sure that all the packages are available on
+			the mirror, otherwise the fai install routine will
+			break. hint: switch the partitions to "preserve" and
+			hdw-get will not install already installed packages
+			again.
+			
+	 files dir:
+
+		- files called DEFAULT in a special directory will be copied to
+		  every client to the file of its dirname.
+		- files named like a clients ip address will be only copied to
+		  that client (again, the file will be the dirname)
+
+		example:
+
+		./fai/files/etc/X11/XF86Config/DEFAULT will be copied to all
+		clients as /etc/X11/XF86Config file.
+
+
 fai server configuration
 ------------------------
 
-[to be continued]
+there are several files you need to hack. here we go:
+
+	- dhcpd:
+
+		file: /etc/dhcpd.conf
+
+		examples rule, have a look at the configuration for my fai
+		client:
+
+		...
+		option routers 192.168.10.10;
+		option domain-name-servers 192.168.10.50, 194.25.134.203;
+		host compaq {
+        		fixed-address 192.168.10.80;
+        		hardware ethernet 00:50:8b:cb:8e:d2;
+        		allow booting;
+        		allow bootp;
+        		next-server hackstation; # the fai server
+        		server-name hackstation;
+        		filename "pxelinux.0";
+		}
+		...
+
+	- tftpboot (you will need tftp-hpa as tftpserver)
+
+		the scripts prepared a working fai config file at
+		/tftpboot/pxelinux.cfg, just add a symbolic link of your clients
+		ip address (in hex, use: gethostip) pointing to fai.
+		ofcourse you need to have the package syslinux installed.
+
+	- nfsd:
+
+		file: /etc/exports
+
+		the scripts added export entries. just substitute "foobar" to
+		the name or ip address of your fai clients.
+
+	- inetd
+
+		file: /etc/inetd.conf
+
+		make sure the tftpboot line is uncommented. if you have problems
+		of tftpd switching to user nobody google for solutions. if you
+		are too lazy substitute "nobody" by "root in inetd.conf. this
+		is dangerous though, you have been warned.
+
+note: restart all the mentioned services.
+
+troubleshooting
+---------------
+
+contact me! -> http://www.hackdaworld.dyndns.org/contents/contact/
+email: hackbard@hackdaworld.dyndns.org
+irc: irc.hackdaworld.dyndns.org - #hackdaworld
+
+greets
+------
+
+good luck now, you are own your own! enjoy hdw. :)
+
+regards, hackbard.
diff --git a/fai/scripts/rc_fai.sh b/fai/scripts/rc_fai.sh
index e297052..192c63f 100755
--- a/fai/scripts/rc_fai.sh
+++ b/fai/scripts/rc_fai.sh
@@ -9,12 +9,43 @@ root=/trg
 croot=/fai/config
 myip="`ifconfig eth0 | grep inet\ addr | awk '{ print $2 }' | awk -F: '{ print $2 }'`"
 myconf=$croot/$myip
+proot=""
 
 if [ ! -d $myconf ] ; then
 	echo "no config found, aborting fai"
 	exit
 fi
 
+echo "debug:"
+route
+ifconfig
+
+#
+# we need writeable /tmp
+#
+mount -tramfs ramfs /tmp
+
+#
+# check if disk is ready
+#
+if [ ! -f $croot/$myip/disk_ready ] ; then
+	echo
+	echo "you're disk seems to not be ready. login now and use cfdisk"
+	echo "to partition your harddisk. please make sure it's compatible"
+	echo "to $croot/$myip/disk:"
+	cat $croot/$myip/disk
+	echo
+	echo "after partitioning your harddisk please touch the file"
+	echo "$croot/$myip/disk_ready"
+	echo "on your fai install server and reboot."
+	echo "... fully automated, he? :p"
+	echo
+	exit
+fi
+
+#
+# disk
+#
 disk=0
 disk=`grep '#\ disk' $myconf/disk | awk '{ print $3 }'`
 if [ ! -b $disk ] ; then
@@ -28,27 +59,110 @@ if [ "$swap" != "0" -a -b ${disk}${swap} ] ; then
 	mkswap ${disk}${swap}
 	echo "done"
 fi
-
-cat $myconf/disk | grep -v '^#' | while read nr mp; do
+cat $myconf/disk | grep -v '^#' | while read nr mp fs ac; do
 	if [ -b ${disk}${nr} ] ; then
-		echo "making filesystem for $mp"
-		mke2fs -j ${disk}${nr}
+		action=""
+		[ "$fs" = "ext3" ] && action="mke2fs -j"
+		[ "$fs" = "ext2" ] && action="mke2fs"
+		if [ "$ac" = "format" -a -n "$action" ] ; then
+			echo "making filesystem for $mp"
+			$action ${disk}${nr}
+		fi
 		if [ "$mp" = "/" ] ; then
 			echo "mounting root partition"
 			mount ${disk}${nr} $root
+			mkdir -p $root/etc
+			grep -v '/dev/root' /etc/fstab > $root/etc/fstab
+			echo -e "${disk}${nr}\t$mp\t$fs\tdefaults 0 2" >> \
+				$root/etc/fstab
+			proot=${disk}${nr}
 		fi
 	fi
 done
-
-cat $myconf/disk | grep -v '^#' | while read nr mp; do
+cat $myconf/disk | grep -v '^#' | while read nr mp fs ac; do
 	if [ "$mp" != "/" ] ; then
 		if [ -b ${disk}${nr} ] ; then
 			mkdir -p $root/$mp
 			mount ${disk}${nr} $root/$mp
+			echo -e "${disk}${nr}\t$mp\t$fs\tdefaults 0 2" >> \
+				$root/etc/fstab
 		fi
 	fi
 done
+# packages might install new fstab file, stored.
+cp $root/etc/fstab $root/etc/fstab~
+
+#
+# install packages
+#
+cd /tmp # we need to wget stuff!
+pkglist=""
+[ -f /fai/config/$myip/packages ] && pkglist=/fai/config/$myip/packages
+if [ -z "$pkglist" ] ; then
+	echo "cant find package list for $myip, aborting"
+	exit
+fi
+hdw-get dist-install $root $pkglist
+
+#
+# config / files
+#
+cp $root/etc/fstab~ $root/etc/fstab
+cp /etc/hdw-get.conf $root/etc
+# files
+cd /fai/files
+for file in `find -type f | grep -v CVS`; do
+	srcf=`basename $file`
+	trgf=`dirname $file`
+	[ "$srcf" = "DEFAULT" -o "$srcf" = "$myip" ] && cp -v $file $root/$trgf
+done
+
+#
+# essential device file
+#
+[ ! -c $root/dev/null ] && mknod -m 0666 $root/dev/null c 1 3
+[ ! -c $root/dev/console ] && mknod -m 0600 $root/dev/console c 5 1
+
+
+#
+# lilo
+#
+cat > $root/etc/lilo.conf << EOF
+boot=$disk
+prompt
+lba32
+timeout=30
+
+default=vmlinuz_hdw
+
+image=/boot/vmlinuz_hdw
+	label=vmlinuz_hdw
+	append="root=$proot"
+	read-only
+
+EOF
+# run lilo in chroot
+cat > $root/run_lilo.sh << EOF
+mount /dev
+mount /sys
+mount /proc
+udevstart
+mount -a
+ln -s /proc/self/fd /dev/fd
+ln -s /proc/self/fd/0 /dev/stdin
+ln -s /proc/self/fd/1 /dev/stdout
+ln -s /proc/self/fd/2 /dev/stderr
+ln -s /proc/kcore /dev/core
+lilo
+EOF
+chmod 755 $root/run_lilo.sh
+chroot $root /usr/bin/env PATH="/bin:/usr/bin:/sbin:/usr/sbin" /bin/bash \
+	--login +h /run_lilo.sh
+
+echo
+echo "fai finished, good luck for reboot ... :)"
+echo
 
-echo "to be continued ...."
+touch /tmp/fai_finished
 
 exit 0
diff --git a/misc/fai/fai_boot b/misc/fai/fai_boot
new file mode 100755
index 0000000..b829d34
--- /dev/null
+++ b/misc/fai/fai_boot
@@ -0,0 +1,81 @@
+#!/bin/sh
+#
+# hdw - linux /etc/init.d/boot (copied from ROCK Linux + modifications)
+#
+# modified for fai routine
+#
+
+exec 2>&1
+
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/fai/scripts
+
+echo "** booting hdw-linux FAI routine ... **"
+
+mount -v -n /dev
+mount -v -n /proc ; mount -v -n /sys
+mkdir -p /dev/shm ; mount -v -n /dev/shm
+mkdir -p /dev/pts ; mount -v -n /dev/pts
+
+echo "loading kernel modules and configuring the kernel ..."
+. /etc/conf/kernel
+
+echo "populating device nodes ..."
+/etc/init.d/udev start
+
+if [ -f /etc/conf/devfs ] ; then
+	echo "configuring device nodes ..."
+	. /etc/conf/devfs
+fi
+
+echo "activating swap-devices ..."
+swapon -a
+
+mount -v -n -o remount,rw /
+mount -v -a -t nocoda,nfs
+
+if type hostname > /dev/null 2>&1
+then
+	echo "set the hostname to [`cat /etc/HOSTNAME`] ..."
+	hostname `cat /etc/HOSTNAME`
+else
+	echo "hostname not set: no 'hostname' command found"
+fi
+
+if type loadkeys > /dev/null 2>&1
+then
+	echo "set the keyboard keymappings ..."
+	if [ -L /etc/default.keymap ] ; then
+		oldpwd="`pwd`" ; cd /etc
+		loadkeys `ls -l default.keymap | tr -s ' ' | cut -f11 -d' '`
+		cd "$oldpwd" ; unset oldpwd
+	elif [ -f /etc/default.keymap ] ; then
+		loadkeys /etc/default.keymap
+	else
+		echo "no /etc/default.keymap found."
+	fi
+else
+	echo "keymappings not configured: no 'loadkeys' command found."
+fi
+
+if type ifconfig > /dev/null 2>&1
+then
+	echo "setting up loopback networking ..."
+	ifconfig lo 127.0.0.1 netmask 255.0.0.0 up
+	route add -net 127.0.0.0 netmask 255.0.0.0 dev lo
+fi
+
+echo 'setting overflow UID and GID kernel parameters ...'
+sysctl -w kernel.overflowuid=`id -u nobody` | tr -d '\n'
+echo -n ', ' ; sysctl -w kernel.overflowgid=`id -g nobody`
+
+echo "initializing kernel random number generator ..."
+[ -f /var/state/random-seed ] && cat /var/state/random-seed >/dev/urandom
+
+echo
+echo
+echo "start of FAI (fully automated installation) process, good luck ..."
+echo
+echo
+echo -en "starting portmap ..."
+/usr/sbin/portmap
+echo " done"
diff --git a/misc/fai/fai_rc b/misc/fai/fai_rc
new file mode 100755
index 0000000..4c1279f
--- /dev/null
+++ b/misc/fai/fai_rc
@@ -0,0 +1,91 @@
+#!/bin/sh
+#
+# hdw - linux /etc/init.d/rc (modified for fai)
+#
+# controls switching of runlevels	(copied from ROCK Linux)
+#
+
+exec 2>&1
+
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/fai/scripts
+
+echo "** running rc (fai) script **"
+
+echo "RC: Previous runlevel: $PREVLEVEL, current runlevel: $RUNLEVEL."
+
+curdir=/etc/init.d/rc$RUNLEVEL.d
+prevdir=/etc/init.d/rc$PREVLEVEL.d
+
+#
+# run the KILL scripts of the previous runlevel (if needed)
+#
+if ! [ $PREVLEVEL = S -o $PREVLEVEL = N ]
+then
+	echo "RC: Leave runlevel $PREVLEVEL ..."
+	for i in $prevdir/K*; do
+		test -x "$i" || continue
+		x="`echo "$i" | sed "s,$prevdir/K..,$curdir/S??,"`"
+		[ "`echo $x`" = "$x" ] || continue ; unset x
+		$i stop < /dev/null
+	done
+fi
+
+echo "RC: Enter runlevel $RUNLEVEL ..."
+
+if [ $RUNLEVEL = S ]
+then
+	#
+	# Kill all processes
+	#
+	echo "Sending all processes a SIGTERM (15) ..."
+	killall5 -15
+	sleep 5
+	echo "Sending all processes a 2nd SIGTERM (15) ..."
+	killall5 -15
+	sleep 3
+	echo "Sending all processes a SIGKILL (9) ..."
+	killall5 -9
+	sleep 3
+elif [ $RUNLEVEL = 0 -o $RUNLEVEL = 6 ]
+then
+	#
+	# shut down the system
+	#
+	if [ $RUNLEVEL = 0 ] ; then
+	mode=halt ; else mode=reboot ; fi
+	/etc/init.d/down $mode
+	exit 0
+else
+	#
+	# run the START scripts of the current (new) runlevel
+	#
+	for i in $curdir/S*; do
+		test -x "$i" || continue
+		x="`echo "$i" | sed "s,$curdir/S..,$prevdir/K??,"`"
+		[ "`echo $x`" = "$x" ] || continue ; unset x
+		$i start < /dev/null
+	done
+fi
+
+echo "mounting fai config space ..."
+FAI_MOUNT_LINE
+echo "done"
+
+echo "executing rc_fai.sh script ..."
+/fai/scripts/rc_fai.sh
+echo
+
+if [ -f /tmp/fai_finished ] ; then
+	echo
+	echo "FAI finished - congrats :)"
+	echo
+	echo "you may login as root (passwd = hdw), chroot to /trg and"
+	echo "build a new kernel. copy the new bzImage to /boot/vmlinuz_hdw"
+	echo "and run lilo. imho this has to be done as we only have a nfsroot"
+	echo "kernel image searching init on a nfsroot. i might be wrong here."
+	echo
+else
+	echo "login: root | passwd = hdw"
+fi
+
+exit 0
diff --git a/scripts/Create-FAI b/scripts/Create-FAI
index 046b1d3..e88406c 100755
--- a/scripts/Create-FAI
+++ b/scripts/Create-FAI
@@ -33,23 +33,29 @@ if [ ! -f ./fai/nfsroot-packages ] ; then
 
 	echo "pretending default target for nfsroot install now"
 	export hdw_target=default
+	echo "hdw_target=default # FAI_WAS_HERE" >> Config # dirty!
 
 	./scripts/Helper -create_dist_files
 
 	export hdw_target=$hdw_orig_target
+	grep -v '# FAI_WAS_HERE' Config > tmp~
+	mv tmp~ Config
 	echo "orig target restored to $hdw_target"
 
 	cp ./distro/default ./fai/nfsroot-packages
-fi
 
-echo "deleting some packages from list now"
-del="linux-libc-headers man-pages binutils gcc m4 autoconf automake"
-del="$del man make patch bin86 nasm lilo cvs"
-del="$del bootdisk" # just by now - may contain kernel image later
-for package in $del; do
-	grep -v ^$package ./fai/nfsroot-packages > ./fai/tmp~
-	mv ./fai/tmp~ ./fai/nfsroot-packages
-done
+	echo "deleting some packages from list now"
+	del="linux-libc-headers man-pages binutils gcc m4 autoconf automake"
+	del="$del man make patch bin86 nasm lilo cvs"
+	del="$del bootdisk" # just by now - may contain kernel image later
+	for package in $del; do
+		grep -v ^$package ./fai/nfsroot-packages > ./fai/tmp~
+		mv ./fai/tmp~ ./fai/nfsroot-packages
+	done
+	echo "adding needed packages to list now"
+	echo "portmap" >> ./fai/nfsroot-packages
+	[ "$hdw_arch" = "ia32" ] && echo "lilo" >> ./fai/nfsroot-packages
+fi
 
 if [ ! -f $fairoot/packages_installed ] ; then
 	echo "creating nfsroot..."
@@ -65,23 +71,37 @@ fi
 if [ ! -f $fairoot/prepared_nfsroot ] ; then
 	echo "preparing nfsroot for automated install routine ..."
 	cd $fairoot
-	mknod -m 0666 dev/null c 1 3
-	mknod -m 0600 dev/console c 5 1
-	grep -v swap etc/fstab > tmp~
-	mv tmp~ etc/fstab
+	# special files (null & console)
+	[ ! -c dev/null ] && mknod -m 0666 dev/null c 1 3
+	[ ! -c dev/console ] && mknod -m 0600 dev/console c 5 1
+	# fstab
+	cp $home_dir/misc/sysfiles/etc/fstab ./etc
+	# the target directory
 	mkdir -p ./trg
+	# dir for mounting fai config
+	mkdir -p fai
+	# removing some services
 	for i in sysklogd network inetd nscd; do
 		rm -f etc/init.d/rc2.d/*${i}
 	done
-	sed "s%^exit\ 0%mount -tnfs $myip:/$home_dir/fai /fai%" \
-		etc/init.d/rc > tmp~
-	mv tmp~ etc/init.d/rc
+	# modified inittab, rc and bootscript
+	sed "s%| /sbin/btee .*%%g" $home_dir/misc/sysfiles/etc/inittab > \
+		etc/inittab
+	cp $home_dir/misc/fai/fai_boot ./etc/init.d/boot
+	sed "s%^FAI_MOUNT_LINE%mount -tnfs $myip:/$home_dir/fai /fai%" \
+		$home_dir/misc/fai/fai_rc > etc/init.d/rc
 	chmod 755 etc/init.d/rc
-	echo "/fai/scripts/rc_fai.sh" >> etc/init.d/rc
-	echo "shutdown -r now" >> etc/init.d/rc
+	# modify hdw-get.conf
+	sed "s%hdw_arch_opt=.*%hdw_arch_opt=$hdw_arch_opt%" etc/hdw-get.conf > \
+		tmp~
+	mv tmp~ etc/hdw-get.conf
+	# get to home_dir again
 	cd $home_dir
 	echo "done"
 	touch $fairoot/prepared_nfsroot
+else
+	echo "nfsroot seems to be prepared already"
+	echo "(del $fairoot/prepared_nfsroot to recreate it)"
 fi
 
 echo "checking pxe/nfs environment ..."
@@ -94,11 +114,18 @@ if [ ! -f /tftpboot/pxelinux.0 ] ; then
 	cp /usr/lib/syslinux/pxelinux.0 /tftpboot
 fi
 mkdir -p /tftpboot/pxelinux.cfg
-echo -e "LABEL fai" > /tftpboot/pxelinux.cfg/fai
-echo -e "\tKERNEL vmlinuz_hdw" >> /tftpboot/pxelinux.cfg/fai
-echo -e "\tAPPEND root=/dev/nfs nfsroot=$myip:$fairoot ip=dhcp" >> \
-	/tftpboot/pxelinux.cfg/fai
-echo -e "\tPROMPT 1" >> /tftpboot/pxelinux.cfg/fai
+cat > /tftpboot/pxelinux.cfg/fai << EOF
+PROMPT 1
+DEFAULT disk
+TIMEOUT 200
+
+LABEL fai
+	KERNEL vmlinuz_hdw
+	APPEND root=/dev/nfs nfsroot=$myip:$fairoot ip=dhcp
+
+LABEL disk
+	LOCALBOOT 0
+EOF
 echo -e "$fairoot\tfoobar(async,ro,no_root_squash)" >> /etc/exports
 echo -e "$home_dir/fai\tfoobar(async,ro,no_root_squash)" >> /etc/exports
 
-- 
2.20.1


From 2031febe2ef7a678b2063d87a31e45dca7bf50b7 Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Wed, 8 Dec 2004 03:27:06 +0000
Subject: [PATCH 10/16] minimal fixes ;) - should work now - semi automatic :))

---
 doc/FAI               |  3 +--
 fai/scripts/rc_fai.sh | 17 +++++++++--------
 misc/fai/fai_rc       |  4 +---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/doc/FAI b/doc/FAI
index 85ccef8..dbe09c2 100644
--- a/doc/FAI
+++ b/doc/FAI
@@ -55,8 +55,7 @@ procedure
 		  (after using cfdisk, sync to disk file!)
 		- reboot and finaly wathc your target system to get hdw'ed :)
 
-	5) login, build a new kernel. copy new bzImage to /boot/vmlinuz_hdw
-	   and run lilo again. reboot and enjoy! good luck.
+	5) optional: login, build a new kernel or do other modifications.
 
 
 fai config files
diff --git a/fai/scripts/rc_fai.sh b/fai/scripts/rc_fai.sh
index 192c63f..a839f69 100755
--- a/fai/scripts/rc_fai.sh
+++ b/fai/scripts/rc_fai.sh
@@ -9,7 +9,6 @@ root=/trg
 croot=/fai/config
 myip="`ifconfig eth0 | grep inet\ addr | awk '{ print $2 }' | awk -F: '{ print $2 }'`"
 myconf=$croot/$myip
-proot=""
 
 if [ ! -d $myconf ] ; then
 	echo "no config found, aborting fai"
@@ -28,15 +27,15 @@ mount -tramfs ramfs /tmp
 #
 # check if disk is ready
 #
-if [ ! -f $croot/$myip/disk_ready ] ; then
+if [ ! -f $myconf/disk_ready ] ; then
 	echo
 	echo "you're disk seems to not be ready. login now and use cfdisk"
 	echo "to partition your harddisk. please make sure it's compatible"
-	echo "to $croot/$myip/disk:"
-	cat $croot/$myip/disk
+	echo "to $myconf/disk:"
+	cat $myconf/disk
 	echo
 	echo "after partitioning your harddisk please touch the file"
-	echo "$croot/$myip/disk_ready"
+	echo "$myconf/disk_ready"
 	echo "on your fai install server and reboot."
 	echo "... fully automated, he? :p"
 	echo
@@ -75,7 +74,6 @@ cat $myconf/disk | grep -v '^#' | while read nr mp fs ac; do
 			grep -v '/dev/root' /etc/fstab > $root/etc/fstab
 			echo -e "${disk}${nr}\t$mp\t$fs\tdefaults 0 2" >> \
 				$root/etc/fstab
-			proot=${disk}${nr}
 		fi
 	fi
 done
@@ -97,7 +95,7 @@ cp $root/etc/fstab $root/etc/fstab~
 #
 cd /tmp # we need to wget stuff!
 pkglist=""
-[ -f /fai/config/$myip/packages ] && pkglist=/fai/config/$myip/packages
+[ -f $myconf/packages ] && pkglist=$myconf/packages
 if [ -z "$pkglist" ] ; then
 	echo "cant find package list for $myip, aborting"
 	exit
@@ -127,6 +125,8 @@ done
 #
 # lilo
 #
+proot=${disk}`grep /[^a-z,^A-Z] $myconf/disk | awk '{ print $1 }'`
+echo "running lilo -> root device = $proot"
 cat > $root/etc/lilo.conf << EOF
 boot=$disk
 prompt
@@ -146,8 +146,9 @@ cat > $root/run_lilo.sh << EOF
 mount /dev
 mount /sys
 mount /proc
+mkdir -p /dev/shm && mount /dev/shm
+mkdir -p /dev/pts && mount /dev/pts
 udevstart
-mount -a
 ln -s /proc/self/fd /dev/fd
 ln -s /proc/self/fd/0 /dev/stdin
 ln -s /proc/self/fd/1 /dev/stdout
diff --git a/misc/fai/fai_rc b/misc/fai/fai_rc
index 4c1279f..bba4373 100755
--- a/misc/fai/fai_rc
+++ b/misc/fai/fai_rc
@@ -80,9 +80,7 @@ if [ -f /tmp/fai_finished ] ; then
 	echo "FAI finished - congrats :)"
 	echo
 	echo "you may login as root (passwd = hdw), chroot to /trg and"
-	echo "build a new kernel. copy the new bzImage to /boot/vmlinuz_hdw"
-	echo "and run lilo. imho this has to be done as we only have a nfsroot"
-	echo "kernel image searching init on a nfsroot. i might be wrong here."
+	echo "do further modifications."
 	echo
 else
 	echo "login: root | passwd = hdw"
-- 
2.20.1


From eb20850196d10946025b08e4f2e2f79ca2115fc8 Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Sun, 12 Dec 2004 17:53:00 +0000
Subject: [PATCH 11/16] added some bootdisk documentation

---
 doc/CHANGELOG |  4 ++++
 doc/FAI       | 38 +++++++++++++++++++++++++++++++++++---
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index a7fdaf9..06947a7 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,3 +1,7 @@
+*) 2004-12-12
+
+- added some bootdisk/fai documentation
+
 *) 2004-12-08
 
 - finished minimal fai concepts
diff --git a/doc/FAI b/doc/FAI
index dbe09c2..bd29b56 100644
--- a/doc/FAI
+++ b/doc/FAI
@@ -16,9 +16,9 @@ files:
 procedure
 ---------
 
-	1) install mnimal nfsroot binaries
+	1) install minimal nfsroot binaries
 
-		vi Config [enter default as a target, specify arch*]
+		vi Config [specify arch* variables]
 
 	note: default target is enough. you dont need to specify fai-server.
 	      we are just going to install the nfsroot which will automate
@@ -47,7 +47,8 @@ procedure
 	3) adapt configs in ./fai (see chapter "fai config files")
 
 	4) pxeboot your install candidates. this is actually not fully
-	   automated.
+	   automated. have a look athe bootdisk section if your client does
+	   not support pxeboot.
 
 		- type "fai" on pxeboot prompt
 		- after first bootup, use cfdisk to partition your harddisk
@@ -154,6 +155,37 @@ there are several files you need to hack. here we go:
 
 note: restart all the mentioned services.
 
+bootdisk
+--------
+
+for computers old enough to not support pxe but having installed a piece
+of hardware called floppy disk, you may create a bootdisk containing the
+install kernel (the pxe stuff is replaced by the bootdisk).
+
+- compile a customized kernel < 1.4 mb. do not unset needed features!
+
+	(use ./misc/arch/${hdw_arch}/linux.config as .config + modify)
+
+- copy bzImage to fai/files/boot/vmlinuz_custom/<ip>
+
+- create bootfloppy/image
+
+	easy way: (create the bootdisk)
+
+	mknod /dev/boot255 c 0 255
+	dd if=bzImage of=/dev/floppy/0
+	rdev /dev/floppy/0 /dev/boot255
+
+	lilo way: (create an image)
+
+	dd if=/dev/zero of=bootdisk.img bs=1024 count=1440
+	yes | mke2fs -q -i 40000 -m 0 bootdisk.img
+	mkdir -p /mnt/tmp ; mount -o loop bootdisk.img /mnt/tmp
+	mkdir -p /mnt/tmp/{boot,etc} ; cp bzImage /mnt/tmp/boot/vmlinuz
+
+	[to be continued ...]
+
+
 troubleshooting
 ---------------
 
-- 
2.20.1


From ca7ab55a9c818a03fe09b23f1c1c29af4679b249 Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Sun, 12 Dec 2004 17:58:07 +0000
Subject: [PATCH 12/16] thunderbird and xorg updated (failing!), fai fstab -
 swap fix

---
 doc/CHANGELOG                            |   3 +
 fai/scripts/rc_fai.sh                    |   2 +
 packages/x11/thunderbird/freetype.patch  | 307 +++++++++++++++++++++++
 packages/x11/thunderbird/freetype1.patch |  46 ----
 packages/x11/thunderbird/freetype2.patch |  59 -----
 packages/x11/thunderbird/freetype3.patch |  38 ---
 packages/x11/thunderbird/freetype4.patch |  60 -----
 packages/x11/thunderbird/freetype5.patch |  20 --
 packages/x11/thunderbird/freetype6.patch |  73 ------
 packages/x11/thunderbird/freetype7.patch |  11 -
 packages/x11/thunderbird/thunderbird     |   6 +-
 packages/x11/xorg/xorg                   |  21 +-
 12 files changed, 326 insertions(+), 320 deletions(-)
 create mode 100644 packages/x11/thunderbird/freetype.patch
 delete mode 100644 packages/x11/thunderbird/freetype1.patch
 delete mode 100644 packages/x11/thunderbird/freetype2.patch
 delete mode 100644 packages/x11/thunderbird/freetype3.patch
 delete mode 100644 packages/x11/thunderbird/freetype4.patch
 delete mode 100644 packages/x11/thunderbird/freetype5.patch
 delete mode 100644 packages/x11/thunderbird/freetype6.patch
 delete mode 100644 packages/x11/thunderbird/freetype7.patch

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 06947a7..86444d7 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,5 +1,8 @@
 *) 2004-12-12
 
+- add swap to fstab file in fai method
+- xorg update (doc install fails)
+- thunderbird update (still failing)
 - added some bootdisk/fai documentation
 
 *) 2004-12-08
diff --git a/fai/scripts/rc_fai.sh b/fai/scripts/rc_fai.sh
index a839f69..d1e4f67 100755
--- a/fai/scripts/rc_fai.sh
+++ b/fai/scripts/rc_fai.sh
@@ -87,6 +87,8 @@ cat $myconf/disk | grep -v '^#' | while read nr mp fs ac; do
 		fi
 	fi
 done
+[ "$swap" != "0" -a -b ${disk}${swap} ] && \
+	echo -e "${disk}${swap}\tswap\tswap\tdefaults 0 0" >> $root/etc/fstab
 # packages might install new fstab file, stored.
 cp $root/etc/fstab $root/etc/fstab~
 
diff --git a/packages/x11/thunderbird/freetype.patch b/packages/x11/thunderbird/freetype.patch
new file mode 100644
index 0000000..172e16b
--- /dev/null
+++ b/packages/x11/thunderbird/freetype.patch
@@ -0,0 +1,307 @@
+--- mozilla-orig/gfx/idl/nsIFreeType2.idl	2004-07-15 11:24:14.000000000 +0000
++++ mozilla/gfx/idl/nsIFreeType2.idl	2004-07-15 11:28:26.000000000 +0000
+@@ -76,10 +76,11 @@
+ native FT_Sfnt_Tag(FT_Sfnt_Tag);
+ native FT_Size(FT_Size);
+ 
+-[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
++[ptr] native FTC_ImageType_p(FTC_ImageType);
+ native FTC_Face_Requester(FTC_Face_Requester);
+ native FTC_Font(FTC_Font);
+-native FTC_Image_Cache(FTC_Image_Cache);
++native FTC_FaceID(FTC_FaceID);
++native FTC_ImageCache(FTC_ImageCache);
+ native FTC_Manager(FTC_Manager);
+ 
+ // #ifdef MOZ_SVG
+@@ -99,7 +100,7 @@
+ 
+     readonly attribute FT_Library library;
+     readonly attribute FTC_Manager FTCacheManager;
+-    readonly attribute FTC_Image_Cache ImageCache;
++    readonly attribute FTC_ImageCache ImageCache;
+ 
+     void    doneFace(in FT_Face face);
+     void    doneFreeType(in FT_Library lib);
+@@ -115,16 +116,16 @@
+     void    outlineDecompose(in FT_Outline_p outline,
+                              in const_FT_Outline_Funcs_p funcs, in voidPtr p);
+     void    setCharmap(in FT_Face face, in FT_CharMap charmap);
+-    void    imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
++    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
+                              in FT_UInt gindex, out FT_Glyph glyph);
+-    void    managerLookupSize(in FTC_Manager manager, in FTC_Font font,
+-                              out FT_Face face, out FT_Size size);
++    void    managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
++                              out FT_Face face);
+     void    managerDone(in FTC_Manager manager);
+     void    managerNew(in FT_Library lib, in FT_UInt max_faces,
+                        in FT_UInt max_sizes, in FT_ULong max_bytes,
+                        in FTC_Face_Requester requester, in FT_Pointer req_data,
+                        out FTC_Manager manager);
+-    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
++    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
+ /* #ifdef MOZ_SVG */
+     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
+                         in FT_Vector_p delta);
+--- mozilla-orig/gfx/src/freetype/nsFreeType.cpp	2004-07-15 11:24:14.000000000 +0000
++++ mozilla/gfx/src/freetype/nsFreeType.cpp	2004-07-15 11:28:26.000000000 +0000
+@@ -110,11 +110,11 @@
+   {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
+   {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
+   {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
+-  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
+-  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
++  {"FTC_ImageCache_Lookup",   NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
++  {"FTC_Manager_LookupFace",  NS_FT2_OFFSET(nsFTC_Manager_LookupFace),  PR_TRUE},
+   {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
+   {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
+-  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
++  {"FTC_ImageCache_New",      NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
+ // #ifdef MOZ_SVG
+   {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
+   {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
+@@ -282,7 +282,7 @@
+ } 
+  
+ NS_IMETHODIMP
+-nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
++nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
+                               FT_UInt glyphID, FT_Glyph *glyph)
+ { 
+   // call the FreeType2 function via the function pointer
+@@ -291,11 +291,11 @@
+ } 
+  
+ NS_IMETHODIMP
+-nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
+-                               FT_Face *face, FT_Size *size)
++nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
++                               FT_Face *face)
+ { 
+   // call the FreeType2 function via the function pointer
+-  FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
++  FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
+   return error ? NS_ERROR_FAILURE : NS_OK;
+ } 
+  
+@@ -320,7 +320,7 @@
+ } 
+  
+ NS_IMETHODIMP
+-nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
++nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
+ { 
+   // call the FreeType2 function via the function pointer
+   FT_Error error = nsFTC_Image_Cache_New(manager, cache);
+@@ -389,7 +389,7 @@
+ } 
+  
+ NS_IMETHODIMP
+-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
++nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
+ {
+   *aCache = mImageCache;
+   return NS_OK;
+--- mozilla-orig/gfx/src/freetype/nsFreeType.h	2004-07-15 11:24:14.000000000 +0000
++++ mozilla/gfx/src/freetype/nsFreeType.h	2004-07-15 11:28:26.000000000 +0000
+@@ -104,13 +104,13 @@
+ typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
+ typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
+ typedef FT_Error (*FTC_Image_Cache_Lookup_t)
+-                      (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
+-typedef FT_Error (*FTC_Manager_Lookup_Size_t)
+-                      (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
++                      (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
++typedef FT_Error (*FTC_Manager_LookupFace_t)
++                      (FTC_Manager, FTC_FaceID, FT_Face*);
+ typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
+ typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
+                        FTC_Face_Requester, FT_Pointer, FTC_Manager*);
+-typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
++typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
+ // #ifdef MOZ_SVG
+ typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
+ typedef FT_Error (*FT_Get_Kerning_t)
+@@ -165,7 +165,7 @@
+   FT_Outline_Decompose_t    nsFT_Outline_Decompose;
+   FT_Set_Charmap_t          nsFT_Set_Charmap;
+   FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
+-  FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
++  FTC_Manager_LookupFace_t  nsFTC_Manager_LookupFace;
+   FTC_Manager_Done_t        nsFTC_Manager_Done;
+   FTC_Manager_New_t         nsFTC_Manager_New;
+   FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
+@@ -213,7 +213,7 @@
+   PRLibrary      *mSharedLib;
+   FT_Library      mFreeTypeLibrary;
+   FTC_Manager     mFTCacheManager;
+-  FTC_Image_Cache mImageCache;
++  FTC_ImageCache  mImageCache;
+ 
+   static nsHashtable   *sFontFamilies;
+   static nsHashtable   *sRange1CharSetNames;
+--- mozilla-orig/gfx/src/ps/nsFontMetricsPS.cpp	2004-07-15 11:24:14.000000000 +0000
++++ mozilla/gfx/src/ps/nsFontMetricsPS.cpp	2004-07-15 11:28:26.000000000 +0000
+@@ -1141,10 +1141,10 @@
+   
+   mPixelSize = NSToIntRound(app2dev * mFont->size);
+ 
+-  mImageDesc.font.face_id    = (void*)mEntry;
+-  mImageDesc.font.pix_width  = mPixelSize;
+-  mImageDesc.font.pix_height = mPixelSize;
+-  mImageDesc.image_type = 0;
++  mImageDesc->face_id = (FTC_FaceID)&mEntry;
++  mImageDesc->width  = mPixelSize;
++  mImageDesc->height = mPixelSize;
++  mImageDesc->flags = 0;
+ 
+   nsresult rv;
+   mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
+@@ -1190,7 +1190,7 @@
+   if (!face)
+     return 0;
+ 
+-  FTC_Image_Cache iCache;
++  FTC_ImageCache iCache;
+   nsresult rv = mFt2->GetImageCache(&iCache);
+   if (NS_FAILED(rv)) {
+     NS_ERROR("Failed to get Image Cache");
+@@ -1228,8 +1228,8 @@
+   
+   FTC_Manager cManager;
+   mFt2->GetFTCacheManager(&cManager);
+-  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
+-                                        &face, nsnull);
++  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
++                                        &face);
+   NS_ASSERTION(rv==0, "failed to get face/size");
+   if (rv)
+     return nsnull;
+@@ -1622,16 +1622,16 @@
+   mEntry->GetFamilyName(fontName);
+   mEntry->GetStyleName(styleName);
+   
+-  mImageDesc.font.face_id    = (void*)mEntry;
++  mImageDesc->face_id = (FTC_FaceID)&mEntry;
+   // TT glyph has no relation to size
+-  mImageDesc.font.pix_width  = 16;
+-  mImageDesc.font.pix_height = 16;
+-  mImageDesc.image_type = 0;
++  mImageDesc->width  = 16;
++  mImageDesc->height = 16;
++  mImageDesc->flags = 0;
+   FT_Face face = nsnull;
+   FTC_Manager cManager;
+   mFt2->GetFTCacheManager(&cManager);
+-  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
+-                                        &face, nsnull);
++  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
++                                        &face);
+   if (NS_FAILED(rv))
+     return;
+  
+--- mozilla-orig/gfx/src/ps/nsFontMetricsPS.h	2004-07-15 11:24:14.000000000 +0000
++++ mozilla/gfx/src/ps/nsFontMetricsPS.h	2004-07-15 11:28:26.000000000 +0000
+@@ -320,7 +320,7 @@
+   nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
+   nsCOMPtr<nsIFreeType2> mFt2;
+   PRUint16        mPixelSize;
+-  FTC_Image_Desc  mImageDesc;
++  FTC_ImageType   mImageDesc;
+ 
+ 
+   static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
+@@ -363,7 +363,7 @@
+ protected:
+   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
+   nsCOMPtr<nsIFreeType2> mFt2;
+-  FTC_Image_Desc  mImageDesc;
++  FTC_ImageType   mImageDesc;
+ };
+ #endif
+ 
+--- mozilla-orig/gfx/src/x11shared/nsFontFreeType.cpp	2004-07-15 11:24:14.000000000 +0000
++++ mozilla/gfx/src/x11shared/nsFontFreeType.cpp	2004-07-15 11:28:26.000000000 +0000
+@@ -177,7 +177,7 @@
+   FTC_Manager mgr;
+   nsresult rv;
+   mFt2->GetFTCacheManager(&mgr);
+-  rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
++  rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
+   NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
+   if (NS_FAILED(rv))
+     return nsnull;
+@@ -191,22 +191,15 @@
+   PRBool embedded_bimap = PR_FALSE;
+   mFaceID = aFaceID;
+   mPixelSize = aPixelSize;
+-  mImageDesc.font.face_id    = (void*)mFaceID;
+-  mImageDesc.font.pix_width  = aPixelSize;
+-  mImageDesc.font.pix_height = aPixelSize;
+-  mImageDesc.image_type = 0;
++  mImageDesc->face_id = (FTC_FaceID)&mFaceID;
++  mImageDesc->width  = aPixelSize;
++  mImageDesc->height = aPixelSize;
++  mImageDesc->flags = 0;
+ 
+   if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
+-    mImageDesc.image_type |= ftc_image_mono;
+     anti_alias = PR_FALSE;
+   }
+ 
+-  if (nsFreeType2::gFreeType2Autohinted)
+-    mImageDesc.image_type |= ftc_image_flag_autohinted;
+-
+-  if (nsFreeType2::gFreeType2Unhinted)
+-    mImageDesc.image_type |= ftc_image_flag_unhinted;
+-
+   PRUint32  num_embedded_bitmaps, i;
+   PRInt32*  embedded_bitmapheights;
+   mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
+@@ -218,7 +211,6 @@
+         if (embedded_bitmapheights[i] == aPixelSize) {
+           embedded_bimap = PR_TRUE;
+           // unhinted must be set for embedded bitmaps to be used
+-          mImageDesc.image_type |= ftc_image_flag_unhinted;
+           break;
+         }
+       }
+@@ -312,7 +304,7 @@
+   if (!face)
+     return NS_ERROR_FAILURE;
+ 
+-  FTC_Image_Cache icache;
++  FTC_ImageCache icache;
+   mFt2->GetImageCache(&icache);
+   if (!icache)
+     return NS_ERROR_FAILURE;
+@@ -401,7 +393,7 @@
+   if (!face)
+     return 0;
+ 
+-  FTC_Image_Cache icache;
++  FTC_ImageCache icache;
+   mFt2->GetImageCache(&icache);
+   if (!icache)
+     return 0;
+@@ -723,7 +715,7 @@
+     if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
+ #endif
+ 
+-  FTC_Image_Cache icache;
++  FTC_ImageCache icache;
+   mFt2->GetImageCache(&icache);
+   if (!icache)
+     return 0;
+--- mozilla-orig/gfx/src/x11shared/nsFontFreeType.h	2004-07-15 11:24:14.000000000 +0000
++++ mozilla/gfx/src/x11shared/nsFontFreeType.h	2004-07-15 11:28:26.000000000 +0000
+@@ -110,7 +110,7 @@
+   XImage *GetXImage(PRUint32 width, PRUint32 height);
+   nsITrueTypeFontCatalogEntry *mFaceID;
+   PRUint16        mPixelSize;
+-  FTC_Image_Desc  mImageDesc;
++  FTC_ImageType   mImageDesc;
+   nsCOMPtr<nsIFreeType2> mFt2;
+ };
+ 
diff --git a/packages/x11/thunderbird/freetype1.patch b/packages/x11/thunderbird/freetype1.patch
deleted file mode 100644
index de2f0ae..0000000
--- a/packages/x11/thunderbird/freetype1.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- ./gfx/idl/nsIFreeType2.idl.orig	2004-07-24 01:30:50.000000000 +0200
-+++ ./gfx/idl/nsIFreeType2.idl	2004-07-24 01:35:19.000000000 +0200
-@@ -76,10 +76,11 @@
- native FT_Sfnt_Tag(FT_Sfnt_Tag);
- native FT_Size(FT_Size);
- 
--[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
-+[ptr] native FTC_ImageType_p(FTC_ImageType);
- native FTC_Face_Requester(FTC_Face_Requester);
- native FTC_Font(FTC_Font);
--native FTC_Image_Cache(FTC_Image_Cache);
-+native FTC_FaceID(FTC_FaceID);
-+native FTC_ImageCache(FTC_ImageCache);
- native FTC_Manager(FTC_Manager);
- 
- // #ifdef MOZ_SVG
-@@ -99,7 +99,7 @@
- 
-     readonly attribute FT_Library library;
-     readonly attribute FTC_Manager FTCacheManager;
--    readonly attribute FTC_Image_Cache ImageCache;
-+    readonly attribute FTC_ImageCache ImageCache;
- 
-     void    doneFace(in FT_Face face);
-     void    doneFreeType(in FT_Library lib);
-@@ -115,16 +115,16 @@
-     void    outlineDecompose(in FT_Outline_p outline,
-                              in const_FT_Outline_Funcs_p funcs, in voidPtr p);
-     void    setCharmap(in FT_Face face, in FT_CharMap charmap);
--    void    imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
-+    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
-                              in FT_UInt gindex, out FT_Glyph glyph);
--    void    managerLookupSize(in FTC_Manager manager, in FTC_Font font,
--                              out FT_Face face, out FT_Size size);
-+    void    managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
-+                              out FT_Face face);
-     void    managerDone(in FTC_Manager manager);
-     void    managerNew(in FT_Library lib, in FT_UInt max_faces,
-                        in FT_UInt max_sizes, in FT_ULong max_bytes,
-                        in FTC_Face_Requester requester, in FT_Pointer req_data,
-                        out FTC_Manager manager);
--    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
-+    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
- /* #ifdef MOZ_SVG */
-     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
-                         in FT_Vector_p delta);
diff --git a/packages/x11/thunderbird/freetype2.patch b/packages/x11/thunderbird/freetype2.patch
deleted file mode 100644
index 6887a54..0000000
--- a/packages/x11/thunderbird/freetype2.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- ./gfx/src/freetype/nsFreeType.cpp.orig	2004-07-24 01:37:07.000000000 +0200
-+++ ./gfx/src/freetype/nsFreeType.cpp	2004-07-24 01:43:37.000000000 +0200
-@@ -110,11 +110,11 @@
-   {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
-   {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
-   {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
--  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
--  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
-+  {"FTC_ImageCache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
-+  {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE},
-   {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
-   {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
--  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
-+  {"FTC_ImageCache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
- // #ifdef MOZ_SVG
-   {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
-   {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
-@@ -282,7 +282,7 @@
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
-+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
-                               FT_UInt glyphID, FT_Glyph *glyph)
- { 
-   // call the FreeType2 function via the function pointer
-@@ -291,11 +291,11 @@
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
--                               FT_Face *face, FT_Size *size)
-+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_Face face_id,
-+                               FT_Face *face)
- { 
-   // call the FreeType2 function via the function pointer
--  FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
-+  FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
-   return error ? NS_ERROR_FAILURE : NS_OK;
- } 
-  
-@@ -320,7 +320,7 @@
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
-+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
- { 
-   // call the FreeType2 function via the function pointer
-   FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -389,7 +389,7 @@
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
-+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
- {
-   *aCache = mImageCache;
-   return NS_OK;
diff --git a/packages/x11/thunderbird/freetype3.patch b/packages/x11/thunderbird/freetype3.patch
deleted file mode 100644
index 037adb2..0000000
--- a/packages/x11/thunderbird/freetype3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./gfx/src/freetype/nsFreeType.h.orig	2004-07-24 01:50:37.000000000 +0200
-+++ ./gfx/src/freetype/nsFreeType.h	2004-07-24 01:53:33.000000000 +0200
-@@ -104,13 +104,13 @@
- typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
- typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
- typedef FT_Error (*FTC_Image_Cache_Lookup_t)
--                      (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
--typedef FT_Error (*FTC_Manager_Lookup_Size_t)
--                      (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
-+                      (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
-+typedef FT_Error (*FTC_Manager_LookupFace_t)
-+                      (FTC_Manager, FTC_FaceID, FT_Face*);
- typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
- typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
-                        FTC_Face_Requester, FT_Pointer, FTC_Manager*);
--typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
-+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
- // #ifdef MOZ_SVG
- typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
- typedef FT_Error (*FT_Get_Kerning_t)
-@@ -165,7 +165,7 @@
-   FT_Outline_Decompose_t    nsFT_Outline_Decompose;
-   FT_Set_Charmap_t          nsFT_Set_Charmap;
-   FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
--  FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
-+  FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace;
-   FTC_Manager_Done_t        nsFTC_Manager_Done;
-   FTC_Manager_New_t         nsFTC_Manager_New;
-   FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
-@@ -213,7 +213,7 @@
-   PRLibrary      *mSharedLib;
-   FT_Library      mFreeTypeLibrary;
-   FTC_Manager     mFTCacheManager;
--  FTC_Image_Cache mImageCache;
-+  FTC_ImageCache mImageCache;
- 
-   static nsHashtable   *sFontFamilies;
-   static nsHashtable   *sRange1CharSetNames;
diff --git a/packages/x11/thunderbird/freetype4.patch b/packages/x11/thunderbird/freetype4.patch
deleted file mode 100644
index 37f5369..0000000
--- a/packages/x11/thunderbird/freetype4.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- ./gfx/src/ps/nsFontMetricsPS.cpp.orig	2004-07-24 01:55:08.000000000 +0200
-+++ ./gfx/src/ps/nsFontMetricsPS.cpp	2004-07-24 01:58:58.000000000 +0200
-@@ -1141,10 +1141,10 @@
-   
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
- 
--  mImageDesc.font.face_id    = (void*)mEntry;
--  mImageDesc.font.pix_width  = mPixelSize;
--  mImageDesc.font.pix_height = mPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id    = (void*)mEntry;
-+  mImageDesc->width  = mPixelSize;
-+  mImageDesc->height = mPixelSize;
-+  mImageDesc->flags = 0;
- 
-   nsresult rv;
-   mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1190,7 +1190,7 @@
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache iCache;
-+  FTC_ImageCache iCache;
-   nsresult rv = mFt2->GetImageCache(&iCache);
-   if (NS_FAILED(rv)) {
-     NS_ERROR("Failed to get Image Cache");
-@@ -1228,8 +1228,8 @@
-   
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, &mImageDesc->face_id,
-+                                        &face);
-   NS_ASSERTION(rv==0, "failed to get face/size");
-   if (rv)
-     return nsnull;
-@@ -1622,16 +1622,16 @@
-   mEntry->GetFamilyName(fontName);
-   mEntry->GetStyleName(styleName);
-   
--  mImageDesc.font.face_id    = (void*)mEntry;
-+  mImageDesc->face_id    = (FTC_FaceID)&mEntry;
-   // TT glyph has no relation to size
--  mImageDesc.font.pix_width  = 16;
--  mImageDesc.font.pix_height = 16;
--  mImageDesc.image_type = 0;
-+  mImageDesc->width  = 16;
-+  mImageDesc->height = 16;
-+  mImageDesc->flags = 0;
-   FT_Face face = nsnull;
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, &mImageDesc->face_id,
-+                                        &face);
-   if (NS_FAILED(rv))
-     return;
-  
diff --git a/packages/x11/thunderbird/freetype5.patch b/packages/x11/thunderbird/freetype5.patch
deleted file mode 100644
index f5d1d1f..0000000
--- a/packages/x11/thunderbird/freetype5.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./gfx/src/ps/nsFontMetricsPS.h.orig	2004-07-24 02:00:15.000000000 +0200
-+++ ./gfx/src/ps/nsFontMetricsPS.h	2004-07-24 02:00:58.000000000 +0200
-@@ -320,7 +320,7 @@
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
-   nsCOMPtr<nsIFreeType2> mFt2;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType  mImageDesc;
- 
- 
-   static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
-@@ -363,7 +363,7 @@
- protected:
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
-   nsCOMPtr<nsIFreeType2> mFt2;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType  mImageDesc;
- };
- #endif
- 
diff --git a/packages/x11/thunderbird/freetype6.patch b/packages/x11/thunderbird/freetype6.patch
deleted file mode 100644
index 5836ad8..0000000
--- a/packages/x11/thunderbird/freetype6.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- ./gfx/src/x11shared/nsFontFreeType.cpp.orig	2004-07-24 02:02:30.000000000 +0200
-+++ ./gfx/src/x11shared/nsFontFreeType.cpp	2004-07-24 02:05:19.000000000 +0200
-@@ -177,7 +177,7 @@
-   FTC_Manager mgr;
-   nsresult rv;
-   mFt2->GetFTCacheManager(&mgr);
--  rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
-+  rv = mFt2->ManagerLookupFace(mgr, &mImageDesc->face_id, &face);
-   NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
-   if (NS_FAILED(rv))
-     return nsnull;
-@@ -191,22 +191,15 @@
-   PRBool embedded_bimap = PR_FALSE;
-   mFaceID = aFaceID;
-   mPixelSize = aPixelSize;
--  mImageDesc.font.face_id    = (void*)mFaceID;
--  mImageDesc.font.pix_width  = aPixelSize;
--  mImageDesc.font.pix_height = aPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc.->face_id    = (FTC_FaceID)mFaceID;
-+  mImageDesc->width  = aPixelSize;
-+  mImageDesc->height = aPixelSize;
-+  mImageDesc->flags = 0;
- 
-   if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
--    mImageDesc.image_type |= ftc_image_mono;
-     anti_alias = PR_FALSE;
-   }
- 
--  if (nsFreeType2::gFreeType2Autohinted)
--    mImageDesc.image_type |= ftc_image_flag_autohinted;
--
--  if (nsFreeType2::gFreeType2Unhinted)
--    mImageDesc.image_type |= ftc_image_flag_unhinted;
--
-   PRUint32  num_embedded_bitmaps, i;
-   PRInt32*  embedded_bitmapheights;
-   mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
-@@ -218,7 +211,6 @@
-         if (embedded_bitmapheights[i] == aPixelSize) {
-           embedded_bimap = PR_TRUE;
-           // unhinted must be set for embedded bitmaps to be used
--          mImageDesc.image_type |= ftc_image_flag_unhinted;
-           break;
-         }
-       }
-@@ -312,7 +304,7 @@
-   if (!face)
-     return NS_ERROR_FAILURE;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return NS_ERROR_FAILURE;
-@@ -401,7 +393,7 @@
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
-@@ -723,7 +715,7 @@
-     if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
- #endif
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
diff --git a/packages/x11/thunderbird/freetype7.patch b/packages/x11/thunderbird/freetype7.patch
deleted file mode 100644
index 6251016..0000000
--- a/packages/x11/thunderbird/freetype7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./gfx/src/x11shared/nsFontFreeType.h.orig	2004-07-24 02:06:58.000000000 +0200
-+++ ./gfx/src/x11shared/nsFontFreeType.h	2004-07-24 02:07:28.000000000 +0200
-@@ -110,7 +110,7 @@
-   XImage *GetXImage(PRUint32 width, PRUint32 height);
-   nsITrueTypeFontCatalogEntry *mFaceID;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType  mImageDesc;
-   nsCOMPtr<nsIFreeType2> mFt2;
- };
- 
diff --git a/packages/x11/thunderbird/thunderbird b/packages/x11/thunderbird/thunderbird
index d930ac5..8bad8ec 100644
--- a/packages/x11/thunderbird/thunderbird
+++ b/packages/x11/thunderbird/thunderbird
@@ -2,9 +2,9 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 0.7
+# [V] 0.8
 # [S] 3-8
-# [D] thunderbird-0.7-source.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/0.7/
+# [D] thunderbird-source-0.8.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/0.8/
 
 srcdir=mozilla
 optimize="`echo $hdw_cflags | awk '{ print $1 }'`"
@@ -12,6 +12,7 @@ export PKG_CONFIG_PATH="/usr/X11R6/lib/pkgconfig"
 
 pre_install()	{
 	export MOZILLA_OFFICIAL=1 BUILD_OFFICIAL=1 MOZ_THUNDERBIRD=1
+	export MOZ_PHOENIX=1
 	#sed "s,0000000000,hdw-linux -- ${hdw_version}," \
 	#	xpfe/global/build.dtd.in > xpfe/global/build.dtd.in.new
 	#mv xpfe/global/build.dtd.in.new xpfe/global/build.dtd.in
@@ -23,6 +24,7 @@ confopt="$confopt --enable-xft --enable-crypto --enable-xinerama"
 confopt="$confopt --disable-tests --disable-debug --disable-dtd-debug"
 confopt="$confopt --disable-pedantic --disable-logging --disable-accessibility"
 confopt="$confopt --enable-strip --enable-strip-libs --enable-extensions=all"
+confopt="$confopt --disable-profilesharing"
 confopt="$confopt --enable-optimize='$optimize'"
 
 post_install()	{
diff --git a/packages/x11/xorg/xorg b/packages/x11/xorg/xorg
index 64a4b09..459d1c4 100644
--- a/packages/x11/xorg/xorg
+++ b/packages/x11/xorg/xorg
@@ -2,16 +2,16 @@
 
 # author: hackbard@hackdaworld.dyndns.org
 
-# [V] 6.7.0
+# [V] 6.8.1
 
 # [S] 3-3
-# [D] X11R6.7.0-src1.tar.gz http://freedesktop.org/~xorg/X11R6.7.0/src/
-# [D] X11R6.7.0-src2.tar.gz http://freedesktop.org/~xorg/X11R6.7.0/src/
-# [D] X11R6.7.0-src3.tar.gz http://freedesktop.org/~xorg/X11R6.7.0/src/
-# [D] X11R6.7.0-src4.tar.gz http://freedesktop.org/~xorg/X11R6.7.0/src/
-# [D] X11R6.7.0-src5.tar.gz http://freedesktop.org/~xorg/X11R6.7.0/src/
-# [D] X11R6.7.0-src6.tar.gz http://freedesktop.org/~xorg/X11R6.7.0/src/
-# [D] X11R6.7.0-src7.tar.gz http://freedesktop.org/~xorg/X11R6.7.0/src/
+# [D] X11R6.8.1-src1.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/
+# [D] X11R6.8.1-src2.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/
+# [D] X11R6.8.1-src3.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/
+# [D] X11R6.8.1-src4.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/
+# [D] X11R6.8.1-src5.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/
+# [D] X11R6.8.1-src6.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/
+# [D] X11R6.8.1-src7.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/
 
 custmain="1"
 custmain()	{
@@ -32,10 +32,9 @@ custmain()	{
 			patch -Nfp1 < $i
 		done
 	fi
-	for file in `grep '<linux/config.h>' -r ./programs/Xserver/hw | \
-						awk -F: '{ print $1 }'`; do
+	for file in `grep '<linux/config.h>' -lr ./`; do
 		echo "patching file $file ..."
-		sed 's%#include <linux/config.h>%%g' $file > ${file}.tmp
+		sed "s%#include <linux/config.h>%/* & */%g" $file > ${file}.tmp
 		mv ${file}.tmp $file
 	done
 	
-- 
2.20.1


From c17dab6d48fa86560654c2dc1e44a2a0375dc24e Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Sun, 12 Dec 2004 18:56:27 +0000
Subject: [PATCH 13/16] finished/fixed fai bootdisk image documentation + added
 lilo.conf file

---
 doc/CHANGELOG      |  1 +
 doc/FAI            | 20 +++++++++-----------
 misc/fai/lilo.conf | 19 +++++++++++++++++++
 3 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 misc/fai/lilo.conf

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 86444d7..5391668 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,5 +1,6 @@
 *) 2004-12-12
 
+- finished/fixed bootdisk image, added misc/fai/lilo.conf
 - add swap to fstab file in fai method
 - xorg update (doc install fails)
 - thunderbird update (still failing)
diff --git a/doc/FAI b/doc/FAI
index bd29b56..b9d68c5 100644
--- a/doc/FAI
+++ b/doc/FAI
@@ -162,29 +162,27 @@ for computers old enough to not support pxe but having installed a piece
 of hardware called floppy disk, you may create a bootdisk containing the
 install kernel (the pxe stuff is replaced by the bootdisk).
 
-- compile a customized kernel < 1.4 mb. do not unset needed features!
+- compile a customized kernel <= 1.1 mb. do not unset needed features!
 
 	(use ./misc/arch/${hdw_arch}/linux.config as .config + modify)
 
 - copy bzImage to fai/files/boot/vmlinuz_custom/<ip>
 
-- create bootfloppy/image
-
-	easy way: (create the bootdisk)
-
-	mknod /dev/boot255 c 0 255
-	dd if=bzImage of=/dev/floppy/0
-	rdev /dev/floppy/0 /dev/boot255
-
-	lilo way: (create an image)
+- create bootfloppy image
 
 	dd if=/dev/zero of=bootdisk.img bs=1024 count=1440
 	yes | mke2fs -q -i 40000 -m 0 bootdisk.img
 	mkdir -p /mnt/tmp ; mount -o loop bootdisk.img /mnt/tmp
 	mkdir -p /mnt/tmp/{boot,etc} ; cp bzImage /mnt/tmp/boot/vmlinuz
+	cp misc/fai/lilo.conf /mnt/tmp/etc/lilo.conf
+	(change boot, disk map and image values)
+	touch /mnt/tmp/boot/map # enough? if not take yours from /boot
+	umount /mnt/tmp
+	(you may store bootdisk.img in the clients config space)
 
-	[to be continued ...]
+	finaly: (create the boot floppy)
 
+	dd if=bootdisk.img of=/dev/floppy/0
 
 troubleshooting
 ---------------
diff --git a/misc/fai/lilo.conf b/misc/fai/lilo.conf
new file mode 100644
index 0000000..e10b219
--- /dev/null
+++ b/misc/fai/lilo.conf
@@ -0,0 +1,19 @@
+disk=/dev/loop0
+bios=0x00
+cylinders=80
+heads=2
+sectors=18
+
+boot=/usr/src/hdw-linux/bootdisk.img
+map=/mnt/tmp/boot/map
+timeout=200
+prompt
+compact
+read-only
+
+default=fai
+
+image=/mnt/tmp/boot/vmlinuz
+	append="ip=dhcp root=/dev/nfs"
+	label=fai
+
-- 
2.20.1


From 01cbdf6a290584bacfb93e7eb3320744b00c8998 Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Sun, 12 Dec 2004 19:05:05 +0000
Subject: [PATCH 14/16] removed broken dns

---
 doc/CHANGELOG                 | 1 +
 misc/sysfiles/etc/resolv.conf | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 5391668..f2dcd34 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,5 +1,6 @@
 *) 2004-12-12
 
+- removed broken dns from resolv.conf file
 - finished/fixed bootdisk image, added misc/fai/lilo.conf
 - add swap to fstab file in fai method
 - xorg update (doc install fails)
diff --git a/misc/sysfiles/etc/resolv.conf b/misc/sysfiles/etc/resolv.conf
index 41fa8ac..89e997e 100644
--- a/misc/sysfiles/etc/resolv.conf
+++ b/misc/sysfiles/etc/resolv.conf
@@ -3,7 +3,6 @@
 # man 5 resolv.conf
 
 # search foobar.com foobar.net
-nameserver 212.185.248.50
 nameserver 194.25.2.129
 nameserver 128.9.0.107
 
-- 
2.20.1


From 9faf0f7f8e54984eeaca64885efaef4e5354100b Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Tue, 21 Dec 2004 23:38:49 +0000
Subject: [PATCH 15/16] fixed/updated thunderbird & firefox + added thunderbird
 to targets

---
 doc/CHANGELOG                           |   5 +
 packages/x11/firefox/firefox            |  35 ++-
 packages/x11/firefox/lfs.patch          | 321 ------------------------
 packages/x11/thunderbird/freetype.patch | 307 ----------------------
 packages/x11/thunderbird/thunderbird    |  35 ++-
 targets/default/include                 |   4 +-
 targets/desktop/include                 |   1 -
 targets/fefe/include                    |   1 -
 targets/mobile/include                  |   1 -
 9 files changed, 50 insertions(+), 660 deletions(-)
 delete mode 100644 packages/x11/firefox/lfs.patch
 delete mode 100644 packages/x11/thunderbird/freetype.patch

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index f2dcd34..5419c2c 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,3 +1,8 @@
+*) 2004-12-22
+
+- fixed / updated firefox & thunderbird package
+- added thunderbird to targets
+
 *) 2004-12-12
 
 - removed broken dns from resolv.conf file
diff --git a/packages/x11/firefox/firefox b/packages/x11/firefox/firefox
index eb2a561..ed155d9 100644
--- a/packages/x11/firefox/firefox
+++ b/packages/x11/firefox/firefox
@@ -2,36 +2,45 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 0.9.2
+# [V] 1.0
 # [S] 3-8
-# [D] firefox-0.9.2-source.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.9.2/
+# [D] firefox-1.0-source.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/source/
 # [D] install_flash_player_7_linux.tar.gz http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/7.0r25/
 
 srcdir=mozilla
 optimize="`echo $hdw_cflags | awk '{ print $1 }'`"
-#export PKG_CONFIG_PATH="/usr/X11R6/lib/pkgconfig"
+#export PKG_CONFIG_PATH="$prefix/X11R6/lib/pkgconfig"
 
 pre_install()	{
 	export MOZILLA_OFFICIAL=1 BUILD_OFFICIAL=1 MOZ_PHOENIX=1
-	#sed "s,0000000000,hdw-linux -- ${hdw_version}," \
-	#	xpfe/global/build.dtd.in > xpfe/global/build.dtd.in.new
-	#mv xpfe/global/build.dtd.in.new xpfe/global/build.dtd.in
+	export MOZILLA_FIVE_HOME=$prefix/lib/firefox-$ver
+	sed "s,0000000000,hdw-linux -- ${hdw_version}," \
+		xpfe/global/build.dtd.in > xpfe/global/build.dtd.in.new
+	mv xpfe/global/build.dtd.in.new xpfe/global/build.dtd.in
 		}
 
 confopt="$confopt --enable-default-toolkit=gtk2 --with-x --with-system-zlib"
 confopt="$confopt --with-system-jpeg --with-system-png --with-extensions"
-#confopt="$confopt --enable-xft --enable-crypto --enable-xinerama"
-confopt="$confopt --enable-crypto --enable-xinerama"
-confopt="$confopt --disable-tests --disable-debug --disable-dtd-debug"
-confopt="$confopt --disable-pedantic --disable-logging --disable-accessibility"
+confopt="$confopt --with-default-mozilla-five-home=$MOZILLA_FIVE_HOME"
+confopt="$confopt --with-user-appdir=.firefox"
+confopt="$confopt --enable-xft --enable-crypto --enable-xinerama"
 confopt="$confopt --enable-strip --enable-strip-libs --enable-extensions=all"
+confopt="$confopt --enable-application=browser"
 confopt="$confopt --enable-optimize='$optimize' --enable-cpp-rtti"
 confopt="$confopt --enable-single-profile --disable-profilesharing "
-confopt="$confopt --disable-mailnews --disable-ldap"
+confopt="$confopt --disable-mailnews --disable-ldap --disable-freetype2"
+confopt="$confopt --disable-tests --disable-debug --disable-composer"
+confopt="$confopt --disable-pedantic --disable-logging --disable-accessibility"
+confopt="$confopt --disable-installer --disable-dtd-debug"
 
 post_install()	{
-	cd $prefix/lib/firefox-*
-	export MOZILLA_FIVE_HOME=$PWD
+	install -d $prefix/include/firefox-$ver/nss
+	cp -vLf dist/private/nss/*.h dist/public/nss/*.h \
+		$prefix/include/firefox-$ver/nss
+	ln -sfv firefox-$ver $prefix/lib/firefox
+	ln -sfv firefox-$ver $prefix/include/firefox
+
+	cd $prefix/lib/firefox-$ver
 	LD_LIBRARY_PATH=. ./regxpcom
 	LD_LIBRARY_PATH=. ./regchrome
 	touch `find $PWD -name *.rdf`
diff --git a/packages/x11/firefox/lfs.patch b/packages/x11/firefox/lfs.patch
deleted file mode 100644
index a4e3243..0000000
--- a/packages/x11/firefox/lfs.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-Submitted By: Igor Zivkovic <igor@linuxfromscratch.org>
-Date: 2004-07-15
-Initial Package Version: 0.8
-Upstream Status: Submitted (http://bugzilla.mozilla.org/show_bug.cgi?id=234035).
-Origin: Peter Kovar's 0.9 patch.
-Description: Fixes compilation against freetype >= 2.1.8.
-
-diff -Naur mozilla-orig/gfx/idl/nsIFreeType2.idl mozilla/gfx/idl/nsIFreeType2.idl
---- mozilla-orig/gfx/idl/nsIFreeType2.idl	2004-07-15 11:24:14.000000000 +0000
-+++ mozilla/gfx/idl/nsIFreeType2.idl	2004-07-15 11:28:26.000000000 +0000
-@@ -76,10 +76,11 @@
- native FT_Sfnt_Tag(FT_Sfnt_Tag);
- native FT_Size(FT_Size);
- 
--[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
-+[ptr] native FTC_ImageType_p(FTC_ImageType);
- native FTC_Face_Requester(FTC_Face_Requester);
- native FTC_Font(FTC_Font);
--native FTC_Image_Cache(FTC_Image_Cache);
-+native FTC_FaceID(FTC_FaceID);
-+native FTC_ImageCache(FTC_ImageCache);
- native FTC_Manager(FTC_Manager);
- 
- // #ifdef MOZ_SVG
-@@ -99,7 +100,7 @@
- 
-     readonly attribute FT_Library library;
-     readonly attribute FTC_Manager FTCacheManager;
--    readonly attribute FTC_Image_Cache ImageCache;
-+    readonly attribute FTC_ImageCache ImageCache;
- 
-     void    doneFace(in FT_Face face);
-     void    doneFreeType(in FT_Library lib);
-@@ -115,16 +116,16 @@
-     void    outlineDecompose(in FT_Outline_p outline,
-                              in const_FT_Outline_Funcs_p funcs, in voidPtr p);
-     void    setCharmap(in FT_Face face, in FT_CharMap charmap);
--    void    imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
-+    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
-                              in FT_UInt gindex, out FT_Glyph glyph);
--    void    managerLookupSize(in FTC_Manager manager, in FTC_Font font,
--                              out FT_Face face, out FT_Size size);
-+    void    managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
-+                              out FT_Face face);
-     void    managerDone(in FTC_Manager manager);
-     void    managerNew(in FT_Library lib, in FT_UInt max_faces,
-                        in FT_UInt max_sizes, in FT_ULong max_bytes,
-                        in FTC_Face_Requester requester, in FT_Pointer req_data,
-                        out FTC_Manager manager);
--    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
-+    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
- /* #ifdef MOZ_SVG */
-     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
-                         in FT_Vector_p delta);
-diff -Naur mozilla-orig/gfx/src/freetype/nsFreeType.cpp mozilla/gfx/src/freetype/nsFreeType.cpp
---- mozilla-orig/gfx/src/freetype/nsFreeType.cpp	2004-07-15 11:24:14.000000000 +0000
-+++ mozilla/gfx/src/freetype/nsFreeType.cpp	2004-07-15 11:28:26.000000000 +0000
-@@ -110,11 +110,11 @@
-   {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
-   {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
-   {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
--  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
--  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
-+  {"FTC_ImageCache_Lookup",   NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
-+  {"FTC_Manager_LookupFace",  NS_FT2_OFFSET(nsFTC_Manager_LookupFace),  PR_TRUE},
-   {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
-   {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
--  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
-+  {"FTC_ImageCache_New",      NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
- // #ifdef MOZ_SVG
-   {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
-   {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
-@@ -282,7 +282,7 @@
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
-+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
-                               FT_UInt glyphID, FT_Glyph *glyph)
- { 
-   // call the FreeType2 function via the function pointer
-@@ -291,11 +291,11 @@
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
--                               FT_Face *face, FT_Size *size)
-+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
-+                               FT_Face *face)
- { 
-   // call the FreeType2 function via the function pointer
--  FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
-+  FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
-   return error ? NS_ERROR_FAILURE : NS_OK;
- } 
-  
-@@ -320,7 +320,7 @@
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
-+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
- { 
-   // call the FreeType2 function via the function pointer
-   FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -389,7 +389,7 @@
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
-+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
- {
-   *aCache = mImageCache;
-   return NS_OK;
-diff -Naur mozilla-orig/gfx/src/freetype/nsFreeType.h mozilla/gfx/src/freetype/nsFreeType.h
---- mozilla-orig/gfx/src/freetype/nsFreeType.h	2004-07-15 11:24:14.000000000 +0000
-+++ mozilla/gfx/src/freetype/nsFreeType.h	2004-07-15 11:28:26.000000000 +0000
-@@ -104,13 +104,13 @@
- typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
- typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
- typedef FT_Error (*FTC_Image_Cache_Lookup_t)
--                      (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
--typedef FT_Error (*FTC_Manager_Lookup_Size_t)
--                      (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
-+                      (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
-+typedef FT_Error (*FTC_Manager_LookupFace_t)
-+                      (FTC_Manager, FTC_FaceID, FT_Face*);
- typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
- typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
-                        FTC_Face_Requester, FT_Pointer, FTC_Manager*);
--typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
-+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
- // #ifdef MOZ_SVG
- typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
- typedef FT_Error (*FT_Get_Kerning_t)
-@@ -165,7 +165,7 @@
-   FT_Outline_Decompose_t    nsFT_Outline_Decompose;
-   FT_Set_Charmap_t          nsFT_Set_Charmap;
-   FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
--  FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
-+  FTC_Manager_LookupFace_t  nsFTC_Manager_LookupFace;
-   FTC_Manager_Done_t        nsFTC_Manager_Done;
-   FTC_Manager_New_t         nsFTC_Manager_New;
-   FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
-@@ -213,7 +213,7 @@
-   PRLibrary      *mSharedLib;
-   FT_Library      mFreeTypeLibrary;
-   FTC_Manager     mFTCacheManager;
--  FTC_Image_Cache mImageCache;
-+  FTC_ImageCache  mImageCache;
- 
-   static nsHashtable   *sFontFamilies;
-   static nsHashtable   *sRange1CharSetNames;
-diff -Naur mozilla-orig/gfx/src/ps/nsFontMetricsPS.cpp mozilla/gfx/src/ps/nsFontMetricsPS.cpp
---- mozilla-orig/gfx/src/ps/nsFontMetricsPS.cpp	2004-07-15 11:24:14.000000000 +0000
-+++ mozilla/gfx/src/ps/nsFontMetricsPS.cpp	2004-07-15 11:28:26.000000000 +0000
-@@ -1141,10 +1141,10 @@
-   
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
- 
--  mImageDesc.font.face_id    = (void*)mEntry;
--  mImageDesc.font.pix_width  = mPixelSize;
--  mImageDesc.font.pix_height = mPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-+  mImageDesc->width  = mPixelSize;
-+  mImageDesc->height = mPixelSize;
-+  mImageDesc->flags = 0;
- 
-   nsresult rv;
-   mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1190,7 +1190,7 @@
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache iCache;
-+  FTC_ImageCache iCache;
-   nsresult rv = mFt2->GetImageCache(&iCache);
-   if (NS_FAILED(rv)) {
-     NS_ERROR("Failed to get Image Cache");
-@@ -1228,8 +1228,8 @@
-   
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   NS_ASSERTION(rv==0, "failed to get face/size");
-   if (rv)
-     return nsnull;
-@@ -1622,16 +1622,16 @@
-   mEntry->GetFamilyName(fontName);
-   mEntry->GetStyleName(styleName);
-   
--  mImageDesc.font.face_id    = (void*)mEntry;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-   // TT glyph has no relation to size
--  mImageDesc.font.pix_width  = 16;
--  mImageDesc.font.pix_height = 16;
--  mImageDesc.image_type = 0;
-+  mImageDesc->width  = 16;
-+  mImageDesc->height = 16;
-+  mImageDesc->flags = 0;
-   FT_Face face = nsnull;
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   if (NS_FAILED(rv))
-     return;
-  
-diff -Naur mozilla-orig/gfx/src/ps/nsFontMetricsPS.h mozilla/gfx/src/ps/nsFontMetricsPS.h
---- mozilla-orig/gfx/src/ps/nsFontMetricsPS.h	2004-07-15 11:24:14.000000000 +0000
-+++ mozilla/gfx/src/ps/nsFontMetricsPS.h	2004-07-15 11:28:26.000000000 +0000
-@@ -320,7 +320,7 @@
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
-   nsCOMPtr<nsIFreeType2> mFt2;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
- 
- 
-   static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
-@@ -363,7 +363,7 @@
- protected:
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
-   nsCOMPtr<nsIFreeType2> mFt2;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
- };
- #endif
- 
-diff -Naur mozilla-orig/gfx/src/x11shared/nsFontFreeType.cpp mozilla/gfx/src/x11shared/nsFontFreeType.cpp
---- mozilla-orig/gfx/src/x11shared/nsFontFreeType.cpp	2004-07-15 11:24:14.000000000 +0000
-+++ mozilla/gfx/src/x11shared/nsFontFreeType.cpp	2004-07-15 11:28:26.000000000 +0000
-@@ -177,7 +177,7 @@
-   FTC_Manager mgr;
-   nsresult rv;
-   mFt2->GetFTCacheManager(&mgr);
--  rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
-+  rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
-   NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
-   if (NS_FAILED(rv))
-     return nsnull;
-@@ -191,22 +191,15 @@
-   PRBool embedded_bimap = PR_FALSE;
-   mFaceID = aFaceID;
-   mPixelSize = aPixelSize;
--  mImageDesc.font.face_id    = (void*)mFaceID;
--  mImageDesc.font.pix_width  = aPixelSize;
--  mImageDesc.font.pix_height = aPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mFaceID;
-+  mImageDesc->width  = aPixelSize;
-+  mImageDesc->height = aPixelSize;
-+  mImageDesc->flags = 0;
- 
-   if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
--    mImageDesc.image_type |= ftc_image_mono;
-     anti_alias = PR_FALSE;
-   }
- 
--  if (nsFreeType2::gFreeType2Autohinted)
--    mImageDesc.image_type |= ftc_image_flag_autohinted;
--
--  if (nsFreeType2::gFreeType2Unhinted)
--    mImageDesc.image_type |= ftc_image_flag_unhinted;
--
-   PRUint32  num_embedded_bitmaps, i;
-   PRInt32*  embedded_bitmapheights;
-   mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
-@@ -218,7 +211,6 @@
-         if (embedded_bitmapheights[i] == aPixelSize) {
-           embedded_bimap = PR_TRUE;
-           // unhinted must be set for embedded bitmaps to be used
--          mImageDesc.image_type |= ftc_image_flag_unhinted;
-           break;
-         }
-       }
-@@ -312,7 +304,7 @@
-   if (!face)
-     return NS_ERROR_FAILURE;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return NS_ERROR_FAILURE;
-@@ -401,7 +393,7 @@
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
-@@ -723,7 +715,7 @@
-     if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
- #endif
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
-diff -Naur mozilla-orig/gfx/src/x11shared/nsFontFreeType.h mozilla/gfx/src/x11shared/nsFontFreeType.h
---- mozilla-orig/gfx/src/x11shared/nsFontFreeType.h	2004-07-15 11:24:14.000000000 +0000
-+++ mozilla/gfx/src/x11shared/nsFontFreeType.h	2004-07-15 11:28:26.000000000 +0000
-@@ -110,7 +110,7 @@
-   XImage *GetXImage(PRUint32 width, PRUint32 height);
-   nsITrueTypeFontCatalogEntry *mFaceID;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
-   nsCOMPtr<nsIFreeType2> mFt2;
- };
- 
diff --git a/packages/x11/thunderbird/freetype.patch b/packages/x11/thunderbird/freetype.patch
deleted file mode 100644
index 172e16b..0000000
--- a/packages/x11/thunderbird/freetype.patch
+++ /dev/null
@@ -1,307 +0,0 @@
---- mozilla-orig/gfx/idl/nsIFreeType2.idl	2004-07-15 11:24:14.000000000 +0000
-+++ mozilla/gfx/idl/nsIFreeType2.idl	2004-07-15 11:28:26.000000000 +0000
-@@ -76,10 +76,11 @@
- native FT_Sfnt_Tag(FT_Sfnt_Tag);
- native FT_Size(FT_Size);
- 
--[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
-+[ptr] native FTC_ImageType_p(FTC_ImageType);
- native FTC_Face_Requester(FTC_Face_Requester);
- native FTC_Font(FTC_Font);
--native FTC_Image_Cache(FTC_Image_Cache);
-+native FTC_FaceID(FTC_FaceID);
-+native FTC_ImageCache(FTC_ImageCache);
- native FTC_Manager(FTC_Manager);
- 
- // #ifdef MOZ_SVG
-@@ -99,7 +100,7 @@
- 
-     readonly attribute FT_Library library;
-     readonly attribute FTC_Manager FTCacheManager;
--    readonly attribute FTC_Image_Cache ImageCache;
-+    readonly attribute FTC_ImageCache ImageCache;
- 
-     void    doneFace(in FT_Face face);
-     void    doneFreeType(in FT_Library lib);
-@@ -115,16 +116,16 @@
-     void    outlineDecompose(in FT_Outline_p outline,
-                              in const_FT_Outline_Funcs_p funcs, in voidPtr p);
-     void    setCharmap(in FT_Face face, in FT_CharMap charmap);
--    void    imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
-+    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
-                              in FT_UInt gindex, out FT_Glyph glyph);
--    void    managerLookupSize(in FTC_Manager manager, in FTC_Font font,
--                              out FT_Face face, out FT_Size size);
-+    void    managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
-+                              out FT_Face face);
-     void    managerDone(in FTC_Manager manager);
-     void    managerNew(in FT_Library lib, in FT_UInt max_faces,
-                        in FT_UInt max_sizes, in FT_ULong max_bytes,
-                        in FTC_Face_Requester requester, in FT_Pointer req_data,
-                        out FTC_Manager manager);
--    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
-+    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
- /* #ifdef MOZ_SVG */
-     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
-                         in FT_Vector_p delta);
---- mozilla-orig/gfx/src/freetype/nsFreeType.cpp	2004-07-15 11:24:14.000000000 +0000
-+++ mozilla/gfx/src/freetype/nsFreeType.cpp	2004-07-15 11:28:26.000000000 +0000
-@@ -110,11 +110,11 @@
-   {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
-   {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
-   {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
--  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
--  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
-+  {"FTC_ImageCache_Lookup",   NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
-+  {"FTC_Manager_LookupFace",  NS_FT2_OFFSET(nsFTC_Manager_LookupFace),  PR_TRUE},
-   {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
-   {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
--  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
-+  {"FTC_ImageCache_New",      NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
- // #ifdef MOZ_SVG
-   {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
-   {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
-@@ -282,7 +282,7 @@
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
-+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
-                               FT_UInt glyphID, FT_Glyph *glyph)
- { 
-   // call the FreeType2 function via the function pointer
-@@ -291,11 +291,11 @@
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
--                               FT_Face *face, FT_Size *size)
-+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
-+                               FT_Face *face)
- { 
-   // call the FreeType2 function via the function pointer
--  FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
-+  FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
-   return error ? NS_ERROR_FAILURE : NS_OK;
- } 
-  
-@@ -320,7 +320,7 @@
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
-+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
- { 
-   // call the FreeType2 function via the function pointer
-   FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -389,7 +389,7 @@
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
-+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
- {
-   *aCache = mImageCache;
-   return NS_OK;
---- mozilla-orig/gfx/src/freetype/nsFreeType.h	2004-07-15 11:24:14.000000000 +0000
-+++ mozilla/gfx/src/freetype/nsFreeType.h	2004-07-15 11:28:26.000000000 +0000
-@@ -104,13 +104,13 @@
- typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
- typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
- typedef FT_Error (*FTC_Image_Cache_Lookup_t)
--                      (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
--typedef FT_Error (*FTC_Manager_Lookup_Size_t)
--                      (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
-+                      (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
-+typedef FT_Error (*FTC_Manager_LookupFace_t)
-+                      (FTC_Manager, FTC_FaceID, FT_Face*);
- typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
- typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
-                        FTC_Face_Requester, FT_Pointer, FTC_Manager*);
--typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
-+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
- // #ifdef MOZ_SVG
- typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
- typedef FT_Error (*FT_Get_Kerning_t)
-@@ -165,7 +165,7 @@
-   FT_Outline_Decompose_t    nsFT_Outline_Decompose;
-   FT_Set_Charmap_t          nsFT_Set_Charmap;
-   FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
--  FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
-+  FTC_Manager_LookupFace_t  nsFTC_Manager_LookupFace;
-   FTC_Manager_Done_t        nsFTC_Manager_Done;
-   FTC_Manager_New_t         nsFTC_Manager_New;
-   FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
-@@ -213,7 +213,7 @@
-   PRLibrary      *mSharedLib;
-   FT_Library      mFreeTypeLibrary;
-   FTC_Manager     mFTCacheManager;
--  FTC_Image_Cache mImageCache;
-+  FTC_ImageCache  mImageCache;
- 
-   static nsHashtable   *sFontFamilies;
-   static nsHashtable   *sRange1CharSetNames;
---- mozilla-orig/gfx/src/ps/nsFontMetricsPS.cpp	2004-07-15 11:24:14.000000000 +0000
-+++ mozilla/gfx/src/ps/nsFontMetricsPS.cpp	2004-07-15 11:28:26.000000000 +0000
-@@ -1141,10 +1141,10 @@
-   
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
- 
--  mImageDesc.font.face_id    = (void*)mEntry;
--  mImageDesc.font.pix_width  = mPixelSize;
--  mImageDesc.font.pix_height = mPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-+  mImageDesc->width  = mPixelSize;
-+  mImageDesc->height = mPixelSize;
-+  mImageDesc->flags = 0;
- 
-   nsresult rv;
-   mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1190,7 +1190,7 @@
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache iCache;
-+  FTC_ImageCache iCache;
-   nsresult rv = mFt2->GetImageCache(&iCache);
-   if (NS_FAILED(rv)) {
-     NS_ERROR("Failed to get Image Cache");
-@@ -1228,8 +1228,8 @@
-   
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   NS_ASSERTION(rv==0, "failed to get face/size");
-   if (rv)
-     return nsnull;
-@@ -1622,16 +1622,16 @@
-   mEntry->GetFamilyName(fontName);
-   mEntry->GetStyleName(styleName);
-   
--  mImageDesc.font.face_id    = (void*)mEntry;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-   // TT glyph has no relation to size
--  mImageDesc.font.pix_width  = 16;
--  mImageDesc.font.pix_height = 16;
--  mImageDesc.image_type = 0;
-+  mImageDesc->width  = 16;
-+  mImageDesc->height = 16;
-+  mImageDesc->flags = 0;
-   FT_Face face = nsnull;
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   if (NS_FAILED(rv))
-     return;
-  
---- mozilla-orig/gfx/src/ps/nsFontMetricsPS.h	2004-07-15 11:24:14.000000000 +0000
-+++ mozilla/gfx/src/ps/nsFontMetricsPS.h	2004-07-15 11:28:26.000000000 +0000
-@@ -320,7 +320,7 @@
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
-   nsCOMPtr<nsIFreeType2> mFt2;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
- 
- 
-   static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
-@@ -363,7 +363,7 @@
- protected:
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
-   nsCOMPtr<nsIFreeType2> mFt2;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
- };
- #endif
- 
---- mozilla-orig/gfx/src/x11shared/nsFontFreeType.cpp	2004-07-15 11:24:14.000000000 +0000
-+++ mozilla/gfx/src/x11shared/nsFontFreeType.cpp	2004-07-15 11:28:26.000000000 +0000
-@@ -177,7 +177,7 @@
-   FTC_Manager mgr;
-   nsresult rv;
-   mFt2->GetFTCacheManager(&mgr);
--  rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
-+  rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
-   NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
-   if (NS_FAILED(rv))
-     return nsnull;
-@@ -191,22 +191,15 @@
-   PRBool embedded_bimap = PR_FALSE;
-   mFaceID = aFaceID;
-   mPixelSize = aPixelSize;
--  mImageDesc.font.face_id    = (void*)mFaceID;
--  mImageDesc.font.pix_width  = aPixelSize;
--  mImageDesc.font.pix_height = aPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mFaceID;
-+  mImageDesc->width  = aPixelSize;
-+  mImageDesc->height = aPixelSize;
-+  mImageDesc->flags = 0;
- 
-   if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
--    mImageDesc.image_type |= ftc_image_mono;
-     anti_alias = PR_FALSE;
-   }
- 
--  if (nsFreeType2::gFreeType2Autohinted)
--    mImageDesc.image_type |= ftc_image_flag_autohinted;
--
--  if (nsFreeType2::gFreeType2Unhinted)
--    mImageDesc.image_type |= ftc_image_flag_unhinted;
--
-   PRUint32  num_embedded_bitmaps, i;
-   PRInt32*  embedded_bitmapheights;
-   mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
-@@ -218,7 +211,6 @@
-         if (embedded_bitmapheights[i] == aPixelSize) {
-           embedded_bimap = PR_TRUE;
-           // unhinted must be set for embedded bitmaps to be used
--          mImageDesc.image_type |= ftc_image_flag_unhinted;
-           break;
-         }
-       }
-@@ -312,7 +304,7 @@
-   if (!face)
-     return NS_ERROR_FAILURE;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return NS_ERROR_FAILURE;
-@@ -401,7 +393,7 @@
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
-@@ -723,7 +715,7 @@
-     if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
- #endif
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
---- mozilla-orig/gfx/src/x11shared/nsFontFreeType.h	2004-07-15 11:24:14.000000000 +0000
-+++ mozilla/gfx/src/x11shared/nsFontFreeType.h	2004-07-15 11:28:26.000000000 +0000
-@@ -110,7 +110,7 @@
-   XImage *GetXImage(PRUint32 width, PRUint32 height);
-   nsITrueTypeFontCatalogEntry *mFaceID;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
-   nsCOMPtr<nsIFreeType2> mFt2;
- };
- 
diff --git a/packages/x11/thunderbird/thunderbird b/packages/x11/thunderbird/thunderbird
index 8bad8ec..30bf5bf 100644
--- a/packages/x11/thunderbird/thunderbird
+++ b/packages/x11/thunderbird/thunderbird
@@ -2,34 +2,43 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 0.8
+# [V] 1.0
 # [S] 3-8
-# [D] thunderbird-source-0.8.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/0.8/
+# [D] thunderbird-1.0-source.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/1.0/source/
 
 srcdir=mozilla
 optimize="`echo $hdw_cflags | awk '{ print $1 }'`"
-export PKG_CONFIG_PATH="/usr/X11R6/lib/pkgconfig"
+export PKG_CONFIG_PATH="$prefix/X11R6/lib/pkgconfig"
 
 pre_install()	{
 	export MOZILLA_OFFICIAL=1 BUILD_OFFICIAL=1 MOZ_THUNDERBIRD=1
-	export MOZ_PHOENIX=1
-	#sed "s,0000000000,hdw-linux -- ${hdw_version}," \
-	#	xpfe/global/build.dtd.in > xpfe/global/build.dtd.in.new
-	#mv xpfe/global/build.dtd.in.new xpfe/global/build.dtd.in
+	export MOZILLA_FIVE_HOME=$prefix/lib/thunderbird-$ver
+	sed "s,0000000000,hdw-linux -- ${hdw_version}," \
+		xpfe/global/build.dtd.in > xpfe/global/build.dtd.in.new
+	mv xpfe/global/build.dtd.in.new xpfe/global/build.dtd.in
 		}
 
 confopt="$confopt --enable-default-toolkit=gtk2 --with-x --with-system-zlib"
-confopt="$confopt --with-system-jpeg --with-system-png --with-extensions"
+confopt="$confopt --with-system-jpeg --with-system-png"
+confopt="$confopt --with-default-mozilla-five-home=$MOZILLA_FIVE_HOME"
 confopt="$confopt --enable-xft --enable-crypto --enable-xinerama"
-confopt="$confopt --disable-tests --disable-debug --disable-dtd-debug"
+confopt="$confopt --enable-application=mail --enable-strip --enable-strip-libs"
+confopt="$confopt --enable-reorder --enable-cpp-rtti --enable-extensions=all"
+confopt="$confopt --disable-tests --disable-debug --disable-extensions"
 confopt="$confopt --disable-pedantic --disable-logging --disable-accessibility"
-confopt="$confopt --enable-strip --enable-strip-libs --enable-extensions=all"
-confopt="$confopt --disable-profilesharing"
+confopt="$confopt --disable-freetype2 --disable-installer --disable-mathml"
+confopt="$confopt --disable-profilesharing --enable-single-profile"
+confopt="$confopt --disable-oji --disable-plugins --disable-necko-disk-cache"
 confopt="$confopt --enable-optimize='$optimize'"
 
 post_install()	{
-	cd $prefix/lib/mozilla-*
-	export MOZILLA_FIVE_HOME=$PWD
+	install -d $prefix/include/thunderbird-$ver/nss
+	cp -vLf dist/private/nss/*.h dist/public/nss/*.h \
+		$prefix/include/thunderbird-$ver/nss
+	ln -sfv thunderbird-$ver $prefix/lib/thunderbird
+	ln -sfv thunderbird-$ver $prefix/include/thunderbird
+
+	cd $prefix/lib/thunderbird-$ver
 	LD_LIBRARY_PATH=. ./regxpcom
 	LD_LIBRARY_PATH=. ./regchrome
 	touch `find $PWD -name *.rdf`
diff --git a/targets/default/include b/targets/default/include
index a8f4891..e3cacc5 100644
--- a/targets/default/include
+++ b/targets/default/include
@@ -1,6 +1,4 @@
-# hdw-linux target default, lists of categories and packages included
-#
-# damn, this is still hardcoded! but once packages have to be chosen! 
+# hdw-linux target default
 #
 # author:	hackbard
 #
diff --git a/targets/desktop/include b/targets/desktop/include
index 453234d..d4aa943 100644
--- a/targets/desktop/include
+++ b/targets/desktop/include
@@ -11,7 +11,6 @@
 # [R] x11/xfree86
 # mozilla / firefox & thunderbird
 # [R] x11/mozilla
-# [R] x11/thunderbird
 
 # [C] security
 # [C] science
diff --git a/targets/fefe/include b/targets/fefe/include
index 908cc8d..279e6c9 100644
--- a/targets/fefe/include
+++ b/targets/fefe/include
@@ -29,7 +29,6 @@
 # [R] x11/xfree86
 # mozilla / firefox & thunderbird
 # [R] x11/mozilla
-# [R] x11/thunderbird
 
 # [C] science
 # [C] soundtools
diff --git a/targets/mobile/include b/targets/mobile/include
index 4c805ed..a245608 100644
--- a/targets/mobile/include
+++ b/targets/mobile/include
@@ -11,7 +11,6 @@
 # [R] x11/xfree86
 # mozilla / firefox & thunderbird          
 # [R] x11/mozilla
-# [R] x11/thunderbird
 
 # [C] security
 # [C] science
-- 
2.20.1


From 137c6d5bc9641b1e65af7a948a39049a20a0b532 Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Tue, 21 Dec 2004 23:46:00 +0000
Subject: [PATCH 16/16] added libieee1284 package

---
 doc/CHANGELOG                             | 1 +
 packages/hackbard/libieee1284/libieee1284 | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 packages/hackbard/libieee1284/libieee1284

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 5419c2c..fe7a50f 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,5 +1,6 @@
 *) 2004-12-22
 
+- added libieee1284 package
 - fixed / updated firefox & thunderbird package
 - added thunderbird to targets
 
diff --git a/packages/hackbard/libieee1284/libieee1284 b/packages/hackbard/libieee1284/libieee1284
new file mode 100644
index 0000000..20b8ab0
--- /dev/null
+++ b/packages/hackbard/libieee1284/libieee1284
@@ -0,0 +1,7 @@
+# hdw - linux libieee1284 package
+#
+# author: hackbard@hackdaworld.dyndns.org
+#
+# [V] 0.2.9pre2
+# [S] 3-1
+# [D] libieee1284-0.2.9pre2.tar.bz2 http://cyberelk.net/tim/data/libieee1284/stable/
-- 
2.20.1