From d05b46757b491459a74f80d739f7d3501ca520bc Mon Sep 17 00:00:00 2001
From: krion <krion@FreeBSD.org>
Date: Mon, 22 Dec 2003 11:32:41 +0000
Subject: - Update to version 2.0.14

PR:		60467
Submitted by:	Ports Fury
---
 textproc/highlight/Makefile  | 9 ++++-----
 textproc/highlight/distinfo  | 2 +-
 textproc/highlight/pkg-plist | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'textproc/highlight')

diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile
index b276e4667d97..7bb0f262fab0 100644
--- a/textproc/highlight/Makefile
+++ b/textproc/highlight/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	highlight
-PORTVERSION=	2.0.13
+PORTVERSION=	2.0.14
 PORTEPOCH=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.andre-simon.de/zip/
@@ -20,8 +20,10 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS} -DHAVE_DECL_GETOPT" LDFLAGS="${LDFLAGS}"
 MAKEFILE=	makefile
+MAKE_ARGS=	CC="${CXX}" \
+		CFLAGS="${CXXFLAGS} ${CPPFLAGS} -DHAVE_DECL_GETOPT" \
+		LDFLAGS="${LDFLAGS}"
 ALL_TARGET=	${PORTNAME}
 
 MAN1=		${PORTNAME}.1
@@ -30,9 +32,6 @@ MANCOMPRESSED=	yes
 post-patch:
 	@${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:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/textproc/highlight/distinfo b/textproc/highlight/distinfo
index 047c8c92aea8..bc00d4cfb44c 100644
--- a/textproc/highlight/distinfo
+++ b/textproc/highlight/distinfo
@@ -1 +1 @@
-MD5 (highlight-2.0-13.tar.gz) = 02287242f8ed460a965dcd5f2c3ec401
+MD5 (highlight-2.0-14.tar.gz) = 4c5d3b3e8c0a4aabd0a3377dbe880ac1
diff --git a/textproc/highlight/pkg-plist b/textproc/highlight/pkg-plist
index 4f256d009a6a..13a03402be6f 100644
--- a/textproc/highlight/pkg-plist
+++ b/textproc/highlight/pkg-plist
@@ -6,7 +6,7 @@ bin/highlight
 %%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
+%%PORTDOCS%%%%EXAMPLESDIR%%/frontend/highlight-pyqt-GUI-0.1-2.tar.gz
 %%DATADIR%%/extensions.conf
 %%DATADIR%%/helpmsg/de.help
 %%DATADIR%%/helpmsg/en.help
-- 
cgit