Index: textproc/docproj/Makefile
===================================================================
--- textproc/docproj/Makefile	(revision 558190)
+++ textproc/docproj/Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	docproj
-PORTVERSION=	2.0
-PORTREVISION=	14
+PORTVERSION=	2.1
 CATEGORIES=	textproc
 
 MAINTAINER=	doceng@FreeBSD.org
@@ -26,19 +25,16 @@
 USES=		ghostscript:run metaport perl5
 USE_PERL5=	run
 
-OPTIONS_DEFINE=		CJK DBLATEX FOP GROFF IGOR JING SVN TRANSLATOR
-OPTIONS_DEFAULT=	CJK GROFF IGOR TRANSLATOR
-.if !exists(/usr/bin/svnlite) && !exists(/usr/bin/svn)
-OPTIONS_DEFAULT+=	SVN
-.endif
+OPTIONS_DEFINE=		CJK DBLATEX FOP GIT GROFF IGOR JING TRANSLATOR
+OPTIONS_DEFAULT=	CJK GIT GROFF IGOR TRANSLATOR
 
 CJK_DESC=		CJK support
 DBLATEX_DESC=		dblatex PDF renderer (experimental, requires TeXLive)
 FOP_DESC=		FOP PDF renderer (requires Java)
+GIT_DESC=		Git support from ports
 GROFF_DESC=		Groff support from ports
 IGOR_DESC=		Igor automated proofreader for documentation
 JING_DESC=		Jing for advanced RELAX NG validation
-SVN_DESC=		Subversion support from ports
 TRANSLATOR_DESC=	Tools for translators
 
 CJK_RUN_DEPENDS=	html2text:textproc/html2text
@@ -46,10 +42,10 @@
 DBLATEX_USE=		TEX=xetex
 FOP_RUN_DEPENDS=	${_FONTS} \
 			fop:textproc/fop
+GIT_RUN_DEPENDS=	git:devel/git
 GROFF_USES=		groff:run
 IGOR_RUN_DEPENDS=	igor:textproc/igor
 JING_RUN_DEPENDS=	jing:textproc/jing
-SVN_RUN_DEPENDS=	${LOCALBASE}/bin/svn:devel/subversion
 TRANSLATOR_RUN_DEPENDS=	itstool:textproc/itstool \
 			msgcat:devel/gettext-tools
 
@@ -65,7 +61,7 @@
 
 .if ${PORT_OPTIONS:MFOP} || ${PORT_OPTIONS:MDBLATEX}
 ONLY_FOR_ARCHS=	amd64 i386
-CJK_RUN_DEPENDS=	${_FONTS_CJK}
+CJK_RUN_DEPENDS+=	${_FONTS_CJK}
 .endif
 
 # generate MINIMALDOCPORTS for src/release/Makefile.inc.docports.