# HG changeset patch
# User Tomas Zeman <tzeman@volny.cz>
# Date 1329313686 -3600
# Node ID 0196de73613936461aedc29cac828606e095500f
# Parent  df315870634b5bb862ebd75f2e075ab1c9f6fdb5
diet-cvm.patch, diet-bglibs folds

diff -r df315870634b -r 0196de736139 diet-bglibs
--- a/diet-bglibs	Wed Feb 15 14:43:57 2012 +0100
+++ b/diet-bglibs	Wed Feb 15 14:48:06 2012 +0100
@@ -1,25 +1,20 @@
-From 79fdfdf8c906da690b889c754a47ef696db6d555 Mon Sep 17 00:00:00 2001
 From: Tomas Zeman <tzeman@volny.cz>
 Date: Thu, 25 Oct 2007 00:13:17 +0200
-Subject: [PATCH] diet-bglibs-1.102-1-i686
- * added
+diet-bglibs
 
-diff --git a/source/dietlibc/diet-bglibs/FrugalBuild b/source/dietlibc/diet-bglibs/FrugalBuild
-new file mode 100644
-index 0000000..76b8a98
---- /dev/null
-+++ b/source/dietlibc/diet-bglibs/FrugalBuild
-@@ -0,0 +1,32 @@
+diff -r bb258baca729 source/dietlibc/diet-bglibs/FrugalBuild
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-bglibs/FrugalBuild	Wed Feb 15 14:47:46 2012 +0100
+@@ -0,0 +1,31 @@
 +# Maintainer: Tomas Zeman <tzeman@volny.cz>
 +
 +branch=diet
 +pkgorig=bglibs
 +pkgname=$branch-$pkgorig
 +pkgver=1.104
-+pkgrel=1
++pkgrel=2
 +pkgdesc="One stop library package"
 +makedepends=(dietlibc gcc)
-+provides=(bglibs)
 +url="http://untroubled.org/bglibs/"
 +archs=(i686)
 +up2date='lynx -dump -nolist $url|grep $pkgorig|grep .tar.gz|head -1|sed -e "s/.*$pkgorig-\(.*\)\.tar.gz.*$/\1/"'
@@ -30,11 +25,11 @@
 +build() {
 +	DDIR=/usr/lib/diet
 +	Fcd $pkgorig-$pkgver
-+	patch -p0 < $Fsrcdir/libtool-tag.patch
++	patch -p0 < $Fsrcdir/libtool-tag.patch || Fdie
 +	echo "diet gcc $CFLAGS" > conf-cc
 +	echo "diet gcc -s -static" > conf-ld
-+	echo "$DDIR/bglibs/include" > conf-include
-+	echo "$DDIR/bglibs/lib" > conf-lib
++	echo "$DDIR/include/bglibs" > conf-include
++	echo "$DDIR/lib" > conf-lib
 +	echo "$DDIR/bin" > conf-bin
 +	echo "$DDIR/man" > conf-man
 +
@@ -42,11 +37,9 @@
 +	make install_prefix=$Fdestdir install || Fdie
 +}
 +# vim: ft=sh
-diff --git a/source/dietlibc/diet-bglibs/libtool-tag.patch b/source/dietlibc/diet-bglibs/libtool-tag.patch
-new file mode 100644
-index 0000000..2172023
---- /dev/null
-+++ b/source/dietlibc/diet-bglibs/libtool-tag.patch
+diff -r bb258baca729 source/dietlibc/diet-bglibs/libtool-tag.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-bglibs/libtool-tag.patch	Wed Feb 15 14:47:46 2012 +0100
 @@ -0,0 +1,11 @@
 +--- Makefile.orig	2006-10-30 22:11:21.000000000 +0100
 ++++ Makefile	2007-10-25 00:00:46.000000000 +0200
diff -r df315870634b -r 0196de736139 diet-bglibs-fix-path.patch
--- a/diet-bglibs-fix-path.patch	Wed Feb 15 14:43:57 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-From ab75b9c964bf3af0ffe45c028dfd1419356e8484 Mon Sep 17 00:00:00 2001
-From: Tomas Zeman <tzeman@volny.cz>
-Date: Sun, 28 Oct 2007 23:29:08 +0100
-Subject: [PATCH] diet-bglibs-1.102-1: fix installation paths
-
----
- source/dietlibc/diet-bglibs/FrugalBuild |    5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/source/dietlibc/diet-bglibs/FrugalBuild b/source/dietlibc/diet-bglibs/FrugalBuild
-index 2930ed6..088d632 100644
---- a/source/dietlibc/diet-bglibs/FrugalBuild
-+++ b/source/dietlibc/diet-bglibs/FrugalBuild
-@@ -7,7 +7,6 @@ pkgver=1.102
- pkgrel=1
- pkgdesc="One stop library package"
- makedepends=(dietlibc gcc)
--provides=(bglibs)
- url="http://untroubled.org/bglibs/"
- archs=(i686)
- up2date='lynx -dump -nolist $url|grep $pkgorig|grep .tar.gz|head -1|sed -e "s/.*$pkgorig-\(.*\)\.tar.gz.*$/\1/"'
-@@ -21,8 +20,8 @@ build() {
- 	patch -p0 < $Fsrcdir/libtool-tag.patch || Fdie
- 	echo "diet gcc $CFLAGS" > conf-cc
- 	echo "diet gcc -s -static" > conf-ld
--	echo "$DDIR/bglibs/include" > conf-include
--	echo "$DDIR/bglibs/lib" > conf-lib
-+	echo "$DDIR/include/bglibs" > conf-include
-+	echo "$DDIR/lib" > conf-lib
- 	echo "$DDIR/bin" > conf-bin
- 	echo "$DDIR/man" > conf-man
- 
--- 
-1.5.3.4
-
diff -r df315870634b -r 0196de736139 diet-bglibs-fix.patch
--- a/diet-bglibs-fix.patch	Wed Feb 15 14:43:57 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-From e77b7a8c68f264af3953fdac5afa9fe719d1ae2b Mon Sep 17 00:00:00 2001
-From: Tomas Zeman <tzeman@volny.cz>
-Date: Fri, 26 Oct 2007 22:24:33 +0200
-Subject: [PATCH] diet-bglibs-1.102-1-i686: die on failed patch
-
----
- source/dietlibc/diet-bglibs/FrugalBuild |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/source/dietlibc/diet-bglibs/FrugalBuild b/source/dietlibc/diet-bglibs/FrugalBuild
-index 95d7e43..2930ed6 100644
---- a/source/dietlibc/diet-bglibs/FrugalBuild
-+++ b/source/dietlibc/diet-bglibs/FrugalBuild
-@@ -18,7 +18,7 @@ sha1sums=('45d0df13d35d5b162378314f354dde76aa704977' \
- build() {
- 	DDIR=/usr/lib/diet
- 	Fcd $pkgorig-$pkgver
--	patch -p0 < $Fsrcdir/libtool-tag.patch
-+	patch -p0 < $Fsrcdir/libtool-tag.patch || Fdie
- 	echo "diet gcc $CFLAGS" > conf-cc
- 	echo "diet gcc -s -static" > conf-ld
- 	echo "$DDIR/bglibs/include" > conf-include
--- 
-1.5.3.4
-
diff -r df315870634b -r 0196de736139 diet-cvm
--- a/diet-cvm	Wed Feb 15 14:43:57 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-From 2db345c6f6940a69bbd7ecebc91339e0e4112e40 Mon Sep 17 00:00:00 2001
-From: Tomas Zeman <tzeman@volny.cz>
-Date: Fri, 26 Oct 2007 22:23:42 +0200
-Subject: [PATCH] diet-cvm-0.82-1-i686
- * added
-
-diff --git a/source/dietlibc/diet-cvm/FrugalBuild b/source/dietlibc/diet-cvm/FrugalBuild
-new file mode 100644
-index 0000000..b10ea92
---- /dev/null
-+++ b/source/dietlibc/diet-cvm/FrugalBuild
-@@ -0,0 +1,32 @@
-+# $Id: PKGBUILD 335 2006-06-02 11:47:37Z zeman $
-+# Maintainer: Tomas Zeman <tzeman@volny.cz>
-+
-+branch=diet
-+pkgorig=cvm
-+pkgname=$branch-$pkgorig
-+pkgver=0.90
-+pkgrel=1
-+pkgdesc="Credential Validation Modules"
-+makedepends=(dietlibc gcc 'diet-bglibs>=1.100')
-+provides=(cvm)
-+url="http://untroubled.org/cvm/"
-+archs=(i686)
-+up2date='lynx -dump -nolist $url|grep $pkgorig|grep .tar.gz|head -1|sed -e "s/.*$pkgorig-\(.*\)\.tar.gz.*$/\1/"'
-+source=($url/$pkgorig-$pkgver.tar.gz)
-+sha1sums=('659c0bc349460cf19442b0bcdc06fad439d57491')
-+
-+build() {
-+	DDIR=/usr/lib/diet
-+	Fcd $pkgorig-$pkgver
-+	echo "diet gcc $CFLAGS" > conf-cc
-+	echo "diet gcc -s -static" > conf-ld
-+	echo "$DDIR/bglibs/include" > conf-bgincs
-+	echo "$DDIR/bglibs/lib" > conf-bglibs
-+	echo "/usr/bin" > conf-bin
-+	echo "$DDIR/include" > conf-include
-+	echo "$DDIR/lib" > conf-lib
-+
-+	make || Fdie
-+	make install_prefix=$Fdestdir PATH=$PATH:$DDIR/bin install || Fdie
-+}
-+# vim: ft=sh
diff -r df315870634b -r 0196de736139 diet-cvm-fix-path.patch
--- a/diet-cvm-fix-path.patch	Wed Feb 15 14:43:57 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-From 0f0cf3df56cce86bb8643e2989b451aa8504013e Mon Sep 17 00:00:00 2001
-From: Tomas Zeman <tzeman@volny.cz>
-Date: Sun, 28 Oct 2007 23:29:42 +0100
-Subject: [PATCH] diet-cvm-0.82-1: fix installation paths
-
----
- source/dietlibc/diet-cvm/FrugalBuild |    8 +++-----
- 1 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/source/dietlibc/diet-cvm/FrugalBuild b/source/dietlibc/diet-cvm/FrugalBuild
-index ee85a0e..6f389ab 100644
---- a/source/dietlibc/diet-cvm/FrugalBuild
-+++ b/source/dietlibc/diet-cvm/FrugalBuild
-@@ -1,4 +1,3 @@
--# $Id: PKGBUILD 335 2006-06-02 11:47:37Z zeman $
- # Maintainer: Tomas Zeman <tzeman@volny.cz>
- 
- branch=diet
-@@ -8,7 +7,6 @@ pkgver=0.82
- pkgrel=1
- pkgdesc="Credential Validation Modules"
- makedepends=(dietlibc gcc 'diet-bglibs>=1.100')
--provides=(cvm)
- url="http://untroubled.org/cvm/"
- archs=(i686)
- up2date='lynx -dump -nolist $url|grep $pkgorig|grep .tar.gz|head -1|sed -e "s/.*$pkgorig-\(.*\)\.tar.gz.*$/\1/"'
-@@ -22,9 +20,9 @@ build() {
- 	patch -p0 < $Fsrcdir/libtool-tag.patch || Fdie
- 	echo "diet gcc $CFLAGS" > conf-cc
- 	echo "diet gcc -s -static" > conf-ld
--	echo "$DDIR/bglibs/include" > conf-bgincs
--	echo "$DDIR/bglibs/lib" > conf-bglibs
--	echo "/usr/bin" > conf-bin
-+	echo "$DDIR/include/bglibs" > conf-bgincs
-+	echo "$DDIR/lib" > conf-bglibs
-+	echo "$DDIR/bin" > conf-bin
- 	echo "$DDIR/include" > conf-include
- 	echo "$DDIR/lib" > conf-lib
- 
--- 
-1.5.3.4
-
diff -r df315870634b -r 0196de736139 diet-cvm.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/diet-cvm.patch	Wed Feb 15 14:48:06 2012 +0100
@@ -0,0 +1,39 @@
+From: Tomas Zeman <tzeman@volny.cz>
+Date: Fri, 26 Oct 2007 22:23:42 +0200
+
+diet-cvm-0.90-2
+
+diff -r 889f8e535334 source/dietlibc/diet-cvm/FrugalBuild
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-cvm/FrugalBuild	Wed Feb 15 14:46:27 2012 +0100
+@@ -0,0 +1,30 @@
++# Maintainer: Tomas Zeman <tzeman@volny.cz>
++
++branch=diet
++pkgorig=cvm
++pkgname=$branch-$pkgorig
++pkgver=0.90
++pkgrel=2
++pkgdesc="Credential Validation Modules"
++makedepends=(dietlibc gcc 'diet-bglibs>=1.100')
++url="http://untroubled.org/cvm/"
++archs=(i686)
++up2date='lynx -dump -nolist $url|grep $pkgorig|grep .tar.gz|head -1|sed -e "s/.*$pkgorig-\(.*\)\.tar.gz.*$/\1/"'
++source=($url/$pkgorig-$pkgver.tar.gz)
++sha1sums=('659c0bc349460cf19442b0bcdc06fad439d57491')
++
++build() {
++	DDIR=/usr/lib/diet
++	Fcd $pkgorig-$pkgver
++	echo "diet gcc $CFLAGS" > conf-cc
++	echo "diet gcc -s -static" > conf-ld
++	echo "$DDIR/include/bglibs" > conf-bgincs
++	echo "$DDIR/lib" > conf-bglibs
++	echo "$DDIR/bin" > conf-bin
++	echo "$DDIR/include" > conf-include
++	echo "$DDIR/lib" > conf-lib
++
++	make || Fdie
++	make install_prefix=$Fdestdir PATH=$PATH:$DDIR/bin install || Fdie
++}
++# vim: ft=sh
diff -r df315870634b -r 0196de736139 series
--- a/series	Wed Feb 15 14:43:57 2012 +0100
+++ b/series	Wed Feb 15 14:48:06 2012 +0100
@@ -3,12 +3,7 @@
 gitignore.patch
 vmailmgr.patch
 diet-bglibs
-diet-cvm
-diet-cvm-fix-path.patch
-upgrade-0.9-diet-cvm.patch
-diet-bglibs-fix.patch
-diet-bglibs-fix-path.patch
-upgrade-0.9-diet-bglibs.patch
+diet-cvm.patch
 diet-daemontools.patch
 upgrade-0.9-diet-daemontools.patch
 bglibs.patch
diff -r df315870634b -r 0196de736139 upgrade-0.9-diet-bglibs.patch
--- a/upgrade-0.9-diet-bglibs.patch	Wed Feb 15 14:43:57 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-diet-bglibs: Upgrade for Frugalware 0.9
-
-diff --git a/source/dietlibc/diet-bglibs/FrugalBuild b/source/dietlibc/diet-bglibs/FrugalBuild
-index 25d303d..592f564 100644
---- a/source/dietlibc/diet-bglibs/FrugalBuild
-+++ b/source/dietlibc/diet-bglibs/FrugalBuild
-@@ -4,7 +4,7 @@ branch=diet
- pkgorig=bglibs
- pkgname=$branch-$pkgorig
- pkgver=1.104
--pkgrel=1
-+pkgrel=2
- pkgdesc="One stop library package"
- makedepends=(dietlibc gcc)
- url="http://untroubled.org/bglibs/"
diff -r df315870634b -r 0196de736139 upgrade-0.9-diet-cvm.patch
--- a/upgrade-0.9-diet-cvm.patch	Wed Feb 15 14:43:57 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-diet-cvm: Upgrade for Frugalware 0.9
-
-diff --git a/source/dietlibc/diet-cvm/FrugalBuild b/source/dietlibc/diet-cvm/FrugalBuild
-index 2697441..119cd8f 100644
---- a/source/dietlibc/diet-cvm/FrugalBuild
-+++ b/source/dietlibc/diet-cvm/FrugalBuild
-@@ -4,7 +4,7 @@ branch=diet
- pkgorig=cvm
- pkgname=$branch-$pkgorig
- pkgver=0.90
--pkgrel=1
-+pkgrel=2
- pkgdesc="Credential Validation Modules"
- makedepends=(dietlibc gcc 'diet-bglibs>=1.100')
- url="http://untroubled.org/cvm/"