summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Knoblich <stkn@gentoo.org>2005-08-16 16:45:07 +0000
committerStefan Knoblich <stkn@gentoo.org>2005-08-16 16:45:07 +0000
commitbbe3a55ffd5c48b4dfe517b06efaa8c34019134e (patch)
treeba8d08dccf3846a65daa92cb4e14167a55ffcfa1 /net-misc
parentInitial import; ebuild submitted by Jochen Schalanda <jochen@schalanda.de> in... (diff)
downloadhistorical-bbe3a55ffd5c48b4dfe517b06efaa8c34019134e.tar.gz
historical-bbe3a55ffd5c48b4dfe517b06efaa8c34019134e.tar.bz2
historical-bbe3a55ffd5c48b4dfe517b06efaa8c34019134e.zip
Modified ebuild and patch for asterisk-1.2.0(_pre).
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/asterisk-cdr_shell/ChangeLog6
-rw-r--r--net-misc/asterisk-cdr_shell/Manifest7
-rw-r--r--net-misc/asterisk-cdr_shell/asterisk-cdr_shell-20050626.ebuild13
-rw-r--r--net-misc/asterisk-cdr_shell/files/cdr_shell-20050626-ast1.2.diff11
4 files changed, 30 insertions, 7 deletions
diff --git a/net-misc/asterisk-cdr_shell/ChangeLog b/net-misc/asterisk-cdr_shell/ChangeLog
index 38dfc2d75f47..9670d085b5b6 100644
--- a/net-misc/asterisk-cdr_shell/ChangeLog
+++ b/net-misc/asterisk-cdr_shell/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/asterisk-cdr_shell
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-cdr_shell/ChangeLog,v 1.2 2005/07/02 09:34:23 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-cdr_shell/ChangeLog,v 1.3 2005/08/16 16:45:07 stkn Exp $
+
+ 16 Aug 2005; Stefan Knoblich <stkn@gentoo.org>
+ +files/cdr_shell-20050626-ast1.2.diff, asterisk-cdr_shell-20050626.ebuild:
+ Modified ebuild and patch for asterisk-1.2.0(_pre).
02 Jul 2005; David Holm <dholm@gentoo.org>
asterisk-cdr_shell-20050626.ebuild:
diff --git a/net-misc/asterisk-cdr_shell/Manifest b/net-misc/asterisk-cdr_shell/Manifest
index 803293d404a5..221de5d0bf2d 100644
--- a/net-misc/asterisk-cdr_shell/Manifest
+++ b/net-misc/asterisk-cdr_shell/Manifest
@@ -1,7 +1,8 @@
-MD5 f2af22876155b63c6f43b3a22e02db52 ChangeLog 590
-MD5 e91669e775c1e5f37f00f40c079cdb23 asterisk-cdr_shell-20050626.ebuild 997
MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
+MD5 33a759f34b2d548a9322330dd24d72f3 ChangeLog 770
+MD5 cbf6d188d3c7db7c818a9d217b898cef asterisk-cdr_shell-20050626.ebuild 1208
MD5 10662cb4837ffa9e0632299fdb67c2c3 files/cdr.conf 150
-MD5 45326ecd0899ea3dfdabea2a556934d8 files/cdr_shell-20050626-astcfg.diff 697
+MD5 8edb3d1311c424a62b5a17a02c22541a files/cdr_shell-20050626-ast1.2.diff 302
MD5 a259df19a6815f1d560ef5128719df41 files/cdr_shell-20050626-stable.diff 746
MD5 c7f98ec712b829b32b590ea718a8ea8d files/digest-asterisk-cdr_shell-20050626 78
+MD5 45326ecd0899ea3dfdabea2a556934d8 files/cdr_shell-20050626-astcfg.diff 697
diff --git a/net-misc/asterisk-cdr_shell/asterisk-cdr_shell-20050626.ebuild b/net-misc/asterisk-cdr_shell/asterisk-cdr_shell-20050626.ebuild
index 17548e253c76..54c6bb591712 100644
--- a/net-misc/asterisk-cdr_shell/asterisk-cdr_shell-20050626.ebuild
+++ b/net-misc/asterisk-cdr_shell/asterisk-cdr_shell-20050626.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-cdr_shell/asterisk-cdr_shell-20050626.ebuild,v 1.2 2005/07/02 09:34:23 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-cdr_shell/asterisk-cdr_shell-20050626.ebuild,v 1.3 2005/08/16 16:45:07 stkn Exp $
inherit eutils
@@ -25,8 +25,15 @@ src_unpack() {
# use asterisk-config...
epatch ${FILESDIR}/${MY_PN}-${PV}-astcfg.diff
- # patch for asterisk stable
- epatch ${FILESDIR}/${MY_PN}-${PV}-stable.diff
+ if has_version "<net-misc/asterisk-1.1.0"; then
+ einfo "Building for Asterisk-1.0.x"
+ # patch for asterisk stable
+ epatch ${FILESDIR}/${MY_PN}-${PV}-stable.diff
+ else
+ einfo "Building for Asterisk-1.2.x"
+ # patch for asterisk 1.2
+ epatch ${FILESDIR}/${MY_PN}-${PV}-ast1.2.diff
+ fi
}
src_compile() {
diff --git a/net-misc/asterisk-cdr_shell/files/cdr_shell-20050626-ast1.2.diff b/net-misc/asterisk-cdr_shell/files/cdr_shell-20050626-ast1.2.diff
new file mode 100644
index 000000000000..036ba75ef72d
--- /dev/null
+++ b/net-misc/asterisk-cdr_shell/files/cdr_shell-20050626-ast1.2.diff
@@ -0,0 +1,11 @@
+--- cdr_shell/cdr_shell.c 2005-06-26 17:01:46.000000000 +0200
++++ cdr_shell.c.new 2005-07-01 01:21:12.000000000 +0200
+@@ -20,7 +20,7 @@
+ #include <asterisk/logger.h>
+ #include <asterisk/cli.h>
+ #include <asterisk/config.h>
+-#include <asterisk.h>
++#include <asterisk/asterisk.h>
+
+
+ #include <stdio.h>