aboutsummaryrefslogtreecommitdiffstats
path: root/deskutils
diff options
context:
space:
mode:
authormat <mat@FreeBSD.org>2013-12-09 23:58:11 +0800
committermat <mat@FreeBSD.org>2013-12-09 23:58:11 +0800
commitf92111fd4e244793e9a11a2de7612f8200143882 (patch)
tree689fc0e8418848ad609664aa5eaa0dca39165daa /deskutils
parent43262a4090622df601e5eedaee26d565ee8b2ebb (diff)
downloadfreebsd-ports-gnome-f92111fd4e244793e9a11a2de7612f8200143882.tar.gz
freebsd-ports-gnome-f92111fd4e244793e9a11a2de7612f8200143882.tar.zst
freebsd-ports-gnome-f92111fd4e244793e9a11a2de7612f8200143882.zip
Move to compiler:c++11-lang.
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/mirall/Makefile5
-rw-r--r--deskutils/mirall/files/patch-src__CMakeLists.txt14
2 files changed, 13 insertions, 6 deletions
diff --git a/deskutils/mirall/Makefile b/deskutils/mirall/Makefile
index 52372873f822..f94652e403f6 100644
--- a/deskutils/mirall/Makefile
+++ b/deskutils/mirall/Makefile
@@ -15,12 +15,11 @@ LIB_DEPENDS= libocsync.so:${PORTSDIR}/net/owncloud-csync \
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
diff --git a/deskutils/mirall/files/patch-src__CMakeLists.txt b/deskutils/mirall/files/patch-src__CMakeLists.txt
index 00927c3d7697..f48bae3b1b73 100644
--- a/deskutils/mirall/files/patch-src__CMakeLists.txt
+++ b/deskutils/mirall/files/patch-src__CMakeLists.txt
@@ -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}