From owner-freebsd-ports-bugs@FreeBSD.ORG  Sun Jun  3 18:40:07 2007
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
X-Original-To: freebsd-ports-bugs@hub.freebsd.org
Delivered-To: freebsd-ports-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5CA8A16A474
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Sun,  3 Jun 2007 18:40:07 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40])
	by mx1.freebsd.org (Postfix) with ESMTP id 27EC513C4AD
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Sun,  3 Jun 2007 18:40:07 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l53Ie6nI014842
	for <freebsd-ports-bugs@freefall.freebsd.org>;
	Sun, 3 Jun 2007 18:40:07 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l53Ie6aY014837;
	Sun, 3 Jun 2007 18:40:06 GMT (envelope-from gnats)
Resent-Date: Sun, 3 Jun 2007 18:40:06 GMT
Resent-Message-Id: <200706031840.l53Ie6aY014837@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-ports-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
	KATO Tsuguru <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id EF2E716A41F
	for <FreeBSD-gnats-submit@FreeBSD.org>;
	Sun,  3 Jun 2007 18:31:35 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa05.dion.ne.jp (msa05.dion.ne.jp [222.3.140.168])
	by mx1.freebsd.org (Postfix) with ESMTP id C23E413C447
	for <FreeBSD-gnats-submit@FreeBSD.org>;
	Sun,  3 Jun 2007 18:31:35 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from localhost.localdomain (ZT066083.ppp.dion.ne.jp [59.128.66.83])
	by msa105.dion.ne.jp (DION MAIL) with ESMTP id DEC75538037
	for <FreeBSD-gnats-submit@FreeBSD.org>;
	Mon,  4 Jun 2007 03:31:33 +0900 (JST)
Message-Id: <20070604033029.4a06708c.tkato432@yahoo.com>
Date: Mon, 4 Jun 2007 03:30:29 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
X-Mailman-Approved-At: Sun, 03 Jun 2007 18:40:59 +0000
Cc: 
Subject: ports/113305: Update port: x11-toolkits/vdk
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Jun 2007 18:40:07 -0000


>Number:         113305
>Category:       ports
>Synopsis:       Update port: x11-toolkits/vdk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 03 18:40:06 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 6.2-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Fix build with gcc4

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11-toolkits/vdk/Makefile x11-toolkits/vdk/Makefile
--- /usr/ports/x11-toolkits/vdk/Makefile	Sun May 20 13:59:17 2007
+++ x11-toolkits/vdk/Makefile	Mon Jun  4 02:03:21 2007
@@ -28,6 +28,14 @@
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib -lgnuregex ${PTHREAD_LIBS}
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 502010
+GNU_REGEX_H=	gnu/regex.h
+.else
+GNU_REGEX_H=	gnuregex.h
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|CXXFLAGS="-s"|CXXFLAGS="$$CXXFLAGS"|g' ${WRKSRC}/configure
@@ -35,7 +43,11 @@
 	@${REINPLACE_CMD} -e 's|-lpthread|${LDFLAGS}|g' ${WRKSRC}/${file}
 .endfor
 .for file in vdk/FileDialog.h vdk/gtksourcebuffer.h vdk/gtksourcetag.h
-	@${REINPLACE_CMD} -e 's|<regex\.h>|<gnuregex.h>|g' ${WRKSRC}/${file}
+	@${REINPLACE_CMD} -e 's|<regex\.h>|<${GNU_REGEX_H}>|g' ${WRKSRC}/${file}
 .endfor
+	@${REINPLACE_CMD} -e \
+		's|VDKComboEntry::||g' ${WRKSRC}/vdk/vdkcomboentry.h
+	@${REINPLACE_CMD} -e \
+		's|VDKFileChooser::||g' ${WRKSRC}/vdk/vdkfilechooser.h
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
>Unformatted: