From owner-freebsd-ports  Thu Feb 21 19:40:13 2002
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 9871437B404
	for <freebsd-ports@hub.freebsd.org>; Thu, 21 Feb 2002 19:40:01 -0800 (PST)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g1M3e1W24067;
	Thu, 21 Feb 2002 19:40:01 -0800 (PST)
	(envelope-from gnats)
Received: from yoda.bmi.net (yoda.bmi.net [204.57.191.163])
	by hub.freebsd.org (Postfix) with ESMTP id 9043837B400
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 21 Feb 2002 19:37:29 -0800 (PST)
Received: from johncoop.MSHOME (drumheller-router.bmi.net [206.63.201.3] (may be forged))
	by yoda.bmi.net (Pro-8.9.3/Pro-8.9.3) with ESMTP id TAA31855
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 21 Feb 2002 19:35:08 -0800
Received: (from root@localhost)
	by johncoop.MSHOME (8.11.6/8.11.6) id g1M3bCX73681;
	Thu, 21 Feb 2002 19:37:12 -0800 (PST)
	(envelope-from jmcoopr)
Message-Id: <200202220337.g1M3bCX73681@johncoop.MSHOME>
Date: Thu, 21 Feb 2002 19:37:12 -0800 (PST)
From: John Merryweather Cooper <john_m_cooper@yahoo.com>
Reply-To: John Merryweather Cooper <john_m_cooper@yahoo.com>
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.113
Subject: ports/35197: [PATCH] fix "auto-crash" build failure on print/lyx
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         35197
>Category:       ports
>Synopsis:       [PATCH] fix "auto-crash" build failure on print/lyx
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 21 19:40:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     John Merryweather Cooper
>Release:        FreeBSD 4.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD johncoop.MSHOME 4.5-STABLE FreeBSD 4.5-STABLE #70: Thu Feb 21 11:12:24 PST 2002 jmcoopr@johncoop.MSHOME:/usr/obj/usr/src/sys/JOHNCOOP i386


	
>Description:
	print/lyx is not autoconf-2.52x ready, so it needs autoconf-2.13.  But,
	if you have both autoconf's installed, print/lyx will try to use the
	later version--resulting in the build failing.
	
>How-To-Repeat:
	attempt to build without this patch to the Makefile
	
>Fix:

	The fix.  The only file modified is the top level Makefile.

--- patch-lyx-Makefile.txt begins here ---
--- Makefile.orig	Tue Jan 22 18:42:28 2002
+++ Makefile	Thu Feb 21 09:43:45 2002
@@ -2,7 +2,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $FreeBSD: ports/print/lyx/Makefile,v 1.58 2002/01/22 12:44:39 dirk Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	lyx
@@ -29,7 +29,7 @@
 		intl.1:${PORTSDIR}/devel/gettext
 
 USE_GMAKE=	yes
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=	213
 USE_XPM=	yes
 USE_NEWGCC=	yes
 USE_PERL5=	yes
@@ -47,5 +47,11 @@
 post-patch:
 	(cd ${WRKSRC}; ${TOUCH} Makefile.in */Makefile.in src/config.h.in)
 	(cd ${WRKSRC}/lib/doc; ${RM} -f *.orig)
+
+pre-build:
+	@${PERL} -pi -e 's|autoheader|${AUTOHEADER}|g' \
+			${WRKSRC}/src/Makefile
+	@${PERL} -pi -e 's|autoconf|${AUTOCONF}|g' \
+			${WRKSRC}/lib/reLyX/Makefile
 
 .include <bsd.port.mk>
--- patch-lyx-Makefile.txt ends here ---


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

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