--- textproc/highlight/Makefile	Fri Nov 14 12:01:40 2003
+++ textproc/highlight/Makefile	Sun Nov 30 15:05:48 2003
@@ -6,43 +6,54 @@ 
 #
 
 PORTNAME=	highlight
-PORTVERSION=	2.0d12	#someday, people will stick to numbers and decimal points
+PORTVERSION=	2.0.13
+PORTEPOCH=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.andre-simon.de/zip/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/d/-/}
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Customizable syntax highlighter
 
-WRKSRC=		${WRKDIR}/${PORTNAME}2
+WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
 USE_GETOPT_LONG=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_REINPLACE=	yes
+USE_GMAKE=	yes
+MAKE_ENV=	CPPFLAGS="${CPPFLAGS} -DHAVE_DECL_GETOPT" LDFLAGS="${LDFLAGS}"
+MAKEFILE=	makefile
+ALL_TARGET=	${PORTNAME}
 
-.if !defined(NOPORTDOCS)
 MAN1=		${PORTNAME}.1
 MANCOMPRESSED=	yes
-.endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/share/highlight|${DATADIR}|' \
-		${WRKSRC}/${PORTNAME}/datadir.cpp
+	@${REINPLACE_CMD} -e \
+		's|/usr/share/highlight|${DATADIR}|' ${WRKSRC}/datadir.cpp
+	@${REINPLACE_CMD} -e 's|g++|$$(CXX)|g ; \
+		 s|-O2|$$(CXXFLAGS) $$(CPPFLAGS)|g ; \
+		 s|-L/usr/lib|$$(LDFLAGS)|g' ${WRKSRC}/makefile
 
 do-install:
-	cd ${WRKSRC} && ${GMAKE} ${INSTALL_TARGET}
-	${MKDIR} ${DATADIR} ${DOCSDIR}
-	${MKDIR} ${DATADIR}/helpmsg ${DATADIR}/langDefs ${DATADIR}/themes
-	${INSTALL_DATA} ${WRKSRC}/helpmsg/* ${DATADIR}/helpmsg
-	${INSTALL_DATA} ${WRKSRC}/langDefs/*.lang ${DATADIR}/langDefs
-	${INSTALL_DATA} ${WRKSRC}/langDefs/extensions.conf ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/themes/* ${DATADIR}/themes
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/../man/${MAN1}.gz ${MANPREFIX}/man/man1
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/../langDefs/extensions.conf ${DATADIR}
+	@${MKDIR} ${DATADIR}/helpmsg
+	${INSTALL_DATA} ${WRKSRC}/../helpmsg/* ${DATADIR}/helpmsg
+	@${MKDIR} ${DATADIR}/langDefs
+	${INSTALL_DATA} ${WRKSRC}/../langDefs/*.lang ${DATADIR}/langDefs
+	@${MKDIR} ${DATADIR}/themes
+	${INSTALL_DATA} ${WRKSRC}/../themes/* ${DATADIR}/themes
 .if !defined(NOPORTDOCS)
-	${INSTALL_MAN} ${WRKSRC}/man/${MAN1}.gz ${MANPREFIX}/man/man1
-.for i in AUTHORS README ChangeLog COPYING INSTALL
-	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+.for i in AUTHORS ChangeLog INSTALL README
+	${INSTALL_DATA} ${WRKSRC}/../${i} ${DOCSDIR}
 .endfor
-.endif # !defined(NOPORTDOCS)
+	@${MKDIR} ${EXAMPLESDIR}
+	${TAR} -C ${WRKSRC}/../utils -cf - . | \
+		${TAR} -C  ${EXAMPLESDIR} --unlink -xf -
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.mk>
--- textproc/highlight/distinfo	Fri Nov 14 12:01:40 2003
+++ textproc/highlight/distinfo	Sun Nov 30 13:42:32 2003
@@ -1, +1, @@ 
-MD5 (highlight-2.0-12.tar.gz) = d1538a74d826527cf6652cf6cc1b63f3
+MD5 (highlight-2.0-13.tar.gz) = 02287242f8ed460a965dcd5f2c3ec401
--- textproc/highlight/pkg-plist	Fri Nov 21 11:00:53 2003
+++ textproc/highlight/pkg-plist	Sun Nov 30 15:04:09 2003
@@ -1,9 +1,12 @@ 
 bin/highlight
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%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%%/frontend/highlight-pyqt-GUI-0.1-1.tar.gz
 %%DATADIR%%/extensions.conf
 %%DATADIR%%/helpmsg/de.help
 %%DATADIR%%/helpmsg/en.help
@@ -13,7 +16,9 @@ 
 %%DATADIR%%/langDefs/agda.lang
 %%DATADIR%%/langDefs/ampl.lang
 %%DATADIR%%/langDefs/amtrix.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
@@ -30,11 +35,14 @@ 
 %%DATADIR%%/langDefs/e.lang
 %%DATADIR%%/langDefs/euphoria.lang
 %%DATADIR%%/langDefs/exp.lang
+%%DATADIR%%/langDefs/flx.lang
 %%DATADIR%%/langDefs/fortran.lang
+%%DATADIR%%/langDefs/frink.lang
 %%DATADIR%%/langDefs/haskell.lang
 %%DATADIR%%/langDefs/httpd.lang
 %%DATADIR%%/langDefs/idl.lang
 %%DATADIR%%/langDefs/ini.lang
+%%DATADIR%%/langDefs/io.lang
 %%DATADIR%%/langDefs/j.lang
 %%DATADIR%%/langDefs/java.lang
 %%DATADIR%%/langDefs/js.lang
@@ -45,10 +53,15 @@ 
 %%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/ms.lang
+%%DATADIR%%/langDefs/nas.lang
 %%DATADIR%%/langDefs/nice.lang
 %%DATADIR%%/langDefs/nut.lang
+%%DATADIR%%/langDefs/oberon.lang
+%%DATADIR%%/langDefs/os.lang
 %%DATADIR%%/langDefs/pas.lang
 %%DATADIR%%/langDefs/php.lang
 %%DATADIR%%/langDefs/pike.lang
@@ -62,6 +75,7 @@ 
 %%DATADIR%%/langDefs/rexx.lang
 %%DATADIR%%/langDefs/rnc.lang
 %%DATADIR%%/langDefs/sc.lang
+%%DATADIR%%/langDefs/sml.lang
 %%DATADIR%%/langDefs/sh.lang
 %%DATADIR%%/langDefs/sma.lang
 %%DATADIR%%/langDefs/spn.lang
@@ -134,4 +148,9 @@ 
 @dirrm %%DATADIR%%/langDefs
 @dirrm %%DATADIR%%/helpmsg
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/frontend
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/cgi/php
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/cgi/perl
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/cgi
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%