Index: head/math/speedcrunch/Makefile =================================================================== --- head/math/speedcrunch/Makefile (revision 425616) +++ head/math/speedcrunch/Makefile (revision 425617) @@ -1,23 +1,21 @@ # Created by: Yinghong.Liu # $FreeBSD$ PORTNAME= speedcrunch DISTVERSION= 0.11 CATEGORIES= math MAINTAINER= ports@FreeBSD.org COMMENT= Keyboard-oriented desktop scientific calculator -USE_QT4= qmake_build moc_build rcc_build uic_build gui network -USES= cmake:outsource -CMAKE_SOURCE_PATH= ${WRKSRC}/src +LICENSE= GPLv2+ USE_GITHUB= yes GH_PROJECT= SpeedCrunch -pre-configure: - ${REINPLACE_CMD} -e '/CMAKE_COLOR_MAKEFILE/d' \ - -e '/CMAKE_VERBOSE_MAKEFILE/d' \ - ${WRKSRC}/src/CMakeLists.txt +USES= cmake:outsource +CMAKE_SOURCE_PATH= ${WRKSRC}/src +USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui network +USE_XORG= x11 xext sm ice .include Index: head/math/speedcrunch/files/patch-src__CMakeLists.txt =================================================================== --- head/math/speedcrunch/files/patch-src__CMakeLists.txt (revision 425616) +++ head/math/speedcrunch/files/patch-src__CMakeLists.txt (nonexistent) @@ -1,29 +0,0 @@ ---- ./src/CMakeLists.txt.orig 2014-01-29 21:24:08.000000000 +0000 -+++ ./src/CMakeLists.txt 2014-03-30 08:34:09.135721829 +0000 -@@ -71,12 +71,13 @@ - - 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 +99,7 @@ - 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) Property changes on: head/math/speedcrunch/files/patch-src__CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/speedcrunch/files/patch-src__SourceFiles.cmake =================================================================== --- head/math/speedcrunch/files/patch-src__SourceFiles.cmake (revision 425616) +++ head/math/speedcrunch/files/patch-src__SourceFiles.cmake (nonexistent) @@ -1,10 +0,0 @@ ---- ./src/SourceFiles.cmake.orig 2014-01-29 21:24:08.000000000 +0000 -+++ ./src/SourceFiles.cmake 2014-03-30 08:33:39.027726508 +0000 -@@ -55,7 +55,6 @@ - - set(speedcrunch_SOURCES - main.cpp --thirdparty/binreloc.c - core/book.cpp - core/constants.cpp - core/evaluator.cpp Property changes on: head/math/speedcrunch/files/patch-src__SourceFiles.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/speedcrunch/files/patch-src_CMakeLists.txt =================================================================== --- head/math/speedcrunch/files/patch-src_CMakeLists.txt (nonexistent) +++ head/math/speedcrunch/files/patch-src_CMakeLists.txt (revision 425617) @@ -0,0 +1,38 @@ +--- 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) Property changes on: head/math/speedcrunch/files/patch-src_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/speedcrunch/files/patch-src_SourceFiles.cmake =================================================================== --- head/math/speedcrunch/files/patch-src_SourceFiles.cmake (nonexistent) +++ head/math/speedcrunch/files/patch-src_SourceFiles.cmake (revision 425617) @@ -0,0 +1,10 @@ +--- 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 Property changes on: head/math/speedcrunch/files/patch-src_SourceFiles.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property