diff --git a/sysutils/Makefile b/sysutils/Makefile index a1eaf8f29f81..3219eff77a10 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -83,6 +83,7 @@ SUBDIR += bareos-client SUBDIR += bareos-docs SUBDIR += bareos-server + SUBDIR += bareos-traymonitor SUBDIR += bareos16-client SUBDIR += bareos16-client-static SUBDIR += bareos16-server diff --git a/sysutils/bareos-traymonitor/Makefile b/sysutils/bareos-traymonitor/Makefile index 20be5d1792a0..0076ba1e9a8f 100644 --- a/sysutils/bareos-traymonitor/Makefile +++ b/sysutils/bareos-traymonitor/Makefile @@ -6,29 +6,23 @@ PKGNAMESUFFIX= -traymonitor COMMENT= Backup archiving recovery open sourced (traymonitor) -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 - -LIB_DEPENDS+= libqwt.so:x11-toolkits/qwt5 \ +LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \ libbareos.so:sysutils/bareos-client CONFLICTS= bacula*-bat-* bareos16-traymonitor-* -USES= pkgconfig gettext-runtime desktop-file-utils qt:4 -USE_QT= qmake_build uic_build moc_build rcc_build gui corelib +USES= pkgconfig gettext-runtime desktop-file-utils qt:5 +USE_QT5= qmake_build uic_build moc_build rcc_build gui corelib WITH_BAT= yes PLIST= ${.CURDIR}/pkg-plist -MAKE_ENV+= MAKEOBJDIRPREFIX=/ +CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1 MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server -CONFIGURE_ARGS+= --enable-traymonitor=yes \ - --with-qwt=${LOCALBASE}/lib \ - --disable-build-dird \ - --disable-build-stored \ - --enable-client-only \ - --with-jansson=${LOCALBASE} \ - --enable-nls=yes +CMAKE_ARGS+= -Dtraymonitor=yes \ + -Dbuild-dird=no \ + -Dbuild-stored=no \ + -Dclient-only=yes .include "${MASTERDIR}/Makefile" diff --git a/sysutils/bareos-traymonitor/pkg-plist b/sysutils/bareos-traymonitor/pkg-plist index 6b010213de0b..add26cb88d6d 100644 --- a/sysutils/bareos-traymonitor/pkg-plist +++ b/sysutils/bareos-traymonitor/pkg-plist @@ -1,7 +1,7 @@ +bin/bareos-tray-monitor @sample %%ETCDIR%%/tray-monitor.d/client/FileDaemon-local.conf.sample @sample %%ETCDIR%%/tray-monitor.d/director/Director-local.conf.sample @sample %%ETCDIR%%/tray-monitor.d/monitor/bareos-mon.conf.sample @sample %%ETCDIR%%/tray-monitor.d/storage/StorageDaemon-local.conf.sample share/applications/bareos-tray-monitor.desktop share/pixmaps/bareos-tray-monitor.xpm -bin/bareos-tray-monitor