CVS commit: pkgsrc/sysutils

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Wed Oct 12 20:59:19 UTC 2022

Modified Files:
        pkgsrc/sysutils/bacula: distinfo
        pkgsrc/sysutils/bacula-tray-monitor: Makefile
        pkgsrc/sysutils/bacula-tray-monitor-qt5: Makefile
        pkgsrc/sysutils/bacula/patches:
            patch-src_qt-console_tray-monitor_tray-monitor.pro.in

Log Message:
bacula-tray-monitor*: now requires inotify


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/sysutils/bacula/distinfo
cvs rdiff -u -r1.52 -r1.53 pkgsrc/sysutils/bacula-tray-monitor/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/bacula/patches/patch-src_qt-console_tray-monitor_tray-monitor.pro.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/bacula/distinfo
diff -u pkgsrc/sysutils/bacula/distinfo:1.61 pkgsrc/sysutils/bacula/distinfo:1.62
--- pkgsrc/sysutils/bacula/distinfo:1.61        Thu Oct  6 02:58:17 2022
+++ pkgsrc/sysutils/bacula/distinfo     Wed Oct 12 20:59:18 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.61 2022/10/06 02:58:17 markd Exp $
+$NetBSD: distinfo,v 1.62 2022/10/12 20:59:18 markd Exp $
 
 BLAKE2s (bacula-13.0.1.tar.gz) = 3989f1eb9b469efba8244d5b3baf64a2ee358c0c72eaf1bbe2837132b1bda559
 SHA512 (bacula-13.0.1.tar.gz) = fd10857d12bb637b9f6e51a03888d8cc93604ba1e793f888304f3c115d48800d7f0d69e30a843355c6760ff8e9b5481c174a24ace1c2adc106cf4ec73646b426
@@ -24,6 +24,6 @@ SHA1 (patch-src_lib_attr.c) = 287851ff2c
 SHA1 (patch-src_plugins_fd_Makefile) = 7fb44bdf1253e0c0f7bc9d621133fc3ba23617a0
 SHA1 (patch-src_plugins_fd_docker_baculatar_baculatar) = ba5fb5edc8ee98f09d31f36e840d68facfe48233
 SHA1 (patch-src_qt-console_bat.pro.in) = 2d9ca83fc9c30bb3be92e051e260f992d7c5b049
-SHA1 (patch-src_qt-console_tray-monitor_tray-monitor.pro.in) = eac1fffd0f79328346f5024527fdc452d06062aa
+SHA1 (patch-src_qt-console_tray-monitor_tray-monitor.pro.in) = bc6a8694987879bda890102088dcb40f29d994d0
 SHA1 (patch-src_stored_Makefile.in) = 4a00b4da8dfca59c5346968b9e534c15c950449a
 SHA1 (patch-src_tools_Makefile.in) = 11caa8f1b4a1b381613ec1d089523dcf43c4078a

Index: pkgsrc/sysutils/bacula-tray-monitor/Makefile
diff -u pkgsrc/sysutils/bacula-tray-monitor/Makefile:1.52 pkgsrc/sysutils/bacula-tray-monitor/Makefile:1.53
--- pkgsrc/sysutils/bacula-tray-monitor/Makefile:1.52   Thu Oct  6 02:58:17 2022
+++ pkgsrc/sysutils/bacula-tray-monitor/Makefile        Wed Oct 12 20:59:19 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2022/10/06 02:58:17 markd Exp $
+# $NetBSD: Makefile,v 1.53 2022/10/12 20:59:19 markd Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-tray-monitor-/}
 COMMENT=       System tray monitor for Bacula - The Network Backup Solution
@@ -23,6 +23,7 @@ post-install:
 
 .include "../../sysutils/bacula/Makefile.common"
 .include "../../sysutils/bacula/buildlink3.mk"
+.include "../../devel/libinotify/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile
diff -u pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile:1.17 pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile:1.18
--- pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile:1.17       Thu Oct  6 02:58:18 2022
+++ pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile    Wed Oct 12 20:59:19 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2022/10/06 02:58:18 markd Exp $
+# $NetBSD: Makefile,v 1.18 2022/10/12 20:59:19 markd Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-tray-monitor-qt5-/}
 COMMENT=       System tray monitor for Bacula - The Network Backup Solution
@@ -26,5 +26,6 @@ post-install:
 
 .include "../../sysutils/bacula/Makefile.common"
 .include "../../sysutils/bacula/buildlink3.mk"
+.include "../../devel/libinotify/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/bacula/patches/patch-src_qt-console_tray-monitor_tray-monitor.pro.in
diff -u pkgsrc/sysutils/bacula/patches/patch-src_qt-console_tray-monitor_tray-monitor.pro.in:1.2 pkgsrc/sysutils/bacula/patches/patch-src_qt-console_tray-monitor_tray-monitor.pro.in:1.3
--- pkgsrc/sysutils/bacula/patches/patch-src_qt-console_tray-monitor_tray-monitor.pro.in:1.2    Thu Oct  6 02:58:17 2022
+++ pkgsrc/sysutils/bacula/patches/patch-src_qt-console_tray-monitor_tray-monitor.pro.in        Wed Oct 12 20:59:18 2022
@@ -1,11 +1,19 @@
-$NetBSD: patch-src_qt-console_tray-monitor_tray-monitor.pro.in,v 1.2 2022/10/06 02:58:17 markd Exp $
+$NetBSD: patch-src_qt-console_tray-monitor_tray-monitor.pro.in,v 1.3 2022/10/12 20:59:18 markd Exp $
 
+- need libinotify on not linux
 - comment out the confs paths and command
 - use just the compiler not libtool for QMAKE_LINK
 
 --- src/qt-console/tray-monitor/tray-monitor.pro.in.orig       2022-08-05 15:13:35.000000000 +0000
 +++ src/qt-console/tray-monitor/tray-monitor.pro.in
-@@ -27,8 +27,8 @@ cross-win32 {
+@@ -23,12 +23,14 @@ cross-win32 {
+ !cross-win32 {
+   LIBS        += -L../../lib -lbaccfg -lbac -L../../findlib -lbacfind @OPENSSL_LIBS@
+ }
+-
++!linux* {
++  LIBS        += -linotify
++}
  
  bins.path = /$(DESTDIR)@sbindir@
  bins.files = bacula-tray-monitor
@@ -16,7 +24,7 @@ $NetBSD: patch-src_qt-console_tray-monit
  
  TEMPLATE     = app
  TARGET       = bacula-tray-monitor
-@@ -38,7 +38,7 @@ INCLUDEPATH += ../.. .
+@@ -38,7 +40,7 @@ INCLUDEPATH += ../.. .
  QMAKE_CC = $(CXX) 
  LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
  LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install