From owner-svn-ports-all@FreeBSD.ORG Fri Feb 8 11:30:15 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 6AF09654; Fri, 8 Feb 2013 11:30:15 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4587AE51; Fri, 8 Feb 2013 11:30:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r18BUErB069258; Fri, 8 Feb 2013 11:30:14 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r18BUE9W069257; Fri, 8 Feb 2013 11:30:14 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201302081130.r18BUE9W069257@svn.freebsd.org> From: Dirk Meyer Date: Fri, 8 Feb 2013 11:30:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r311936 - head/graphics/graphviz X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Feb 2013 11:30:15 -0000 Author: dinoex Date: Fri Feb 8 11:30:13 2013 New Revision: 311936 URL: http://svnweb.freebsd.org/changeset/ports/311936 Log: - add option NVTHREADS for compatibility with nvidia libs PR: 171949 Modified: head/graphics/graphviz/Makefile Modified: head/graphics/graphviz/Makefile ============================================================================== --- head/graphics/graphviz/Makefile Fri Feb 8 09:42:12 2013 (r311935) +++ head/graphics/graphviz/Makefile Fri Feb 8 11:30:13 2013 (r311936) @@ -63,7 +63,7 @@ PDOCS_HTML= doc/*.html doc/info/*.gif USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} -OPTIONS_DEFINE= XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO LIBRSVG2 GTK2 GDK_PIXBUF GNOMEUI SMYRNA GVEDIT MING DEVIL GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL GUILE TK +OPTIONS_DEFINE= XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO LIBRSVG2 GTK2 GDK_PIXBUF GNOMEUI SMYRNA GVEDIT MING DEVIL GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL GUILE TK NVTHREADS OPTIONS_DEFAULT?= XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO NO_OPTIONS_SORT=yes DIGCOLA_DESC= neato layout engine wiwth DIGCOLA features @@ -85,6 +85,7 @@ LUA_DESC= Lua bindings (swig) TCL_DESC= TCL bindings (swig) GUILE_DESC= Guile bindings (swig) TK_DESC= TK toolkit support +NVTHREADS_DESC= Link with threads (needed for nvidia) .include @@ -398,6 +399,11 @@ CONFIGURE_ARGS+= --with-ghostscript=no PLIST_SUB+= WITH_GHOSTSCRIPT="@comment " .endif +.if ${PORT_OPTIONS:MNVTHREADS} +CFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} +.endif + post-patch: @${FIND} ${WRKSRC} -name Makefile.in | \ ${XARGS} ${REINPLACE_CMD} \ @@ -427,7 +433,7 @@ post-patch: @${REINPLACE_CMD} -e 's|#include "gui.h"|#include "gui/gui.h"|' \ ${WRKSRC}/cmd/smyrna/tvnodes.h ${CP} ${WRKSRC}/lib/cgraph/cgraph.h ${WRKSRC}/plugin/ming/ -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's| install-txtDATA$$||' \ ${WRKSRC}/Makefile.in .endif @@ -437,7 +443,7 @@ post-install: install-ldconfig-file ${MAKE} ${INSTALL_TARGET} cd ${WRKSRC} && \ ${INSTALL_DATA} ${FIX_INCLUDE} ${PREFIX}/include/graphviz/ -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}/html @${MKDIR} ${DOCSDIR}/pdf @@ -446,7 +452,7 @@ post-install: install-ldconfig-file ${INSTALL_DATA} ${PDOCS_PDF} ${DOCSDIR}/pdf/ && \ ${INSTALL_DATA} ${PDOCS_HTML} ${DOCSDIR}/html/ .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${ECHO_MSG} "Installing demo data..." @${MKDIR} ${EXAMPLESDIR} ${INSTALL_SCRIPT} \