4 files changed, 48 insertions, 22 deletions

diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index 99652b926f6a..29e602f1dc7c 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -2,20 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	tulip
-PORTVERSION=	4.6.0
-PORTREVISION=	2
+PORTVERSION=	4.6.1
+DISTVERSIONSUFFIX=	_src
 CATEGORIES=	graphics
 MASTER_SITES=	SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}_src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	System dedicated to the visualization of huge graphs
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libOGDF.so:${PORTSDIR}/math/ogdf \
+LICENSE=	LGPL3
+
+LIB_DEPENDS=	libquazip.so:${PORTSDIR}/archivers/quazip \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
-		libquazip.so:${PORTSDIR}/archivers/quazip \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+		libOGDF.so:${PORTSDIR}/math/ogdf \
+		libfreetype.so:${PORTSDIR}/print/freetype2
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		cmake:outsource compiler:c++11-lib dos2unix execinfo python \
 		shebangfix
@@ -24,18 +27,38 @@ DOS2UNIX_FILES=	software/tulip/src/main.cpp
 USE_CXXSTD=	c++11
 USE_GL=		glew glut
 USE_GNOME=	libxml2
-USE_QT4=	corelib gui network opengl webkit xml xmlpatterns \
-		qmake_build moc_build rcc_build uic_build
+CMAKE_ARGS=	-DBUILD_DOC:BOOL=OFF \
+		-DOGDFInclude:STRING=${LOCALBASE}/include \
+		-DOGDFLibrary:STRING=${LOCALBASE}/lib/libOGDF.so
+USE_LDCONFIG=	${PREFIX}/lib/tulip
+
 CXXFLAGS+=	-fPIC -I${LOCALBASE}/include -DNDEBUG -DOGDF_DLL
 LDFLAGS+=	-L${LOCALBASE}/lib
-CMAKE_ARGS=	-DOGDFLibrary=${LOCALBASE}/lib/libOGDF.so \
-		-DOGDFInclude=${LOCALBASE}/include \
-		-DBUILD_DOC:BOOL=false
-USE_LDCONFIG=	${PREFIX}/lib/tulip
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+PLIST_SUB=	TULIP_VERSION="${PORTVERSION}" \
+		TULIP_VERS="${PORTVERSION:R}"
+
+DESKTOP_ENTRIES="Tulip" "" "${PREFIX}/share/pixmaps.tulip.png" "tulip" "" ""
+
+OPTIONS_SINGLE=		GUI
+OPTIONS_SINGLE_GUI=	QT4 QT5
+OPTIONS_DEFAULT=	QT4
+
+QT4_USE=		qt4=corelib,gui,network,opengl,webkit \
+			qt4=xml,xmlpatterns \
+			qt4=moc_build,qmake_build,rcc_build,uic_build
+QT4_CMAKE_ON=		-DUSE_QT5_IF_INSTALLED:BOOL=OFF
+QT5_USE=		qt5=core,gui,network,opengl,webkit,widgets \
+			qt5=xml,xmlpatterns \
+			qt5=buildtools_build,qmake_build
+QT5_CMAKE_ON=		-DUSE_QT5_IF_INSTALLED:BOOL=ON
+
+post-build:
+	@${LN} -sf logo32x32.png \
+		${WRKSRC}/library/tulip-gui/resources/icons/tulip.png
 
-PLIST_SUB+=	TULIP_VERSION=${PORTVERSION} \
-		TULIP_VERS=${PORTVERSION:R}
+post-install:
+	(cd ${WRKSRC}/library/tulip-gui/resources/icons && ${INSTALL_DATA} \
+		tulip.png ${STAGEDIR}${PREFIX}/share/pixmaps)
 
 .include <bsd.port.mk>
diff --git a/graphics/tulip/distinfo b/graphics/tulip/distinfo
index 170ecf15689d..bb96cc783a7c 100644
--- a/graphics/tulip/distinfo
+++ b/graphics/tulip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tulip-4.6.0_src.tar.gz) = 6012dab496883b4e835bf7b4d7c2b7f4df7f5e05c00a2345f8a0d93d5c2eacd7
-SIZE (tulip-4.6.0_src.tar.gz) = 82681832
+SHA256 (tulip-4.6.1_src.tar.gz) = 27ab129af9541b94bfb6f63497b4055a298a3058be58795b3bc67c2d9789a18b
+SIZE (tulip-4.6.1_src.tar.gz) = 82574518
diff --git a/graphics/tulip/pkg-descr b/graphics/tulip/pkg-descr
index 94ae50e6e940..a85f9d863ba9 100644
--- a/graphics/tulip/pkg-descr
+++ b/graphics/tulip/pkg-descr
@@ -1,7 +1,7 @@
-Tulip software is a system dedicated to the visualization of huge graphs. It
-manages graphs with a number of elements(node and edges) up to 500.000 on a
-personal computer(PIII 600, with 256mo). Its SuperGraph technology architecture
-enables to do the following things :
+Tulip software is a system dedicated to the visualization of huge
+graphs. It manages graphs with a number of elements(node and edges) up
+to 500.000 on a personal computer(PIII 600, with 256mo). Its SuperGraph
+technology architecture enables to do the following things :
    * 3D visualizations
    * 3D modifications
    * Plug-in support for easy evolution
diff --git a/graphics/tulip/pkg-plist b/graphics/tulip/pkg-plist
index aed843115047..8ce0ec44b639 100644
--- a/graphics/tulip/pkg-plist
+++ b/graphics/tulip/pkg-plist
@@ -233,6 +233,7 @@ include/tulip/StlFunctions.h
 include/tulip/StlIterator.h
 include/tulip/StoredType.h
 include/tulip/StringCollection.h
+include/tulip/StringEditor.h
 include/tulip/StringProperty.h
 include/tulip/StringsListSelectionDialog.h
 include/tulip/StringsListSelectionWidget.h
@@ -613,6 +614,7 @@ lib/tulip/view/libpythonscriptview-%%TULIP_VERSION%%.so
 %%DATADIR%%/bitmaps/samplePictures/741.png
 %%DATADIR%%/bitmaps/samplePictures/891.png
 %%DATADIR%%/bitmaps/titlebarGradient.png
+%%DATADIR%%/bitmaps/tulip.ico
 %%DATADIR%%/bitmaps/welcomelogo.bmp
 %%DATADIR%%/wizards/README.txt
 %%DATADIR%%/wizards/tlpalgorithm/algorithm.cmake
@@ -649,3 +651,4 @@ lib/tulip/view/libpythonscriptview-%%TULIP_VERSION%%.so
 %%DATADIR%%/wizards/tlpview/view.cpp
 %%DATADIR%%/wizards/tlpview/view.h
 %%DATADIR%%/wizards/tlpview/wizard.xml
+share/pixmaps/tulip.png