Date: Mon, 4 Jun 2007 03:30:29 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/113305: Update port: x11-toolkits/vdk Message-ID: <20070604033029.4a06708c.tkato432@yahoo.com> Resent-Message-ID: <200706031840.l53Ie6aY014837@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070604033029.4a06708c.tkato432>