New version bump thanks to Torsten Veller <torsten@veller.net>

7 files changed, 186 insertions, 2 deletions

diff --git a/net-dialup/capi4k-utils/ChangeLog b/net-dialup/capi4k-utils/ChangeLog
index 91c549d0723e..be5c936b7c6f 100644
--- a/net-dialup/capi4k-utils/ChangeLog
+++ b/net-dialup/capi4k-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/capi4k-utils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.14 2004/10/14 20:08:30 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.15 2004/10/30 13:13:58 dragonheart Exp $
+
+*capi4k-utils-20041006 (30 Oct 2004)
+
+  30 Oct 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/capi-init-20041006, +files/capi4k-utils-2004-10-06-fPIC.patch,
+  +files/capi4k-utils-2004-10-06.patch, +capi4k-utils-20041006.ebuild:
+  New version bump thanks to Torsten Veller <torsten@veller.net>
 
   14 Oct 2004; David Holm <dholm@gentoo.org> capi4k-utils-20040810.ebuild:
   Added to ~ppc.
diff --git a/net-dialup/capi4k-utils/Manifest b/net-dialup/capi4k-utils/Manifest
index 7c33b411cd37..078532dce873 100644
--- a/net-dialup/capi4k-utils/Manifest
+++ b/net-dialup/capi4k-utils/Manifest
@@ -1,8 +1,13 @@
 MD5 c1efc8d14739da7700d94a9d5a26c36c ChangeLog 1879
+MD5 dd20ef6caadbe6ca73bce2a1d34518df capi4k-utils-20041006.ebuild 2157
 MD5 03aaea36415b2221e3057baee7f1662f capi4k-utils-20021026.ebuild 1346
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 8a68cd59daa9bd143ce9987778320b62 capi4k-utils-20040810.ebuild 1760
 MD5 6c75232315b3bb9c63d8e566c24e396a files/capi 543
+MD5 8b4a7394c2826badb822b9575dbfbd4d files/capi4k-utils-2004-10-06.patch 2144
 MD5 14a08bf121eef97390c18eafd8458bc7 files/digest-capi4k-utils-20021026 75
-MD5 befd926d2f898c15846c2f7452853ec1 files/capi-init-20040810 609
+MD5 f2524d2cc37ffcbc2096a4f0ac7177c7 files/digest-capi4k-utils-20041006 75
 MD5 daf5a35ac5aeac77c4ac69274ed15395 files/digest-capi4k-utils-20040810 75
+MD5 befd926d2f898c15846c2f7452853ec1 files/capi-init-20040810 609
+MD5 befd926d2f898c15846c2f7452853ec1 files/capi-init-20041006 609
+MD5 9bc030e6ab061e50f16efb0def04f0b6 files/capi4k-utils-2004-10-06-fPIC.patch 286
diff --git a/net-dialup/capi4k-utils/capi4k-utils-20041006.ebuild b/net-dialup/capi4k-utils/capi4k-utils-20041006.ebuild
new file mode 100644
index 000000000000..b6b4bc1bbf4e
--- /dev/null
+++ b/net-dialup/capi4k-utils/capi4k-utils-20041006.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20041006.ebuild,v 1.1 2004/10/30 13:13:58 dragonheart Exp $
+
+inherit eutils
+
+YEAR_PV=${PV:0:4}
+MON_PV=${PV:4:2}
+DAY_PV=${PV:6:2}
+
+MY_P=${PN}-${YEAR_PV}-${MON_PV}-${DAY_PV}
+
+S=${WORKDIR}/${PN}
+DESCRIPTION="Capi4Linux Utils"
+SRC_URI="ftp://ftp.in-berlin.de/pub/capi4linux/${MY_P}.tar.gz ftp://ftp.in-berlin.de/pub/capi4linux/OLD/${MY_P}.tar.gz"
+HOMEPAGE="ftp://ftp.in-berlin.de/pub/capi4linux/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="virtual/linux-sources
+	dev-lang/perl
+	>=sys-apps/sed-4
+	virtual/os-headers
+	sys-devel/automake
+	sys-devel/autoconf
+	sys-devel/libtool
+	>=sys-apps/sed-4"
+
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${MY_P}.patch || die "patch failed"
+	epatch ${FILESDIR}/${MY_P}-fPIC.patch || die "patch failed"
+	sed -i -e 's:linux/capi.h>$:linux/compiler.h>\n#include <linux/capi.h>:g' */*.c || die "sed failed"
+	sed -i -e "s:^CFLAGS\(.*\)-O2:CFLAGS\1${CFLAGS}:g" */Makefile.am || die "sed failed"
+}
+
+src_compile() {
+	# required by fPIC patch
+	cd ${S}/capi20 || die
+	ebegin "Updating autotools-generated files"
+	aclocal -I . || die "aclocal failed"
+	automake -a || die "automake failed"
+	autoconf || die "autoconf failed"
+	libtoolize -f -c || die "libtoolize failed"
+	eend $?
+	cd ${S} || die
+
+	emake subconfig || die
+	emake || die
+}
+
+src_install() {
+	dodir /dev
+	emake DESTDIR=${D} install || die
+	rm -rf ${D}/dev
+	newdoc rcapid/README README.rcapid
+	newdoc pppdcapiplugin/README README.pppdcapiplugin
+	docinto examples.pppdcapiplugin; dodoc pppdcapiplugin/examples/*
+	newinitd ${FILESDIR}/capi-init-${PV} capi
+	insinto /etc
+	insopts -m 0600
+	doins capiinit/capi.conf
+}
+
+pkg_postinst() {
+	einfo "To use isdn4linux with CAPI replace"
+	einfo "I4L_MODULE=\"hisax\" with I4L_MODULE=\"capidrv\","
+	einfo "start /etc/init.d/capi and load the module"
+	einfo "capidrv."
+	einfo ""
+	einfo "Annotation for active AVM ISDN boards (B1 ISA/PCI, ...):"
+	einfo "Please download the latest firmware from"
+	einfo "ftp://ftp.in-berlin.de/pub/capi4linux and copy the files "
+	einfo "to /usr/lib/isdn and check your /etc/capi.conf file"
+	einfo ""
+}
diff --git a/net-dialup/capi4k-utils/files/capi-init-20041006 b/net-dialup/capi4k-utils/files/capi-init-20041006
new file mode 100644
index 000000000000..0f543a6f904b
--- /dev/null
+++ b/net-dialup/capi4k-utils/files/capi-init-20041006
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/files/capi-init-20041006,v 1.1 2004/10/30 13:13:58 dragonheart Exp $
+
+depend() {
+	after isapnp
+}
+
+start() {
+	if [ ! -e /etc/capi.conf ] ; then
+		eerror "You're missing /etc/capi.conf (comes with a capi-driver)."
+		eerror "Emerge net-dialup/fcpci if you are having an AVM Fritz!Card PCI"
+		return 1
+	fi
+	ebegin "Starting CAPI"
+	/sbin/capiinit start
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping CAPI"
+	/sbin/capiinit stop
+	eend $?
+}
diff --git a/net-dialup/capi4k-utils/files/capi4k-utils-2004-10-06-fPIC.patch b/net-dialup/capi4k-utils/files/capi4k-utils-2004-10-06-fPIC.patch
new file mode 100644
index 000000000000..fc34a613e5be
--- /dev/null
+++ b/net-dialup/capi4k-utils/files/capi4k-utils-2004-10-06-fPIC.patch
@@ -0,0 +1,10 @@
+--- capi20/Makefile.am_old	2004-10-30 13:15:45.099518775 +0200
++++ capi20/Makefile.am	2004-10-30 13:16:13.422481911 +0200
+@@ -14,6 +14,7 @@
+ 
+ libcapi20dyn_a_SOURCES = capidyn.c
+ libcapi20dyn_a_CFLAGS = -fPIC
++CFLAGS = -fPIC
+ # libcapi20_la_LIBADD = $(LIBADD_DL)
+ 
+ $(OBJECTS): libtool
diff --git a/net-dialup/capi4k-utils/files/capi4k-utils-2004-10-06.patch b/net-dialup/capi4k-utils/files/capi4k-utils-2004-10-06.patch
new file mode 100644
index 000000000000..7ec19836fe10
--- /dev/null
+++ b/net-dialup/capi4k-utils/files/capi4k-utils-2004-10-06.patch
@@ -0,0 +1,55 @@
+diff -Naur capi4k-utils_old/capi20/capiutils.h capi4k-utils/capi20/capiutils.h
+--- capi4k-utils_old/capi20/capiutils.h	2004-10-06 17:13:33.000000000 +0200
++++ capi4k-utils/capi20/capiutils.h	2004-10-14 11:18:07.049529668 +0200
+@@ -918,7 +918,7 @@
+ 		,_cstruct BChannelinformation
+ 		,_cstruct Keypadfacility
+ 		,_cstruct Useruserdata
+-                ,_cstruct Facilitydataarra);
++                ,_cstruct Facilitydataarray);
+ unsigned CONNECT_REQ (_cmsg *cmsg, _cword ApplId, _cword Messagenumber
+ 		,_cdword adr
+ 		,_cword CIPValue
+diff -Naur capi4k-utils_old/capifax/capi.c capi4k-utils/capifax/capi.c
+--- capi4k-utils_old/capifax/capi.c	2004-08-10 14:11:20.000000000 +0200
++++ capi4k-utils/capifax/capi.c	2004-10-14 11:16:52.699740737 +0200
+@@ -82,7 +82,7 @@
+ 			 * of the application
+ 			 */
+ 			ALERT_REQ (CMSG, Appl_Id, 0, CONNECT_IND_PLCI(CMSG),
+-				   NULL, NULL, NULL, NULL, NULL);
++				   NULL, NULL, NULL, NULL);
+ 			/* inform the user application */
+ 			SetState(Connection, D_ConnectPending);
+ 			IncomingCall(Connection, GetCallingPartyNumber (Connection));
+diff -Naur capi4k-utils_old/.config capi4k-utils/.config
+--- capi4k-utils_old/.config	1970-01-01 01:00:00.000000000 +0100
++++ capi4k-utils/.config	2004-02-23 19:29:23.000000000 +0100
+@@ -0,0 +1,11 @@
++#
++# Automatically generated by make menuconfig: don't edit
++#
++CONFIG_KERNELDIR='/usr/src/linux'
++CONFIG_BINDIR='/usr/bin'
++CONFIG_SBINDIR='/usr/sbin'
++CONFIG_MANDIR='/usr/share/man'
++CONFIG_AVMCAPICTRL=y
++CONFIG_CAPIFAX=y
++CONFIG_RCAPID=y
++CONFIG_PPPDCAPIPLUGIN=y
+diff -Naur capi4k-utils_old/scripts/autoconf.h capi4k-utils/scripts/autoconf.h
+--- capi4k-utils_old/scripts/autoconf.h	1970-01-01 01:00:00.000000000 +0100
++++ capi4k-utils/scripts/autoconf.h	2004-02-23 19:29:23.000000000 +0100
+@@ -0,0 +1,12 @@
++/*
++ * Automatically generated by make menuconfig: don't edit
++ */
++#define AUTOCONF_INCLUDED
++#define CONFIG_KERNELDIR "/usr/src/linux"
++#define CONFIG_BINDIR "/usr/bin"
++#define CONFIG_SBINDIR "/usr/sbin"
++#define CONFIG_MANDIR "/usr/share/man"
++#define CONFIG_AVMCAPICTRL 1
++#define CONFIG_CAPIFAX
++#define CONFIG_RCAPID
++#define CONFIG_PPPDCAPIPLUGIN 1
diff --git a/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006 b/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006
new file mode 100644
index 000000000000..63aefc8b31c8
--- /dev/null
+++ b/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006
@@ -0,0 +1 @@
+MD5 54992ff362ca44629fdf59773a6864cd capi4k-utils-2004-10-06.tar.gz 743667