2 files changed, 16 insertions, 118 deletions

diff --git a/textproc/txt2tags/Makefile b/textproc/txt2tags/Makefile
index 44ca158ddb88..d3c3dff2484f 100644
--- a/textproc/txt2tags/Makefile
+++ b/textproc/txt2tags/Makefile
@@ -10,31 +10,30 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert simply formatted text into markup (e.g., HTML)
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USES=		python:2 shebangfix tar:tgz
-SHEBANG_FILES=	extras/html-update.sh
+SHEBANG_FILES=	extras/html-update.sh txt2tags
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-PORTDOCS=	ChangeLog README userguide.pdf
-SAMPLE_DIRS=	css img module
+PLIST_FILES=	bin/${PORTNAME}
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/env python|/env python2|' \
-		${WRKSRC}/txt2tags
-	@${MV} ${WRKSRC}/doc/userguide.pdf ${WRKSRC}/
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/txt2tags ${STAGEDIR}${PREFIX}/bin
-.for dir in ${SAMPLE_DIRS}
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${dir}
-	${INSTALL_DATA} ${WRKSRC}/samples/${dir}/* ${STAGEDIR}${EXAMPLESDIR}/${dir}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/samples/sample* ${STAGEDIR}${EXAMPLESDIR}/
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/extras
-	${CP} -a ${WRKSRC}/extras/* ${STAGEDIR}${EXAMPLESDIR}/extras
+
+do-install-EXAMPLES-on:
+	@cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} extras ${STAGEDIR}${EXAMPLESDIR}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for docs in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/userguide.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/txt2tags/pkg-plist b/textproc/txt2tags/pkg-plist
deleted file mode 100644
index c2fcf43207c0..000000000000
--- a/textproc/txt2tags/pkg-plist
+++ /dev/null
@@ -1,101 +0,0 @@
-bin/txt2tags
-%%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/ctags
-%%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
-%%EXAMPLESDIR%%/extras/txt2tags-compiler.vim
-%%EXAMPLESDIR%%/extras/txt2tags-gedit.lang
-%%EXAMPLESDIR%%/extras/txt2tags-kate.xml
-%%EXAMPLESDIR%%/extras/txt2tags-mode.el
-%%EXAMPLESDIR%%/extras/txt2tags.le
-%%EXAMPLESDIR%%/extras/txt2tags.jsf
-%%EXAMPLESDIR%%/extras/txt2tags.php
-%%EXAMPLESDIR%%/extras/txt2tags.vim
-%%EXAMPLESDIR%%/extras/txt2tagsrc
-%%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/t2tpowered-black.png
-%%EXAMPLESDIR%%/img/t2tpowered-white.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-slides-80x25.art
-%%EXAMPLESDIR%%/sample.adoc
-%%EXAMPLESDIR%%/sample.art
-%%EXAMPLESDIR%%/sample.creole
-%%EXAMPLESDIR%%/sample.dbk
-%%EXAMPLESDIR%%/sample.doku
-%%EXAMPLESDIR%%/sample.gwiki
-%%EXAMPLESDIR%%/sample.html
-%%EXAMPLESDIR%%/sample.lout
-%%EXAMPLESDIR%%/sample.man
-%%EXAMPLESDIR%%/sample.mgp
-%%EXAMPLESDIR%%/sample.moin
-%%EXAMPLESDIR%%/sample.pm6
-%%EXAMPLESDIR%%/sample.pmw
-%%EXAMPLESDIR%%/sample.sgml
-%%EXAMPLESDIR%%/sample.t2t
-%%EXAMPLESDIR%%/sample.tex
-%%EXAMPLESDIR%%/sample.txt
-%%EXAMPLESDIR%%/sample.wiki
-%%EXAMPLESDIR%%/sample.xhtml