Date: Tue, 22 Apr 2014 13:24:48 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351833 - in head/graphics/tulip: . files Message-ID: <201404221324.s3MDOmID040472@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Tue Apr 22 13:24:48 2014 New Revision: 351833 URL: http://svnweb.freebsd.org/changeset/ports/351833 QAT: https://qat.redports.org/buildarchive/r351833/ Log: - Add a couple of missing patches - Explicitely depend on graphics/jpeg - Remove DOCS Added: head/graphics/tulip/files/patch-CMakeLists.txt (contents, props changed) head/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt (contents, props changed) head/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp (contents, props changed) Modified: head/graphics/tulip/Makefile Modified: head/graphics/tulip/Makefile ============================================================================== --- head/graphics/tulip/Makefile Tue Apr 22 13:11:44 2014 (r351832) +++ head/graphics/tulip/Makefile Tue Apr 22 13:24:48 2014 (r351833) @@ -10,12 +10,11 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}_src MAINTAINER= gahr@FreeBSD.org COMMENT= System dedicated to the visualization of huge graphs -OPTIONS_DEFINE= DOCS - LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ libQxtCore.so:${PORTSDIR}/devel/libqxt \ libOGDF.so:${PORTSDIR}/math/ogdf \ - libpng.so:${PORTSDIR}/graphics/png + libpng.so:${PORTSDIR}/graphics/png \ + libjpeg.so:${PORTSDIR}/graphics/jpeg USES= cmake:outsource compiler:c++11-lib shebangfix dos2unix SHEBANG_FILES= tulip-config.in @@ -39,13 +38,4 @@ WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_SUB+= TULIP_VERSION=${PORTVERSION} \ TULIP_VERS=${PORTVERSION:R} -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= * -post-install: - ${INSTALL} -d ${STAGEDIR}${DOCSDIR} - (cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}-html && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) -.endif - .include <bsd.port.mk> Added: head/graphics/tulip/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/tulip/files/patch-CMakeLists.txt Tue Apr 22 13:24:48 2014 (r351833) @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2014-04-18 10:21:16.000000000 +0200 ++++ CMakeLists.txt 2014-04-18 10:22:19.000000000 +0200 +@@ -274,8 +274,8 @@ + SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) + SET(FTGLLibrary ftgl-tulip-${TulipMMVersion}) + SET(qscintilla2Include ${PROJECT_SOURCE_DIR}/thirdparty/QScintilla-gpl-2.5.1/Qt4/) +-SET(OGDFInclude ${PROJECT_SOURCE_DIR}/thirdparty/OGDF) +-SET(OGDFLibrary OGDF-tulip-${TulipMMVersion}) ++#SET(OGDFInclude ${PROJECT_SOURCE_DIR}/thirdparty/OGDF) ++#SET(OGDFLibrary OGDF-tulip-${TulipMMVersion}) + SET(QHULLInclude ${PROJECT_SOURCE_DIR}/thirdparty) + SET(YajlLibrary yajl-tulip-${TulipMMVersion}) + SET(TulipCoreInclude ${PROJECT_SOURCE_DIR}/library/tulip-core/include/) Added: head/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt Tue Apr 22 13:24:48 2014 (r351833) @@ -0,0 +1,11 @@ +--- software/crash_handling/CMakeLists.txt.orig 2014-04-18 11:54:11.000000000 +0200 ++++ software/crash_handling/CMakeLists.txt 2014-04-18 11:54:21.000000000 +0200 +@@ -39,7 +39,7 @@ + ADD_LIBRARY(crash_handling STATIC ${LIB_SRCS}) + + IF(UNIX) +- TARGET_LINK_LIBRARIES(crash_handling dl) ++ TARGET_LINK_LIBRARIES(crash_handling) + ENDIF(UNIX) + + IF(HAVE_BFD) Added: head/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp Tue Apr 22 13:24:48 2014 (r351833) @@ -0,0 +1,11 @@ +--- software/crash_handling/CrashHandling.cpp.orig 2014-04-18 10:33:31.000000000 +0200 ++++ software/crash_handling/CrashHandling.cpp 2014-04-18 10:34:25.000000000 +0200 +@@ -38,7 +38,7 @@ + /* + Linux/MacOS-specific handling + */ +-#if defined(__unix__) || defined(__APPLE__) ++#if (defined(__unix__) || defined(__APPLE__)) && !defined(__FreeBSD__) + + # if defined(__i386__) || defined(__amd64__) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404221324.s3MDOmID040472>