4 files changed, 99 insertions, 85 deletions

diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 4087cf146b46..932aba37dfea 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -6,23 +6,26 @@
 #
 
 PORTNAME=	yaz
-PORTVERSION=	4.0.11
+PORTVERSION=	4.0.12
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.indexdata.dk/pub/yaz/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Z39.50/SR client and API library
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
-		xslt.2:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS=	icuuc:${PORTSDIR}/devel/icu
 
 USE_ICONV=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
+USE_GNOME=	libxml2 libxslt
+USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
+
 CONFIGURE_ARGS+=--enable-shared --with-openssl=${OPENSSLBASE} \
 		--with-iconv=${LOCALBASE} --with-xml2=${LOCALBASE} \
-		--with-xslt=${LOCALBASE} --enable-tcpd
-USE_LDCONFIG=	yes
+		--with-xslt=${LOCALBASE} --with-icu=${LOCALBASE} \
+		--enable-tcpd
 
 MAN1=		yaz-asncomp.1 yaz-client.1 yaz-iconv.1 \
 		yaz-json-parse.1 yaz-marcdump.1 \
@@ -30,8 +33,15 @@ MAN1=		yaz-asncomp.1 yaz-client.1 yaz-iconv.1 \
 MAN7=		bib1-attr.7 yaz-log.7 yaz.7
 MAN8=		yaz-config.8 yaz-ztest.8
 
+post-patch:
+.if defined(NOPORTDOCS)
+	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's/%%DOC%%//' Makefile.in
+.else
+	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's/%%DOC%%/doc/' Makefile.in
+.endif
+
 post-configure:
-	cd ${WRKSRC}/doc && \
+	@cd ${WRKSRC}/doc && \
 		${REINPLACE_CMD} -e 's,[$$]{datarootdir}/man,${PREFIX}/man,' \
 		Makefile
 
diff --git a/net/yaz/distinfo b/net/yaz/distinfo
index 8642787675be..8be7a858ffb5 100644
--- a/net/yaz/distinfo
+++ b/net/yaz/distinfo
@@ -1,3 +1,2 @@
-MD5 (yaz-4.0.11.tar.gz) = 31e4561dacdfb4db2d0a79fd9391c854
-SHA256 (yaz-4.0.11.tar.gz) = 21ef2ab3302ec18060d27bc72006e6517b2290264239312f415a64fd71fe2f0a
-SIZE (yaz-4.0.11.tar.gz) = 2248742
+SHA256 (yaz-4.0.12.tar.gz) = cafb74d0323921005dab48cb7c46814c0c17d9d4a5135456b4a90e2f5a96280c
+SIZE (yaz-4.0.12.tar.gz) = 2252891
diff --git a/net/yaz/files/patch-Makefile.in b/net/yaz/files/patch-Makefile.in
index cf555e37ab75..56aa032a1200 100644
--- a/net/yaz/files/patch-Makefile.in
+++ b/net/yaz/files/patch-Makefile.in
@@ -1,7 +1,11 @@
---- Makefile.in.bak	2010-07-30 10:41:04.502726505 +0200
-+++ Makefile.in	2010-07-30 10:42:15.531264210 +0200
-@@ -283,7 +283,7 @@
- SUBDIRS = src include util test client ztest zoom doc etc
+--- ./Makefile.in.orig	2010-08-17 12:42:04.000000000 +0200
++++ Makefile.in	2010-11-04 17:52:13.000000000 +0100
+@@ -280,10 +280,10 @@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign 
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = src include util test client ztest zoom doc etc
++SUBDIRS = src include util test client ztest zoom %%DOC%% etc
  aclocaldir = $(datadir)/aclocal
  aclocal_DATA = m4/yaz.m4
 -pkgconfigdir = $(libdir)/pkgconfig
diff --git a/net/yaz/pkg-plist b/net/yaz/pkg-plist
index 5fcf31ef5d16..c813a7242b0d 100644
--- a/net/yaz/pkg-plist
+++ b/net/yaz/pkg-plist
@@ -21,6 +21,7 @@ include/yaz/diagsru_update.h
 include/yaz/diagsrw.h
 include/yaz/dirent.h
 include/yaz/errno.h
+include/yaz/facet.h
 include/yaz/file_glob.h
 include/yaz/gettimeofday.h
 include/yaz/icu.h
@@ -125,76 +126,76 @@ lib/libyaz_server.so
 lib/libyaz_server.so.4
 libdata/pkgconfig/yaz.pc
 share/aclocal/yaz.m4
-share/doc/yaz/apilayer.png
-share/doc/yaz/asn.external.html
-share/doc/yaz/asn.html
-share/doc/yaz/asn.pdu.html
-share/doc/yaz/asn.preparing.html
-share/doc/yaz/bib1.html
-share/doc/yaz/common/id.png
-share/doc/yaz/common/style1.css
-share/doc/yaz/comstack.addresses.html
-share/doc/yaz/comstack.client.html
-share/doc/yaz/comstack.common.html
-share/doc/yaz/comstack.diagnostics.html
-share/doc/yaz/comstack.html
-share/doc/yaz/comstack.introduction.html
-share/doc/yaz/comstack.server.html
-share/doc/yaz/comstack.ssl.html
-share/doc/yaz/comstack.summary.html
-share/doc/yaz/credits.html
-share/doc/yaz/future.html
-share/doc/yaz/index.html
-share/doc/yaz/indexdata.html
-share/doc/yaz/installation.html
-share/doc/yaz/installation.unix.html
-share/doc/yaz/installation.win32.html
-share/doc/yaz/introduction.api.html
-share/doc/yaz/introduction.html
-share/doc/yaz/license.html
-share/doc/yaz/list-oids.html
-share/doc/yaz/marc.html
-share/doc/yaz/odr.debugging.html
-share/doc/yaz/odr.html
-share/doc/yaz/odr.programming.html
-share/doc/yaz/odr.use.html
-share/doc/yaz/reference.html
-share/doc/yaz/server.backend.html
-share/doc/yaz/server.backendfunctions.html
-share/doc/yaz/server.frontend.html
-share/doc/yaz/server.html
-share/doc/yaz/server.invocation.html
-share/doc/yaz/server.main.html
-share/doc/yaz/server.vhosts.html
-share/doc/yaz/soap.html
-share/doc/yaz/soap.http.html
-share/doc/yaz/soap.srw.html
-share/doc/yaz/soap.xml.html
-share/doc/yaz/tools.html
-share/doc/yaz/tools.log.html
-share/doc/yaz/tools.nmem.html
-share/doc/yaz/tools.oid.html
-share/doc/yaz/tools.retrieval.html
-share/doc/yaz/yaz-asncomp.html
-share/doc/yaz/yaz-client.html
-share/doc/yaz/yaz-config.html
-share/doc/yaz/yaz-iconv.html
-share/doc/yaz/yaz-icu.html
-share/doc/yaz/yaz-illclient.html
-share/doc/yaz/yaz-json-parse.html
-share/doc/yaz/yaz-log.html
-share/doc/yaz/yaz-marcdump.html
-share/doc/yaz/yaz-ztest.html
-share/doc/yaz/yaz.html
-share/doc/yaz/zoom.events.html
-share/doc/yaz/zoom.extendedservices.html
-share/doc/yaz/zoom.html
-share/doc/yaz/zoom.options.html
-share/doc/yaz/zoom.query.html
-share/doc/yaz/zoom.records.html
-share/doc/yaz/zoom.resultsets.html
-share/doc/yaz/zoom.scan.html
-share/doc/yaz/zoomsh.html
+%%PORTDOCS%%%%DOCSDIR%%/apilayer.png
+%%PORTDOCS%%%%DOCSDIR%%/asn.external.html
+%%PORTDOCS%%%%DOCSDIR%%/asn.html
+%%PORTDOCS%%%%DOCSDIR%%/asn.pdu.html
+%%PORTDOCS%%%%DOCSDIR%%/asn.preparing.html
+%%PORTDOCS%%%%DOCSDIR%%/bib1.html
+%%PORTDOCS%%%%DOCSDIR%%/common/id.png
+%%PORTDOCS%%%%DOCSDIR%%/common/style1.css
+%%PORTDOCS%%%%DOCSDIR%%/comstack.addresses.html
+%%PORTDOCS%%%%DOCSDIR%%/comstack.client.html
+%%PORTDOCS%%%%DOCSDIR%%/comstack.common.html
+%%PORTDOCS%%%%DOCSDIR%%/comstack.diagnostics.html
+%%PORTDOCS%%%%DOCSDIR%%/comstack.html
+%%PORTDOCS%%%%DOCSDIR%%/comstack.introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/comstack.server.html
+%%PORTDOCS%%%%DOCSDIR%%/comstack.ssl.html
+%%PORTDOCS%%%%DOCSDIR%%/comstack.summary.html
+%%PORTDOCS%%%%DOCSDIR%%/credits.html
+%%PORTDOCS%%%%DOCSDIR%%/future.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/indexdata.html
+%%PORTDOCS%%%%DOCSDIR%%/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/installation.unix.html
+%%PORTDOCS%%%%DOCSDIR%%/installation.win32.html
+%%PORTDOCS%%%%DOCSDIR%%/introduction.api.html
+%%PORTDOCS%%%%DOCSDIR%%/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/license.html
+%%PORTDOCS%%%%DOCSDIR%%/list-oids.html
+%%PORTDOCS%%%%DOCSDIR%%/marc.html
+%%PORTDOCS%%%%DOCSDIR%%/odr.debugging.html
+%%PORTDOCS%%%%DOCSDIR%%/odr.html
+%%PORTDOCS%%%%DOCSDIR%%/odr.programming.html
+%%PORTDOCS%%%%DOCSDIR%%/odr.use.html
+%%PORTDOCS%%%%DOCSDIR%%/reference.html
+%%PORTDOCS%%%%DOCSDIR%%/server.backend.html
+%%PORTDOCS%%%%DOCSDIR%%/server.backendfunctions.html
+%%PORTDOCS%%%%DOCSDIR%%/server.frontend.html
+%%PORTDOCS%%%%DOCSDIR%%/server.html
+%%PORTDOCS%%%%DOCSDIR%%/server.invocation.html
+%%PORTDOCS%%%%DOCSDIR%%/server.main.html
+%%PORTDOCS%%%%DOCSDIR%%/server.vhosts.html
+%%PORTDOCS%%%%DOCSDIR%%/soap.html
+%%PORTDOCS%%%%DOCSDIR%%/soap.http.html
+%%PORTDOCS%%%%DOCSDIR%%/soap.srw.html
+%%PORTDOCS%%%%DOCSDIR%%/soap.xml.html
+%%PORTDOCS%%%%DOCSDIR%%/tools.html
+%%PORTDOCS%%%%DOCSDIR%%/tools.log.html
+%%PORTDOCS%%%%DOCSDIR%%/tools.nmem.html
+%%PORTDOCS%%%%DOCSDIR%%/tools.oid.html
+%%PORTDOCS%%%%DOCSDIR%%/tools.retrieval.html
+%%PORTDOCS%%%%DOCSDIR%%/yaz-asncomp.html
+%%PORTDOCS%%%%DOCSDIR%%/yaz-client.html
+%%PORTDOCS%%%%DOCSDIR%%/yaz-config.html
+%%PORTDOCS%%%%DOCSDIR%%/yaz-iconv.html
+%%PORTDOCS%%%%DOCSDIR%%/yaz-icu.html
+%%PORTDOCS%%%%DOCSDIR%%/yaz-illclient.html
+%%PORTDOCS%%%%DOCSDIR%%/yaz-json-parse.html
+%%PORTDOCS%%%%DOCSDIR%%/yaz-log.html
+%%PORTDOCS%%%%DOCSDIR%%/yaz-marcdump.html
+%%PORTDOCS%%%%DOCSDIR%%/yaz-ztest.html
+%%PORTDOCS%%%%DOCSDIR%%/yaz.html
+%%PORTDOCS%%%%DOCSDIR%%/zoom.events.html
+%%PORTDOCS%%%%DOCSDIR%%/zoom.extendedservices.html
+%%PORTDOCS%%%%DOCSDIR%%/zoom.html
+%%PORTDOCS%%%%DOCSDIR%%/zoom.options.html
+%%PORTDOCS%%%%DOCSDIR%%/zoom.query.html
+%%PORTDOCS%%%%DOCSDIR%%/zoom.records.html
+%%PORTDOCS%%%%DOCSDIR%%/zoom.resultsets.html
+%%PORTDOCS%%%%DOCSDIR%%/zoom.scan.html
+%%PORTDOCS%%%%DOCSDIR%%/zoomsh.html
 share/yaz/etc/MARC21slim2DC.xsl
 share/yaz/etc/MARC21slim2MODS.xsl
 share/yaz/etc/MARC21slim2RDFDC.xsl
@@ -223,6 +224,6 @@ share/yaz/z39.50/z3950v3.asn
 @dirrm share/yaz/ill
 @dirrm share/yaz/etc
 @dirrm share/yaz
-@dirrm share/doc/yaz/common
-@dirrm share/doc/yaz
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/common
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/yaz