Bug 109593 - unbreak net/quagga installation for FreeBSD 5.x and earlier
unbreak net/quagga installation for FreeBSD 5.x and earlier
Status: Closed FIXED
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s)
Latest
Any Any
: Normal Affects Only Me
Assigned To: FreeBSD ports mailing list
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2007-02-27 08:50 UTC by eugen
Modified: 2007-02-28 15:20 UTC (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description eugen 2007-02-27 08:50:10 UTC
	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.

Fix: Early versions have to build and use newer texinfo package.



Eugene Grosbein--KQGpyZbiiesC3uhORY4mejISPZVErOfGAxykneHkHqUWBuzS
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

--- 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
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 ;-)
Comment 1 eugen 2007-02-27 09:10:59 UTC
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
Comment 2 Edwin Groothuis freebsd_committer 2007-02-27 11:14:26 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback
Comment 3 eugen 2007-02-27 11:25:09 UTC
> +.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
Comment 4 boris 2007-02-28 03:30:14 UTC
Hello!

    Approved. This solutions is exactly one I looked for.

With respect,
    Boris
Comment 5 Mark Linimon freebsd_committer 2007-02-28 04:29:39 UTC
State Changed
From-To: feedback->open

Maintainer approved.
Comment 6 dfilter freebsd_committer 2007-02-28 15:17:50 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"
Comment 7 Sergey Matveychuk freebsd_committer 2007-02-28 15:18:03 UTC
State Changed
From-To: open->closed

Committed. Thanks!