- Update net/yaz to version 5.0.2

- Update net/zebra-server to 2.0.55 and fix build
  with new net/yaz [1]
- Bump other affected ports

PR:		ports/183355 [1]
Submitted by:	myself
Approved by:	maintainer

4 files changed, 20 insertions, 40 deletions

diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index f8ba3e9a827..8f64ad21732 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	yaz
-PORTVERSION=	4.2.68
+PORTVERSION=	5.0.2
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.indexdata.dk/pub/yaz/
 
@@ -22,21 +22,8 @@ CONFIGURE_ARGS+=--enable-shared --with-openssl=${OPENSSLBASE} \
 		--with-xslt=${LOCALBASE} --with-icu=${LOCALBASE} \
 		--enable-tcpd
 
-MAN1=		yaz-asncomp.1 yaz-client.1 yaz-config.1 yaz-iconv.1 \
-		yaz-json-parse.1 yaz-marcdump.1 \
-		zoomsh.1 yaz-icu.1 yaz-illclient.1 yaz-url.1
-MAN7=		bib1-attr.7 yaz-log.7 yaz.7
-MAN8=		yaz-ztest.8
-
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if !${PORT_OPTIONS:MDOCS}
-EXTRA_PATCHES+=	${FILESDIR}/extrapatch-doc__Makefile.in
-.endif
-
 post-configure:
 	@${REINPLACE_CMD} -e 's,[$$]{datarootdir}/man,${PREFIX}/man,' \
 		${WRKSRC}/doc/Makefile
diff --git a/net/yaz/distinfo b/net/yaz/distinfo
index a0bb14db49e..9cde4bd860c 100644
--- a/net/yaz/distinfo
+++ b/net/yaz/distinfo
@@ -1,2 +1,2 @@
-SHA256 (yaz-4.2.68.tar.gz) = 97b403e2adb6291b6f51b0462374d87c23366f74399dd6301cc8e055a5d4ea44
-SIZE (yaz-4.2.68.tar.gz) = 2452033
+SHA256 (yaz-5.0.2.tar.gz) = 8d920ed8d6b0489afd344ee411f0278d1627fea687270347f4a9b186fbcc43e9
+SIZE (yaz-5.0.2.tar.gz) = 2389716
diff --git a/net/yaz/files/extrapatch-doc__Makefile.in b/net/yaz/files/extrapatch-doc__Makefile.in
deleted file mode 100644
index a6d3deb3741..00000000000
--- a/net/yaz/files/extrapatch-doc__Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- doc/Makefile.in.orig	2012-11-07 20:12:22.000000000 +0100
-+++ doc/Makefile.in	2012-11-07 20:13:07.000000000 +0100
-@@ -221,7 +221,6 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = common
- XMLFILES = bookinfo.xml introduction.xml installation.xml \
-  indexdata.xml \
-  asn.xml tools.xml odr.xml comstack.xml server.xml license.xml \
-@@ -682,9 +681,8 @@
- 
- info-am:
- 
--install-data-am: install-docDATA install-man
-+install-data-am: install-man
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- 
- install-dvi: install-dvi-recursive
- 
diff --git a/net/yaz/pkg-plist b/net/yaz/pkg-plist
index f6545f622e8..50399d06366 100644
--- a/net/yaz/pkg-plist
+++ b/net/yaz/pkg-plist
@@ -122,16 +122,30 @@ include/yaz/zoom.h
 lib/libyaz.a
 lib/libyaz.la
 lib/libyaz.so
-lib/libyaz.so.4
+lib/libyaz.so.5
 lib/libyaz_icu.a
 lib/libyaz_icu.la
 lib/libyaz_icu.so
-lib/libyaz_icu.so.4
+lib/libyaz_icu.so.5
 lib/libyaz_server.a
 lib/libyaz_server.la
 lib/libyaz_server.so
-lib/libyaz_server.so.4
+lib/libyaz_server.so.5
 libdata/pkgconfig/yaz.pc
+man/man1/yaz-asncomp.1.gz
+man/man1/yaz-client.1.gz
+man/man1/yaz-config.1.gz
+man/man1/yaz-iconv.1.gz
+man/man1/yaz-icu.1.gz
+man/man1/yaz-illclient.1.gz
+man/man1/yaz-json-parse.1.gz
+man/man1/yaz-marcdump.1.gz
+man/man1/yaz-url.1.gz
+man/man1/zoomsh.1.gz
+man/man7/bib1-attr.7.gz
+man/man7/yaz-log.7.gz
+man/man7/yaz.7.gz
+man/man8/yaz-ztest.8.gz
 share/aclocal/yaz.m4
 %%PORTDOCS%%%%DOCSDIR%%/apilayer.png
 %%PORTDOCS%%%%DOCSDIR%%/asn.external.html