Update to 0.13.1

  pkg_online server defaults to dict://dict.mova.org:26280

  "onlineinfo" has pkg_summary(5) raw format. Appropriate changes were
  made for pkg_online_client(1) and pkg_summary2onlineinfo(1).

4 files changed, 10 insertions, 23 deletions

diff --git a/pkgtools/pkg_online-server/Makefile b/pkgtools/pkg_online-server/Makefile
index ac97a460725..acfded29c32 100644
--- a/pkgtools/pkg_online-server/Makefile
+++ b/pkgtools/pkg_online-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/03/09 19:15:19 cheusov Exp $
+# $NetBSD: Makefile,v 1.8 2012/11/25 20:51:03 cheusov Exp $
 #
 
 .include "../../pkgtools/pkg_online-server/Makefile.common"
@@ -9,7 +9,7 @@ MAINTAINER=	cheusov@NetBSD.org
 COMMENT+=	(server tools)
 
 DEPENDS+=	dict-server>=1.10.10nb2:../../textproc/dict-server
-DEPENDS+=	pkg_summary-utils>=0.18.1:../../pkgtools/pkg_summary-utils
+DEPENDS+=	pkg_summary-utils>=0.60.0:../../pkgtools/pkg_summary-utils
 DEPENDS+=	pipestatus-[0-9]*:../../devel/pipestatus
 
 BUILD_DEPENDS+=	mk-configure>=0.20.0:../../devel/mk-configure
diff --git a/pkgtools/pkg_online-server/Makefile.common b/pkgtools/pkg_online-server/Makefile.common
index 967a2a532c9..1abbee98a2c 100644
--- a/pkgtools/pkg_online-server/Makefile.common
+++ b/pkgtools/pkg_online-server/Makefile.common
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile.common,v 1.7 2012/09/11 23:19:37 asau Exp $
+# $NetBSD: Makefile.common,v 1.8 2012/11/25 20:51:03 cheusov Exp $
 #
 # used by pkgtools/pkg_online-client/Makefile
 # used by pkgtools/pkg_online-server/Makefile
 
 DISTNAME=	pkg_online-${VERSION}
-MASTER_SITES=	http://mova.org/~cheusov/pub/pkg_online/
+MASTER_SITES=	http://mova.org/~cheusov/pub/pkg_online/ \
+		ftp://ftp.NetBSD.org/pub/NetBSD/misc/cheusov/pkg_online/
 
-VERSION=	0.13.0
+VERSION=	0.13.1
 
 HOMEPAGE=	http://mova.org/~cheusov/pub/pkg_online/
 COMMENT=	Client/Server package searcher for pkgsrc
diff --git a/pkgtools/pkg_online-server/distinfo b/pkgtools/pkg_online-server/distinfo
index 98c771172b8..b76157ab258 100644
--- a/pkgtools/pkg_online-server/distinfo
+++ b/pkgtools/pkg_online-server/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2012/08/26 10:06:46 cheusov Exp $
+$NetBSD: distinfo,v 1.6 2012/11/25 20:51:03 cheusov Exp $
 
-SHA1 (pkg_online-0.13.0.tar.gz) = 2c55fb9ac8b83764f00a25323784d0b8697f8bde
-RMD160 (pkg_online-0.13.0.tar.gz) = 86a898a56655f0d088a3a1266df8288750f3e0aa
-Size (pkg_online-0.13.0.tar.gz) = 17116 bytes
-SHA1 (patch-client_pkg__online__client.conf) = bf5ce474a87d68de87beaeb2cc81b839de28c3b1
+SHA1 (pkg_online-0.13.1.tar.gz) = ee84a229ac650a6bd710cc775d3ef036123a6646
+RMD160 (pkg_online-0.13.1.tar.gz) = 89757e88919925fe5b9a0982d1de942532fd6fde
+Size (pkg_online-0.13.1.tar.gz) = 12211 bytes
diff --git a/pkgtools/pkg_online-server/patches/patch-client_pkg__online__client.conf b/pkgtools/pkg_online-server/patches/patch-client_pkg__online__client.conf
deleted file mode 100644
index 846fa9224a5..00000000000
--- a/pkgtools/pkg_online-server/patches/patch-client_pkg__online__client.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-client_pkg__online__client.conf,v 1.1 2012/08/26 10:06:46 cheusov Exp $
-
---- client/pkg_online_client.conf.orig	2010-11-26 23:45:46.000000000 +0000
-+++ client/pkg_online_client.conf
-@@ -12,7 +12,7 @@ set_if_not_set (){
- 
- # default server:port
- if test -z "$PKG_ONLINE_SERVER"; then
--    export PKG_ONLINE_SERVER=dictd.xdsl.by
-+    export PKG_ONLINE_SERVER=dict.mova.org
-     export PKG_ONLINE_PORT=26280
- fi
- set_if_not_set PKG_ONLINE_PORT 2628