Reverted wrong commit

4 files changed, 14 insertions, 48 deletions

diff --git a/devel/py-doctor/Makefile b/devel/py-doctor/Makefile
index f103e0de09c..f23e62fa3f6 100644
--- a/devel/py-doctor/Makefile
+++ b/devel/py-doctor/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2017/12/18 08:48:26 adam Exp $
+# $NetBSD: Makefile,v 1.11 2017/12/18 08:54:18 adam Exp $
 
-DISTNAME=	pydoctor-16.3.0
+DISTNAME=	pydoctor-0.5
 PKGNAME=	${DISTNAME:S/py/${PYPKGPREFIX}-/}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pydoctor/}
@@ -10,10 +10,11 @@ HOMEPAGE=	https://pypi.python.org/pypi/pydoctor/
 COMMENT=	API doc generator
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-epydoc-[0-9]*:../../textproc/py-epydoc
-DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+DEPENDS+=	${PYPKGPREFIX}-nevow>=0.9.18:../../www/py-nevow
 
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-xml via py-nevow
+
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-doctor/distinfo b/devel/py-doctor/distinfo
index 13190a817c0..19ae583719b 100644
--- a/devel/py-doctor/distinfo
+++ b/devel/py-doctor/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2017/12/18 08:48:26 adam Exp $
+$NetBSD: distinfo,v 1.5 2017/12/18 08:54:18 adam Exp $
 
-SHA1 (pydoctor-16.3.0.tar.gz) = 27112550bc29505ba3d3f908efde56151d65e7c2
-RMD160 (pydoctor-16.3.0.tar.gz) = 0037d6e733f4192ea9d2d9642dcbf8604793c919
-SHA512 (pydoctor-16.3.0.tar.gz) = d0eb7cd491c32f76cf34b4c27de865b0ff074f172d40cbf65abdaf07c13ebca9bd0dfa4ffa53b33ad1220f1d06981557db978b73cc1e5283a98a1425240a9a26
-Size (pydoctor-16.3.0.tar.gz) = 94811 bytes
+SHA1 (pydoctor-0.5.tar.gz) = bd82a2419b56c4c36890cce68f98a3228b855f36
+RMD160 (pydoctor-0.5.tar.gz) = 6be8fd43f45cda9b6bf992ebfaf5c2fcc6c48cfd
+SHA512 (pydoctor-0.5.tar.gz) = 92cb2de2e6cb9f9ae106272f88e7cf24fed4f8ab80118050a27949db4c728377e939bc0d661ba004e974e1a30c4b2f120f311eaa445a2ab90fc82f09badda9cf
+Size (pydoctor-0.5.tar.gz) = 83632 bytes
diff --git a/devel/scmcvs/distinfo b/devel/scmcvs/distinfo
index 808e71d8261..b6ef35bfa6b 100644
--- a/devel/scmcvs/distinfo
+++ b/devel/scmcvs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2017/12/18 08:48:26 adam Exp $
+$NetBSD: distinfo,v 1.21 2017/12/18 08:51:48 adam Exp $
 
 SHA1 (cvs-1.12.13.tar.bz2) = 93a8dacc6ff0e723a130835713235863f1f5ada9
 RMD160 (cvs-1.12.13.tar.bz2) = ba3048e3e2d99ae78f6a759889b615acf65dd487
@@ -12,7 +12,7 @@ SHA1 (patch-ag) = 53d072ba6bdbe0f988829616a232bb154cab2be3
 SHA1 (patch-ah) = b03e6675ab1f6f62fc885d990b5a6bf64c309e9f
 SHA1 (patch-ai) = d265a2967566cf2679ad6fff1dffd5c6d6cbd120
 SHA1 (patch-ak) = 3582de771a424cd7c906574bf4a76fc57f977e6b
-SHA1 (patch-al) = d23cc725aa31a5f2e9db9f3aa84513a114285f03
+SHA1 (patch-al) = 5c4909942ccfa7d7000c2856705ca9a28dbf005d
 SHA1 (patch-am) = cb0cc7cdfaf1d2455c519eda5cf239ea623c4f7b
 SHA1 (patch-an) = 2eac4f7d0be8aa73de2ef3b021c134d0d9e40125
 SHA1 (patch-ao) = ccc7a159a6eb1ebc07c9187e3bcd0db61b8b4086
diff --git a/devel/scmcvs/patches/patch-al b/devel/scmcvs/patches/patch-al
index 9f61bc4101d..3cf88a9f406 100644
--- a/devel/scmcvs/patches/patch-al
+++ b/devel/scmcvs/patches/patch-al
@@ -1,43 +1,8 @@
-$NetBSD: patch-al,v 1.7 2017/12/18 08:48:27 adam Exp $
+$NetBSD: patch-al,v 1.8 2017/12/18 08:51:48 adam Exp $
 
 --- src/client.c.orig	2005-10-02 15:17:20.000000000 +0000
 +++ src/client.c
-@@ -1147,7 +1147,6 @@ read_counted_file (char *filename, char 
-     size_t nread;
-     size_t nwrite;
- 
--    FILE *fp;
- 
-     read_line (&size_string);
-     if (size_string[0] == 'z')
-@@ -1168,9 +1167,6 @@ protocol error: compressed files not sup
-        is binary or not.  I haven't carefully looked into whether
-        CVS/Template files should use local text file conventions or
-        not.  */
--    fp = CVS_FOPEN (filename, "wb");
--    if (!fp)
--	error (1, errno, "cannot write %s", fullname);
-     nread = size;
-     nwrite = 0;
-     pread = buf;
-@@ -1189,16 +1185,11 @@ protocol error: compressed files not sup
- 
- 	if (nwrite > 0)
- 	{
--	    n = fwrite (pwrite, sizeof *pwrite, nwrite, fp);
--	    if (ferror (fp))
--		error (1, errno, "cannot write %s", fullname);
- 	    nwrite -= n;
- 	    pwrite += n;
- 	}
-     }
-     free (buf);
--    if (fclose (fp) < 0)
--	error (1, errno, "cannot close %s", fullname);
- }
- 
- 
-@@ -4179,6 +4170,16 @@ start_server (void)
+@@ -4179,6 +4179,16 @@ start_server (void)
  	    error (1, 0,
  		   "This server does not support the global -n option.");
      }