Update to 0.98.2. This is from riz AT boogers.sf.ca.us

via PR #29518 with some slight modifications. Also some review
by Greg Troxel (who is a quagga developer). This is based on the
pkgsrc-wip version.

This has many changes. But ChangeLog is incomplete.

This uses USE_LIBTOOL.
Uses rcd scripts provide from quagga distribution (are pkgsrc/NetBSD style).
Adds USE_ZEBRA_OSPF_OPAQUELSA build definition for --enable-opaque-lsa.

All patches removed.

1 files changed, 50 insertions, 21 deletions

diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index fb4e5b5fac9..84346294002 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/12/29 15:31:24 minskim Exp $
+# $NetBSD: Makefile,v 1.17 2005/03/02 19:15:07 reed Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
-DISTNAME=	quagga-0.96.3
-PKGREVISION=	2
+DISTNAME=	quagga-0.98.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.quagga.net/download/
 
@@ -13,59 +12,89 @@ COMMENT=	Free multithreaded routing daemon software (fork of zebra)
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_BUILDLINK3=		yes
-GNU_CONFIGURE=		# defined
+USE_BUILDLINK3=		YES
+GNU_CONFIGURE=		YES
+USE_GNU_TOOLS+=		make
+USE_LIBTOOL=		YES
+
 PKG_SYSCONFSUBDIR?=	zebra
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--enable-exampledir=${PREFIX}/share/examples/quagga
+#CONFIGURE_ARGS+=	--enable-pkgsrcrcdir=${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/run/zebra
-# you might need debugging, it's a developer release !
-#CFLAGS+=	-g
 
 CONFLICTS+=		zebra-[0-9]*
 
-PLIST_SRC=		# empty
+PLIST_SRC=		${WRKDIR}/PLIST
+PLIST_CAT=		# empty
 
 INFO_FILES=	quagga.info
 
 USE_PKGINSTALL=	YES
+RCD_SCRIPTS=	zebra bgpd ospfd ripd
 PKG_GROUPS=	quagga
 PKG_USERS=	quagga:quagga
 
+# log_syslog.conf is used as a template for each config file
+.for _file_ in vtysh.conf zebra.conf bgpd.conf ospfd.conf ripd.conf
+CONF_FILES_PERMS+=	${PREFIX}/share/examples/quagga/log_syslog.conf \
+			${PKG_SYSCONFDIR}/${_file_} quagga quagga 0600
+.endfor
+.undef _file_
+
+BUILD_DEFS+=			USE_ZEBRA_VTYSH USE_ZEBRA_OSPF_OPAQUELSA
+USE_ZEBRA_VTYSH?=		YES
+USE_ZEBRA_OSPF_OPAQUELSA?=	YES
+
 .if defined(USE_ZEBRA_VTYSH) && ${USE_ZEBRA_VTYSH} == "YES"
 USE_GNU_READLINE=	# uses rl_pending_input
 .  include "../../devel/readline/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-vtysh
-PLIST_SRC+=		${PKGDIR}/PLIST.vtysh
+PLIST_CAT+=		${PKGDIR}/PLIST.vtysh
 .else
 CONFIGURE_ARGS+=	--disable-vtysh
 .endif
 
-USE_GNU_TOOLS+=		make
+.if defined(USE_ZEBRA_OSPF_OPAQUELSA) && ${USE_ZEBRA_OSPF_OPAQUELSA} == "YES"
+CONFIGURE_ARGS+=	--enable-opaque-lsa
+PLIST_CAT+=		${PKGDIR}/PLIST.opaquelsa
+.endif
 
 BUILD_DEFS+=		USE_INET6
 
 .if defined(USE_INET6) && ${USE_INET6} == YES
-PLIST_SRC+=		${PKGDIR}/PLIST.v6
+PLIST_CAT+=		${PKGDIR}/PLIST.v6
+RCD_SCRIPTS+=		ospf6d ripngd
+.for _file_ in ospf6d.conf ripngd.conf
+CONF_FILES_PERMS+=	${PREFIX}/share/examples/quagga/log_syslog.conf \
+			${PKG_SYSCONFDIR}/${_file_} quagga quagga 0600
+.endfor
+.undef _file_
 .else
 CONFIGURE_ARGS+=	--disable-ospf6d
 CONFIGURE_ARGS+=	--disable-ripngd
 .endif
 
-PLIST_SRC+=		${PKGDIR}/PLIST
+PLIST_CAT+=		${PKGDIR}/PLIST
 
 LIBS+=			${LDFLAGS}
 
-pre-configure:
-	cd ${WRKSRC} && ${AUTORECONF} --force
-#	cd ${WRKSRC} && ${AUTOMAKE}
-
-#post-build:
-#	cd ${WRKSRC}/doc ; \
-#	${TOUCH} quagga.texi ; \
-#	${MAKEINFO} --no-split quagga.texi
+.for _script_ in ${RCD_SCRIPTS}
+RCD_SCRIPT_SRC.${_script_}?=	${WRKSRC}/pkgsrc/${_script_}.sh
+.endfor
 
 post-install:
 	@${CHMOD} a+r ${PREFIX}/share/examples/quagga/*
+	${INSTALL} -d -o quagga -g quagga -m 750 ${PKG_SYSCONFDIR}
+	${INSTALL_DATA} ${FILESDIR}/log_syslog.conf ${PREFIX}/share/examples/quagga
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/quagga
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/quagga/mpls
+	${INSTALL_DATA} ${WRKSRC}/doc/BGP-TypeCode ${PREFIX}/share/doc/quagga
+	${INSTALL_DATA} ${WRKSRC}/doc/draft-zebra-00.txt ${PREFIX}/share/doc/quagga
+	${INSTALL_DATA} ${WRKSRC}/doc/mpls/* ${PREFIX}/share/doc/quagga/mpls
+	${CAT} ${PLIST_CAT} > ${PLIST_SRC}
+	(cd ${PREFIX}; ${FIND} share/doc/quagga -type f -print ) >> ${PLIST_SRC}
+	(cd ${PREFIX}; ${FIND} share/doc/quagga -type d -print ) | \
+		${SED} -e 's/^/@dirrm /' | ${SORT} -r >> ${PLIST_SRC}
 
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"