From 78018a798ab055835e4e08c65ce8d3b4ad994ee1 Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Thu, 11 Aug 2005 23:19:41 +0000
Subject: [PATCH] packages updates = helper improvements

---
 doc/CHANGELOG                           |  2 +
 packages/hackbard/dfbpoint/dfbpoint     |  2 +-
 packages/hackbard/dfbsee/dfbsee         | 12 ++++--
 packages/hackbard/directfb/directfb     |  2 +-
 packages/hackbard/fig2ps/fig2ps         |  2 +-
 packages/hackbard/tetex/tetex           | 52 +++++++------------------
 packages/hackbard/which/which           | 13 +++++++
 packages/multimedia/avifile/avifile     | 13 ++++---
 packages/multimedia/mesa3d/mesa3d       |  4 +-
 packages/multimedia/sdl-mixer/sdl-mixer |  4 +-
 packages/net/bind/named.init            |  1 +
 packages/net/portmap/portmap.init       |  1 +
 packages/soundtools/aumix/aumix         |  2 +-
 packages/x11/glib/glib                  |  4 +-
 packages/x11/glib1/gcc34.patch          | 11 ++++++
 packages/x11/imagemagick/imagemagick    |  4 +-
 packages/x11/libidl/libidl              |  4 +-
 packages/x11/libxml/libxml              |  4 +-
 packages/x11/wmapm/wmapm                |  2 +-
 packages/x11/wmwave/wmwave              |  2 +-
 scripts/Download                        |  3 ++
 scripts/Helper                          | 26 +++++++++----
 22 files changed, 100 insertions(+), 70 deletions(-)
 create mode 100644 packages/hackbard/which/which
 create mode 100644 packages/x11/glib1/gcc34.patch

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index bd33f82..a8afd01 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,5 +1,7 @@
 *) 2005-08-11
 
+- improved helper scripts
+- more package updates (stage 5 done)
 - fixes to fai routine, improved hdw-get
 - several package updates (stage 4)
 - xdirectfb changes (adapted from malis notebook)
diff --git a/packages/hackbard/dfbpoint/dfbpoint b/packages/hackbard/dfbpoint/dfbpoint
index 3d850c2..ad65745 100644
--- a/packages/hackbard/dfbpoint/dfbpoint
+++ b/packages/hackbard/dfbpoint/dfbpoint
@@ -4,6 +4,6 @@
 #
 # [V] 0.7.2
 # [S] 3-6
-# [D] DFBPoint-0.7.2.tar.gz http://www.directfb.org/download/DFBPoint/
+# [D] DFBPoint-0.7.2.tar.gz http://directfb.org/downloads/Programs/
 
 srcdir="DFBPoint-$ver"
diff --git a/packages/hackbard/dfbsee/dfbsee b/packages/hackbard/dfbsee/dfbsee
index fe0d8d8..e2c2a71 100644
--- a/packages/hackbard/dfbsee/dfbsee
+++ b/packages/hackbard/dfbsee/dfbsee
@@ -2,8 +2,14 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 0.7.4
+# [V] cvs
 # [S] 3-6
-# [D] DFBSee-0.7.4.tar.gz http://www.directfb.org/download/DFBSee/
+# [D] dfbsee.tar.bz2 cvs:anonymous:directfb.org:cvs/directfb:DFBSee
 
-srcdir="DFBSee-$ver"
+srcdir="DFBSee"
+
+export PKG_CONFIG=/usr/bin/pkg-config
+
+pre_install()	{
+	./autogen.sh
+		}
diff --git a/packages/hackbard/directfb/directfb b/packages/hackbard/directfb/directfb
index 890f76a..6fcfd94 100644
--- a/packages/hackbard/directfb/directfb
+++ b/packages/hackbard/directfb/directfb
@@ -9,7 +9,7 @@
 srcdir="DirectFB-$ver"
 [ "$ver" = "cvs" ] && srcdir="DirectFB"
 
-confopt="$confopt --enable-sysfs"
+confopt="$confopt --enable-sysfs --enable-video4linux2"
 # uncomment if you want multi app support (requires fusion kernel patch)
 # confopt="$confopt --enable-multi"
 
diff --git a/packages/hackbard/fig2ps/fig2ps b/packages/hackbard/fig2ps/fig2ps
index 4d122d1..2206557 100644
--- a/packages/hackbard/fig2ps/fig2ps
+++ b/packages/hackbard/fig2ps/fig2ps
@@ -3,7 +3,7 @@
 # author: hackbard@hackdaworld.org
 #
 # [V] 1.3.2
-# [S] 3-6
+# [S] 3-8
 # [D] fig2ps_1.3.2.tar.gz http://mesh.dl.sourceforge.net/sourceforge/fig2ps/
 
 build_main()	{
diff --git a/packages/hackbard/tetex/tetex b/packages/hackbard/tetex/tetex
index 6d3d661..b1214a9 100644
--- a/packages/hackbard/tetex/tetex
+++ b/packages/hackbard/tetex/tetex
@@ -2,46 +2,24 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 2.0.2
+# [V] 3.0
 # [S] 3-5
-# [D] tetex-src-2.0.2.tar.gz ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/2.0/distrib/
-# [D] tetex-texmf-2.0.2.tar.gz ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/2.0/distrib/
-# [D] tetex-texmfsrc-2.0.2.tar.gz ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/2.0/distrib/
-# [D] graphs.tar.gz http://www.cs.umu.se/~drewes/graphs/
+# [D] tetex-src-3.0.tar.gz ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/3.0/distrib/
+# [D] tetex-texmf-3.0.tar.gz ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/3.0/distrib/
+# [D] tetex-texmfsrc-3.0.tar.gz ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/3.0/distrib/
 
 srcdir="tetex-src-$ver"
-confopt="$confopt --disable-multiplatform"
+confopt="$confopt --with-system-ncurses --with-system-zlib"
+confopt="$confopt --exec-prefix=$prefix --without-texinfo"
+# to avoid x dependency
+# confopt="$confopt --with-x=no"
 
-pre_install()	{
-	mkdir -p $prefix/share/texmf
-	mkdir -p $root/src.$package/tex
-	tar --use-compress-program=gunzip -xf \
-		$archdir/tetex-texmf-${ver}.tar.gz -C \
-		$root/src.$package/tex
-	chown -R 0.0 $root/src.$package/tex
-	cp -a $root/src.$package/tex/* $prefix/share/texmf
-	rm -rf $root/src.$package/tex/*
-	tar --use-compress-program=gunzip -xf \
-		$archdir/tetex-texmfsrc-${ver}.tar.gz -C \
-		$root/src.$package/tex
-	chown -R 0.0 $root/src.$package/tex
-	cp -a $root/src.$package/tex/* $prefix/share/texmf
-	rm -rf $root/src.$package/tex
-	
-	# wrong timestamp
-	#touch ./texk/web2c/tangleboot.p
-	# new flex
-	sed 's%$(LEX)%$(LEX) -l%g' texk/web2c/omegafonts/Makefile.in > tmp~
-	mv tmp~ texk/web2c/omegafonts/Makefile.in
-		}
+make_conf="all $make_conf"
 
-post_install()	{
-	# installing graphs.sty
-	mkdir -p $prefix/share/texmf/tex/latex/graphs
-	tar --use-compress-program=gunzip -xf \
-		$archdir/graphs.tar.gz -C \
-		$prefix/share/texmf/tex/latex/graphs
-	chown -R 0.0 $prefix/share/texmf/tex/latex/graphs
-	echo "\special{header=${prefix}/share/texmf/tex/latex/graphs/graphs.header}" > \
-		$prefix/share/texmf/tex/latex/graphs/graphs_config.tex
+pre_install()	{
+	install -v -d -m755 $prefix/share/texmf
+	gzip -dc $archdir/tetex-texmf-${ver}.tar.gz | \
+		( umask 0; tar -C $prefix/share/texmf -xf -)
+	gzip -dc $archdir/tetex-texmfsrc-${ver}.tar.gz | \
+		( umask 0; tar -C $prefix/share/texmf -xf -)
 		}
diff --git a/packages/hackbard/which/which b/packages/hackbard/which/which
new file mode 100644
index 0000000..ce42f88
--- /dev/null
+++ b/packages/hackbard/which/which
@@ -0,0 +1,13 @@
+# hdw - linux zip package
+#
+# author: hackbard@hackdaworld.dyndns.org
+#
+# [V] 0.1
+# [S] 3-1
+# [D] which http://www.hackdaworld.org/download/
+
+custmain=1
+
+custmain()	{
+	install -v -m755 $archdir/which $prefix/bin
+		}
diff --git a/packages/multimedia/avifile/avifile b/packages/multimedia/avifile/avifile
index 57d888d..0c7fbf0 100644
--- a/packages/multimedia/avifile/avifile
+++ b/packages/multimedia/avifile/avifile
@@ -2,12 +2,15 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] cvs
+# [V] 0.7-0.7.43
 # [S] 3-5
-# [D] avifile.tar.bz2 cvs:anonymous:cvs.avifile.sourceforge.net:cvsroot/avifile:avifile
+# [D] avifile-0.7-0.7.43.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/avifile/
+# [D] binaries-011002.tgz http://mesh.dl.sourceforge.net/sourceforge/avifile/
+
+extra_ver="011002"
+confopt="$confopt --with-win32-path=$prefix/lib/avifile"
 
 pre_install()	{
-	./autogen.sh
+	install -v -d -m755 $prefix/lib/avifile/win32
+	tar xvfz $archdir/binaries-${extra_ver}.tgz -C $prefix/lib/avifile
 		}
-
-confopt="$confopt --enable-shared --enable-static"
diff --git a/packages/multimedia/mesa3d/mesa3d b/packages/multimedia/mesa3d/mesa3d
index 4a15544..ad12c68 100644
--- a/packages/multimedia/mesa3d/mesa3d
+++ b/packages/multimedia/mesa3d/mesa3d
@@ -2,9 +2,9 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 6.0.1
+# [V] 6.3
 # [S] 3-6
-# [D] MesaLib-6.0.1.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/mesa3d/
+# [D] MesaLib-6.3.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/mesa3d/
 
 srcdir=Mesa-$ver
 # install in /opt/mesa3d
diff --git a/packages/multimedia/sdl-mixer/sdl-mixer b/packages/multimedia/sdl-mixer/sdl-mixer
index bc5c0de..fa558f5 100644
--- a/packages/multimedia/sdl-mixer/sdl-mixer
+++ b/packages/multimedia/sdl-mixer/sdl-mixer
@@ -2,8 +2,8 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 1.2.5
+# [V] 1.2.6
 # [S] 3-5
-# [D] SDL_mixer-1.2.5.tar.gz http://www.libsdl.org/projects/SDL_mixer/release/
+# [D] SDL_mixer-1.2.6.tar.gz http://www.libsdl.org/projects/SDL_mixer/release/
 
 srcdir="SDL_mixer-$ver"
diff --git a/packages/net/bind/named.init b/packages/net/bind/named.init
index dfc25c4..54f0256 100644
--- a/packages/net/bind/named.init
+++ b/packages/net/bind/named.init
@@ -1 +1,2 @@
 s_value=45
+bin=named
diff --git a/packages/net/portmap/portmap.init b/packages/net/portmap/portmap.init
index a6db5d5..b03c0ce 100644
--- a/packages/net/portmap/portmap.init
+++ b/packages/net/portmap/portmap.init
@@ -1,2 +1,3 @@
 s_value=45
 depends=ifconfig
+path=/sbin
diff --git a/packages/soundtools/aumix/aumix b/packages/soundtools/aumix/aumix
index b33cea3..14c34aa 100644
--- a/packages/soundtools/aumix/aumix
+++ b/packages/soundtools/aumix/aumix
@@ -3,7 +3,7 @@
 # author: hackbard@hackdaworld.dyndns.org
 #
 # [V] 2.8
-# [S] 3-4
+# [S] 3-8
 # [D] aumix-2.8.tar.bz2 http://jpj.net/~trevor/aumix/
 
 confopt="$confopt --without-gtk1"
diff --git a/packages/x11/glib/glib b/packages/x11/glib/glib
index 482d52f..f7576c7 100644
--- a/packages/x11/glib/glib
+++ b/packages/x11/glib/glib
@@ -2,9 +2,9 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 2.4.4
+# [V] 2.7.7
 # [S] 3-5
-# [D] glib-2.4.4.tar.bz2 http://ftp.gnome.org/pub/gnome/sources/glib/2.4/
+# [D] glib-2.7.7.tar.bz2 http://ftp.gnome.org/pub/gnome/sources/glib/2.7/
 
 # optional
 # confopt="$confopt --disable-debug"
diff --git a/packages/x11/glib1/gcc34.patch b/packages/x11/glib1/gcc34.patch
new file mode 100644
index 0000000..f76534a
--- /dev/null
+++ b/packages/x11/glib1/gcc34.patch
@@ -0,0 +1,11 @@
+--- ./gstrfuncs.c.orig	2004-05-15 13:40:03.556092792 +0000
++++ ./gstrfuncs.c	2004-05-15 13:40:36.712052320 +0000
+@@ -47,6 +47,8 @@
+  * inteferes with g_strsignal() on some OSes
+  */
+ 
++#define G_GNUC_PRETTY_FUNCTION
++
+ typedef union  _GDoubleIEEE754  GDoubleIEEE754;
+ #define G_IEEE754_DOUBLE_BIAS   (1023)
+ /* multiply with base2 exponent to get base10 exponent (nomal numbers) */
diff --git a/packages/x11/imagemagick/imagemagick b/packages/x11/imagemagick/imagemagick
index a2da69e..c511dff 100644
--- a/packages/x11/imagemagick/imagemagick
+++ b/packages/x11/imagemagick/imagemagick
@@ -2,9 +2,9 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 6.0.3-1
+# [V] 6.2.3-5
 # [S] 3-6
-# [D] ImageMagick-6.0.3-1.tar.bz2 ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/
+# [D] ImageMagick-6.2.3-5.tar.bz2 http://www.imagemagick.org/download/
 
 xtraver="`echo $ver | awk -F- '{ print $1 }'`"
 srcdir="ImageMagick-${xtraver}"
diff --git a/packages/x11/libidl/libidl b/packages/x11/libidl/libidl
index 5c7e064..755ab06 100644
--- a/packages/x11/libidl/libidl
+++ b/packages/x11/libidl/libidl
@@ -2,9 +2,9 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 0.8.3
+# [V] 0.8.6
 # [S] 3-5
-# [D] libIDL-0.8.3.tar.bz2 ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/
+# [D] libIDL-0.8.6.tar.bz2 ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/
 
 srcdir="libIDL-${ver}"
 
diff --git a/packages/x11/libxml/libxml b/packages/x11/libxml/libxml
index 0b2cbe3..d3839f5 100644
--- a/packages/x11/libxml/libxml
+++ b/packages/x11/libxml/libxml
@@ -2,6 +2,6 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 2.6.11
+# [V] 2.6.20
 # [S] 3-5
-# [D] libxml2-2.6.11.tar.bz2 ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/
+# [D] libxml2-2.6.20.tar.bz2 ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/
diff --git a/packages/x11/wmapm/wmapm b/packages/x11/wmapm/wmapm
index d643b39..208fa3e 100644
--- a/packages/x11/wmapm/wmapm
+++ b/packages/x11/wmapm/wmapm
@@ -4,7 +4,7 @@
 #
 # [V] 3.1
 # [S] 3-4
-# [D] wmapm-3.1.tar.gz http://dockapps.org/download.php/id/25/
+# [D] wmapm-3.1.tar.gz http://hdwlinux.org/download/hdw-linux/hdw-linux-1.0/sources/x11/wmapm/
 
 build_main()	{
 	cd wmapm &&
diff --git a/packages/x11/wmwave/wmwave b/packages/x11/wmwave/wmwave
index 6dd0dad..258d93b 100644
--- a/packages/x11/wmwave/wmwave
+++ b/packages/x11/wmwave/wmwave
@@ -4,7 +4,7 @@
 #
 # [V] 0-4modified
 # [S] 3-4
-# [D] wmwave.tar.bz2 http://www.hackdaworld.org/download/hdw-linux/hdw-linux-1.0/sources/x11/wmwave/
+# [D] wmwave.tar.bz2 http://www.hdwlinux.org/download/hdw-linux/hdw-linux-1.0/sources/x11/wmwave/
 
 build_main()	{
 	rm -fv *.o wmwave
diff --git a/scripts/Download b/scripts/Download
index cd73b12..5001ce6 100755
--- a/scripts/Download
+++ b/scripts/Download
@@ -218,6 +218,9 @@ for dir in `ls -A --ignore="CVS" ./download`; do
 		# possibly the package exists
 		mkdir -p ./download/$dir/$pkg ; cd ./download/$dir/$pkg
 				tolf="`find ../.. -name $file | tail -1`"
+				if [ -n "$tolf" ] ; then
+					[ -d $tolf ] && tolf=""
+				fi
 				if [ -f ./$file ] ; then
 					echo "$file allready downloaded."
 					echo
diff --git a/scripts/Helper b/scripts/Helper
index 048ed14..1d1b272 100755
--- a/scripts/Helper
+++ b/scripts/Helper
@@ -16,6 +16,8 @@ ccl=0
 cdf=0
 rtd=0
 bd=0
+chr=0
+root=""
 
 while [ "$1" ] ; do
 	case "$1" in
@@ -23,6 +25,7 @@ while [ "$1" ] ; do
 		-create_dist_files)	cdf=1;	shift 1 ;;
 		-create_runtimedeps)	rtd=1;	shift 1 ;;
 		-create_build_deps)	bd=1;	shift 1 ;;
+		-chroot)		chr=1;	shift 1 ;;
 		*)
 			echo
 			echo "usage:"
@@ -36,18 +39,27 @@ while [ "$1" ] ; do
 	esac
 done
 
+[ "$chr" = "1" ] && root=$hdw_build_dir
+
 if [ "$rtd" = "1" ] ; then
 	echo "# hdw packages + run time dependencies"
 	echo "#"
 	echo "# created `date`"
 	echo
-	for i in /var/adm/deps/run/*; do
-		echo -en $i | sed 's$/var/adm/deps/run/$$'
-		echo -en " - "
-		for j in `cat $i`; do
-			echo -en "$j "
-		done
-		echo -en "\n"
+	echo "00-dirtree -"
+	for i in $root/var/adm/flists/*; do
+		package=`basename $i | sed 's/-[0-9].*//'`
+		if [ -n "`echo $package | grep -v stage[0-1]`" ] ; then
+			file="$root/var/adm/deps/run/$package"
+			echo -en $package
+			echo -en " - "
+			if [ -f $file ] ; then
+				for j in `cat $file`; do
+					echo -en "$j "
+				done
+			fi
+			echo -en "\n"
+		fi
 	done
 fi
 
-- 
2.39.2