Version Bump. Changing maintainer to myself. Ebuild thanks to Stefan Briesenick <sbriesen@gmx.de> in bug 72131

6 files changed, 132 insertions, 13 deletions

diff --git a/net-misc/capi4hylafax/ChangeLog b/net-misc/capi4hylafax/ChangeLog
index 54fb63059c97..46aa75d39a78 100644
--- a/net-misc/capi4hylafax/ChangeLog
+++ b/net-misc/capi4hylafax/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/capi4hylafax
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/ChangeLog,v 1.6 2004/08/08 00:19:48 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/ChangeLog,v 1.7 2004/12/02 21:26:14 genstef Exp $
+
+*capi4hylafax-01.02.03 (02 Dec 2004)
+
+  02 Dec 2004; Stefan Schweizer <genstef@gentoo.org> metadata.xml,
+  files/capi4hylafax, +capi4hylafax-01.02.03.ebuild:
+  Version Bump. Changing maintainer to myself. Ebuild thanks to Stefan
+  Briesenick <sbriesen@gmx.de> in bug 72131
 
   08 Aug 2004; Tom Martin <slarti@gentoo.org> capi4hylafax-01.02.02.ebuild:
   Typo in DESCRIPTION: recieve -> receive. Bug 59717.
diff --git a/net-misc/capi4hylafax/Manifest b/net-misc/capi4hylafax/Manifest
index 2ece0e3650e0..634dccf83192 100644
--- a/net-misc/capi4hylafax/Manifest
+++ b/net-misc/capi4hylafax/Manifest
@@ -1,5 +1,7 @@
 MD5 0aa6b3186babffbc27efb9e0fa4c1233 capi4hylafax-01.02.02.ebuild 1456
-MD5 a381c0df0801bd241c2482f1f0acd1f8 ChangeLog 869
-MD5 86839ab49843d9936a51027707b8422f metadata.xml 386
-MD5 8d2ed89bc1f0ec75d51b43a0bbec9a1e files/capi4hylafax 333
+MD5 56f99be5ccf2e98faa7dc759c7a4b111 capi4hylafax-01.02.03.ebuild 2484
+MD5 95063dc297b654b53d033105025b54b5 ChangeLog 1143
+MD5 d6f473d9cfb90e50b96f35ea0fc748c4 metadata.xml 390
+MD5 31c0b75d7bee2aa6864db8f9c828e1c1 files/capi4hylafax 985
 MD5 7033ac371b28b9db979167f182afd52c files/digest-capi4hylafax-01.02.02 73
+MD5 0b8d19fc4ec6d9aae318a26b151aa46d files/digest-capi4hylafax-01.02.03 154
diff --git a/net-misc/capi4hylafax/capi4hylafax-01.02.03.ebuild b/net-misc/capi4hylafax/capi4hylafax-01.02.03.ebuild
new file mode 100644
index 000000000000..5df8af7686df
--- /dev/null
+++ b/net-misc/capi4hylafax/capi4hylafax-01.02.03.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/capi4hylafax-01.02.03.ebuild,v 1.1 2004/12/02 21:26:14 genstef Exp $
+
+inherit eutils
+
+DESCRIPTION="CAPI4HylaFAX - send/receive faxes via CAPI and AVM Fritz!Cards."
+SRC_URI="mirror://debian/pool/main/c/capi4hylafax/capi4hylafax_${PV}.orig.tar.gz
+		mirror://debian/pool/main/c/capi4hylafax/capi4hylafax_${PV}-7.diff.gz"
+HOMEPAGE="http://packages.qa.debian.org/c/capi4hylafax.html"
+
+IUSE="unicode"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DEPEND="net-dialup/capi4k-utils
+		net-misc/hylafax"
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+	mv ${S}.orig ${S}
+	cd ${S}
+
+	epatch ${WORKDIR}/capi4hylafax_${PV}-7.diff
+
+	for i in * debian/* src/scripts/setupconffile; do
+		[ -f "${i}" ] && sed -si "s:/var/spool/hylafax:/var/spool/fax:" ${i}
+	done
+
+	# patch man pages
+	sed -i -e "s:/usr/share/doc/capi4hylafax/:/usr/share/doc/${P}/html/:g" \
+		-e "s:c2send:c2faxsend:g" -e "s:c2recv:c2faxrecv:g" \
+		-e "s:CAPI4HYLAFAXCONFIG(1):C2FAXADDMODEM(8):g" \
+		-e "s:CAPI4HYLAFAXCONFIG \"1\":C2FAXADDMODEM \"8\":g" \
+		-e "s:capi4hylafaxconfig:c2faxaddmodem:g" debian/*.1
+	cp -f debian/capi4hylafax.1 debian/c2faxaddmodem.8
+
+	# if specified, convert all relevant files from latin1 to UTF-8
+	if useq unicode; then
+		for i in config.faxCAPI; do
+			einfo "Converting ${i} to UTF-8"
+			iconv -f latin1 -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
+		done
+	fi
+}
+
+src_compile() {
+	econf --with-hylafax-spooldir=/var/spool/fax || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	einstall || die "einstall failed"
+
+	# install setup script
+	newsbin src/scripts/setupconffile c2faxaddmodem
+
+	# install sample config
+	insinto /var/spool/fax/etc
+	doins config.faxCAPI
+
+	# install docs
+	dodoc AUTHORS ChangeLog Readme_src
+	newdoc debian/changelog ChangeLog.debian
+	dohtml README.html LIESMICH.html
+
+	# install man pages
+	doman debian/c2fax*.[18]
+
+	# install examples
+	docinto examples
+	dodoc sample_*
+	dodoc fritz_pic.tif
+	dodoc GenerateFileMail.pl
+
+	# finally install init-script
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/capi4hylafax
+}
+
+pkg_postinst() {
+	einfo "To use CAPI4HylaFAX:"
+	einfo "Make sure that your isdn/capi devices are owned by"
+	einfo "the \"uucp\" user (set in /etc/devfsd.conf)."
+	einfo "Modify /var/spool/fax/etc/config.faxCAPI"
+	einfo "to suit your system, and append the line"
+	einfo "SendFaxCmd:             /usr/bin/c2faxsend"
+	einfo "to your HylaFAX config file (/var/spool/fax/etc/config)."
+}
diff --git a/net-misc/capi4hylafax/files/capi4hylafax b/net-misc/capi4hylafax/files/capi4hylafax
index 43693f2e4efd..51a714d27e40 100644
--- a/net-misc/capi4hylafax/files/capi4hylafax
+++ b/net-misc/capi4hylafax/files/capi4hylafax
@@ -1,20 +1,37 @@
 #!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/files/capi4hylafax,v 1.2 2004/12/02 21:26:14 genstef Exp $
+
+# symlink this script to capi4hylafax.<device>
+# if you want to use more than one config-file.
 
 depend() {
 	need capi
 }
 
 start() {
-	ebegin "Starting CAPI4HylaFAX"
-	start-stop-daemon -b -m --quiet --start --exec /usr/bin/c2faxrecv \
-		--pidfile /var/run/c2faxrecv.pid
-	eend $?
+	local DEVICE="${myservice#*.}"
+	[ "${DEVICE}" = "${myservice}" ] && DEVICE="faxCAPI"
+	local CONFIG="/var/spool/fax/etc/config.${DEVICE}"
+
+	if [ ! -f "$CONFIG" ]; then
+		eerror "You're missing ${CONFIG}"
+		return 1
+	fi
 
+	ebegin "Starting CAPI4HylaFAX for ${DEVICE}"
+	start-stop-daemon -b -m --quiet --start --pidfile "/var/run/c2faxrecv.${DEVICE}.pid" \
+		--exec /usr/bin/c2faxrecv ${DEVICE}
+	eend $?
 }
 
 stop() {
-	ebegin "Stopping CAPI4HylaFAX"
-	start-stop-daemon -o --quiet --stop --pidfile /var/run/c2faxrecv.pid
-        eend $?
+	local DEVICE="${myservice#*.}"
+	[ "${DEVICE}" = "${myservice}" ] && DEVICE="faxCAPI"
 
+	ebegin "Stopping CAPI4HylaFAX for ${DEVICE}"
+	start-stop-daemon >/dev/null --quiet --stop --pidfile "/var/run/c2faxrecv.${DEVICE}.pid" --retry 10 && \
+	/bin/rm -f /var/run/c2faxrecv.${DEVICE}.pid
+        eend $?
 }
diff --git a/net-misc/capi4hylafax/files/digest-capi4hylafax-01.02.03 b/net-misc/capi4hylafax/files/digest-capi4hylafax-01.02.03
new file mode 100644
index 000000000000..110a29e2f1e8
--- /dev/null
+++ b/net-misc/capi4hylafax/files/digest-capi4hylafax-01.02.03
@@ -0,0 +1,2 @@
+MD5 8236290d6b880ee7d5e2fe970648ad6f capi4hylafax_01.02.03.orig.tar.gz 400508
+MD5 9a1d502bcc23282237cbc8a8a64699ce capi4hylafax_01.02.03-7.diff.gz 230581
diff --git a/net-misc/capi4hylafax/metadata.xml b/net-misc/capi4hylafax/metadata.xml
index ba31d6a2c376..0535d11e9b7e 100644
--- a/net-misc/capi4hylafax/metadata.xml
+++ b/net-misc/capi4hylafax/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>comm-fax</herd>
 <maintainer>
-  <email>nerdboy@gentoo.org</email>
-  <name>Steve Arnold</name>
+  <email>genstef@gentoo.org</email>
+  <name>Stefan Schweizer</name>
   <description>Primary Maintainer</description>
 </maintainer>
 <longdescription>Fax package for ISDN cards with CAPI capabilities.</longdescription>