Fixed BUG #47846.

6 files changed, 92 insertions, 12 deletions

diff --git a/net-misc/hylafax/ChangeLog b/net-misc/hylafax/ChangeLog
index 62af17e25a21..e0bba2358f8c 100644
--- a/net-misc/hylafax/ChangeLog
+++ b/net-misc/hylafax/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/hylafax
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.27 2004/04/15 18:05:08 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.28 2004/04/19 22:12:34 kugelfang Exp $
+
+  20 Apr 2004; Danny van Dyk <kugelfang@gentoo.org>
+  +files/hylafax-4.1.8-fPIC.patch, hylafax-4.1.8-r1.ebuild,
+  hylafax-4.1.8-r2.ebuild, hylafax-4.1.8.ebuild:
+  Added patch to allow compilation on alpha and amd64. Fixes BUG #47846. marked
+  -r2 "~amd64 ~alpha" and marked all previous version "-alpha -amd64" on behalf
+  of agriffis.
 
   15 Apr 2004; <augustus@gentoo.org> hylafax-4.1.8-r2.ebuild:
   Added ~amd64 keyword.
diff --git a/net-misc/hylafax/Manifest b/net-misc/hylafax/Manifest
index c56fe054e6f9..502c5f33d9a6 100644
--- a/net-misc/hylafax/Manifest
+++ b/net-misc/hylafax/Manifest
@@ -1,10 +1,11 @@
-MD5 a8605f1617ec9ba62067f2054a3b3305 ChangeLog 5768
-MD5 d23315f9c307090fb7c2532c218aec99 hylafax-4.1.8-r1.ebuild 2354
-MD5 2a18440f11cf0bc2fca49b65fcef4a9e hylafax-4.1.8.ebuild 2195
+MD5 bf11af6676a966260cc8904216820a61 ChangeLog 6106
+MD5 58fe70487a9e93b002431f41cfb1a9e6 hylafax-4.1.8-r1.ebuild 2363
+MD5 6aefa026092c0dee7e9f6178d5aa0379 hylafax-4.1.8-r2.ebuild 2493
+MD5 70d3cff20cc103d931a254e1f878d2e6 hylafax-4.1.8.ebuild 2204
 MD5 d82acf1bcf0f7f9e181d6a2821292f2e metadata.xml 435
-MD5 854d985d4ed11d187e9bab9e46affd98 hylafax-4.1.8-r2.ebuild 2408
 MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8 66
 MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8-r1 66
-MD5 44bdb0490811a12b11a1bb69433ea7a4 files/hylafax 3765
 MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8-r2 66
+MD5 44bdb0490811a12b11a1bb69433ea7a4 files/hylafax 3765
 MD5 ad3b0e7082e6e71ee6ba940ce1b6b071 files/hylafax-4.1.8-gcc-version.patch 520
+MD5 5f2f2e3fe04414f953d4010d32261318 files/hylafax-4.1.8-fPIC.patch 2086
diff --git a/net-misc/hylafax/files/hylafax-4.1.8-fPIC.patch b/net-misc/hylafax/files/hylafax-4.1.8-fPIC.patch
new file mode 100644
index 000000000000..edfa65f889a6
--- /dev/null
+++ b/net-misc/hylafax/files/hylafax-4.1.8-fPIC.patch
@@ -0,0 +1,67 @@
+--- hylafax-4.1.8/util/Makefile.in.orig	2004-04-19 20:08:17.819401240 +0200
++++ hylafax-4.1.8/util/Makefile.in	2004-04-19 20:13:06.757475976 +0200
+@@ -100,6 +100,11 @@
+ 
+ @MAKEINCLUDE@ @MAKELQUOTE@${COMMONRULES}@MAKERQUOTE@
+ 
++.c++.o:
++	${C++F} -fPIC ${C++FILE} -c $<@MAKECXXOVERRIDE@
++.c.o:
++	${CCF} -fPIC ${CCFILE} -c $<@MAKECXXOVERRIDE@
++
+ libfaxutil.a: ${OBJECTS}
+ 	@rm -f $@;
+ 	@echo "${AR} ${AROPTS} $@ ${OBJECTS}"; \
+@@ -143,6 +148,8 @@
+ 	${C++F} -c ${C++FILE} ${SRCDIR}/faxwatch.c++@MAKECXXOVERRIDE@
+ faxwatch: faxwatch.o ${LIBS}
+ 	${C++F} -o $@ faxwatch.o ${LDFLAGS}
++faxfetch.o: ${SRCDIR}/faxfetch.c++
++	${C++F} -c ${C++FILE} ${SRCDIR}/faxfetch.c++@MAKECXXOVERRIDE@
+ faxfetch: faxfetch.o ${LIBS}
+ 	${C++F} -o $@ faxfetch.o ${LDFLAGS}
+ 
+--- hylafax-4.1.8/regex/Makefile.in.orig	2004-04-19 20:14:16.780830808 +0200
++++ hylafax-4.1.8/regex/Makefile.in	2004-04-19 20:14:59.114395128 +0200
+@@ -53,6 +53,9 @@
+ 
+ @MAKEINCLUDE@ @MAKELQUOTE@${COMMONRULES}@MAKERQUOTE@
+ 
++.c.o:
++	${CCF} -fPIC ${CCFILE} -c $<@MAKECXXOVERRIDE@
++
+ libregex.a: ${OBJECTS}
+ 	@rm -f $@;
+ 	${AR} ${AROPTS} $@ ${OBJECTS}
+--- hylafax-4.1.8/faxd/Makefile.in.orig	2004-04-19 20:32:15.018913704 +0200
++++ hylafax-4.1.8/faxd/Makefile.in	2004-04-19 20:44:50.024135464 +0200
+@@ -158,6 +158,9 @@
+ 
+ @MAKEINCLUDE@ @MAKELQUOTE@${COMMONRULES}@MAKERQUOTE@
+ 
++.c++.o:
++	${C++F} -fPIC ${C++FILE} -c $<@MAKECXXOVERRIDE@
++
+ libfaxserver.a: ${SERVER_OBJS} ${MODEM_OBJS}
+ 	${AR} ${AROPTS} libfaxserver.a $?
+ 	${RANLIB} libfaxserver.a
+@@ -171,7 +174,18 @@
+ mkhash:	${SRCDIR}/mkhash.c
+ 	${CCF} -o mkhash ${SRCDIR}/mkhash.c
+ 
+-faxQueueApp.o FaxRecv.o:
++#FAXQOBJS
++DestControl.c++ DestInfo.c++ Job.c++ HylaClient.c++ Modem.c++ QLink.c++ Trigger.c++ TriggerRef.c++ faxQueueApp.c++:
++	${C++F} ${C++FILE} -c $@
++
++#FAXSENDOBJS, FAXGETTYOBJS
++faxSendApp.c++ faxQCleanApp.c++ Getty.c++ Getty@GETTY@.c++ faxGettyApp.c++ pageSendApp.c++:
++	${C++F} ${C++FILE} -c $@
++
++#REST OBJS
++tagtest.c++ cqtest.c++ choptest.c++ tsitest.c++ trigtest.c++:
++	${C++F} ${C++FILE} -c $@
++
+ incdepend: hash.h
+ 
+ faxq:	${FAXQOBJS} libfaxserver.${DSO} ${LIBS}
diff --git a/net-misc/hylafax/hylafax-4.1.8-r1.ebuild b/net-misc/hylafax/hylafax-4.1.8-r1.ebuild
index dae36ef846f9..22747cac760e 100644
--- a/net-misc/hylafax/hylafax-4.1.8-r1.ebuild
+++ b/net-misc/hylafax/hylafax-4.1.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.1.8-r1.ebuild,v 1.4 2004/03/13 17:52:26 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.1.8-r1.ebuild,v 1.5 2004/04/19 22:12:34 kugelfang Exp $
 
 # This is basically unchanged from the one supplied by Stephane Loeuillet
 # to Gentoo bug: http://bugs.gentoo.org/show_bug.cgi?id=28574
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.hylafax.org/source/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="hylafax"
-KEYWORDS="x86 sparc alpha hppa "
+KEYWORDS="x86 sparc hppa -alpha -amd64"
 
 DEPEND="net-dialup/mgetty
 	>=sys-libs/zlib-1.1.4
diff --git a/net-misc/hylafax/hylafax-4.1.8-r2.ebuild b/net-misc/hylafax/hylafax-4.1.8-r2.ebuild
index a9abc249b62c..cfcef4ef35ce 100644
--- a/net-misc/hylafax/hylafax-4.1.8-r2.ebuild
+++ b/net-misc/hylafax/hylafax-4.1.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.1.8-r2.ebuild,v 1.2 2004/04/15 18:05:08 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.1.8-r2.ebuild,v 1.3 2004/04/19 22:12:34 kugelfang Exp $
 
 # This is basically unchanged from the one supplied by Stephane Loeuillet
 # to Gentoo bug: http://bugs.gentoo.org/show_bug.cgi?id=28574
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.hylafax.org/source/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="hylafax"
-KEYWORDS="~x86 ~sparc ~alpha ~hppa ~amd64"
+KEYWORDS="~x86 ~sparc ~hppa ~alpha ~amd64"
 
 DEPEND="net-dialup/mgetty
 	>=sys-libs/zlib-1.1.4
@@ -29,6 +29,11 @@ RDEPEND="${DEPEND}"
 
 src_compile() {
 	epatch ${FILESDIR}/${P}-gcc-version.patch
+	case ${ARCH} in
+		"alpha"|"amd64")
+		epatch ${FILESDIR}/${P}-fPIC.patch
+		;;
+	esac
 	# no 'econf' here because does not support standard --prefix option (prehistoric autoconf v1.92 used !!!)
 	autoreconf -f
 	./configure \
diff --git a/net-misc/hylafax/hylafax-4.1.8.ebuild b/net-misc/hylafax/hylafax-4.1.8.ebuild
index 1648111a52c9..3d76992e3beb 100644
--- a/net-misc/hylafax/hylafax-4.1.8.ebuild
+++ b/net-misc/hylafax/hylafax-4.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.1.8.ebuild,v 1.5 2004/03/13 17:52:26 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.1.8.ebuild,v 1.6 2004/04/19 22:12:34 kugelfang Exp $
 
 # This is basically unchanged from the one supplied by Stephane Loeuillet
 # to Gentoo bug: http://bugs.gentoo.org/show_bug.cgi?id=28574
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.hylafax.org/source/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="hylafax"
-KEYWORDS="x86 sparc alpha hppa "
+KEYWORDS="x86 sparc hppa -alpha -amd64"
 
 DEPEND="net-dialup/mgetty
 	>=sys-libs/zlib-1.1.4