diff -ruNd speedcrunch.orig/Makefile speedcrunch/Makefile --- speedcrunch.orig/Makefile 2016-11-07 12:40:37 UTC +++ speedcrunch/Makefile @@ -2,20 +2,30 @@ # $FreeBSD: head/math/speedcrunch/Makefile 425617 2016-11-07 12:40:37Z amdmi3 $ PORTNAME= speedcrunch -DISTVERSION= 0.11 +DISTVERSION= 0.12 +DISTVERSIONSUFFIX= -${BB_COMMIT} CATEGORIES= math +MASTER_SITES= http://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mikael.urankar@gmail.com COMMENT= Keyboard-oriented desktop scientific calculator LICENSE= GPLv2+ -USE_GITHUB= yes -GH_PROJECT= SpeedCrunch +BB_ACCOUNT= heldercorreia +BB_PROJECT= ${PORTNAME} +BB_COMMIT= 7f2565d6a0ad -USES= cmake:outsource +WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT} + +USES= cmake:outsource gmake CMAKE_SOURCE_PATH= ${WRKSRC}/src -USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui network -USE_XORG= x11 xext sm ice +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 diff -ruNd speedcrunch.orig/distinfo speedcrunch/distinfo --- speedcrunch.orig/distinfo 2015-05-07 16:32:43 UTC +++ speedcrunch/distinfo @@ -1,2 +1,3 @@ -SHA256 (speedcrunch-SpeedCrunch-0.11_GH0.tar.gz) = 3632f2b40ac628d2665c838643cc99c50e89b60f54ac2a82b4533d254f0cb6eb -SIZE (speedcrunch-SpeedCrunch-0.11_GH0.tar.gz) = 1516510 +TIMESTAMP = 1486560374 +SHA256 (speedcrunch-0.12-7f2565d6a0ad.tar.gz) = 24d8b0d9f1386d74fe75f7f86d56fd8a57405887b30da55a12dc7d1078780485 +SIZE (speedcrunch-0.12-7f2565d6a0ad.tar.gz) = 3667373 diff -ruNd speedcrunch.orig/files/patch-src_CMakeLists.txt speedcrunch/files/patch-src_CMakeLists.txt --- speedcrunch.orig/files/patch-src_CMakeLists.txt 2016-11-07 12:40:37 UTC +++ speedcrunch/files/patch-src_CMakeLists.txt @@ -1,38 +0,0 @@ ---- 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) diff -ruNd speedcrunch.orig/files/patch-src_SourceFiles.cmake speedcrunch/files/patch-src_SourceFiles.cmake --- speedcrunch.orig/files/patch-src_SourceFiles.cmake 2016-11-07 12:40:37 UTC +++ speedcrunch/files/patch-src_SourceFiles.cmake @@ -1,10 +0,0 @@ ---- src/SourceFiles.cmake.orig 2014-01-29 21:24:08 UTC -+++ src/SourceFiles.cmake -@@ -55,7 +55,6 @@ gui/mainwindow.h - - set(speedcrunch_SOURCES - main.cpp --thirdparty/binreloc.c - core/book.cpp - core/constants.cpp - core/evaluator.cpp diff -ruNd speedcrunch.orig/pkg-plist speedcrunch/pkg-plist --- speedcrunch.orig/pkg-plist 2014-03-31 10:57:12 UTC +++ speedcrunch/pkg-plist @@ -1,3 +0,0 @@ -bin/speedcrunch -share/applications/speedcrunch.desktop -share/pixmaps/speedcrunch.png