From eugen@www.svzserv.kemerovo.su  Tue Feb 27 08:46:22 2007
Return-Path: <eugen@www.svzserv.kemerovo.su>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 178A816A402
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Feb 2007 08:46:22 +0000 (UTC)
	(envelope-from eugen@www.svzserv.kemerovo.su)
Received: from www.svzserv.kemerovo.su (www.svzserv.kemerovo.su [213.184.65.80])
	by mx1.freebsd.org (Postfix) with ESMTP id 7A5E313C494
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Feb 2007 08:46:20 +0000 (UTC)
	(envelope-from eugen@www.svzserv.kemerovo.su)
Received: from www.svzserv.kemerovo.su (smmsp@localhost [127.0.0.1])
	by www.svzserv.kemerovo.su (8.13.8/8.13.8) with ESMTP id l1R8kIs0062250;
	Tue, 27 Feb 2007 15:46:18 +0700 (KRAT)
	(envelope-from eugen@www.svzserv.kemerovo.su)
Received: (from root@localhost)
	by www.svzserv.kemerovo.su (8.13.8/8.13.8/Submit) id l1R8kIuM062249;
	Tue, 27 Feb 2007 15:46:18 +0700 (KRAT)
	(envelope-from eugen)
Message-Id: <200702270846.l1R8kIuM062249@www.svzserv.kemerovo.su>
Date: Tue, 27 Feb 2007 15:46:18 +0700 (KRAT)
From: Eugene Grosbein <eugen@grosbein.pp.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: boris@tagnet.ru
Subject: unbreak quagga installation for FreeBSD 5.x and earlier
X-Send-Pr-Version: 3.113
X-GNATS-Notify: boris@tagnet.ru

>Number:         109593
>Category:       ports
>Synopsis:       unbreak net/quagga installation for FreeBSD 5.x and earlier
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 27 08:50:10 GMT 2007
>Closed-Date:    Wed Feb 28 15:18:07 GMT 2007
>Last-Modified:  Wed Feb 28 15:20:05 GMT 2007
>Originator:     Eugene Grosbein
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
Svyaz Service JSC
>Environment:
System: FreeBSD www.svzserv.kemerovo.su 4.11-STABLE FreeBSD 4.11-STABLE #20: Mon Nov 27 13:23:00 KRAT 2006 eu@www.svzserv.kemerovo.su:/home4/obj/home/src/sys/WWW i386

>Description:
	quagga runs makeinfo during 'install' stage.
	FreeBSD 6.0 and later have texinfo 4.8 that runs Ok
	but earlier versions have texinfo 4.6 that breaks on quagga.texi
	and interrupts installation of port.

>How-To-Repeat:
	Try to install quagga port using FreeBSD 4.11 or FreeBSD 5.x
	(I have to admit that I did not test 5.x ;-)

>Fix:

	Early versions have to build and use newer texinfo package.

--- Makefile.orig	Thu Feb  1 20:25:05 2007
+++ Makefile	Tue Feb 27 15:36:11 2007
@@ -122,6 +122,11 @@
 CFLAGS+=	-DQUAGGA_TCP_MD5SIG
 .endif
 
+.if ${OSVERSION} < 500000
+BUILD_DEPENDS+=${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
+CONFIGURE_ENV+=MAKEINFO=${LOCALBASE}/bin/makeinfo
+.endif
+
 USE_RC_SUBR=	watchquagga.sh
 .if ${OSVERSION} < 500000 || ${OSVERSION} >= 600101
 USE_RC_SUBR+=	quagga.sh



Eugene Grosbein
>Release-Note:
>Audit-Trail:

From: Eugene Grosbein <eugen@grosbein.pp.ru>
To: bug-followup@freebsd.org
Cc: boris@tagnet.ru
Subject: Re: ports/109593: unbreak quagga installation for FreeBSD 5.x and earlier
Date: Tue, 27 Feb 2007 16:10:59 +0700

 Hi!
 
 Additionally, I suggest to remove files/patch-doc-Makefile.in
 and restore installation of quagga.info, it's very inconvinient
 that port stopped to install this manual.
 
 Here is modified patch for port's Makefile.
 
 --- Makefile.orig	Thu Feb  1 20:25:05 2007
 +++ Makefile	Tue Feb 27 16:06:44 2007
 @@ -7,7 +7,7 @@
  
  PORTNAME=	quagga
  PORTVERSION=	0.99.6
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	net ipv6
  MASTER_SITES=	http://quagga.net/download/ \
  		http://www.ru.quagga.net/download/ \
 @@ -34,6 +34,7 @@
  
  MAN1=		vtysh.1
  MAN8=		bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
 +INFO=		quagga
  
  OPTIONS=	ISISD		"Enable experimental ISIS daemon"	off \
  		PAM		"PAM authentication for vtysh"	off \
 @@ -120,6 +121,11 @@
  .endif
  EXTRA_PATCHES+=${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgp_network.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgp_vty.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgpd.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgpd.h ${PATCHDIR}/extra-tcpmd5-patch-lib-sockopt.c ${PATCHDIR}/extra-tcpmd5-patch-lib-sockopt.h ${PATCHDIR}/extra-tcpmd5-patch-vtysh-extract.pl.in
  CFLAGS+=	-DQUAGGA_TCP_MD5SIG
 +.endif
 +
 +.if ${OSVERSION} < 500000
 +BUILD_DEPENDS+=${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
 +CONFIGURE_ENV+=MAKEINFO=${LOCALBASE}/bin/makeinfo
  .endif
  
  USE_RC_SUBR=	watchquagga.sh
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Feb 27 11:14:26 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109593 

From: Eugene Grosbein <eugen@grosbein.pp.ru>
To: bug-followup@freebsd.org
Cc: boris@tagnet.ru
Subject: Re: ports/109593: unbreak quagga installation for FreeBSD 5.x and earlier
Date: Tue, 27 Feb 2007 18:25:09 +0700

 > +.if ${OSVERSION} < 500000
 > +BUILD_DEPENDS+=${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
 > +CONFIGURE_ENV+=MAKEINFO=${LOCALBASE}/bin/makeinfo
 
 Oops... It should be ${OSVERSION} < 600000 here, not 500000.
 
 Eugene

From: Boris Kovalenko <boris@tagnet.ru>
To: bug-followup@FreeBSD.org,  eugen@grosbein.pp.ru
Cc:  
Subject: Re: ports/109593: unbreak quagga installation for FreeBSD 5.x and
 earlier
Date: Wed, 28 Feb 2007 08:30:14 +0500

 Hello!
 
     Approved. This solutions is exactly one I looked for.
 
 With respect,
     Boris
 
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Wed Feb 28 04:29:39 UTC 2007 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109593 
State-Changed-From-To: open->closed 
State-Changed-By: sem 
State-Changed-When: Wed Feb 28 15:18:03 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109593 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/109593: commit references a PR
Date: Wed, 28 Feb 2007 15:17:50 +0000 (UTC)

 sem         2007-02-28 15:17:41 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/quagga           Makefile 
   Removed files:
     net/quagga/files     patch-doc-Makefile.in 
   Log:
   - Restore info files install and fix build them on OSVERSION<600000
   
   PR:             ports/109593
   Submitted by:   Eugene Grosbein <eugen_AT_grosbein.pp.ru>
   Approved by:    maintainer
   
   Revision  Changes    Path
   1.51      +7 -1      ports/net/quagga/Makefile
   1.2       +0 -11     ports/net/quagga/files/patch-doc-Makefile.in (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
