Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Dec 2013 15:58:11 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r335999 - in head/deskutils/mirall: . files
Message-ID:  <201312091558.rB9FwBet072183@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Mon Dec  9 15:58:11 2013
New Revision: 335999
URL: http://svnweb.freebsd.org/changeset/ports/335999

Log:
  Move to compiler:c++11-lang.

Modified:
  head/deskutils/mirall/Makefile
  head/deskutils/mirall/files/patch-src__CMakeLists.txt

Modified: head/deskutils/mirall/Makefile
==============================================================================
--- head/deskutils/mirall/Makefile	Mon Dec  9 15:32:46 2013	(r335998)
+++ head/deskutils/mirall/Makefile	Mon Dec  9 15:58:11 2013	(r335999)
@@ -15,12 +15,11 @@ LIB_DEPENDS=	libocsync.so:${PORTSDIR}/ne
 		libinotify.so:${PORTSDIR}/devel/libinotify \
 		libqtkeychain.so:${PORTSDIR}/security/qtkeychain
 
-USES=		cmake:outsource pkgconfig gmake
+USES=		cmake:outsource pkgconfig gmake compiler:c++11-lang
 USE_BZIP2=
 USE_QT4=	corelib dbus gui linguist moc network qmake qtestlib rcc uic webkit xml
-CMAKE_ENV=	CSYNC_DIR=${LOCALBASE}
+CMAKE_ENV=	CSYNC_DIR=${LOCALBASE} INOTIFY_LIB=${LOCALBASE}/lib
 CMAKE_ARGS=	-DCSYNC_INCLUDE_PATH:STRING=${LOCALBASE}/include/ocsync/
-USE_GCC=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 

Modified: head/deskutils/mirall/files/patch-src__CMakeLists.txt
==============================================================================
--- head/deskutils/mirall/files/patch-src__CMakeLists.txt	Mon Dec  9 15:32:46 2013	(r335998)
+++ head/deskutils/mirall/files/patch-src__CMakeLists.txt	Mon Dec  9 15:58:11 2013	(r335999)
@@ -1,6 +1,14 @@
---- ./src/CMakeLists.txt.orig	2013-09-04 11:09:12.000000000 +0200
-+++ ./src/CMakeLists.txt	2013-09-18 15:09:30.000000000 +0200
-@@ -140,7 +140,7 @@
+--- ./src/CMakeLists.txt.orig	2013-10-21 14:05:25.000000000 +0200
++++ ./src/CMakeLists.txt	2013-12-09 16:16:15.000000000 +0100
+@@ -125,6 +125,7 @@
+     set(libsync_SRCS ${libsync_SRCS} mirall/folderwatcher_inotify.cpp)
+     set(libsync_HEADERS ${libsync_HEADERS} mirall/inotify.h)
+     set(libsync_HEADERS ${libsync_HEADERS} mirall/folderwatcher_inotify.h)
++    link_directories($ENV{INOTIFY_LIB})
+ ENDIF()
+ IF( WIN32 ) 
+     set(libsync_SRCS ${libsync_SRCS} mirall/folderwatcher_win.cpp)
+@@ -140,7 +141,7 @@
  list(APPEND libsync_LINK_TARGETS
      ${QT_LIBRARIES}
      ${CSYNC_LIBRARY}



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