svn commit: r351942 - in branches/2014Q2/graphics/tulip: . files

[Pietro Cerutti]

Author: gahr
Date: Wed Apr 23 13:47:49 2014
New Revision: 351942
URL: http://svnweb.freebsd.org/changeset/ports/351942
QAT: https://qat.redports.org/buildarchive/r351942/

Log:
  MFH: r351833
  
  - Add a couple of missing patches
  - Explicitely depend on graphics/jpeg
  - Remove DOCS
  
  Approved by:    portmgr

Added:
  branches/2014Q2/graphics/tulip/files/patch-CMakeLists.txt
     - copied unchanged from r351833, head/graphics/tulip/files/patch-CMakeLists.txt
  branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt
     - copied unchanged from r351833, head/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt
  branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp
     - copied unchanged from r351833, head/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp
Modified:
  branches/2014Q2/graphics/tulip/Makefile
Directory Properties:
  branches/2014Q2/   (props changed)

Modified: branches/2014Q2/graphics/tulip/Makefile
==============================================================================
--- branches/2014Q2/graphics/tulip/Makefile	Wed Apr 23 13:46:29 2014	(r351941)
+++ branches/2014Q2/graphics/tulip/Makefile	Wed Apr 23 13:47:49 2014	(r351942)
@@ -19,7 +19,8 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/prin
 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
@@ -43,13 +44,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>

Copied: branches/2014Q2/graphics/tulip/files/patch-CMakeLists.txt (from r351833, head/graphics/tulip/files/patch-CMakeLists.txt)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q2/graphics/tulip/files/patch-CMakeLists.txt	Wed Apr 23 13:47:49 2014	(r351942, copy of r351833, head/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/)

Copied: branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt (from r351833, head/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt	Wed Apr 23 13:47:49 2014	(r351942, copy of r351833, head/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)

Copied: branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp (from r351833, head/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp	Wed Apr 23 13:47:49 2014	(r351942, copy of r351833, head/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__)
+