From 4e7284e4924605816b5aca2ecec3be9833f6c283 Mon Sep 17 00:00:00 2001
From: Mathieu <tenfingers@ifrance.com>
Date: Sat, 13 Sep 2003 17:21:10 +0000
Subject: [PATCH] Mathieu <tenfingers@ifrance.com>: various patches : * bitlbee
 : fixes the sysconfdir path * fmnewpackages.sh : tries to auto-detect the [M]
 line   (this fix can be duplicated in newpackages.sh i think) * eterm16 :
 fixes the download links, cleans up the .conf, adds imlib2 support * libxml2,
 gst-plugins, gstreamer,gkrellm : version updates * subversion : checksum
 update

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1392 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/CHANGELOG-RENE        |  3 +++
 misc/archive/fmnewpackage.sh                   |  5 ++++-
 package/daniel/gkrellm/gkrellm.desc            |  4 ++--
 .../gnome2/gst-plugins10/gst-plugins10.desc    |  4 ++--
 package/gnome2/gstreamer10/gstreamer10.desc    |  4 ++--
 package/jsaw/eterm16/eterm16.conf              | 18 ++++--------------
 package/jsaw/eterm16/eterm16.desc              |  8 +++-----
 package/mathieu/bitlbee/bitlbee.conf           |  2 +-
 package/rene/libxml2/libxml2.desc              |  4 ++--
 package/rene/subversion/subversion.desc        |  2 +-
 10 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 696169d76..6b3771802 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -9,6 +9,9 @@
                    fixed some pkgcheck mis-use
  - fixed a typo in xjdic - which never could have been build!
  - Alejandro Mery: updated lvs and keepalived
+ - Mathieu: bitlbee sysconfdir fix, cleaned and fixed eterm16, version
+            updates for libxml2 gst-plugins gstreamer and gkrellm and added
+            subversion checksum
 
 *) 2003-09-12 (2.0.0-rc1 - 2.0.0-rc2)
 
diff --git a/misc/archive/fmnewpackage.sh b/misc/archive/fmnewpackage.sh
index a23829348..2486622bc 100644
--- a/misc/archive/fmnewpackage.sh
+++ b/misc/archive/fmnewpackage.sh
@@ -150,6 +150,9 @@ if [ "$rep" != "*" ]; then
 	exit
 fi
 
+rep=${dir/\/$package/}
+maintainer="$( grep -h -m 1 "\[M\]" package/$rep/*/*.desc | head -n 1 | cut -d' ' -f2- )"
+
 echo -n "Creating package/$dir ... "
 if [ -e package/$dir ] ; then
 	echo "failed"
@@ -203,7 +206,7 @@ cat >>$package.desc <<EEE
 [U] $url
 
 [A] TODO: Author
-[M] TODO: Maintainer
+[M] ${maintainer:-TODO: Maintainer}
 
 [C] TODO: Category
 
diff --git a/package/daniel/gkrellm/gkrellm.desc b/package/daniel/gkrellm/gkrellm.desc
index adf6fae00..b1b55c3bc 100644
--- a/package/daniel/gkrellm/gkrellm.desc
+++ b/package/daniel/gkrellm/gkrellm.desc
@@ -61,8 +61,8 @@
 
 [L] GPL
 [S] Stable
-[V] 2.1.15
+[V] 2.1.19
 [P] X -----5---9 570.000
 
-[D] 769275749 gkrellm-2.1.15.tar.bz2 http://web.wt.net/~billw/gkrellm/
+[D] 3256047938 gkrellm-2.1.19.tar.bz2 http://web.wt.net/~billw/gkrellm/
 
diff --git a/package/gnome2/gst-plugins10/gst-plugins10.desc b/package/gnome2/gst-plugins10/gst-plugins10.desc
index 617ab0e98..d2770a40f 100644
--- a/package/gnome2/gst-plugins10/gst-plugins10.desc
+++ b/package/gnome2/gst-plugins10/gst-plugins10.desc
@@ -35,8 +35,8 @@
 
 [L] LGPL
 [S] Beta
-[V] 0.6.2
+[V] 0.6.3
 [P] X -----5---9 676.000
 
-[D] 4237449499 gst-plugins-0.6.2.tar.bz2 http://telia.dl.sourceforge.net/sourceforge/gstreamer/
+[D] 3326085837 gst-plugins-0.6.3.tar.gz http://telia.dl.sourceforge.net/sourceforge/gstreamer/
 
diff --git a/package/gnome2/gstreamer10/gstreamer10.desc b/package/gnome2/gstreamer10/gstreamer10.desc
index b6664deea..3bb5bafa0 100644
--- a/package/gnome2/gstreamer10/gstreamer10.desc
+++ b/package/gnome2/gstreamer10/gstreamer10.desc
@@ -41,8 +41,8 @@
 
 [L] LGPL
 [S] Beta
-[V] 0.6.2
+[V] 0.6.3
 [P] X -----5---9 473.000
 
-[D] 281626698 gstreamer-0.6.2.tar.bz2 http://telia.dl.sourceforge.net/sourceforge/gstreamer/
+[D] 2423208230 gstreamer-0.6.3.tar.gz http://gstreamer.net/releases/0.6.3/src/
 
diff --git a/package/jsaw/eterm16/eterm16.conf b/package/jsaw/eterm16/eterm16.conf
index 32051f3e3..43cdd75a8 100644
--- a/package/jsaw/eterm16/eterm16.conf
+++ b/package/jsaw/eterm16/eterm16.conf
@@ -23,18 +23,8 @@
 
 . package/*/*/e16.conf
 
-libast_pc () 
-{
-	echo "Building libast..."
-	tar $taropt $archdir/${libast}.tar.bz2
-	
-	cd ${libast}
-		eval ./autogen.sh
-		eval_config_command $( eval echo $confopt )
-		eval "$MAKE $makeopt"
-                eval "$MAKE $makeinstopt"
-	cd ..
-}
+for dir in opt/e17 usr $ROCKCFG_PKG_E17_CORE_PREFIX ; do
+    [ -f "$root/$dir/lib/libImlib2.so" ] && var_append confopt ' ' "--with-imlib=$root/$dir"
+done
 
-hook_add preconf 1 "libast_pc"
-var_append confopt ' ' "--enable-trans --enable-utmp --enable-multi-charset --enable-greek"
\ No newline at end of file
+var_append confopt ' ' "--enable-trans --enable-utmp --enable-multi-charset --enable-greek"
diff --git a/package/jsaw/eterm16/eterm16.desc b/package/jsaw/eterm16/eterm16.desc
index de31e61f9..1e2d1cddd 100644
--- a/package/jsaw/eterm16/eterm16.desc
+++ b/package/jsaw/eterm16/eterm16.desc
@@ -39,9 +39,7 @@
 [V] 0.9.2
 [P] X -----5---9 922.000
 
-[O] libast="libast-20030820"
+[SRC] .
 
-[D] 1817727120 Eterm-0.9.2.tar.gz http://dl.sourceforge.net/sourceforge/eterm/
-[D] 4168304702 libast-20030820.tar.bz2 cvs://pserver:anonymous@cvs.enlightenment.sourceforge.net:/cvsroot/enlightenment::eterm/libast!2003-08-20/
-#      (cd libast && ./autogen.sh $ac_configure_args && make install && cd .. && rm -rf libast)
-# cvs://pserver:anonymous@cvs.enlightenment.sourceforge.net:/cvsroot/enlightenment::e17/libs/imlib2_loaders/!2003-03-15/
\ No newline at end of file
+[D] 771916799 libast-0.5.tar.gz http://www.eterm.org/download/
+[D] 1817727120 Eterm-0.9.2.tar.gz http://www.eterm.org/download/
diff --git a/package/mathieu/bitlbee/bitlbee.conf b/package/mathieu/bitlbee/bitlbee.conf
index dd9012a06..0652d37b1 100644
--- a/package/mathieu/bitlbee/bitlbee.conf
+++ b/package/mathieu/bitlbee/bitlbee.conf
@@ -22,4 +22,4 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 runconf=0
-preconf="./configure --prefix=$root/$prefix"
+preconf="./configure --prefix=$root/$prefix --etcdir=$sysconfdir/$pkg"
diff --git a/package/rene/libxml2/libxml2.desc b/package/rene/libxml2/libxml2.desc
index 4cc47262e..0bf6de605 100644
--- a/package/rene/libxml2/libxml2.desc
+++ b/package/rene/libxml2/libxml2.desc
@@ -36,8 +36,8 @@
 
 [L] LGPL
 [S] Stable
-[V] 2.5.8
+[V] 2.5.10
 [P] X -----5---9 351.000
 
-[D] 2046806030 libxml2-2.5.8.tar.gz ftp://xmlsoft.org/
+[D] 371451689 libxml2-2.5.10.tar.gz ftp://xmlsoft.org/
 
diff --git a/package/rene/subversion/subversion.desc b/package/rene/subversion/subversion.desc
index 748f534c6..5bb040585 100644
--- a/package/rene/subversion/subversion.desc
+++ b/package/rene/subversion/subversion.desc
@@ -39,5 +39,5 @@
 [V] 0.29.0
 [P] X -----5---9 864.000
 
-[D] 0 subversion-0.29.0.tar.gz http://subversion.tigris.org/files/documents/15/5977/
+[D] 3839463653 subversion-0.29.0.tar.gz http://subversion.tigris.org/files/documents/15/5977/