Do not use DESCR_SRC, the readme job doesn't handle it well and it's not

even a dynamic description.

6 files changed, 39 insertions, 26 deletions

diff --git a/pkgtools/pkg_online-client/DESCR b/pkgtools/pkg_online-client/DESCR
index c9acd2ebe1e..0d216f87fca 100644
--- a/pkgtools/pkg_online-client/DESCR
+++ b/pkgtools/pkg_online-client/DESCR
@@ -1,2 +1,20 @@
+pkg_online - client/server package searcher for pkgsrc.
+
+Every separate field (PKGPATH, PKGNAME, COMMENT etc.) may be queried
+separately and multiple fields may be queried too. A lot of search
+strategies are available. Set of fields and search strategies may
+very depending on your server configuration. Search in multiple
+"repositories" is supported too, e.g. search in binary repository
+or in pkgsrc source tree.
+
+Communication protocol is a well known dictionary protocol described
+in RFC-2229. Server may run dictd or any other dictionary protocol
+server.  For dictd see http://www.dict.org and
+http://sourceforge.net/projects/dict
+
+pkg_online has minimal amount of things specific to pkgsrc and can
+easily be adapted to any other packageing systems.
+
+Of course it is based on pkg_summary-utils ;-)
 
 This package provides client tools of PKG_ONLINE.
diff --git a/pkgtools/pkg_online-client/Makefile b/pkgtools/pkg_online-client/Makefile
index edcd616a1d9..c9bb984d967 100644
--- a/pkgtools/pkg_online-client/Makefile
+++ b/pkgtools/pkg_online-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/05/16 21:46:13 cheusov Exp $
+# $NetBSD: Makefile,v 1.4 2011/05/21 09:07:04 wiz Exp $
 #
 
 .include "../../pkgtools/pkg_online-server/Makefile.common"
@@ -17,8 +17,6 @@ BUILD_DEPENDS+=	mk-configure>=0.20.0:../../devel/mk-configure
 
 INSTALL_TARGET=	install-client install-doc
 
-DESCR_SRC+=	${.CURDIR}/DESCR
-
 DOCDIR=		${PREFIX}/share/doc/pkg_online-client
 EGDIR=		${PREFIX}/share/examples/pkg_online-client
 
diff --git a/pkgtools/pkg_online-server/DESCR b/pkgtools/pkg_online-server/DESCR
index bfed53e0f8e..385d96dcbe4 100644
--- a/pkgtools/pkg_online-server/DESCR
+++ b/pkgtools/pkg_online-server/DESCR
@@ -1,2 +1,20 @@
+pkg_online - client/server package searcher for pkgsrc.
+
+Every separate field (PKGPATH, PKGNAME, COMMENT etc.) may be queried
+separately and multiple fields may be queried too. A lot of search
+strategies are available. Set of fields and search strategies may
+very depending on your server configuration. Search in multiple
+"repositories" is supported too, e.g. search in binary repository
+or in pkgsrc source tree.
+
+Communication protocol is a well known dictionary protocol described
+in RFC-2229. Server may run dictd or any other dictionary protocol
+server.  For dictd see http://www.dict.org and
+http://sourceforge.net/projects/dict
+
+pkg_online has minimal amount of things specific to pkgsrc and can
+easily be adapted to any other packageing systems.
+
+Of course it is based on pkg_summary-utils ;-)
 
 This package provides tools for building PKG_ONLINE databases.
diff --git a/pkgtools/pkg_online-server/DESCR.common b/pkgtools/pkg_online-server/DESCR.common
deleted file mode 100644
index cde21aaeb42..00000000000
--- a/pkgtools/pkg_online-server/DESCR.common
+++ /dev/null
@@ -1,18 +0,0 @@
-pkg_online - client/server package searcher for pkgsrc.
-
-Every separate field (PKGPATH, PKGNAME, COMMENT etc.) may be queried
-separately and multiple fields may be queried too. A lot of search
-strategies are available. Set of fields and search strategies may
-very depending on your server configuration. Search in multiple
-"repositories" is supported too, e.g. search in binary repository
-or in pkgsrc source tree.
-
-Communication protocol is a well known dictionary protocol described
-in RFC-2229. Server may run dictd or any other dictionary protocol
-server.  For dictd see http://www.dict.org and
-http://sourceforge.net/projects/dict
-
-pkg_online has minimal amount of things specific to pkgsrc and can
-easily be adapted to any other packageing systems.
-
-Of course it is based on pkg_summary-utils ;-)
diff --git a/pkgtools/pkg_online-server/Makefile b/pkgtools/pkg_online-server/Makefile
index fcd3134d909..64741b8d01c 100644
--- a/pkgtools/pkg_online-server/Makefile
+++ b/pkgtools/pkg_online-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/05/16 21:46:13 cheusov Exp $
+# $NetBSD: Makefile,v 1.4 2011/05/21 09:07:04 wiz Exp $
 #
 
 .include "../../pkgtools/pkg_online-server/Makefile.common"
@@ -16,8 +16,6 @@ BUILD_DEPENDS+=	mk-configure>=0.20.0:../../devel/mk-configure
 
 INSTALL_TARGET=	install-server install-doc
 
-DESCR_SRC+=	${.CURDIR}/DESCR
-
 DOCDIR=		${PREFIX}/share/doc/pkg_online-server
 EGDIR=		${PREFIX}/share/examples/pkg_online-server
 
diff --git a/pkgtools/pkg_online-server/Makefile.common b/pkgtools/pkg_online-server/Makefile.common
index dbc6a4a2afe..8ac009366c9 100644
--- a/pkgtools/pkg_online-server/Makefile.common
+++ b/pkgtools/pkg_online-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2011/05/16 21:46:13 cheusov Exp $
+# $NetBSD: Makefile.common,v 1.4 2011/05/21 09:07:04 wiz Exp $
 #
 # used by pkgtools/pkg_online-client/Makefile
 # used by pkgtools/pkg_online-server/Makefile
@@ -16,6 +16,5 @@ LICENSE=		mit
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 DISTINFO_FILE=		${.CURDIR}/../../pkgtools/pkg_online-server/distinfo
-DESCR_SRC=		${.CURDIR}/../../pkgtools/pkg_online-server/DESCR.common
 
 USE_LANGUAGES=		# none