- Add a couple of missing patches

- Explicitely depend on graphics/jpeg
- Remove DOCS

4 files changed, 37 insertions, 12 deletions

diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index 2b11c8f..47bc221 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -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>
diff --git a/graphics/tulip/files/patch-CMakeLists.txt b/graphics/tulip/files/patch-CMakeLists.txt
new file mode 100644
index 0000000..b5455f8
--- /dev/null
+++ b/graphics/tulip/files/patch-CMakeLists.txt
@@ -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/)
diff --git a/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt b/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt
new file mode 100644
index 0000000..926414c
--- /dev/null
+++ b/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt
@@ -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)
diff --git a/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp b/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp
new file mode 100644
index 0000000..696a0fc
--- /dev/null
+++ b/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp
@@ -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__)
+