# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1285574090 0
# Node ID 53ce5256aa417cad8dbfa6100b835c51fd3bc82a
# Parent  9c7938cac484a6e7df041dfca369c7ff1183d5c4
Up: cyrus-imapd, cyrus-imapd-dev to 2.3.16.

diff -r 9c7938cac484 -r 53ce5256aa41 cyrus-imapd-dev/receipt
--- a/cyrus-imapd-dev/receipt	Mon Sep 27 07:05:26 2010 +0000
+++ b/cyrus-imapd-dev/receipt	Mon Sep 27 07:54:50 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="cyrus-imapd-dev"
-VERSION="2.2.12"
+VERSION="2.3.16"
 CATEGORY="development"
 SHORT_DESC="IMAP server development files."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 9c7938cac484 -r 53ce5256aa41 cyrus-imapd/receipt
--- a/cyrus-imapd/receipt	Mon Sep 27 07:05:26 2010 +0000
+++ b/cyrus-imapd/receipt	Mon Sep 27 07:54:50 2010 +0000
@@ -1,14 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="cyrus-imapd"
-VERSION="2.2.12"
+VERSION="2.3.16"
 CATEGORY="network"
 SHORT_DESC="IMAP server."
 MAINTAINER="pascal.bellard@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://cyrusimap.web.cmu.edu/"
 WGET_URL="ftp://ftp.andrew.cmu.edu/pub/cyrus/$TARBALL"
-BUILD_DEPENDS="libcomerr-dev cyrus-sasl cyrus-sasl-dev openssl-dev db-dev"
+BUILD_DEPENDS="libcomerr-dev cyrus-sasl cyrus-sasl-dev openssl-dev db-dev perl"
 DEPENDS="libcomerr cyrus-sasl openssl db perl libwrap slitaz-base-files \
 net-snmp"
 CONFIG_FILES="/etc/imapd.conf /etc/cyrus.conf"
@@ -17,16 +17,6 @@
 compile_rules()
 {
 	cd $src
-	while read arg file; do
-		[ -f done.$file ] && continue
-		echo "Apply $file..."
-		patch $arg < ../stuff/$file
-		touch done.$file
-	done << EOT
--p1 50-FTBFS-gcc-4.0-fix.dpatch
--p0 p1.patch
--p0 p2.patch
-EOT
 	./configure --prefix=/usr --infodir=/usr/share/info \
 	--with-service-path=/usr/lib/cyrus \
 	--with-cyrus-prefix=/usr/lib/cyrus \
@@ -42,8 +32,8 @@
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/lib/cyrus $fs/usr/lib
 	cp -a $_pkg/usr/lib/perl5 $fs/usr/lib
-	strip -s $fs/usr/lib/cyrus/bin/*
-	cp $src/tools/mkimap $fs/usr/lib/cyrus/bin
+	strip -s $fs/usr/lib/cyrus/*
+	cp $src/tools/mkimap $fs/usr/lib/cyrus
 	cp -a stuff/etc $fs
 	cp $src/master/conf/small.conf $fs/etc/cyrus.conf
 	for i in proc db socket log msg ptclient; do
diff -r 9c7938cac484 -r 53ce5256aa41 cyrus-imapd/stuff/50-FTBFS-gcc-4.0-fix.dpatch
--- a/cyrus-imapd/stuff/50-FTBFS-gcc-4.0-fix.dpatch	Mon Sep 27 07:05:26 2010 +0000
+++ b/cyrus-imapd/stuff/50-FTBFS-gcc-4.0-fix.dpatch	Mon Sep 27 07:54:50 2010 +0000
@@ -1,10 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50-FTBFS-gcc-4.0-fix.dpatch by Ondřej Surý <ondrej@sury.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix FTBFS when compiling with gcc-4.0, there is imapopts is used before declared
-
-@DPATCH@
 diff -urN cyrus22-imapd-2.2.12~/tools/config2header cyrus22-imapd-2.2.12/tools/config2header
 --- cyrus22-imapd-2.2.12~/tools/config2header	2004-06-22 21:02:31.000000000 +0200
 +++ cyrus22-imapd-2.2.12/tools/config2header	2005-06-22 07:56:17.180293688 +0200