Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Nov 2016 12:40:37 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r425617 - in head/math/speedcrunch: . files
Message-ID:  <201611071240.uA7Cebpf027649@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Nov  7 12:40:37 2016
New Revision: 425617
URL: https://svnweb.freebsd.org/changeset/ports/425617

Log:
  - Add LICENSE
  - Simplify patching
  - Regenerate patches
  - Add missing depends

Added:
  head/math/speedcrunch/files/patch-src_CMakeLists.txt
     - copied, changed from r425616, head/math/speedcrunch/files/patch-src__CMakeLists.txt
  head/math/speedcrunch/files/patch-src_SourceFiles.cmake
     - copied, changed from r425616, head/math/speedcrunch/files/patch-src__SourceFiles.cmake
Deleted:
  head/math/speedcrunch/files/patch-src__CMakeLists.txt
  head/math/speedcrunch/files/patch-src__SourceFiles.cmake
Modified:
  head/math/speedcrunch/Makefile

Modified: head/math/speedcrunch/Makefile
==============================================================================
--- head/math/speedcrunch/Makefile	Mon Nov  7 12:39:41 2016	(r425616)
+++ head/math/speedcrunch/Makefile	Mon Nov  7 12:40:37 2016	(r425617)
@@ -8,16 +8,14 @@ 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 <bsd.port.mk>

Copied and modified: head/math/speedcrunch/files/patch-src_CMakeLists.txt (from r425616, head/math/speedcrunch/files/patch-src__CMakeLists.txt)
==============================================================================
--- head/math/speedcrunch/files/patch-src__CMakeLists.txt	Mon Nov  7 12:39:41 2016	(r425616, copy source)
+++ head/math/speedcrunch/files/patch-src_CMakeLists.txt	Mon Nov  7 12:40:37 2016	(r425617)
@@ -1,6 +1,15 @@
---- ./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 @@
+--- 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 )
  
@@ -19,7 +28,7 @@
  
  # 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 @@
+@@ -98,6 +97,7 @@ TARGET_LINK_LIBRARIES(testevaluator ${QT
  ADD_TEST(testevaluator testevaluator)
  
  ADD_EXECUTABLE(testfloatnum ${testfloatnum_SOURCES})

Copied and modified: head/math/speedcrunch/files/patch-src_SourceFiles.cmake (from r425616, head/math/speedcrunch/files/patch-src__SourceFiles.cmake)
==============================================================================
--- head/math/speedcrunch/files/patch-src__SourceFiles.cmake	Mon Nov  7 12:39:41 2016	(r425616, copy source)
+++ head/math/speedcrunch/files/patch-src_SourceFiles.cmake	Mon Nov  7 12:40:37 2016	(r425617)
@@ -1,6 +1,6 @@
---- ./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 @@
+--- 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611071240.uA7Cebpf027649>