- Update to 2.3

- Install extras into EXAMPLESDIR instead of DATADIR
- Shorten COMMENT a bit

3 files changed, 57 insertions, 29 deletions

diff --git a/textproc/txt2tags/Makefile b/textproc/txt2tags/Makefile
index 1159d8f4059b..8fe513417901 100644
--- a/textproc/txt2tags/Makefile
+++ b/textproc/txt2tags/Makefile
@@ -6,27 +6,29 @@
 #
 
 PORTNAME=	txt2tags
-PORTVERSION=	1.5
+PORTVERSION=	2.3
 CATEGORIES=	textproc
 MASTER_SITES=	http://txt2tags.sourceforge.net/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sergei@FreeBSD.org
-COMMENT=	Utility to turn simply formatted text into markup (e.g., HTML)
+COMMENT=	Convert simply formatted text into markup (e.g., HTML)
 
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
-DOCS=		ChangeLog.txt README.html README.txt RULES TODO userguide/*
-CONTRIB=	contrib/* extras/*
-EXAMPLES=	samples/*
+DOCS=		ChangeLog README README-FIRST TEAM TODO doc/userguide.pdf
+SAMPLE_DIRS=	css img module
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/txt2tags ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${CONTRIB} ${DATADIR}
-	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+.for dir in ${SAMPLE_DIRS}
+	@${MKDIR} ${EXAMPLESDIR}/${dir}
+	${INSTALL_DATA} ${WRKSRC}/samples/${dir}/* ${EXAMPLESDIR}/${dir}
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/samples/sample* ${EXAMPLESDIR}/
+	@${MKDIR} ${EXAMPLESDIR}/extras
+	${INSTALL_DATA} ${WRKSRC}/extras/* ${EXAMPLESDIR}/extras
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
diff --git a/textproc/txt2tags/distinfo b/textproc/txt2tags/distinfo
index 1dcfe2c9ce75..ea09f07e63c6 100644
--- a/textproc/txt2tags/distinfo
+++ b/textproc/txt2tags/distinfo
@@ -1,2 +1,2 @@
-MD5 (txt2tags-1.5.tgz) = bb8675a483ba5285403d19c971a016fa
-SIZE (txt2tags-1.5.tgz) = 126283
+MD5 (txt2tags-2.3.tgz) = 0514bb01161183808dc8be105c032677
+SIZE (txt2tags-2.3.tgz) = 880164
diff --git a/textproc/txt2tags/pkg-plist b/textproc/txt2tags/pkg-plist
index 4a21e8a5155f..c51ef79b6da1 100644
--- a/textproc/txt2tags/pkg-plist
+++ b/textproc/txt2tags/pkg-plist
@@ -1,18 +1,46 @@
+@comment $FreeBSD$
 bin/txt2tags
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.html
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/RULES
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README-FIRST
+%%PORTDOCS%%%%DOCSDIR%%/TEAM
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/userguide.html
-%%PORTDOCS%%%%DOCSDIR%%/userguide.t2t
+%%PORTDOCS%%%%DOCSDIR%%/userguide.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/abuseme.html
-%%EXAMPLESDIR%%/abuseme.t2t
-%%EXAMPLESDIR%%/photo.jpg
-%%EXAMPLESDIR%%/pwrbytxt2tags-1.png
-%%EXAMPLESDIR%%/pwrbytxt2tags-2.png
+%%EXAMPLESDIR%%/css/color.css
+%%EXAMPLESDIR%%/css/color.html
+%%EXAMPLESDIR%%/css/modern.css
+%%EXAMPLESDIR%%/css/modern.html
+%%EXAMPLESDIR%%/css/tech.css
+%%EXAMPLESDIR%%/css/tech.html
+%%EXAMPLESDIR%%/extras/README
+%%EXAMPLESDIR%%/extras/css-reference.txt
+%%EXAMPLESDIR%%/extras/gvim-menu.vim
+%%EXAMPLESDIR%%/extras/html-update.sh
+%%EXAMPLESDIR%%/extras/nanorc
+%%EXAMPLESDIR%%/extras/pagemaker.vim
+%%EXAMPLESDIR%%/extras/t2tconv
+%%EXAMPLESDIR%%/extras/t2tmake.rb
+%%EXAMPLESDIR%%/extras/txt2tags-compiler.vim
+%%EXAMPLESDIR%%/extras/txt2tags-kate.xml
+%%EXAMPLESDIR%%/extras/txt2tags-mode.el
+%%EXAMPLESDIR%%/extras/txt2tags.php
+%%EXAMPLESDIR%%/extras/txt2tags.vim
+%%EXAMPLESDIR%%/extras/unhtml.vim
+%%EXAMPLESDIR%%/img/madeinbr.png
+%%EXAMPLESDIR%%/img/old-poweredby-1.png
+%%EXAMPLESDIR%%/img/old-poweredby-2.png
+%%EXAMPLESDIR%%/img/photo.jpg
+%%EXAMPLESDIR%%/img/t2tbutton.png
+%%EXAMPLESDIR%%/img/t2tpowered.png
+%%EXAMPLESDIR%%/img/valid-css.png
+%%EXAMPLESDIR%%/img/valid-html.png
+%%EXAMPLESDIR%%/img/valid-xhtml.png
+%%EXAMPLESDIR%%/module/README
+%%EXAMPLESDIR%%/module/module-body.py
+%%EXAMPLESDIR%%/module/module-full.py
 %%EXAMPLESDIR%%/sample.html
+%%EXAMPLESDIR%%/sample.lout
 %%EXAMPLESDIR%%/sample.man
 %%EXAMPLESDIR%%/sample.mgp
 %%EXAMPLESDIR%%/sample.moin
@@ -21,11 +49,9 @@ bin/txt2tags
 %%EXAMPLESDIR%%/sample.t2t
 %%EXAMPLESDIR%%/sample.tex
 %%EXAMPLESDIR%%/sample.txt
+%%EXAMPLESDIR%%/sample.xhtml
+@dirrm %%EXAMPLESDIR%%/module
+@dirrm %%EXAMPLESDIR%%/img
+@dirrm %%EXAMPLESDIR%%/extras
+@dirrm %%EXAMPLESDIR%%/css
 @dirrm %%EXAMPLESDIR%%
-%%DATADIR%%/pagemaker.vim
-%%DATADIR%%/txt2tags-mode.el
-%%DATADIR%%/txt2tags-reverse_title.patch
-%%DATADIR%%/txt2tags.php
-%%DATADIR%%/txt2tags.vim
-%%DATADIR%%/unhtml.vim
-@dirrm %%DATADIR%%