added 4.2_rc2 and bumped 4.1.8-r4 to x86 (closes bug 59766)

7 files changed, 304 insertions, 10 deletions

diff --git a/net-misc/hylafax/ChangeLog b/net-misc/hylafax/ChangeLog
index 49e1566e98a1..318973628caf 100644
--- a/net-misc/hylafax/ChangeLog
+++ b/net-misc/hylafax/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/hylafax
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.34 2004/07/05 03:04:05 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.35 2004/08/10 04:15:54 nerdboy Exp $
+
+*hylafax-4.2.0_rc2 (09 Aug 2004)
+
+  09 Aug 2004; Steve Arnold <nerdboy@gentoo.org> +files/99hylafax-4.2,
+  +files/hylafax-4.2, hylafax-4.1.8-r4.ebuild, +hylafax-4.2.0_rc2.ebuild:
+  added 4.2_rc2 and bumped 4.1.8-r4 to x86 (closes bug 59766)
+  4.2 ebuild contributed by stan <stan@saticed.me.uk>
 
 *hylafax-4.1.8-r4 (04 Jul 2004)
 
diff --git a/net-misc/hylafax/Manifest b/net-misc/hylafax/Manifest
index 43eef135d78c..e14297a13f19 100644
--- a/net-misc/hylafax/Manifest
+++ b/net-misc/hylafax/Manifest
@@ -1,16 +1,20 @@
-MD5 d6924a605e66bd7e7694b715aa8afb79 hylafax-4.1.8-r3.ebuild 3020
+MD5 06989d59ee6022d280925f7ed533f1b7 ChangeLog 7192
+MD5 5bc6512c151e6dfd52edef7a54ae2ce5 hylafax-4.1.8-r1.ebuild 2867
 MD5 a9f1947fcf266c9a40835a277a8fff44 hylafax-4.1.8-r2.ebuild 2996
+MD5 d6924a605e66bd7e7694b715aa8afb79 hylafax-4.1.8-r3.ebuild 3020
 MD5 993dbda50bbe5694c4b9e4f4916b6ad8 hylafax-4.1.8.ebuild 2176
-MD5 bd83966f3b6ace3490d23ee5ef791ccf hylafax-4.1.8-r4.ebuild 3239
-MD5 32d51977416e093ab6a8ccc1b84ffcd9 ChangeLog 6896
 MD5 d82acf1bcf0f7f9e181d6a2821292f2e metadata.xml 435
-MD5 5bc6512c151e6dfd52edef7a54ae2ce5 hylafax-4.1.8-r1.ebuild 2867
+MD5 84494692709b1bfb7d6d8022da6f4350 hylafax-4.1.8-r4.ebuild 3238
+MD5 f3d3726e99b8591bd8e3a11dd3a3c615 hylafax-4.2.0_rc2.ebuild 3517
+MD5 46bbae3c77d5651a20e606eb6228c159 files/99hylafax 62
+MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8 66
 MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8-r1 66
 MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8-r2 66
 MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8-r3 66
-MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8-r4 66
-MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8 66
 MD5 bc084d075b601d42fbd417b97a45f1b2 files/hylafax 3757
-MD5 46bbae3c77d5651a20e606eb6228c159 files/99hylafax 62
 MD5 5f2f2e3fe04414f953d4010d32261318 files/hylafax-4.1.8-fPIC.patch 2086
 MD5 ad3b0e7082e6e71ee6ba940ce1b6b071 files/hylafax-4.1.8-gcc-version.patch 520
+MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8-r4 66
+MD5 fa83948864d83f34f54ce35f26b38ed6 files/99hylafax-4.2 75
+MD5 fa879f978e557c87a4feda32b702ea24 files/hylafax-4.2 3756
+MD5 56c8a42db89b1c225f1fd074ae02050e files/digest-hylafax-4.2.0_rc2 69
diff --git a/net-misc/hylafax/files/99hylafax-4.2 b/net-misc/hylafax/files/99hylafax-4.2
new file mode 100644
index 000000000000..e488a19e4d17
--- /dev/null
+++ b/net-misc/hylafax/files/99hylafax-4.2
@@ -0,0 +1,2 @@
+PATH="/var/spool/fax/bin"
+CONFIG_PROTECT="/var/spool/fax/etc /usr/lib/fax"
diff --git a/net-misc/hylafax/files/digest-hylafax-4.2.0_rc2 b/net-misc/hylafax/files/digest-hylafax-4.2.0_rc2
new file mode 100644
index 000000000000..184607862c73
--- /dev/null
+++ b/net-misc/hylafax/files/digest-hylafax-4.2.0_rc2
@@ -0,0 +1 @@
+MD5 8cb199c3bf95e71f4eee28665407f6ec hylafax-4.2.0rc2.tar.gz 1348806
diff --git a/net-misc/hylafax/files/hylafax-4.2 b/net-misc/hylafax/files/hylafax-4.2
new file mode 100644
index 000000000000..8ea1dd3ce056
--- /dev/null
+++ b/net-misc/hylafax/files/hylafax-4.2
@@ -0,0 +1,159 @@
+#!/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/hylafax/files/hylafax-4.2,v 1.1 2004/08/10 04:15:54 nerdboy Exp $
+
+depend() {
+	use net
+}
+
+checkconfig() {
+	SPOOL=/var/spool/fax
+	if [ ! -f $SPOOL/etc/setup.cache ] ; then
+		eerror "No $SPOOL/etc/setup.cache file exists! Use faxsetup(8C) !"
+	fi
+
+}
+
+start() {
+	ebegin "Starting HylaFAX Servers."
+	SPOOL=/var/spool/fax
+	checkconfig || return 1
+
+	. $SPOOL/etc/setup.cache
+
+	# Just in case these are not in setup.cache yet
+	if [ -z "$HFAXD_SERVER" ]; then
+		HFAXD_SERVER=yes
+	fi
+	if [ -z "$FAXQ_SERVER" ]; then
+		FAXQ_SERVER=yes
+	fi
+	if [ -z "$HFAXD_OLD_PROTOCOL" ]; then
+		HFAXD_OLD_PROTOCOL=no
+	fi
+	if [ -z "$HFAXD_SNPP_SERVER" ]; then
+		HFAXD_SNPP_SERVER=no
+	fi
+
+	IS_ON=/etc/chkconfig            # NB: chkconfig is IRIX- and Linux-specific
+	FAXQ=$SBIN/faxq
+	HFAXD=$LIBEXEC/hfaxd
+	FAXQUIT=$SBIN/faxquit
+	FAXPORT=hylafax                 # designated port for new protocol
+	SNPPPORT=444                    # official port for SNPP
+
+	if test ! -x $IS_ON ; then
+		IS_ON=true
+	fi
+
+	if $IS_ON verbose ; then
+		ECHO=echo
+	else            # For a quiet startup and shutdown
+		ECHO=:
+	fi
+#
+# Figure out which brand of echo we have and define prompt
+# and printf shell functions accordingly.  Note that we
+# assume that if the System V-style echo is not present,
+# then the BSD printf program is available.  These functions
+# are defined here so that they can be tailored on a per-site,
+# etc. basis.
+#
+	if [ `echo foo\\\c`@ = "foo@" ]; then
+# System V-style echo supports \r
+# and \c which is all that we need
+		printf()
+        	{
+			$ECHO "$*\\c"
+		}
+	elif [ "`echo -n foo`@" = "foo@" ]; then
+# BSD-style echo; use echo -n to get
+# a line without the trailing newline
+		printf()
+		{
+			$ECHO -n "$*"
+		}
+	else
+# something else; do without
+		printf()
+		{
+			$ECHO "$*"
+		}
+	fi
+
+#
+#
+# killall -SIGNAL process-name
+#
+# Emulate the necessary functionality of the
+# killall program
+#
+	killall()
+	{
+# NB: ps ax should give an error on System V, so we try it first!
+		pid="`ps ax 2>/dev/null | $AWK \"\
+		/[\/ (]$2[ )]/  {print \\$1;}
+		/[\/ ]$2\$/     {print \\$1;}\"`"
+		test "$pid" ||
+		pid="`ps -e 2>/dev/null | $AWK \"/ $2[ ]*\$/ {print \\$1;}\"`"
+		test "$pid" && kill $1 $pid; return
+	}
+
+	if $IS_ON fax && test -x $FAXQ; then
+		if test $FAXQ_SERVER = yes ; then
+			killall -15 faxq
+		fi
+		if test $HFAXD_SERVER = yes ; then
+			killall -15 hfaxd
+		fi
+		printf "HylaFAX:"
+		if test $FAXQ_SERVER = yes ; then
+			$FAXQ; printf " faxq "
+		fi
+		if test $HFAXD_SERVER = yes ; then
+			HFAXD_OPT="-i $FAXPORT"
+#			HFAXD="$HFAXD -i $FAXPORT"
+			HFAXMSG=" hfaxd"
+			if [ $HFAXD_OLD_PROTOCOL = yes ]; then
+				HFAXD_OPT="$HFAXD_OPT -o 4557"
+#				HFAXD="$HFAXD -o 4557"
+				HFAXMSG="$HFAXMSG (with old protocol"
+			else
+				HFAXMSG="$HFAXMSG (without old protocol"
+			fi
+			if [ $HFAXD_SNPP_SERVER = yes ]; then
+				HFAXD_OPT="$HFAXD_OPT -s $SNPPPORT"
+#				HFAXD="$HFAXD -s $SNPPPORT"
+				HFAXMSG="$HFAXMSG & with SNPP support)"
+			else
+				HFAXMSG="$HFAXMSG & without SNPP support)"
+			fi
+#			$HFAXD ; printf "$HFAXMSG\n"
+			echo $HFAXMSG
+			echo $HFAXD $HFAXD_OPT
+			/sbin/start-stop-daemon --start --quiet --exec $HFAXD -- $HFAXD_OPT
+		fi
+		if test $FAXQ_SERVER != yes -a $HFAXD_SERVER != yes ; then
+			printf " not started (script disabled by configure)\n"
+		fi
+		$ECHO "."
+	fi
+	eend $?
+
+}
+
+stop() {
+	ebegin "Stopping HylaFAX Servers."
+        checkconfig || return 2
+	. $SPOOL/etc/setup.cache
+	FAXQUIT=$SBIN/faxquit
+        HFAXD=$LIBEXEC/hfaxd
+
+#        $ECHO "Stopping HylaFAX Servers."
+	$FAXQUIT >/dev/null 2>&1
+	/sbin/start-stop-daemon --stop --quiet --exec $HFAXD
+	eend $?
+#        killall -15 hfaxd
+
+}
diff --git a/net-misc/hylafax/hylafax-4.1.8-r4.ebuild b/net-misc/hylafax/hylafax-4.1.8-r4.ebuild
index e56d1c90197f..152149fb64ee 100644
--- a/net-misc/hylafax/hylafax-4.1.8-r4.ebuild
+++ b/net-misc/hylafax/hylafax-4.1.8-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.1.8-r4.ebuild,v 1.1 2004/07/05 03:04:05 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.1.8-r4.ebuild,v 1.2 2004/08/10 04:15:54 nerdboy Exp $
 
 # This was originally contributed by Stephane Loeuillet, via
 # Gentoo bug: http://bugs.gentoo.org/show_bug.cgi?id=28574
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.hylafax.org/source/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="hylafax"
-KEYWORDS="~x86 ~sparc ~hppa ~alpha ~amd64 ~ppc"
+KEYWORDS="x86 ~sparc ~hppa ~alpha ~amd64 ~ppc"
 
 DEPEND="net-dialup/mgetty
 	>=sys-libs/zlib-1.1.4
diff --git a/net-misc/hylafax/hylafax-4.2.0_rc2.ebuild b/net-misc/hylafax/hylafax-4.2.0_rc2.ebuild
new file mode 100644
index 000000000000..de500fa659c2
--- /dev/null
+++ b/net-misc/hylafax/hylafax-4.2.0_rc2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.2.0_rc2.ebuild,v 1.1 2004/08/10 04:15:54 nerdboy Exp $
+
+# New modified 4.2 ebuild contributed by stan <stan@saticed.me.uk>
+# Gentoo bug: http://bugs.gentoo.org/show_bug.cgi?id=59766
+# Nice job, and thanks :)
+
+inherit eutils
+
+IUSE="faxonly jpeg pam"
+
+DESCRIPTION="Client-server fax package for class 1 and 2 fax modems."
+HOMEPAGE="http://www.hylafax.org"
+SRC_URI="ftp://ftp.hylafax.org/source/BETA/${P/_/}.tar.gz"
+
+SLOT="0"
+LICENSE="hylafax"
+KEYWORDS="~x86 ~sparc ~hppa ~alpha ~amd64 ~ppc"
+
+DEPEND="!faxonly? ( net-dialup/mgetty )
+	>=sys-libs/zlib-1.1.4
+	virtual/ghostscript
+	>=media-libs/tiff-3.5.5
+	jpeg? ( media-libs/jpeg )
+	sys-apps/gawk
+	pam? ( sys-libs/pam )"
+
+RDEPEND="${DEPEND}
+	net-mail/metamail"
+
+export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc"
+
+S=${WORKDIR}/${P/_/}
+
+src_unpack() {
+	unpack ${A}
+	echo "\${OBJECTS}: GC++OPTS+=-fpic" >> ${S}/util/Makefile.LINUXdso
+	echo "\${SERVER_OBJS}: GC++OPTS+=-fpic" >> ${S}/faxd/Makefile.LINUXdso
+	echo "\${MODEM_OBJS}: GC++OPTS+=-fpic" >> ${S}/faxd/Makefile.LINUXdso
+}
+
+src_compile() {
+	local my_conf="
+		--with-DIR_BIN=/usr/bin
+		--with-DIR_SBIN=/usr/sbin
+		--with-DIR_LIB=/usr/lib
+		--with-DIR_LIBEXEC=/usr/sbin
+		--with-DIR_LIBDATA=/usr/lib/fax
+		--with-DIR_LOCKS=/var/lock
+		--with-DIR_MAN=/usr/share/man
+		--with-DIR_SPOOL=/var/spool/fax
+		--with-DIR_HTML=/usr/share/doc/${P}/html
+		--with-DIR_CGI=${WORKDIR}
+		--with-PATH_EGETTY=/bin/false
+		--with-HTML=yes
+		--with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
+		--with-PATH_IMPRIP=\"\"
+		--with-SYSVINIT=no
+		--with-LIBTIFF=\"-ltiff -ljpeg -lz\"
+		--with-OPTIMIZER=\"${CFLAGS}\""
+
+	if [ -h /etc/localtime ]; then
+		local continent=$(readlink /etc/localtime | cut -d / -f 5)
+		if [ "${continent}" == "Europe" ]; then
+			my_conf="${my_conf} --with-PAGESIZE=A4"
+		fi
+	fi
+
+	use faxonly && my_conf="${my_conf} --with-PATH_GETTY=/bin/false
+	                                  --with-PATH_VGETTY=/bin/false"
+	#--enable-pam isn't valid
+	use pam || my_conf="${my_conf} $(use_enable pam)"
+
+	# no 'econf' here because custom configure script used
+	eval ./configure --nointeractive ${my_conf} || die "./configure failed"
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/{bin,sbin} /usr/lib/fax /usr/share/man /var/spool
+	dodir /usr/share/doc/${P}/html
+
+	make \
+		BIN=${D}/usr/bin \
+		SBIN=${D}/usr/sbin \
+		LIBDIR=${D}/usr/lib \
+		LIB=${D}/usr/lib \
+		LIBEXEC=${D}/usr/sbin \
+		LIBDATA=${D}/usr/lib/fax \
+		MAN=${D}/usr/share/man \
+		SPOOL=${D}/var/spool/fax \
+		HTMLDIR=${D}/usr/share/doc/${P}/html \
+		install || die "make install failed"
+
+	keepdir /var/spool/fax/{archive,client,pollq,tmp}
+
+	einfo "Adding env.d entry for Hylafax"
+	insinto /etc/env.d
+	newins ${FILESDIR}/99hylafax-4.2 hylafax
+
+	einfo "Adding init.d entry for Hylafax"
+	insinto /etc/init.d
+	insopts -m 755
+	newins ${FILESDIR}/hylafax-4.2 hylafax
+
+	dodoc COPYRIGHT README TODO VERSION
+}
+
+pkg_postinst() {
+	ewarn "Proper fax2tiff support now requires libtiff 3.5.5 until there"
+	ewarn "is an upstream fix for bug #48077.  You must use this version"
+	ewarn "of fax2tiff if you need conversion of G3 files, however, you"
+	ewarn "you must still build hylafax against tiff-3.5.7-r1 or better."
+	ewarn "I repeat: do not try to build hylafax or anything else against"
+	ewarn "tiff-3.5.5 because it won't work.  You've been warned."
+	echo
+	einfo "Now run faxsetup"
+	echo
+}