upgrade to 2.0.25

3 files changed, 21 insertions, 191 deletions

diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile
index d5a1df3d16f5..d3df3ae62d2a 100644
--- a/textproc/highlight/Makefile
+++ b/textproc/highlight/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	highlight
-PORTVERSION=	2.0.23
-PORTEPOCH=	1
+PORTVERSION=	2.0.25
+PORTEPOCH=	0
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.andre-simon.de/zip/
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
@@ -27,9 +27,17 @@ MAKE_ARGS=	CC="${CXX}" \
 		LDFLAGS="${LDFLAGS}"
 ALL_TARGET=	${PORTNAME}
 
+PLIST_FILES=	bin/highlight
+
 MAN1=		${PORTNAME}.1
 MANCOMPRESSED=	yes
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/share/highlight|${DATADIR}|' ${WRKSRC}/datadir.cpp
@@ -56,4 +64,12 @@ do-install:
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.mk>
+post-install:
+.for dir in ${PREFIX}/share/${PORTNAME} ${PREFIX}/share/examples/${PORTNAME}
+	@${FIND} ${dir} ! -type d | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${dir} -type d | ${SORT} -r | \
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+.endfor
+
+.include <bsd.port.post.mk>
diff --git a/textproc/highlight/distinfo b/textproc/highlight/distinfo
index db936f0f792b..6832241334f3 100644
--- a/textproc/highlight/distinfo
+++ b/textproc/highlight/distinfo
@@ -1,2 +1,2 @@
-MD5 (highlight-2.0-23.tar.gz) = 7f6c2b87e066b305b3de2e563ec96ccf
-SIZE (highlight-2.0-23.tar.gz) = 246173
+MD5 (highlight-2.0-25.tar.gz) = 2207446e4030563af71e9dee3c2c7167
+SIZE (highlight-2.0-25.tar.gz) = 256582
diff --git a/textproc/highlight/pkg-plist b/textproc/highlight/pkg-plist
deleted file mode 100644
index b750f8c7955c..000000000000
--- a/textproc/highlight/pkg-plist
+++ /dev/null
@@ -1,186 +0,0 @@
-bin/highlight
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/cgi/perl/README_CGI
-%%PORTDOCS%%%%EXAMPLESDIR%%/cgi/perl/highlight.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/cgi/php/CodeHighLight.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/cgi/php/SyntaxHighlighter.php
-%%DATADIR%%/extensions.conf
-%%DATADIR%%/helpmsg/de.help
-%%DATADIR%%/helpmsg/en.help
-%%DATADIR%%/helpmsg/fr.help
-%%DATADIR%%/langDefs/4gl.lang
-%%DATADIR%%/langDefs/4th.lang
-%%DATADIR%%/langDefs/abp.lang
-%%DATADIR%%/langDefs/ada.lang
-%%DATADIR%%/langDefs/agda.lang
-%%DATADIR%%/langDefs/ampl.lang
-%%DATADIR%%/langDefs/amtrix.lang
-%%DATADIR%%/langDefs/arm.lang
-%%DATADIR%%/langDefs/as.lang
-%%DATADIR%%/langDefs/asm.lang
-%%DATADIR%%/langDefs/asp.lang
-%%DATADIR%%/langDefs/aspect.lang
-%%DATADIR%%/langDefs/avenue.lang
-%%DATADIR%%/langDefs/awk.lang
-%%DATADIR%%/langDefs/bat.lang
-%%DATADIR%%/langDefs/bb.lang
-%%DATADIR%%/langDefs/bib.lang
-%%DATADIR%%/langDefs/bms.lang
-%%DATADIR%%/langDefs/c.lang
-%%DATADIR%%/langDefs/cb.lang
-%%DATADIR%%/langDefs/clipper.lang
-%%DATADIR%%/langDefs/clp.lang
-%%DATADIR%%/langDefs/cob.lang
-%%DATADIR%%/langDefs/cs.lang
-%%DATADIR%%/langDefs/css.lang
-%%DATADIR%%/langDefs/dylan.lang
-%%DATADIR%%/langDefs/e.lang
-%%DATADIR%%/langDefs/erl.lang
-%%DATADIR%%/langDefs/euphoria.lang
-%%DATADIR%%/langDefs/exp.lang
-%%DATADIR%%/langDefs/f77.lang
-%%DATADIR%%/langDefs/f90.lang
-%%DATADIR%%/langDefs/flx.lang
-%%DATADIR%%/langDefs/frink.lang
-%%DATADIR%%/langDefs/haskell.lang
-%%DATADIR%%/langDefs/httpd.lang
-%%DATADIR%%/langDefs/icn.lang
-%%DATADIR%%/langDefs/idl.lang
-%%DATADIR%%/langDefs/ini.lang
-%%DATADIR%%/langDefs/inp.lang
-%%DATADIR%%/langDefs/io.lang
-%%DATADIR%%/langDefs/j.lang
-%%DATADIR%%/langDefs/java.lang
-%%DATADIR%%/langDefs/js.lang
-%%DATADIR%%/langDefs/jsp.lang
-%%DATADIR%%/langDefs/ldif.lang
-%%DATADIR%%/langDefs/lisp.lang
-%%DATADIR%%/langDefs/lotos.lang
-%%DATADIR%%/langDefs/ls.lang
-%%DATADIR%%/langDefs/lua.lang
-%%DATADIR%%/langDefs/m.lang
-%%DATADIR%%/langDefs/make.lang
-%%DATADIR%%/langDefs/mel.lang
-%%DATADIR%%/langDefs/ml.lang
-%%DATADIR%%/langDefs/mo.lang
-%%DATADIR%%/langDefs/mod3.lang
-%%DATADIR%%/langDefs/mpl.lang
-%%DATADIR%%/langDefs/ms.lang
-%%DATADIR%%/langDefs/nas.lang
-%%DATADIR%%/langDefs/nice.lang
-%%DATADIR%%/langDefs/nut.lang
-%%DATADIR%%/langDefs/oberon.lang
-%%DATADIR%%/langDefs/objc.lang
-%%DATADIR%%/langDefs/octave.lang
-%%DATADIR%%/langDefs/os.lang
-%%DATADIR%%/langDefs/pas.lang
-%%DATADIR%%/langDefs/php.lang
-%%DATADIR%%/langDefs/pike.lang
-%%DATADIR%%/langDefs/pl.lang
-%%DATADIR%%/langDefs/pl1.lang
-%%DATADIR%%/langDefs/pov.lang
-%%DATADIR%%/langDefs/pro.lang
-%%DATADIR%%/langDefs/progress.lang
-%%DATADIR%%/langDefs/ps.lang
-%%DATADIR%%/langDefs/psl.lang
-%%DATADIR%%/langDefs/py.lang
-%%DATADIR%%/langDefs/r.lang
-%%DATADIR%%/langDefs/rb.lang
-%%DATADIR%%/langDefs/rexx.lang
-%%DATADIR%%/langDefs/rnc.lang
-%%DATADIR%%/langDefs/sc.lang
-%%DATADIR%%/langDefs/scala.lang
-%%DATADIR%%/langDefs/sh.lang
-%%DATADIR%%/langDefs/sma.lang
-%%DATADIR%%/langDefs/sml.lang
-%%DATADIR%%/langDefs/snobol.lang
-%%DATADIR%%/langDefs/spec.lang
-%%DATADIR%%/langDefs/spn.lang
-%%DATADIR%%/langDefs/sql.lang
-%%DATADIR%%/langDefs/sybase.lang
-%%DATADIR%%/langDefs/tcl.lang
-%%DATADIR%%/langDefs/tex.lang
-%%DATADIR%%/langDefs/txt.lang
-%%DATADIR%%/langDefs/vb.lang
-%%DATADIR%%/langDefs/verilog.lang
-%%DATADIR%%/langDefs/vhd.lang
-%%DATADIR%%/langDefs/xml.lang
-%%DATADIR%%/langDefs/xpp.lang
-%%DATADIR%%/langDefs/y.lang
-%%DATADIR%%/themes/aqua.style
-%%DATADIR%%/themes/berries-dark.style
-%%DATADIR%%/themes/berries-light.style
-%%DATADIR%%/themes/bipolar.style
-%%DATADIR%%/themes/blacknblue.style
-%%DATADIR%%/themes/blue.style
-%%DATADIR%%/themes/bright.style
-%%DATADIR%%/themes/bright2.style
-%%DATADIR%%/themes/bruised.style
-%%DATADIR%%/themes/bubblegum.style
-%%DATADIR%%/themes/contrast.style
-%%DATADIR%%/themes/darkblue.style
-%%DATADIR%%/themes/darkness.style
-%%DATADIR%%/themes/desert.style
-%%DATADIR%%/themes/dream.style
-%%DATADIR%%/themes/dull.style
-%%DATADIR%%/themes/easter.style
-%%DATADIR%%/themes/emacs.style
-%%DATADIR%%/themes/fluke.style
-%%DATADIR%%/themes/golden.style
-%%DATADIR%%/themes/greenlcd.style
-%%DATADIR%%/themes/greyish.style
-%%DATADIR%%/themes/ide-anjuta.style
-%%DATADIR%%/themes/ide-codewarrior.style
-%%DATADIR%%/themes/ide-devcpp.style
-%%DATADIR%%/themes/ide-jbuilder4.style
-%%DATADIR%%/themes/ide-jcreator2.style
-%%DATADIR%%/themes/ide-kdev.style
-%%DATADIR%%/themes/ide-msvcpp.style
-%%DATADIR%%/themes/ide-synedit.style
-%%DATADIR%%/themes/imperial.style
-%%DATADIR%%/themes/kwrite.style
-%%DATADIR%%/themes/matlab.style
-%%DATADIR%%/themes/navy.style
-%%DATADIR%%/themes/nedit.style
-%%DATADIR%%/themes/neon.style
-%%DATADIR%%/themes/neon2.style
-%%DATADIR%%/themes/night.style
-%%DATADIR%%/themes/nightvision.style
-%%DATADIR%%/themes/pablo.style
-%%DATADIR%%/themes/peachpuff.style
-%%DATADIR%%/themes/peachy.style
-%%DATADIR%%/themes/print.style
-%%DATADIR%%/themes/rand01.style
-%%DATADIR%%/themes/rand02.style
-%%DATADIR%%/themes/ron.style
-%%DATADIR%%/themes/slime.style
-%%DATADIR%%/themes/smoke.style
-%%DATADIR%%/themes/the.style
-%%DATADIR%%/themes/typical.style
-%%DATADIR%%/themes/untitled.style
-%%DATADIR%%/themes/untypical.style
-%%DATADIR%%/themes/usable.style
-%%DATADIR%%/themes/vampire.style
-%%DATADIR%%/themes/vim-dark.style
-%%DATADIR%%/themes/vim.style
-%%DATADIR%%/themes/website.style
-%%DATADIR%%/themes/website2-blue.style
-%%DATADIR%%/themes/website2.style
-%%DATADIR%%/themes/website3-blue.style
-%%DATADIR%%/themes/website3.style
-%%DATADIR%%/themes/whatis.style
-%%DATADIR%%/themes/whitenblue.style
-%%DATADIR%%/themes/whitengrey.style
-%%DATADIR%%/themes/zellner.style
-@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%/langDefs
-@dirrm %%DATADIR%%/helpmsg
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/cgi/php
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/cgi/perl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/cgi
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%