# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1320248118 0
# Node ID 4de59d145d6696c2eaf7dfa77b051e2326790fdf
# Parent  e20765e81e238736e4460d5a32198759f68f9e07
Up: cherokee to 1.2.101.

diff -r e20765e81e23 -r 4de59d145d66 cherokee-dev/receipt
--- a/cherokee-dev/receipt	Wed Nov 02 15:31:12 2011 +0000
+++ b/cherokee-dev/receipt	Wed Nov 02 15:35:18 2011 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="cherokee-dev"
-VERSION="1.2.1"
+VERSION="1.2.101"
 CATEGORY="development"
 SHORT_DESC="devel files for cherokee"
 MAINTAINER="slaxemulator@gmail.com"
@@ -13,9 +13,9 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib/cherokee $fs/usr/share
-	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
-	cp -a $_pkg/usr/lib/cherokee/*.*a $fs/usr/lib/cherokee
-	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
-	cp -a $_pkg/usr/share/aclocal $fs/usr/share
+	cp -a $install/usr/lib/*.*a $fs/usr/lib
+	cp -a $install/usr/lib/cherokee/*.*a $fs/usr/lib/cherokee
+	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
+	cp -a $install/usr/share/aclocal $fs/usr/share
 }
 
diff -r e20765e81e23 -r 4de59d145d66 cherokee-doc/receipt
--- a/cherokee-doc/receipt	Wed Nov 02 15:31:12 2011 +0000
+++ b/cherokee-doc/receipt	Wed Nov 02 15:35:18 2011 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="cherokee-doc"
-VERSION="1.2.1"
+VERSION="1.2.101"
 CATEGORY="misc"
 SHORT_DESC="Docs for cherokee"
 MAINTAINER="slaxemulator@gmail.com"
@@ -13,6 +13,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share
-	cp -a $_pkg/usr/share/doc $fs/usr/share
+	cp -a $install/usr/share/doc $fs/usr/share
 }
 
diff -r e20765e81e23 -r 4de59d145d66 cherokee/receipt
--- a/cherokee/receipt	Wed Nov 02 15:31:12 2011 +0000
+++ b/cherokee/receipt	Wed Nov 02 15:35:18 2011 +0000
@@ -1,16 +1,17 @@
 # SliTaz package receipt.
 
 PACKAGE="cherokee"
-VERSION="1.2.1"
+VERSION="1.2.101"
 CATEGORY="network"
 SHORT_DESC="A very fast, fiexible and easy to configure Web Server."
 MAINTAINER="slaxemulator@gmail.com"
-DEPENDS="pcre cyrus-sasl openssl python libmysqlclient libldap ffmpeg"
-BUILD_DEPENDS="pcre-dev cyrus-sasl-dev openssl-dev openldap-dev python-dev pam-dev libmysqlclient ffmpeg-dev gettext autoconf automake"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.cherokee-project.com/"
 WGET_URL="http://www.cherokee-project.com/download/1.2/$VERSION/$TARBALL"
 
+DEPENDS="pcre cyrus-sasl openssl python libmysqlclient libldap ffmpeg"
+BUILD_DEPENDS="pcre-dev cyrus-sasl-dev openssl-dev openldap-dev python-dev pam-dev libmysqlclient ffmpeg-dev gettext autoconf automake"
+
 # Rules to configure and make the package.
 compile_rules()
 {
@@ -24,21 +25,28 @@
 		--with-wwwuser=www --with-wwwgroup=www \
 		--enable-os-string="SliTaz" \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$PWD/_pkg install
-	install -D -m644 pam.d_cherokee $PWD/_pkg/etc/pam.d/$PACKAGE
+	make && make DESTDIR=$DESTDIR install
+	install -D -m644 pam.d_cherokee $DESTDIR/etc/pam.d/$PACKAGE
+	chown -R www:www $DESTDIR/var/lib/$PACKAGE/graphs
+	python -m compileall $DESTDIR
+	python -O -m compileall $DESTDIR
+	mkdir -p $DESTDIR/var/log/$PACKAGE $DESTDIR/etc/logrotate.d
+	chown -R www:www $DESTDIR/var/log/$PACKAGE
+	cp -a $stuff/$PACKAGE.logrotate $DESTDIR/etc/logrotate.d/$PACKAGE
+	
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib/cherokee $fs/usr/share $fs/etc/init.d
-	cp -a $_pkg/usr/bin $fs/usr
-	cp -a $_pkg/usr/sbin $fs/usr
-	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
-	cp -a $_pkg/usr/lib/cherokee/*.so* $fs/usr/lib/cherokee
-	cp -a $_pkg/usr/share/cherokee $fs/usr/share
-	cp -a $_pkg/var $fs
-	cp -a $_pkg/etc $fs
+	cp -a $install/usr/bin $fs/usr
+	cp -a $install/usr/sbin $fs/usr
+	cp -a $install/usr/lib/*.so* $fs/usr/lib
+	cp -a $install/usr/lib/cherokee/*.so* $fs/usr/lib/cherokee
+	cp -a $install/usr/share/cherokee $fs/usr/share
+	cp -a $install/var $fs
+	cp -a $install/etc $fs
 	cp -a $stuff/cherokee $fs/etc/init.d
 }