Update to 3.10

* Add build time dependency to asciidoc (a2x)

Changelog:
3.10 @ 2013-01-20
  Make the behavior of a second -d option match the documentation.

3.9 @ 2013-01-20
  Added -i option for generating incremental fast exports.

3.8 @ 2013-01-13
  Fix buggy generation of the revision-map file (thanks to Chris Rorvick).
  Don't convert .cvsignores by default, we have field reports of collisions.

3.7 @ 2013-01-08
  Bug fix in timezone handling (thanks to Chris Rorvick).
  Major performance gain in the CVS client code (thanks to Sergei Trofimovich).

3.6 @ 2013-01-06
  The third field in an author entry is now interpreted as if it were TZ.

3.5 @ 2013-01-02
  Remove the --test-log option now that cvsps has its own test suite.
  New --reposurgeon option for passing reference-lifting hints to reposurgeon.

3.4 @ 2013-01-01
  Incorporate Heiko Voight's patch solving some time-skew cases.
  The git-tree tests for cvsps are now completely merged into the test suite.
  Code passes Coverity auditing.

3.3 @ 2012-12-30
  There's a new -A option that does author-name mapping in the expected way.
  There's a new -R option that writes out a revision map.
  cvsps run from within a repository directory will do the right thing.
  A bug that could garble translations of branchy repositories has been fixed.

3 files changed, 28 insertions, 35 deletions

diff --git a/devel/cvsps3/Makefile b/devel/cvsps3/Makefile
index 43f46146754..7521e5f0fc9 100644
--- a/devel/cvsps3/Makefile
+++ b/devel/cvsps3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2013/01/30 14:45:40 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2013/02/25 21:26:55 ryoon Exp $
 #
 
-DISTNAME=	cvsps-3.2
+DISTNAME=	cvsps-3.10
 PKGNAME=	${DISTNAME:S/cvsps-/cvsps3-/}
 CATEGORIES=	devel scm
 MASTER_SITES=	${HOMEPAGE}
@@ -13,13 +13,15 @@ LICENSE=	gnu-gpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+BUILD_DEPENDS+=		asciidoc-[0-9]*:../../textproc/asciidoc
+
 USE_TOOLS+=		gmake
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 LIBS.SunOS+=		-lnsl -lsocket
 MAKE_ENV+=		LIBS=${LIBS:Q}
-MAKE_ENV+=		prefix=${DESTDIR}${PREFIX}
+MAKE_ENV+=		prefix=${PREFIX}
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvsps3/distinfo b/devel/cvsps3/distinfo
index c0e97e86682..810552035ce 100644
--- a/devel/cvsps3/distinfo
+++ b/devel/cvsps3/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2013/01/30 11:34:58 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2013/02/25 21:26:55 ryoon Exp $
 
-SHA1 (cvsps-3.2.tar.gz) = fd4a3d3a0dc630381456d4fcc06fe72c6ca60689
-RMD160 (cvsps-3.2.tar.gz) = af75060a260e74919802b651c76ccb33fa07e240
-Size (cvsps-3.2.tar.gz) = 60627 bytes
-SHA1 (patch-aa) = 976b74f3183c0ef41799a62909cf66ff41ee6048
+SHA1 (cvsps-3.10.tar.gz) = 8e0b2c66abd521eef2851da2fa5175f14215e9bf
+RMD160 (cvsps-3.10.tar.gz) = 81475073aa2cae6e8d9a357c5448e9c9f727327e
+Size (cvsps-3.10.tar.gz) = 64303 bytes
+SHA1 (patch-aa) = dd6a5b7a3559d664eb2a1966430e16350ac4d48c
diff --git a/devel/cvsps3/patches/patch-aa b/devel/cvsps3/patches/patch-aa
index 6ef3e9d465e..b341113fd08 100644
--- a/devel/cvsps3/patches/patch-aa
+++ b/devel/cvsps3/patches/patch-aa
@@ -1,37 +1,28 @@
-$NetBSD: patch-aa,v 1.1 2013/01/30 11:34:58 ryoon Exp $
+$NetBSD: patch-aa,v 1.2 2013/02/25 21:26:55 ryoon Exp $
 
 * Pass pkgsrc environment variables
 
---- Makefile.orig	2012-12-24 20:12:10.000000000 +0000
+--- Makefile.orig	2013-01-21 13:20:15.000000000 +0000
 +++ Makefile
-@@ -3,7 +3,7 @@ VERSION=3.2
- CC?=gcc
- CFLAGS?=-g -O2 -Wall 
+@@ -5,7 +5,7 @@ CFLAGS?=-g -O2 -Wall 
  CPPFLAGS+=-I. -DVERSION=\"$(VERSION)\"
+ LDLIBS+=-lz # += to allow solaris and friends add their libs like -lsocket
+ INSTALL = install
 -prefix?=/usr/local
 +prefix?=${PREFIX}
- OBJS=\
- 	cbtcommon/debug.o\
- 	cbtcommon/hash.o\
-@@ -22,7 +22,7 @@ deps:
- 	makedepend -Y -I. *.c cbtcommon/*.c
+ target=$(DESTDIR)$(prefix)
  
- cvsps: $(OBJS)
--	$(CC) -o cvsps $(OBJS) -lz
-+	$(CC) ${LDFLAGS} -o cvsps3 $(OBJS) -lz ${LIBS}
+ OBJS= debug.o \
+@@ -51,9 +51,9 @@ pylint:
  
- check:
- 	@(cd test >/dev/null; make --quiet)
-@@ -38,9 +38,9 @@ cvsps.html: cvsps.asc
+ install: cvsps.1 all
+ 	$(INSTALL) -d "$(target)/bin"
+-	$(INSTALL) -d "$(target)/share/man/man1"
+-	$(INSTALL) cvsps "$(target)/bin"
+-	$(INSTALL) -m 644 cvsps.1 "$(target)/share/man/man1"
++	$(INSTALL) -d "$(target)/${PKGMANDIR}/man1"
++	$(INSTALL) cvsps "$(target)/bin/cvsps3"
++	$(INSTALL) -m 644 cvsps.1 "$(target)/${PKGMANDIR}/man1/cvsps3.1"
  
- install: cvsps.1
- 	[ -d $(prefix)/bin ] || mkdir -p $(prefix)/bin
--	[ -d $(prefix)/share/man/man1 ] || mkdir -p $(prefix)/share/man/man1
--	install cvsps $(prefix)/bin
--	install -m 644 cvsps.1 $(prefix)/share/man/man1
-+	[ -d $(prefix)/${PKGMANDIR}/man1 ] || mkdir -p $(prefix)/${PKGMANDIR}/man1
-+	install cvsps3 $(prefix)/bin
-+	install -m 644 cvsps.1 $(prefix)/${PKGMANDIR}/man1/cvsps3.1
- 
- tags: *.c *.h cbtcommon/*.c cbtcommon/*.h
- 	ctags *.c *.h cbtcommon/*.c cbtcommon/*.h
+ tags: *.c *.h
+ 	ctags *.c *.h