From tkato@prontomail.com  Sun Dec 21 06:02:04 2003
Return-Path: <tkato@prontomail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6B07F16A4CF
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun, 21 Dec 2003 06:01:55 -0800 (PST)
Received: from hfep03.dion.ne.jp (hfep03.dion.ne.jp [203.181.105.69])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BD8EA43D53
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun, 21 Dec 2003 06:01:53 -0800 (PST)
	(envelope-from tkato@prontomail.com)
Received: from localhost ([61.204.120.54]) by hfep03.dion.ne.jp with SMTP
          id <20031221140150942.ZQBB@hfep03.dion.ne.jp>
          for <FreeBSD-gnats-submit@FreeBSD.org>;
          Sun, 21 Dec 2003 23:01:50 +0900
Message-Id: <20031221230025.586323da.tkato@prontomail.com>
Date: Sun, 21 Dec 2003 23:00:25 +0900
From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: textproc/highlight to 2.0.14

>Number:         60467
>Category:       ports
>Synopsis:       Update port: textproc/highlight to 2.0.14
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    krion
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 21 06:10:15 PST 2003
>Closed-Date:    Mon Dec 22 03:32:52 PST 2003
>Last-Modified:  Mon Dec 22 03:32:52 PST 2003
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.9-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Update to version 2.0-14

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/textproc/highlight/Makefile textproc/highlight/Makefile
--- /usr/ports/textproc/highlight/Makefile	Fri Dec  5 17:24:15 2003
+++ textproc/highlight/Makefile	Sun Dec 21 18:09:12 2003
@@ -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 @@
 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 @@
 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 -urN /usr/ports/textproc/highlight/distinfo textproc/highlight/distinfo
--- /usr/ports/textproc/highlight/distinfo	Fri Dec  5 17:24:15 2003
+++ textproc/highlight/distinfo	Sun Dec 21 18:01:26 2003
@@ -1 +1 @@
-MD5 (highlight-2.0-13.tar.gz) = 02287242f8ed460a965dcd5f2c3ec401
+MD5 (highlight-2.0-14.tar.gz) = 4c5d3b3e8c0a4aabd0a3377dbe880ac1
diff -urN /usr/ports/textproc/highlight/pkg-plist textproc/highlight/pkg-plist
--- /usr/ports/textproc/highlight/pkg-plist	Fri Dec  5 17:24:15 2003
+++ textproc/highlight/pkg-plist	Sun Dec 21 18:14:16 2003
@@ -6,7 +6,7 @@
 %%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
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->krion 
Responsible-Changed-By: krion 
Responsible-Changed-When: Sun Dec 21 06:20:52 PST 2003 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=60467 
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Mon Dec 22 03:32:45 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=60467 
>Unformatted:
