Page MenuHomeFreeBSD
Files F167391579

D12489.id33419.diff
No OneTemporary
Actions

D12489.id33419.diff
View Options

Index: deskutils/charmtimetracker/Makefile
===================================================================
--- deskutils/charmtimetracker/Makefile
+++ deskutils/charmtimetracker/Makefile
@@ -2,32 +2,29 @@
# $FreeBSD$
PORTNAME= charmtimetracker
-PORTVERSION= 1.11.4
+DISTVERSION= 1.11.4
+PORTREVISION= 1
CATEGORIES= deskutils
-MAINTAINER= avg@icyb.net.ua
+MAINTAINER= adridg@FreeBSD.org
COMMENT= Time tracker
+# The top-level license file is GPLv2, but all the sources say
+# (at your option) GPLv2+ .
LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
-BROKEN_powerpc64= fails to compile: cc1plus: unrecognized command line option "-std=c++0x"
+USES= cmake:outsource compiler:c++11-lib
+CMAKE_ARGS= -DCharm_VERSION:STRING=${PORTVERSION}
USE_GITHUB= yes
GH_ACCOUNT= KDAB
GH_PROJECT= Charm
-USES= cmake
-CMAKE_ARGS+= -DCharm_VERSION:STRING=${PORTVERSION} -DCHARM_FORCE_QT4=true
-USE_QT4= qmake_build moc_build rcc_build uic_build corelib dbus gui \
- network qtestlib script sql sql-sqlite3 xml
-USE_XORG= ice x11 xext xscrnsaver
-INSTALLS_ICONS= yes
-
-PORTDOCS= ReadMe.txt
-
-OPTIONS_DEFINE= DOCS
-
-post-install:
- ${RM} ${STAGEDIR}${DOCSDIR}/License.txt
+USE_QT5= core dbus gui \
+ network printsupport script sql sql-sqlite3 \
+ testlib widgets xml \
+ buildtools_build qmake_build
+USE_XORG= ice x11 xcb xext xscrnsaver
.include <bsd.port.mk>
Index: deskutils/charmtimetracker/files/patch-CMakeLists.txt
===================================================================
--- deskutils/charmtimetracker/files/patch-CMakeLists.txt
+++ deskutils/charmtimetracker/files/patch-CMakeLists.txt
@@ -1,6 +1,51 @@
---- CMakeLists.txt.orig 2012-04-19 18:05:29.938959913 +0300
-+++ CMakeLists.txt 2012-04-19 18:05:39.398959691 +0300
-@@ -191,7 +191,7 @@
+Tidy build:
+
+- Use CMake-standard way of looking for C++ standards, but keep
+ minimum CMake version unchanged because of policies around *_VERSION
+ variables.
+- Drop addition of bad -std= flag
+- Don't look for qtkeychain
+- Don't install License.txt file
+
+--- CMakeLists.txt.orig 2016-11-02 11:10:18 UTC
++++ CMakeLists.txt
+@@ -1,4 +1,8 @@
+-PROJECT( Charm )
++CMAKE_MINIMUM_REQUIRED( VERSION 2.6.0 )
++PROJECT( Charm CXX )
++SET( CMAKE_CXX_STANDARD 11 )
++SET( CMAKE_CXX_STANDARD_REQUIRED ON )
++
+ IF( NOT Charm_VERSION )
+ FIND_PACKAGE( Git QUIET )
+ IF( EXISTS ${GIT_EXECUTABLE} )
+@@ -34,12 +38,8 @@ ENDIF()
+
+ MESSAGE( STATUS "Building Charm ${Charm_VERSION} in ${CMAKE_BUILD_TYPE} mode" )
+
+-CMAKE_MINIMUM_REQUIRED( VERSION 2.6.0 )
+ SET( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake" )
+
+-IF(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+- SET(CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
+-ENDIF()
+ IF(MSVC)
+ SET(CMAKE_CXX_FLAGS "-D_USING_V110_SDK71_=1 ${CMAKE_CXX_FLAGS}")
+ ENDIF()
+@@ -72,12 +72,6 @@ IF(Qt5Core_FOUND)
+ set(QTPRINT_LIBRARIES ${Qt5PrintSupport_LIBRARIES})
+ ENDIF()
+
+- find_package(Qt5Keychain QUIET)
+-
+- IF(Qt5Keychain_FOUND)
+- set(QTKEYCHAIN_SYSTEM ON)
+- ENDIF()
+-
+ SET(CHARM_MAC_HIGHRES_SUPPORT_ENABLED ON)
+
+ IF(WIN32)
+@@ -191,7 +185,7 @@ IF( APPLE AND "${QT_VERSION_MAJOR}.${QT_
ENDIF()
IF( CMAKE_BUILD_TYPE MATCHES "^[Rr]elease$" )
@@ -9,3 +54,12 @@
ENDIF()
# Always include the source and build directories in the include path
+@@ -264,7 +258,7 @@ CONFIGURE_FILE( CharmCMake.h.cmake ${CMA
+ SET( LICENSE_FILE "License.txt" )
+ SET( README_FILE "ReadMe.txt" )
+ IF( NOT APPLE )
+- INSTALL( FILES "${LICENSE_FILE}" "${README_FILE}" DESTINATION ${DOC_INSTALL_DIR} )
++ INSTALL( FILES "${README_FILE}" DESTINATION ${DOC_INSTALL_DIR} )
+ ENDIF()
+
+ # Only support CPack packaging on newer versions of CMake.
Index: deskutils/charmtimetracker/pkg-plist
===================================================================
--- deskutils/charmtimetracker/pkg-plist
+++ deskutils/charmtimetracker/pkg-plist
@@ -1,3 +1,4 @@
bin/charmtimetracker
share/applications/charmtimetracker.desktop
+%%DOCSDIR%%/ReadMe.txt
share/icons/hicolor/128x128/apps/Charm-128x128.png

File Metadata

Mime Type
text/plain
Expires
Sat, Aug 22, 12:36 PM (20 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37082625
Default Alt Text
D12489.id33419.diff (4 KB)

Event Timeline