From owner-freebsd-ports  Sat Apr 24 13:40:11 1999
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 3CCA114F1B
	for <freebsd-ports@FreeBSD.org>; Sat, 24 Apr 1999 13:40:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id NAA99886;
	Sat, 24 Apr 1999 13:40:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from stade.demon.co.uk (stade.demon.co.uk [158.152.29.164])
	by hub.freebsd.org (Postfix) with ESMTP id 6263514F1B
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 24 Apr 1999 13:39:10 -0700 (PDT)
	(envelope-from aw1@stade.co.uk)
Received: (from aw1@localhost)
	by stade.demon.co.uk (8.9.3/8.9.3) id IAA02431;
	Sat, 24 Apr 1999 08:57:51 +0100 (BST)
	(envelope-from aw1)
Message-Id: <199904240757.IAA02431@stade.demon.co.uk>
Date: Sat, 24 Apr 1999 08:57:51 +0100 (BST)
From: Adrian Wontroba <aw1@stade.co.uk>
Reply-To: aw1@stade.co.uk
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/11310: Port upgrade: Hylafax - allow to compile with egcs
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         11310
>Category:       ports
>Synopsis:       Port upgrade: Hylafax - allow to compile with egcs
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 24 13:40:00 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     Adrian Wontroba
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
Yes, some would be nice!
>Environment:

	4.0-CURRENT with system egcs 

>Description:

	Hylafax will not compile without applying a distribution
	patch.

>How-To-Repeat:

	cd /usr/ports/comms/hylafax; make install

>Fix:
	
	Apply the following patch, which for a 4.0-CURRENT system
	applies a distribution patch. It also quietens portlint
	a little, moving Y2K further down the makefile.

	Changed files
		hylafax/Makefile
		hylafax/files/md5

diff -ruN --exclude cvs ../comms/hylafax/Makefile hylafax/Makefile
--- ../comms/hylafax/Makefile	Wed Apr 14 08:22:05 1999
+++ hylafax/Makefile	Sat Apr 24 07:33:26 1999
@@ -14,9 +14,15 @@
 		ftp://ftp.sisis.de/pub/hylafax/source/
 EXTRACT_SUFX=	-tar.gz
 
-MAINTAINER=	ports@freebsd.org
+# need a patch if using egcs
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} >= 400002
+PATCH_SITES=	http://www.hylafax.org/patches/
+PATCHFILES=	gcc-2.8.x.patch
+PATCH_DIST_STRIP=	-p1
+.endif
 
-Y2K=		http://www.hylafax.org/HylaFAQ/Q189.html
+MAINTAINER=	ports@freebsd.org
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash2 \
 		${PREFIX}/lib/afm/Courier:${PORTSDIR}/print/afm
@@ -26,6 +32,7 @@
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff34 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
+Y2K=		http://www.hylafax.org/HylaFAQ/Q189.html
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-INSTALL="" \
 		--with-MAKE=gmake --with-CC=/usr/bin/cc \
@@ -52,8 +59,8 @@
 	chown uucp ${SUID_EXES}
 	chmod 4555 ${SUID_EXES}
 	@if [ ! -f ${PREFIX}/etc/rc.d/hylafax.sh.sample ]; then	\
-		cp ${FILESDIR}/hylafax.sh.sample ${PREFIX}/etc/rc.d;	\
+		${CP} ${FILESDIR}/hylafax.sh.sample ${PREFIX}/etc/rc.d;	\
 	fi
 	${CAT} ${PKGDIR}/MESSAGE
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude cvs ../comms/hylafax/files/md5 hylafax/files/md5
--- ../comms/hylafax/files/md5	Sun Apr 12 04:10:49 1998
+++ hylafax/files/md5	Sat Apr 24 07:35:12 1999
@@ -1 +1,2 @@
 MD5 (hylafax-v4.0pl2-tar.gz) = 59966e41f769770134b2c80c84245874
+MD5 (gcc-2.8.x.patch) = 87175988e93d94c01325a8ea77cf24e2

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message