- Update to 2.6

3 files changed, 61 insertions, 9 deletions

diff --git a/textproc/txt2tags/Makefile b/textproc/txt2tags/Makefile
index c1336327695e..ff1de7926f00 100644
--- a/textproc/txt2tags/Makefile
+++ b/textproc/txt2tags/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	txt2tags
-PORTVERSION=	2.5
-PORTREVISION=	1
+PORTVERSION=	2.6
 CATEGORIES=	textproc
-MASTER_SITES=	SF
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sylvio@FreeBSD.org
@@ -18,7 +17,7 @@ COMMENT=	Convert simply formatted text into markup (e.g., HTML)
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
-PORTDOCS=	ChangeLog README TODO userguide.pdf
+PORTDOCS=	ChangeLog README userguide.pdf
 SAMPLE_DIRS=	css img module
 
 post-patch:
@@ -32,7 +31,7 @@ do-install:
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/samples/sample* ${EXAMPLESDIR}/
 	@${MKDIR} ${EXAMPLESDIR}/extras
-	${INSTALL_DATA} ${WRKSRC}/extras/* ${EXAMPLESDIR}/extras
+	${CP} -a ${WRKSRC}/extras/* ${EXAMPLESDIR}/extras
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for docs in ${PORTDOCS}
diff --git a/textproc/txt2tags/distinfo b/textproc/txt2tags/distinfo
index c1347880c84f..ea2059611fa1 100644
--- a/textproc/txt2tags/distinfo
+++ b/textproc/txt2tags/distinfo
@@ -1,3 +1,2 @@
-MD5 (txt2tags-2.5.tgz) = e4d4553651b5be0711263378ca133c43
-SHA256 (txt2tags-2.5.tgz) = af980d228d546cf227def5438c731d688a9e7f92f64abd6dee316962bcc6240e
-SIZE (txt2tags-2.5.tgz) = 549169
+SHA256 (txt2tags-2.6.tgz) = 601467d7860f3cfb3d48050707c6277ff3ceb22fa7be4f5bd968de540ac5b05c
+SIZE (txt2tags-2.6.tgz) = 544724
diff --git a/textproc/txt2tags/pkg-plist b/textproc/txt2tags/pkg-plist
index 96129f16e806..06ed98e97c30 100644
--- a/textproc/txt2tags/pkg-plist
+++ b/textproc/txt2tags/pkg-plist
@@ -11,6 +11,47 @@ bin/txt2tags
 %%EXAMPLESDIR%%/extras/gensite
 %%EXAMPLESDIR%%/extras/gvim-menu.vim
 %%EXAMPLESDIR%%/extras/html-update.sh
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images/underline.png
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images/code.png
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images/disconnect.png
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images/h1.png
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images/h2.png
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images/h3.png
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images/h4.png
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images/h5.png
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images/italic.png
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images/link.png
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images/list-bullet.png
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images/list-numeric.png
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images/picture.png
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images/preview.png
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images/quotes.png
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images/stroke.png
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images/bold.png
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/readme.txt
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/set.js
+%%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/style.css
+%%EXAMPLESDIR%%/extras/markitup/README
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/underline.png
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/comment.png
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/comment0.png
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/em.png
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/empty.png
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/extlink.png
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/guiedit.js
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/h1.png
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/h2.png
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/h3.png
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/hr.png
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/link.png
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/ol.png
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/README
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/strike.png
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/strong.png
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/ul.png
+%%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit/blank.png
+%%EXAMPLESDIR%%/extras/pmwiki/txt2tags.php
+%%EXAMPLESDIR%%/extras/dynartslides
 %%EXAMPLESDIR%%/extras/nanorc
 %%EXAMPLESDIR%%/extras/pagemaker.vim
 %%EXAMPLESDIR%%/extras/t2tmake.rb
@@ -18,7 +59,8 @@ bin/txt2tags
 %%EXAMPLESDIR%%/extras/txt2tags-gedit.lang
 %%EXAMPLESDIR%%/extras/txt2tags-kate.xml
 %%EXAMPLESDIR%%/extras/txt2tags-mode.el
-%%EXAMPLESDIR%%/extras/txt2tags-textmate.zip
+%%EXAMPLESDIR%%/extras/txt2tags.le
+%%EXAMPLESDIR%%/extras/txt2tags.jsf
 %%EXAMPLESDIR%%/extras/txt2tags.php
 %%EXAMPLESDIR%%/extras/txt2tags.vim
 %%EXAMPLESDIR%%/extras/txt2tagsrc
@@ -37,6 +79,11 @@ bin/txt2tags
 %%EXAMPLESDIR%%/module/README
 %%EXAMPLESDIR%%/module/module-body.py
 %%EXAMPLESDIR%%/module/module-full.py
+%%EXAMPLESDIR%%/sample-slides-80x25.art
+%%EXAMPLESDIR%%/sample.adoc
+%%EXAMPLESDIR%%/sample.art
+%%EXAMPLESDIR%%/sample.creole
+%%EXAMPLESDIR%%/sample.dbk
 %%EXAMPLESDIR%%/sample.doku
 %%EXAMPLESDIR%%/sample.gwiki
 %%EXAMPLESDIR%%/sample.html
@@ -45,6 +92,7 @@ bin/txt2tags
 %%EXAMPLESDIR%%/sample.mgp
 %%EXAMPLESDIR%%/sample.moin
 %%EXAMPLESDIR%%/sample.pm6
+%%EXAMPLESDIR%%/sample.pmw
 %%EXAMPLESDIR%%/sample.sgml
 %%EXAMPLESDIR%%/sample.t2t
 %%EXAMPLESDIR%%/sample.tex
@@ -53,6 +101,12 @@ bin/txt2tags
 %%EXAMPLESDIR%%/sample.xhtml
 @dirrm %%EXAMPLESDIR%%/module
 @dirrm %%EXAMPLESDIR%%/img
+@dirrm %%EXAMPLESDIR%%/extras/markitup/sets/txt2tags/images
+@dirrm %%EXAMPLESDIR%%/extras/markitup/sets/txt2tags
+@dirrm %%EXAMPLESDIR%%/extras/markitup/sets
+@dirrm %%EXAMPLESDIR%%/extras/markitup
+@dirrm %%EXAMPLESDIR%%/extras/pmwiki/t2tguiedit
+@dirrm %%EXAMPLESDIR%%/extras/pmwiki
 @dirrm %%EXAMPLESDIR%%/extras
 @dirrm %%EXAMPLESDIR%%/css
 @dirrm %%EXAMPLESDIR%%