Attachment #180473 for bug #217460




# $FreeBSD$

PORTNAME=	speedcrunch
DISTVERSION=	0.12
CATEGORIES=	math
MASTER_SITES=	http://bitbucket.org/heldercorreia/${PORTNAME}/get/
DISTNAME=	branch-${DISTVERSION}

MAINTAINER=	mikael.urankar@gmail.com
COMMENT=	Keyboard-oriented desktop scientific calculator

LICENSE=	GPLv2+

WRKSRC=		${WRKDIR}/heldercorreia-speedcrunch-7f2565d6a0ad
GH_PROJECT=	SpeedCrunch

USES=		cmake:outsource gmake
CMAKE_SOURCE_PATH=	${WRKSRC}/src
USE_QT5=	buildtools core gui help qmake_build qml widgets
USE_XORG=	x11

PLIST_FILES=	bin/speedcrunch \
		share/applications/speedcrunch.desktop \
		share/appdata/speedcrunch.appdata.xml \
		share/pixmaps/speedcrunch.png

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (speedcrunch-SpeedCrunch-0.11_GH0.tar.gz) = 3632f2b40ac628d2665c838643cc99c50e89b60f54ac2a82b4533d254f0cb6eb	1	TIMESTAMP = 1488474133
2	SIZE (speedcrunch-SpeedCrunch-0.11_GH0.tar.gz) = 1516510	2	SHA256 (branch-0.12.tar.gz) = 24d8b0d9f1386d74fe75f7f86d56fd8a57405887b30da55a12dc7d1078780485
		3	SIZE (branch-0.12.tar.gz) = 3667373




--- src/CMakeLists.txt.orig	2014-01-29 21:24:08 UTC
+++ src/CMakeLists.txt
@@ -19,8 +19,6 @@ IF(COMMAND cmake_policy)
  CMAKE_POLICY(SET CMP0005 OLD)   # remove this and the quoted arguments in
                                  # ADD_DEFINITONS() once CMake 2.6 is used
 ENDIF(COMMAND cmake_policy)
-SET(CMAKE_COLOR_MAKEFILE      ON)
-SET(CMAKE_VERBOSE_MAKEFILE    OFF)
 SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 
 SET(QT_MIN_VERSION "4.8.0")
@@ -71,12 +69,13 @@ ENDIF( APPLE )
 
 ADD_CUSTOM_TARGET( confclean COMMAND rm -rf Makefile CMakeFiles/ CMakeCache.txt cmake_install.cmake DartTestfile.txt install_manifest.txt )
 
-find_library(x11 X11)
-IF(x11)
-  TARGET_LINK_LIBRARIES(${PROGNAME} ${QT_LIBRARIES} X11)
-ELSE(x11)
+find_package(X11)
+IF(X11_FOUND)
+  INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
+  TARGET_LINK_LIBRARIES(${PROGNAME} ${QT_LIBRARIES} ${X11_LIBRARIES})
+ELSE(X11_FOUND)
   TARGET_LINK_LIBRARIES(${PROGNAME} ${QT_LIBRARIES})
-ENDIF(x11)
+ENDIF(X11_FOUND)
 
 # only needed for static builds when directx is enabled in qt and you
 # get a linker error because of missing a directx function
@@ -98,6 +97,7 @@ TARGET_LINK_LIBRARIES(testevaluator ${QT
 ADD_TEST(testevaluator testevaluator)
 
 ADD_EXECUTABLE(testfloatnum ${testfloatnum_SOURCES})
+TARGET_LINK_LIBRARIES(testfloatnum m)
 ADD_TEST(testfloatnum testfloatnum)
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} thirdparty core gui math)

Lines 1-10 Link Here

(-)files/patch-src_SourceFiles.cmake (-10 lines)
1	--- src/SourceFiles.cmake.orig 2014-01-29 21:24:08 UTC
2	+++ src/SourceFiles.cmake
3	@@ -55,7 +55,6 @@ gui/mainwindow.h
4
5	set(speedcrunch_SOURCES
6	main.cpp
7	-thirdparty/binreloc.c
8	core/book.cpp
9	core/constants.cpp
10	core/evaluator.cpp

Lines 1-3 Link Here

(-)pkg-plist (-3 lines)
1	bin/speedcrunch
2	share/applications/speedcrunch.desktop
3	share/pixmaps/speedcrunch.png

Return to bug 217460

Lines 2-21 Link Here

(-)Makefile (-7 / +13 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= speedcrunch	4	PORTNAME= speedcrunch
5	DISTVERSION= 0.11	5	DISTVERSION= 0.12
6	CATEGORIES= math	6	CATEGORIES= math
		7	MASTER_SITES= http://bitbucket.org/heldercorreia/${PORTNAME}/get/
		8	DISTNAME= branch-${DISTVERSION}
7		9
8	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= mikael.urankar@gmail.com
9	COMMENT= Keyboard-oriented desktop scientific calculator	11	COMMENT= Keyboard-oriented desktop scientific calculator
10		12
11	LICENSE= GPLv2+	13	LICENSE= GPLv2+
12		14
13	USE_GITHUB= yes	15	WRKSRC= ${WRKDIR}/heldercorreia-speedcrunch-7f2565d6a0ad
14	GH_PROJECT= SpeedCrunch
15		16
16	USES= cmake:outsource	17	USES= cmake:outsource gmake
17	CMAKE_SOURCE_PATH= ${WRKSRC}/src	18	CMAKE_SOURCE_PATH= ${WRKSRC}/src
18	USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui network	19	USE_QT5= buildtools core gui help qmake_build qml widgets
19	USE_XORG= x11 xext sm ice	20	USE_XORG= x11
20		21
		22	PLIST_FILES= bin/speedcrunch \
		23	share/applications/speedcrunch.desktop \
		24	share/appdata/speedcrunch.appdata.xml \
		25	share/pixmaps/speedcrunch.png
		26
21	.include <bsd.port.mk>	27	.include <bsd.port.mk>

Lines 1-38 Link Here

(-)files/patch-src_CMakeLists.txt (-38 lines)
1	--- src/CMakeLists.txt.orig 2014-01-29 21:24:08 UTC
2	+++ src/CMakeLists.txt
3	@@ -19,8 +19,6 @@ IF(COMMAND cmake_policy)
4	CMAKE_POLICY(SET CMP0005 OLD) # remove this and the quoted arguments in
5	# ADD_DEFINITONS() once CMake 2.6 is used
6	ENDIF(COMMAND cmake_policy)
7	-SET(CMAKE_COLOR_MAKEFILE ON)
8	-SET(CMAKE_VERBOSE_MAKEFILE OFF)
9	SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
10
11	SET(QT_MIN_VERSION "4.8.0")
12	@@ -71,12 +69,13 @@ ENDIF( APPLE )
13
14	ADD_CUSTOM_TARGET( confclean COMMAND rm -rf Makefile CMakeFiles/ CMakeCache.txt cmake_install.cmake DartTestfile.txt install_manifest.txt )
15
16	-find_library(x11 X11)
17	-IF(x11)
18	- TARGET_LINK_LIBRARIES(${PROGNAME} ${QT_LIBRARIES} X11)
19	-ELSE(x11)
20	+find_package(X11)
21	+IF(X11_FOUND)
22	+ INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
23	+ TARGET_LINK_LIBRARIES(${PROGNAME} ${QT_LIBRARIES} ${X11_LIBRARIES})
24	+ELSE(X11_FOUND)
25	TARGET_LINK_LIBRARIES(${PROGNAME} ${QT_LIBRARIES})
26	-ENDIF(x11)
27	+ENDIF(X11_FOUND)
28
29	# only needed for static builds when directx is enabled in qt and you
30	# get a linker error because of missing a directx function
31	@@ -98,6 +97,7 @@ TARGET_LINK_LIBRARIES(testevaluator ${QT
32	ADD_TEST(testevaluator testevaluator)
33
34	ADD_EXECUTABLE(testfloatnum ${testfloatnum_SOURCES})
35	+TARGET_LINK_LIBRARIES(testfloatnum m)
36	ADD_TEST(testfloatnum testfloatnum)
37
38	INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} thirdparty core gui math)