From ab6dddc33e1b3c2f598f9b2dfdb417094605b5d1 Mon Sep 17 00:00:00 2001
From: Thierry N <thierryn1 at hispeed dot ch>
Date: Thu, 20 Aug 2009 08:54:32 +0200
Subject: pkg-get, correctif pour pkg-repgen

---
 base/pkg-get/.md5sum          |  5 +++--
 base/pkg-get/Pkgfile          |  5 +++--
 base/pkg-get/pkg-get.conf     |  2 +-
 base/pkg-get/pkg-repgen.patch | 11 +++++++++++
 base/pkg-get/syn              |  7 ++++---
 5 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 base/pkg-get/pkg-repgen.patch

(limited to 'base/pkg-get')

diff --git a/base/pkg-get/.md5sum b/base/pkg-get/.md5sum
index f012617fc..64b1b95b3 100644
--- a/base/pkg-get/.md5sum
+++ b/base/pkg-get/.md5sum
@@ -1,4 +1,5 @@
 5ee169f2f99fc501387219b6b96ca9ef  pkg-get-0.4.5.tar.gz
-8743345d92c1ef62e433b4e76468496e  pkg-get.conf
+653417fe57aef74d16397de9e2a17519  pkg-get.conf
 c3fb4f7ca868903da78d316be77cca16  pkg-get.patch
-cc2b9dcbd4e834b4928839a69d159a9f  syn
+c4cca630bfcc85a3f3b13497aff01310  pkg-repgen.patch
+7f54fb956ff1e04efbeb80ca8e52ebb3  syn
diff --git a/base/pkg-get/Pkgfile b/base/pkg-get/Pkgfile
index 7fa207258..3ce4665f9 100644
--- a/base/pkg-get/Pkgfile
+++ b/base/pkg-get/Pkgfile
@@ -6,13 +6,14 @@
 
 name=pkg-get
 version=0.4.5
-release=3
+release=4
 source=(http://www.varlock.com/files/$name-$version.tar.gz \
-	$name.patch pkg-get.conf syn)
+	$name.patch pkg-get.conf pkg-repgen.patch syn)
 
 build() {
 ARCH_=`uname -m`
 	cd $name-$version
+	patch -Np1 -i ../pkg-repgen.patch
 	patch -p1 < ../$name.patch
 	make PREFIX=$PKG/usr CFGDIR=$PKG/etc install
 	install -m 755 ../syn $PKG/usr/bin/syn
diff --git a/base/pkg-get/pkg-get.conf b/base/pkg-get/pkg-get.conf
index ebbff51e3..2a097b733 100644
--- a/base/pkg-get/pkg-get.conf
+++ b/base/pkg-get/pkg-get.conf
@@ -3,7 +3,7 @@
 # pkg-get configuration file
 # package repositories (remote)
 # The first two are remote repoistories, the last is a local one
-pkgdir /srv/NuTyX/locale
+# pkgdir /srv/NuTyX/locale
 pkgdir /srv/NuTyX/test|http://nutyx.meticul.eu/2009/uname-m/test
 pkgdir /srv/NuTyX/release|http://nutyx.meticul.eu/2009/uname-m/release
 # runscripts: if "yes" pre-post install scripts are
diff --git a/base/pkg-get/pkg-repgen.patch b/base/pkg-get/pkg-repgen.patch
new file mode 100644
index 000000000..8fd93c56b
--- /dev/null
+++ b/base/pkg-get/pkg-repgen.patch
@@ -0,0 +1,11 @@
+--- pkg-get-0.4.5/scripts/pkg-repgen.pl.original	2009-08-19 11:44:55.000000000 +0000
++++ pkg-get-0.4.5/scripts/pkg-repgen.pl	2009-08-19 11:47:59.000000000 +0000
+@@ -198,7 +198,7 @@
+         my $path = `prt-get path $package`;
+         $path =~ s/\n//g;
+         my $normal= $package;
+-        $normal =~ s/[^[:alnum:]]/_/g;
++        $normal =~ s/[^[:alnum:]]/-/g;
+         if (-f "$path/pre-install"){
+             print $fh "${normal}_pre_install() {\n";
+             open(my $pre, "$path/pre-install");
diff --git a/base/pkg-get/syn b/base/pkg-get/syn
index c4bdeb1fe..f0bf5d46e 100644
--- a/base/pkg-get/syn
+++ b/base/pkg-get/syn
@@ -6,12 +6,13 @@ if [ ! "$EUID" -eq 0 ]; then
 	exit 1
 fi
 if [ ! -L /depot ]; then
+	if [ ! -d $Depot/locale ]; then mkdir -p $Depot/locale; fi
 	pushd $Depot/locale > /dev/null
 	pkg-repgen
 	popd
-	for i in test stable
+	for i in test release
 	do
-		if [ -d $Depot/$i ]; then
+		if [ -a $Depot/$i ]; then
 			rm -r $Depot/$i
 		fi
 	done
@@ -27,7 +28,7 @@ if [ ! -L /depot ]; then
 else
 	for i in `cat /etc/pkg-get.conf |grep -v ^#|grep http|cut -d "|" -f 1|cut -d" " -f2|cut -d"/" -f4`
 	do
-		rsync -avuz --delete-before rsync://nutyx.meticul.eu/nutyx/2009/uname-m/$i/ $Depot/$i/
+		rsync -avuz --delete-before rsync://nutyx.meticul.eu/nutyx/2009/i686/$i/ $Depot/$i/
 	done
 fi
 	
-- 
cgit v1.2.3-70-g09d2