From owner-svn-ports-all@freebsd.org Thu May 9 19:04:26 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47F68158B3BE; Thu, 9 May 2019 19:04:26 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E3A0675FE1; Thu, 9 May 2019 19:04:25 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BFCCB212F6; Thu, 9 May 2019 19:04:25 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x49J4PoF003546; Thu, 9 May 2019 19:04:25 GMT (envelope-from acm@FreeBSD.org) Received: (from acm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x49J4PGw003543; Thu, 9 May 2019 19:04:25 GMT (envelope-from acm@FreeBSD.org) Message-Id: <201905091904.x49J4PGw003543@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: acm set sender to acm@FreeBSD.org using -f From: Jose Alonso Cardenas Marquez Date: Thu, 9 May 2019 19:04:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501133 - in head/sysutils: . bareos-traymonitor X-SVN-Group: ports-head X-SVN-Commit-Author: acm X-SVN-Commit-Paths: in head/sysutils: . bareos-traymonitor X-SVN-Commit-Revision: 501133 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E3A0675FE1 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.993,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 May 2019 19:04:26 -0000 Author: acm Date: Thu May 9 19:04:24 2019 New Revision: 501133 URL: https://svnweb.freebsd.org/changeset/ports/501133 Log: - Re-add sysutils/bareos-traymonitor Modified: head/sysutils/Makefile head/sysutils/bareos-traymonitor/Makefile head/sysutils/bareos-traymonitor/pkg-plist Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Thu May 9 18:43:46 2019 (r501132) +++ head/sysutils/Makefile Thu May 9 19:04:24 2019 (r501133) @@ -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 Modified: head/sysutils/bareos-traymonitor/Makefile ============================================================================== --- head/sysutils/bareos-traymonitor/Makefile Thu May 9 18:43:46 2019 (r501132) +++ head/sysutils/bareos-traymonitor/Makefile Thu May 9 19:04:24 2019 (r501133) @@ -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" Modified: head/sysutils/bareos-traymonitor/pkg-plist ============================================================================== --- head/sysutils/bareos-traymonitor/pkg-plist Thu May 9 18:43:46 2019 (r501132) +++ head/sysutils/bareos-traymonitor/pkg-plist Thu May 9 19:04:24 2019 (r501133) @@ -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