3 files changed, 51 insertions, 45 deletions

diff --git a/net/yazproxy/Makefile b/net/yazproxy/Makefile
index b4c36ce4f219..b4eb1c03c73d 100644
--- a/net/yazproxy/Makefile
+++ b/net/yazproxy/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	yazproxy
-PORTVERSION=	1.0.1
+PORTVERSION=	1.2.1
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.indexdata.dk/pub/yazproxy/
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	A powerful general purpose Z39.50/SRW/SRU proxy
 
-LIB_DEPENDS=	yazcpp.1:${PORTSDIR}/net/yaz++
+LIB_DEPENDS=	yazpp:${PORTSDIR}/net/yaz++
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-shared --with-yazpp=${LOCALBASE}/bin
diff --git a/net/yazproxy/distinfo b/net/yazproxy/distinfo
index 5ce8039d375b..547d6b2c60e6 100644
--- a/net/yazproxy/distinfo
+++ b/net/yazproxy/distinfo
@@ -1,3 +1,3 @@
-MD5 (yazproxy-1.0.1.tar.gz) = c39396ae77ed918ea2da05c4e4ee45c5
-SHA256 (yazproxy-1.0.1.tar.gz) = 3f3b7cf8ef901c0ee226224ca697dda98051343a06604e5a347d507d56b52661
-SIZE (yazproxy-1.0.1.tar.gz) = 512473
+MD5 (yazproxy-1.2.1.tar.gz) = c9727d675058857f8c21f3bab737a24f
+SHA256 (yazproxy-1.2.1.tar.gz) = 44bfff819bc3d7bd17201b11f9afbdb9832b0ce56af702eb2928119f5a2d786e
+SIZE (yazproxy-1.2.1.tar.gz) = 673818
diff --git a/net/yazproxy/pkg-plist b/net/yazproxy/pkg-plist
index 26097a39a3fa..372d5d7f69e8 100644
--- a/net/yazproxy/pkg-plist
+++ b/net/yazproxy/pkg-plist
@@ -1,52 +1,58 @@
 bin/yazproxy
 include/yazproxy/bw.h
+include/yazproxy/limit-connect.h
 include/yazproxy/module.h
 include/yazproxy/proxy.h
 lib/libyazproxy.a
 lib/libyazproxy.la
 lib/libyazproxy.so
 lib/libyazproxy.so.1
+lib/yazproxy/mod_proxy_helsinki.a
+lib/yazproxy/mod_proxy_helsinki.la
+lib/yazproxy/mod_proxy_helsinki.so
 lib/yazproxy/mod_proxy_sample.a
 lib/yazproxy/mod_proxy_sample.la
 lib/yazproxy/mod_proxy_sample.so
-share/doc/yazproxy/id.png
-share/doc/yazproxy/installation.html
-share/doc/yazproxy/introduction.html
-share/doc/yazproxy/license.html
-share/doc/yazproxy/other-optimizations.html
-share/doc/yazproxy/otherinfo-encoding.html
-share/doc/yazproxy/proxy-config-file.html
-share/doc/yazproxy/proxy-keepalive.html
-share/doc/yazproxy/proxy-reference.html
-share/doc/yazproxy/proxy-target.html
-share/doc/yazproxy/proxy-usage.html
-share/doc/yazproxy/query-cache.html
-share/doc/yazproxy/query-validation.html
-share/doc/yazproxy/record-cache.html
-share/doc/yazproxy/record-validation.html
-share/doc/yazproxy/support.html
-share/doc/yazproxy/using.html
-share/doc/yazproxy/windows.html
-share/doc/yazproxy/yaz.css
-share/doc/yazproxy/yazproxy-man.html
-share/doc/yazproxy/yazproxy-schema.html
-share/doc/yazproxy/yazproxy.html
-share/doc/yazproxy/yazproxy.pdf
-share/yazproxy/MARC21slim2DC.xsl
-share/yazproxy/MARC21slim2MODS.xsl
-share/yazproxy/MARC21slim2MODS3.xsl
-share/yazproxy/MARC21slim2RDFDC.xsl
-share/yazproxy/MARC21slim2SRWDC.xsl
-share/yazproxy/MARC21slimUtils.xsl
-share/yazproxy/config.xml
-share/yazproxy/config-mafi2ma.xml
-share/yazproxy/explain.xml
-share/yazproxy/pqf.properties
-share/yazproxy/voyager.xml
-share/yazproxy/yazproxy.xsd
-share/yazproxy/yazproxyctl.sh
-share/yazproxy/zeerex-2.0.xsd
-@dirrm include/yazproxy
+%%DOCSDIR%%/common/id.png
+%%DOCSDIR%%/common/style1.css
+%%DOCSDIR%%/installation.html
+%%DOCSDIR%%/introduction.html
+%%DOCSDIR%%/license.html
+%%DOCSDIR%%/other-optimizations.html
+%%DOCSDIR%%/otherinfo-encoding.html
+%%DOCSDIR%%/proxy-config-file.html
+%%DOCSDIR%%/proxy-keepalive.html
+%%DOCSDIR%%/proxy-reference.html
+%%DOCSDIR%%/proxy-target.html
+%%DOCSDIR%%/proxy-usage.html
+%%DOCSDIR%%/query-cache.html
+%%DOCSDIR%%/query-validation.html
+%%DOCSDIR%%/record-cache.html
+%%DOCSDIR%%/record-validation.html
+%%DOCSDIR%%/support.html
+%%DOCSDIR%%/using.html
+%%DOCSDIR%%/windows.html
+%%DOCSDIR%%/yazproxy-man.html
+%%DOCSDIR%%/yazproxy-schema.html
+%%DOCSDIR%%/yazproxy.html
+%%DOCSDIR%%/yazproxy.pdf
+%%DATADIR%%/MARC21slim2DC.xsl
+%%DATADIR%%/MARC21slim2MODS.xsl
+%%DATADIR%%/MARC21slim2MODS3.xsl
+%%DATADIR%%/MARC21slim2RDFDC.xsl
+%%DATADIR%%/MARC21slim2SRWDC.xsl
+%%DATADIR%%/MARC21slimUtils.xsl
+%%DATADIR%%/config-mafi2ma.xml
+%%DATADIR%%/config-modules.xml
+%%DATADIR%%/config.xml
+%%DATADIR%%/explain.xml
+%%DATADIR%%/pqf.properties
+%%DATADIR%%/voyager.xml
+%%DATADIR%%/yazproxy.xsd
+%%DATADIR%%/yazproxyctl.sh
+%%DATADIR%%/zeerex-2.0.xsd
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%/common
+@dirrm %%DOCSDIR%%
 @dirrm lib/yazproxy
-@dirrm share/doc/yazproxy
-@dirrm share/yazproxy
+@dirrm include/yazproxy