4 files changed, 30 insertions, 28 deletions

diff --git a/textproc/docdiff/Makefile b/textproc/docdiff/Makefile
index 0ef3c4d3e3d2..4163c6262dd5 100644
--- a/textproc/docdiff/Makefile
+++ b/textproc/docdiff/Makefile
@@ -6,35 +6,34 @@
 #
 
 PORTNAME=	docdiff
-PORTVERSION=	0.3.4
-PORTREVISION=	1
+PORTVERSION=	0.4.0
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Compare text word by word
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Compares two text files by word, by character, or by line
 
-RUN_DEPENDS=	*ruby*-uconv>=0:${PORTSDIR}/japanese/ruby-uconv \
-		*ruby*-iconv>=0:${PORTSDIR}/converters/ruby-iconv
-
-USE_RUBY=	yes
 NO_BUILD=	yes
+USE_RUBY=	yes
+USE_RUBY_FEATURES=	iconv
+
 PORTDOCS=	readme.html readme.en.html readme.ja.html
 
 post-patch:
-	@${REINPLACE_CMD} -e '1s|#!.*|#!${RUBY}|;/ :format/s|html|tty|;\
-	/SystemConfigFileName =/s|etc.*conf|${PREFIX}/etc/${PORTNAME}.conf|;\
-	s|/etc/docdiff/docdiff.conf|${PREFIX}/etc/${PORTNAME}.conf|'\
-		${WRKSRC}/${PORTNAME}.rb
+	@${REINPLACE_CMD} \
+		-e '1 s|#!.*|#!${RUBY}|' \
+		-e '/ :format/ s|html|tty|' \
+		-e '/SystemConfigFileName =/ s|etc.*conf|${PREFIX}/etc/${PORTNAME}.conf|' \
+		-e 's|/etc/docdiff/docdiff.conf|${PREFIX}/etc/${PORTNAME}.conf|' \
+			${WRKSRC}/${PORTNAME}.rb
 
 do-install:
-	@cd ${WRKSRC}/${PORTNAME}/&&\
-		${COPYTREE_SHARE} . ${RUBY_SITELIBDIR}/${PORTNAME}/
-	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.rb ${PREFIX}/bin/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.example ${PREFIX}/etc/
-.ifndef NOPORTDOCS
-	@${INSTALL} -d ${DOCSDIR}/
-	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
+	cd ${WRKSRC}/${PORTNAME}/ && ${COPYTREE_SHARE} . ${RUBY_SITELIBDIR}/${PORTNAME}/
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.rb ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.example ${PREFIX}/etc/
+.if !defined(NOPORTDOCS)
+	${INSTALL} -d ${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/docdiff/distinfo b/textproc/docdiff/distinfo
index a55231a08561..252e0d1b6695 100644
--- a/textproc/docdiff/distinfo
+++ b/textproc/docdiff/distinfo
@@ -1,2 +1,2 @@
-SHA256 (docdiff-0.3.4.tar.gz) = e0843efe9fe55425e692ed47f791b37174928889b11d569cb128f5343dc96040
-SIZE (docdiff-0.3.4.tar.gz) = 207003
+SHA256 (docdiff-0.4.0.tar.gz) = 38f1e7d7e02c1bab801aab32c8e366a73a228b40516c71e1c1d3888d3ae2a935
+SIZE (docdiff-0.4.0.tar.gz) = 212317
diff --git a/textproc/docdiff/pkg-descr b/textproc/docdiff/pkg-descr
index 914cc0532075..8f4d64054b09 100644
--- a/textproc/docdiff/pkg-descr
+++ b/textproc/docdiff/pkg-descr
@@ -1,6 +1,9 @@
-DocDiff compares two files and shows the difference. It can compare
-files word by word, char by char, or line by line. It has several
-output formats such as HTML, tty, Manued, or user-defined markup.
+DocDiff compares two text files and shows the difference. It can compare files
+word by word, character by character, or line by line. It has several output
+formats such as HTML, tty, Manued, or user-defined markup.
 
-WWW: http://www.kt.rim.or.jp/~hisashim/docdiff/
-Author: Hisashi MORITA <hisashim at kt dot rim dot or dot jp>
+It supports several encodings and end-of-line characters, including ASCII (and
+other single byte encodings such as ISO-8859-*), UTF-8, EUC-JP, Shift_JIS, CR,
+LF, and CRLF.
+
+WWW: http://docdiff.sourceforge.net/
diff --git a/textproc/docdiff/pkg-plist b/textproc/docdiff/pkg-plist
index cb2f6f504b85..4949155aab34 100644
--- a/textproc/docdiff/pkg-plist
+++ b/textproc/docdiff/pkg-plist
@@ -1,6 +1,7 @@
 bin/docdiff
 etc/docdiff.conf.example
 %%RUBY_SITELIBDIR%%/docdiff/charstring.rb
+%%RUBY_SITELIBDIR%%/docdiff/diff.rb
 %%RUBY_SITELIBDIR%%/docdiff/diff/contours.rb
 %%RUBY_SITELIBDIR%%/docdiff/diff/editscript.rb
 %%RUBY_SITELIBDIR%%/docdiff/diff/rcsdiff.rb
@@ -8,7 +9,6 @@ etc/docdiff.conf.example
 %%RUBY_SITELIBDIR%%/docdiff/diff/speculative.rb
 %%RUBY_SITELIBDIR%%/docdiff/diff/subsequence.rb
 %%RUBY_SITELIBDIR%%/docdiff/diff/unidiff.rb
-%%RUBY_SITELIBDIR%%/docdiff/diff.rb
 %%RUBY_SITELIBDIR%%/docdiff/difference.rb
 %%RUBY_SITELIBDIR%%/docdiff/document.rb
 %%RUBY_SITELIBDIR%%/docdiff/encoding/en_ascii.rb
@@ -16,6 +16,6 @@ etc/docdiff.conf.example
 %%RUBY_SITELIBDIR%%/docdiff/encoding/ja_sjis.rb
 %%RUBY_SITELIBDIR%%/docdiff/encoding/ja_utf8.rb
 %%RUBY_SITELIBDIR%%/docdiff/view.rb
-@dirrm %%RUBY_SITELIBDIR%%/docdiff/diff
 @dirrm %%RUBY_SITELIBDIR%%/docdiff/encoding
+@dirrm %%RUBY_SITELIBDIR%%/docdiff/diff
 @dirrm %%RUBY_SITELIBDIR%%/docdiff