From 2bf082f7970edc871b7cc6bd43186051fd5c9503 Mon Sep 17 00:00:00 2001 From: Andreas Klemm Date: Sat, 22 Jan 2000 22:12:16 +0000 Subject: [PATCH] upgrade to 0.84b And port changes from sumikawa@ebina.hitachi.co.jp: - add 'ipv6' on CATEGORIES - get rid of 'USE_INET6' and use 'OSVERSION' instead of it. - make PLIST.v6 only difference from PLIST for easily maintanance Submitted by: sumikawa@ebina.hitachi.co.jp --- net/zebra-devel/Makefile | 19 +++++++++++-------- net/zebra-devel/distinfo | 2 +- net/zebra-devel/pkg-plist | 2 +- net/zebra-devel/pkg-plist.v6 | 15 --------------- net/zebra-pj/Makefile | 19 +++++++++++-------- net/zebra-pj/distinfo | 2 +- net/zebra-pj/pkg-plist | 2 +- net/zebra-pj/pkg-plist.v6 | 15 --------------- net/zebra/Makefile | 19 +++++++++++-------- net/zebra/distinfo | 2 +- net/zebra/pkg-plist | 2 +- net/zebra/pkg-plist.v6 | 15 --------------- 12 files changed, 39 insertions(+), 75 deletions(-) diff --git a/net/zebra-devel/Makefile b/net/zebra-devel/Makefile index ec3976889626..77c1621fa671 100644 --- a/net/zebra-devel/Makefile +++ b/net/zebra-devel/Makefile @@ -1,28 +1,31 @@ # New ports collection makefile for: zebra -# Version required: SNAP 981222 +# Version required: 0.84b # Date created: So 31 Mai 1998 11:00:30 CEST # Whom: Andreas Klemm # # $FreeBSD$ # -DISTNAME= zebra-0.84 -CATEGORIES= net +DISTNAME= zebra-0.84b +CATEGORIES= net ipv6 MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/ # you might need debugging, it's a developer release ! #CFLAGS+= -g MAINTAINER= andreas@FreeBSD.org -WRKSRC= ${WRKDIR}/zebra-0.84a GNU_CONFIGURE= yes CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/zebra -.if defined(USE_INET6) -PLIST= ${PKGDIR}/PLIST.v6 +.include + +.if ${OSVERSION} >= 400014 +PLIST:= ${WRKDIR}/PLIST +pre-install: + @${CAT} ${PKGDIR}/PLIST.v6 > ${PLIST} + @${CAT} ${PKGDIR}/PLIST >> ${PLIST} .else CONFIGURE_ARGS+=--disable-ospf6d --disable-ripngd -PLIST= ${PKGDIR}/PLIST .endif post-install: @@ -38,4 +41,4 @@ post-install: @${ECHO} "router_flags=\"start\"" @${ECHO} "done." -.include +.include diff --git a/net/zebra-devel/distinfo b/net/zebra-devel/distinfo index 2ce444b26780..f910e349ed95 100644 --- a/net/zebra-devel/distinfo +++ b/net/zebra-devel/distinfo @@ -1 +1 @@ -MD5 (zebra-0.84.tar.gz) = f438f081e2abe5261dccae5cd04e158b +MD5 (zebra-0.84b.tar.gz) = c7fcad82c84d34662621f0d8ecb8388b diff --git a/net/zebra-devel/pkg-plist b/net/zebra-devel/pkg-plist index 3e28171db3e3..14dbb9f31e54 100644 --- a/net/zebra-devel/pkg-plist +++ b/net/zebra-devel/pkg-plist @@ -6,9 +6,9 @@ sbin/zebractl etc/zebra/README.mbgp etc/zebra/bgpd.conf.sample etc/zebra/bgpd.conf.sample2 +etc/zebra/ospfd.conf.sample etc/zebra/ripd.conf.sample etc/zebra/zebra.conf.sample -etc/zebra/ospfd.conf.sample @unexec install-info --delete %D/info/zebra.info %D/info/dir info/zebra.info @exec install-info %D/info/zebra.info %D/info/dir diff --git a/net/zebra-devel/pkg-plist.v6 b/net/zebra-devel/pkg-plist.v6 index 34a29c6b01e5..a9344d7c2409 100644 --- a/net/zebra-devel/pkg-plist.v6 +++ b/net/zebra-devel/pkg-plist.v6 @@ -1,19 +1,4 @@ -sbin/bgpd sbin/ospf6d -sbin/ospfd -sbin/ripd sbin/ripngd -sbin/zebra -sbin/zebractl -etc/zebra/README.mbgp -etc/zebra/bgpd.conf.sample -etc/zebra/bgpd.conf.sample2 etc/zebra/ospf6d.conf.sample -etc/zebra/ospfd.conf.sample -etc/zebra/ripd.conf.sample etc/zebra/ripngd.conf.sample -etc/zebra/zebra.conf.sample -@unexec install-info --delete %D/info/zebra.info %D/info/dir -info/zebra.info -@exec install-info %D/info/zebra.info %D/info/dir -@dirrm etc/zebra diff --git a/net/zebra-pj/Makefile b/net/zebra-pj/Makefile index ec3976889626..77c1621fa671 100644 --- a/net/zebra-pj/Makefile +++ b/net/zebra-pj/Makefile @@ -1,28 +1,31 @@ # New ports collection makefile for: zebra -# Version required: SNAP 981222 +# Version required: 0.84b # Date created: So 31 Mai 1998 11:00:30 CEST # Whom: Andreas Klemm # # $FreeBSD$ # -DISTNAME= zebra-0.84 -CATEGORIES= net +DISTNAME= zebra-0.84b +CATEGORIES= net ipv6 MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/ # you might need debugging, it's a developer release ! #CFLAGS+= -g MAINTAINER= andreas@FreeBSD.org -WRKSRC= ${WRKDIR}/zebra-0.84a GNU_CONFIGURE= yes CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/zebra -.if defined(USE_INET6) -PLIST= ${PKGDIR}/PLIST.v6 +.include + +.if ${OSVERSION} >= 400014 +PLIST:= ${WRKDIR}/PLIST +pre-install: + @${CAT} ${PKGDIR}/PLIST.v6 > ${PLIST} + @${CAT} ${PKGDIR}/PLIST >> ${PLIST} .else CONFIGURE_ARGS+=--disable-ospf6d --disable-ripngd -PLIST= ${PKGDIR}/PLIST .endif post-install: @@ -38,4 +41,4 @@ post-install: @${ECHO} "router_flags=\"start\"" @${ECHO} "done." -.include +.include diff --git a/net/zebra-pj/distinfo b/net/zebra-pj/distinfo index 2ce444b26780..f910e349ed95 100644 --- a/net/zebra-pj/distinfo +++ b/net/zebra-pj/distinfo @@ -1 +1 @@ -MD5 (zebra-0.84.tar.gz) = f438f081e2abe5261dccae5cd04e158b +MD5 (zebra-0.84b.tar.gz) = c7fcad82c84d34662621f0d8ecb8388b diff --git a/net/zebra-pj/pkg-plist b/net/zebra-pj/pkg-plist index 3e28171db3e3..14dbb9f31e54 100644 --- a/net/zebra-pj/pkg-plist +++ b/net/zebra-pj/pkg-plist @@ -6,9 +6,9 @@ sbin/zebractl etc/zebra/README.mbgp etc/zebra/bgpd.conf.sample etc/zebra/bgpd.conf.sample2 +etc/zebra/ospfd.conf.sample etc/zebra/ripd.conf.sample etc/zebra/zebra.conf.sample -etc/zebra/ospfd.conf.sample @unexec install-info --delete %D/info/zebra.info %D/info/dir info/zebra.info @exec install-info %D/info/zebra.info %D/info/dir diff --git a/net/zebra-pj/pkg-plist.v6 b/net/zebra-pj/pkg-plist.v6 index 34a29c6b01e5..a9344d7c2409 100644 --- a/net/zebra-pj/pkg-plist.v6 +++ b/net/zebra-pj/pkg-plist.v6 @@ -1,19 +1,4 @@ -sbin/bgpd sbin/ospf6d -sbin/ospfd -sbin/ripd sbin/ripngd -sbin/zebra -sbin/zebractl -etc/zebra/README.mbgp -etc/zebra/bgpd.conf.sample -etc/zebra/bgpd.conf.sample2 etc/zebra/ospf6d.conf.sample -etc/zebra/ospfd.conf.sample -etc/zebra/ripd.conf.sample etc/zebra/ripngd.conf.sample -etc/zebra/zebra.conf.sample -@unexec install-info --delete %D/info/zebra.info %D/info/dir -info/zebra.info -@exec install-info %D/info/zebra.info %D/info/dir -@dirrm etc/zebra diff --git a/net/zebra/Makefile b/net/zebra/Makefile index ec3976889626..77c1621fa671 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -1,28 +1,31 @@ # New ports collection makefile for: zebra -# Version required: SNAP 981222 +# Version required: 0.84b # Date created: So 31 Mai 1998 11:00:30 CEST # Whom: Andreas Klemm # # $FreeBSD$ # -DISTNAME= zebra-0.84 -CATEGORIES= net +DISTNAME= zebra-0.84b +CATEGORIES= net ipv6 MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/ # you might need debugging, it's a developer release ! #CFLAGS+= -g MAINTAINER= andreas@FreeBSD.org -WRKSRC= ${WRKDIR}/zebra-0.84a GNU_CONFIGURE= yes CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/zebra -.if defined(USE_INET6) -PLIST= ${PKGDIR}/PLIST.v6 +.include + +.if ${OSVERSION} >= 400014 +PLIST:= ${WRKDIR}/PLIST +pre-install: + @${CAT} ${PKGDIR}/PLIST.v6 > ${PLIST} + @${CAT} ${PKGDIR}/PLIST >> ${PLIST} .else CONFIGURE_ARGS+=--disable-ospf6d --disable-ripngd -PLIST= ${PKGDIR}/PLIST .endif post-install: @@ -38,4 +41,4 @@ post-install: @${ECHO} "router_flags=\"start\"" @${ECHO} "done." -.include +.include diff --git a/net/zebra/distinfo b/net/zebra/distinfo index 2ce444b26780..f910e349ed95 100644 --- a/net/zebra/distinfo +++ b/net/zebra/distinfo @@ -1 +1 @@ -MD5 (zebra-0.84.tar.gz) = f438f081e2abe5261dccae5cd04e158b +MD5 (zebra-0.84b.tar.gz) = c7fcad82c84d34662621f0d8ecb8388b diff --git a/net/zebra/pkg-plist b/net/zebra/pkg-plist index 3e28171db3e3..14dbb9f31e54 100644 --- a/net/zebra/pkg-plist +++ b/net/zebra/pkg-plist @@ -6,9 +6,9 @@ sbin/zebractl etc/zebra/README.mbgp etc/zebra/bgpd.conf.sample etc/zebra/bgpd.conf.sample2 +etc/zebra/ospfd.conf.sample etc/zebra/ripd.conf.sample etc/zebra/zebra.conf.sample -etc/zebra/ospfd.conf.sample @unexec install-info --delete %D/info/zebra.info %D/info/dir info/zebra.info @exec install-info %D/info/zebra.info %D/info/dir diff --git a/net/zebra/pkg-plist.v6 b/net/zebra/pkg-plist.v6 index 34a29c6b01e5..a9344d7c2409 100644 --- a/net/zebra/pkg-plist.v6 +++ b/net/zebra/pkg-plist.v6 @@ -1,19 +1,4 @@ -sbin/bgpd sbin/ospf6d -sbin/ospfd -sbin/ripd sbin/ripngd -sbin/zebra -sbin/zebractl -etc/zebra/README.mbgp -etc/zebra/bgpd.conf.sample -etc/zebra/bgpd.conf.sample2 etc/zebra/ospf6d.conf.sample -etc/zebra/ospfd.conf.sample -etc/zebra/ripd.conf.sample etc/zebra/ripngd.conf.sample -etc/zebra/zebra.conf.sample -@unexec install-info --delete %D/info/zebra.info %D/info/dir -info/zebra.info -@exec install-info %D/info/zebra.info %D/info/dir -@dirrm etc/zebra