added latest official stable upstream version (fixed bug 62026)

6 files changed, 193 insertions, 7 deletions

diff --git a/net-misc/hylafax/ChangeLog b/net-misc/hylafax/ChangeLog
index dc43f0f0bba9..1584aa327590 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.36 2004/08/23 00:00:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.37 2004/08/30 00:03:32 nerdboy Exp $
+
+*hylafax-4.2.0 (29 Aug 2004)
+
+  29 Aug 2004; Steve Arnold <nerdboy@gentoo.org>
+  +files/hylafax-4.2.0-dso.patch, +files/hylafax-4.2.0-faxcron_uid.patch,
+  +hylafax-4.2.0.ebuild:
+  added/fixed latest official stable upstream version (bug 62026)
 
   22 Aug 2004; Jason Wever <weeve@gentoo.org> hylafax-4.1.8-r4.ebuild:
   Stable on sparc.
diff --git a/net-misc/hylafax/Manifest b/net-misc/hylafax/Manifest
index f5e780dd8d7e..09a26bbea8ca 100644
--- a/net-misc/hylafax/Manifest
+++ b/net-misc/hylafax/Manifest
@@ -1,20 +1,24 @@
-MD5 44832cf3e003542a36ad624c12309588 ChangeLog 7281
+MD5 8d03070db193998585f6ac780ab834c5 ChangeLog 7528
 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 d82acf1bcf0f7f9e181d6a2821292f2e metadata.xml 435
-MD5 d6924a605e66bd7e7694b715aa8afb79 hylafax-4.1.8-r3.ebuild 3020
 MD5 4d5babd63ce67564579fe6763b0d0df9 hylafax-4.1.8-r4.ebuild 3235
 MD5 e1c09d4ae9f16afec0050de46d762254 hylafax-4.2.0_rc2.ebuild 3518
+MD5 403a6aa03ec22b618e6d7efb78aa4893 hylafax-4.2.0.ebuild 3564
+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 bc084d075b601d42fbd417b97a45f1b2 files/hylafax 3757
-MD5 ad3b0e7082e6e71ee6ba940ce1b6b071 files/hylafax-4.1.8-gcc-version.patch 520
 MD5 5f2f2e3fe04414f953d4010d32261318 files/hylafax-4.1.8-fPIC.patch 2086
-MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8-r3 66
-MD5 46bbae3c77d5651a20e606eb6228c159 files/99hylafax 62
+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 56c8a42db89b1c225f1fd074ae02050e files/digest-hylafax-4.2.0_rc2 69
 MD5 491e78765b433d7c11146120cf7e40f8 files/hylafax-4.2 3759
+MD5 56c8a42db89b1c225f1fd074ae02050e files/digest-hylafax-4.2.0_rc2 69
+MD5 6b124a5aade1c4eabe5fdde7a21e0689 files/hylafax-4.2.0-dso.patch 884
+MD5 cfcafeadd916b8a9103b9b9110887916 files/hylafax-4.2.0-faxcron_uid.patch 527
+MD5 61b6d16148a84723c2996b519a57d498 files/digest-hylafax-4.2.0 66
diff --git a/net-misc/hylafax/files/digest-hylafax-4.2.0 b/net-misc/hylafax/files/digest-hylafax-4.2.0
new file mode 100644
index 000000000000..9de57e0107eb
--- /dev/null
+++ b/net-misc/hylafax/files/digest-hylafax-4.2.0
@@ -0,0 +1 @@
+MD5 463726ed21cfdac730c5d6915e0840cf hylafax-4.2.0.tar.gz 1351870
diff --git a/net-misc/hylafax/files/hylafax-4.2.0-dso.patch b/net-misc/hylafax/files/hylafax-4.2.0-dso.patch
new file mode 100644
index 000000000000..ba81b75373b0
--- /dev/null
+++ b/net-misc/hylafax/files/hylafax-4.2.0-dso.patch
@@ -0,0 +1,41 @@
+--- configure~	2004-08-24 08:09:46.158571000 -0700
++++ configure	2004-08-24 08:17:31.973611105 -0700
+@@ -907,11 +907,6 @@
+ }
+ 
+ if [ -z "$GCOPTS" ]; then
+-    case $CC-$TARGET in
+-    gcc-x86_64-*-linux-gnu)
+-	GCOPTS='-fPIC'
+-	;;
+-    esac
+     capture $CCOMPILER $ENVOPTS -g -c dummy.c && {
+ 	Note "Looks like $CCOMPILER supports the -g option."
+ 	# NB: cannot use captureX here 'cuz we lose stderr
+@@ -1069,9 +1064,6 @@
+     CC-*-sco3.2v5.*)		# cfront-based or cfront-compatible
+ 	GCXXOPTS='+a1 +p'
+ 	;;
+-    g++-x86_64-*-linux-gnu)
+-	GCXXOPTS='-fPIC'
+-	;;
+     *)
+ 	GCXXOPTS=
+ 	;;
+@@ -3389,6 +3381,16 @@
+     DSOSUF=a DSOOPTS= DSODELAY= LLDOPTS=
+ else
+     MAKEDSOINCLUDE="$MAKEINCLUDE"
++    case $CC-$TARGET in
++    gcc-*-linux-gnu)
++	GCOPTS="$GCOPTS -fpic"
++	;;
++    esac
++    case $CXX-$TARGET in
++    g++-*-linux-gnu)
++	GCXXOPTS="$GCXXOPTS -fpic"
++	;;
++    esac
+ fi
+ 
+ Note ""
diff --git a/net-misc/hylafax/files/hylafax-4.2.0-faxcron_uid.patch b/net-misc/hylafax/files/hylafax-4.2.0-faxcron_uid.patch
new file mode 100644
index 000000000000..b83a5d2329b0
--- /dev/null
+++ b/net-misc/hylafax/files/hylafax-4.2.0-faxcron_uid.patch
@@ -0,0 +1,11 @@
+--- util/faxcron.sh.in.orig	2004-08-28 12:15:58.000000000 +0100
++++ util/faxcron.sh.in	2004-08-28 12:16:39.000000000 +0100
+@@ -41,7 +41,7 @@
+ AGELOG=30			# keep log info for last 30 days
+ AGERCV=7			# purge received facsimile after 7 days
+ AGETMP=1			# purge orphaned temp files after 1 day
+-FAXUSER=fax			# owner of log files
++FAXUSER=@FAXUID@		# owner of log files
+ LOGMODE=0644			# mode for log files
+ XFERLOG=etc/xferfaxlog		# HylaFAX xferfaxlog file location
+ LAST=etc/lastrun		# file where time+date of last run recorded
diff --git a/net-misc/hylafax/hylafax-4.2.0.ebuild b/net-misc/hylafax/hylafax-4.2.0.ebuild
new file mode 100644
index 000000000000..2ddd77d28b84
--- /dev/null
+++ b/net-misc/hylafax/hylafax-4.2.0.ebuild
@@ -0,0 +1,122 @@
+# 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.ebuild,v 1.1 2004/08/30 00:03:32 nerdboy Exp $
+
+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/${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}
+	app-arch/sharutils"
+
+export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-dso.patch
+	epatch ${FILESDIR}/${P}-faxcron_uid.patch
+}
+
+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)"
+
+	# eval required for quoting in ${my_conf} to work properly, better way?
+	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 /var/spool/recvq
+	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,etc,pollq,recvq,tmp}
+	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
+
+	einfo "Adding env.d entry for Hylafax"
+	insinto /etc/env.d
+	newins ${FILESDIR}/99hylafax-4.2 99hylafax
+
+	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 "must still build hylafax against tiff-3.5.7-r1 or better."
+	echo
+	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
+	echo
+	einfo "Hylafax now depends on sharutils instead of metamail for mime"
+	einfo "handling, however, you can continue to use the latter if you"
+	einfo "like.  As always, file a bug if you have problems."
+	echo
+	einfo "Now run faxsetup and (if necessary) faxaddmodem."
+	echo
+}