[pkgsrc/trunk]: pkgsrc/sysutils/bacula Fixed EXAMPLESDIR in patches

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils/bacula Fixed EXAMPLESDIR in patches
From: adam <adam%pkgsrc.org@localhost>
Date: Mon, 16 Jan 2023 19:16:01 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/6c56680cde1f
branches:  trunk
changeset: 393026:6c56680cde1f
user:      adam <adam%pkgsrc.org@localhost>
date:      Sat May 16 08:06:56 2009 +0000

description:
Fixed EXAMPLESDIR in patches

diffstat:

 sysutils/bacula/distinfo         |  17 +++++++++--------
 sysutils/bacula/patches/patch-aa |   8 ++++----
 sysutils/bacula/patches/patch-ac |  12 ++++++------
 sysutils/bacula/patches/patch-ae |   8 ++++----
 sysutils/bacula/patches/patch-af |   8 ++++----
 sysutils/bacula/patches/patch-ag |   8 ++++----
 sysutils/bacula/patches/patch-ah |   8 ++++----
 sysutils/bacula/patches/patch-ai |   8 ++++----
 sysutils/bacula/patches/patch-ap |  22 ++++++++++++++++++++++
 9 files changed, 61 insertions(+), 38 deletions(-)

diffs (271 lines):

diff -r a32562a044a0 -r 6c56680cde1f sysutils/bacula/distinfo
--- a/sysutils/bacula/distinfo  Sat May 16 08:06:18 2009 +0000
+++ b/sysutils/bacula/distinfo  Sat May 16 08:06:56 2009 +0000
@@ -1,20 +1,21 @@
-$NetBSD: distinfo,v 1.33 2009/05/15 10:29:05 adam Exp $
+$NetBSD: distinfo,v 1.34 2009/05/16 08:06:56 adam Exp $
 
 SHA1 (bacula-3.0.1.tar.gz) = 073d3d9458b51b928c0b5f8cf830c94362366c9a
 RMD160 (bacula-3.0.1.tar.gz) = 8f23238a7475fb1d3371e583d43fbd6f49efc113
 Size (bacula-3.0.1.tar.gz) = 3842746 bytes
-SHA1 (patch-aa) = 9d2332130ac10930291d6dfe22070230aca8d8dd
+SHA1 (patch-aa) = e59bccdc80b23b2a64bd7e4f2bbefe22e019fca8
 SHA1 (patch-ab) = 760c5214dc9a4e4c11e812842e790b973c502c1a
-SHA1 (patch-ac) = d9dc44741297924355a3ac86d9fc204b28c73daf
+SHA1 (patch-ac) = db88570ebbed0e624315b6eb4668ff97b6b180b6
 SHA1 (patch-ad) = 6a739f6960da444d30df8ffd49cb258446e06797
-SHA1 (patch-ae) = 8e40ed5552e2f0c29cbd6db57fcd29572f86c234
-SHA1 (patch-af) = 841b68034d591f8d859bd0a9260627f23a0f4b65
-SHA1 (patch-ag) = d7a0586819d2c9404ebac576ce23e48aae705130
-SHA1 (patch-ah) = c06e022df8fa7465b495294bed542af33f329d1e
-SHA1 (patch-ai) = 80058e5b7db5bdb5cd08f17a89ae72bed3a1a1ad
+SHA1 (patch-ae) = 1b4d6fdeb8570be9f7e5f0355701d92d81f68b07
+SHA1 (patch-af) = 20429fa1f517348ee290d90dd1d420347fb1928e
+SHA1 (patch-ag) = 6123cbf2cb3517850e65251ea80fb9b505cdf230
+SHA1 (patch-ah) = c096a775d98eae0b4ce20bedbbb99ed9a646603e
+SHA1 (patch-ai) = 388e075e7ec54fb377ee9dbe8338c667efb256ee
 SHA1 (patch-aj) = df5eba3c80d36ecc26c6acb1566a4411c308b2f0
 SHA1 (patch-ak) = d4c41a8a52d5420e1a9228d725dfd21e52c2fb3a
 SHA1 (patch-al) = 1fc78c0de4461c9294325e835e5ed529228e32c4
 SHA1 (patch-am) = a2bfd8f345ce2c68b9387b02b08437cb9fc5772b
 SHA1 (patch-an) = 365e6ee90c178349b6ca127accb47b9c7de7ce94
 SHA1 (patch-ao) = e2e005d7fa2f769f650fb3f6f2e1c52d611352ad
+SHA1 (patch-ap) = 385d8ee2227c58dabfe2d88ce9abb1fe88a67b4e
diff -r a32562a044a0 -r 6c56680cde1f sysutils/bacula/patches/patch-aa
--- a/sysutils/bacula/patches/patch-aa  Sat May 16 08:06:18 2009 +0000
+++ b/sysutils/bacula/patches/patch-aa  Sat May 16 08:06:56 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2009/05/15 10:29:05 adam Exp $
+$NetBSD: patch-aa,v 1.4 2009/05/16 08:06:56 adam Exp $
 
 --- src/dird/Makefile.in.orig  2009-02-18 12:40:09.000000000 +0100
 +++ src/dird/Makefile.in
@@ -16,7 +16,7 @@
        $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir
        @srcconf=bacula-dir.conf; \
 -         if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+         if  test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \
++         if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
              destconf=$$srcconf.new; \
              echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
           else \
@@ -24,8 +24,8 @@
           fi; \
 -         echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -         ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+         echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \
-+         ${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf
++         echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
++         ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
        @if  test -f ${DESTDIR}${scriptdir}/query.sql; then \
           echo "  ==> Saving existing query.sql to query.sql.old"; \
           $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \
diff -r a32562a044a0 -r 6c56680cde1f sysutils/bacula/patches/patch-ac
--- a/sysutils/bacula/patches/patch-ac  Sat May 16 08:06:18 2009 +0000
+++ b/sysutils/bacula/patches/patch-ac  Sat May 16 08:06:56 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2009/05/15 10:29:05 adam Exp $
+$NetBSD: patch-ac,v 1.5 2009/05/16 08:06:56 adam Exp $
 
 --- src/console/Makefile.in.orig       2009-02-18 12:40:09.000000000 +0100
 +++ src/console/Makefile.in
@@ -16,23 +16,23 @@
        $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(sbindir)/bconsole
        @srcconf=bconsole.conf; \
 -      if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+      if  test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \
++      if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
           destconf=$$srcconf.new; \
           echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
        else \
           destconf=$$srcconf; \
 -         if  test -f ${DESTDIR}${sysconfdir}/console.conf; then \
-+         if  test -f ${DESTDIR}/usr/pkg/share/examples/bacula/console.conf; then \
++         if  test -f ${DESTDIR}%%EXAMPLESDIR%%/console.conf; then \
              echo "Existing console.conf moved to bconsole.conf"; \
 -            @$(MV) ${DESTDIR}${sysconfdir}/console.conf ${DESTDIR}${sysconfdir}/bconsole.conf; \
-+            @$(MV) ${DESTDIR}/usr/pkg/share/examples/bacula/console.conf ${DESTDIR}/usr/pkg/share/examples/bacula/bconsole.conf; \
++            @$(MV) ${DESTDIR}%%EXAMPLESDIR%%/console.conf ${DESTDIR}%%EXAMPLESDIR%%/bconsole.conf; \
              destconf=$$srcconf.new; \
           fi; \
        fi; \
 -      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \
-+      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf
++      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
++      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
        if test -f static-bconsole; then \
           $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bconsole $(DESTDIR)$(sbindir)/static-bconsole; \
        fi
diff -r a32562a044a0 -r 6c56680cde1f sysutils/bacula/patches/patch-ae
--- a/sysutils/bacula/patches/patch-ae  Sat May 16 08:06:18 2009 +0000
+++ b/sysutils/bacula/patches/patch-ae  Sat May 16 08:06:56 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.4 2009/05/15 10:29:05 adam Exp $
+$NetBSD: patch-ae,v 1.5 2009/05/16 08:06:56 adam Exp $
 
 --- src/filed/Makefile.in.orig 2009-02-18 12:40:09.000000000 +0100
 +++ src/filed/Makefile.in
@@ -16,7 +16,7 @@
        $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd 
        @srcconf=bacula-fd.conf; \
 -      if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+      if  test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \
++      if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
           destconf=$$srcconf.new; \
           echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
        else \
@@ -24,8 +24,8 @@
        fi; \
 -      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \
-+      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf
++      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
++      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
        @if test -f static-bacula-fd; then \
           $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \
        fi
diff -r a32562a044a0 -r 6c56680cde1f sysutils/bacula/patches/patch-af
--- a/sysutils/bacula/patches/patch-af  Sat May 16 08:06:18 2009 +0000
+++ b/sysutils/bacula/patches/patch-af  Sat May 16 08:06:56 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.4 2009/05/15 10:29:05 adam Exp $
+$NetBSD: patch-af,v 1.5 2009/05/16 08:06:57 adam Exp $
 
 --- src/stored/Makefile.in.orig        2009-02-18 12:40:09.000000000 +0100
 +++ src/stored/Makefile.in
@@ -61,7 +61,7 @@
        $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) btape $(DESTDIR)$(sbindir)/btape
        @srcconf=bacula-sd.conf; \
 -      if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+      if  test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \
++      if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
           destconf=$$srcconf.new; \
           echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
        else \
@@ -69,8 +69,8 @@
        fi; \
 -      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \
-+      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf
++      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
++      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
        @if test -f static-bacula-sd; then \
           $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-sd $(DESTDIR)$(sbindir)/static-bacula-sd; \
        fi
diff -r a32562a044a0 -r 6c56680cde1f sysutils/bacula/patches/patch-ag
--- a/sysutils/bacula/patches/patch-ag  Sat May 16 08:06:18 2009 +0000
+++ b/sysutils/bacula/patches/patch-ag  Sat May 16 08:06:56 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.5 2009/05/15 10:29:05 adam Exp $
+$NetBSD: patch-ag,v 1.6 2009/05/16 08:06:57 adam Exp $
 
 --- src/gnome2-console/Makefile.in.orig        2009-02-18 12:40:09.000000000 +0100
 +++ src/gnome2-console/Makefile.in
@@ -16,7 +16,7 @@
        $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bgnome-console $(DESTDIR)$(sbindir)/bgnome-console
        @srcconf=bgnome-console.conf; \
 -      if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+      if  test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \
++      if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
           destconf=$$srcconf.new; \
           echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
        else \
@@ -24,8 +24,8 @@
        fi; \
 -      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \
-+      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf
++      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
++      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
        if test -f static-bgnome-console; then \
           $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bgnome-console $(DESTDIR)$(sbindir)/static-bgnome-console; \
        fi 
diff -r a32562a044a0 -r 6c56680cde1f sysutils/bacula/patches/patch-ah
--- a/sysutils/bacula/patches/patch-ah  Sat May 16 08:06:18 2009 +0000
+++ b/sysutils/bacula/patches/patch-ah  Sat May 16 08:06:56 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.5 2009/05/15 10:29:05 adam Exp $
+$NetBSD: patch-ah,v 1.6 2009/05/16 08:06:57 adam Exp $
 
 --- src/wx-console/Makefile.in.orig    2009-03-09 16:34:05.000000000 +0100
 +++ src/wx-console/Makefile.in
@@ -16,7 +16,7 @@
        $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bwx-console $(DESTDIR)$(sbindir)/bwx-console
        @srcconf=bwx-console.conf; \
 -      if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+      if  test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \
++      if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
           destconf=$$srcconf.new; \
           echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
        else \
@@ -24,8 +24,8 @@
        fi; \
 -      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \
-+      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf
++      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
++      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
  
  uninstall:
        (cd $(DESTDIR)$(sbindir); $(RMF) bwx-console)
diff -r a32562a044a0 -r 6c56680cde1f sysutils/bacula/patches/patch-ai
--- a/sysutils/bacula/patches/patch-ai  Sat May 16 08:06:18 2009 +0000
+++ b/sysutils/bacula/patches/patch-ai  Sat May 16 08:06:56 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.5 2009/05/15 10:29:05 adam Exp $
+$NetBSD: patch-ai,v 1.6 2009/05/16 08:06:57 adam Exp $
 
 --- src/tray-monitor/Makefile.in.orig  2008-10-19 12:34:03.000000000 +0200
 +++ src/tray-monitor/Makefile.in
@@ -16,7 +16,7 @@
        $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-tray-monitor $(DESTDIR)$(sbindir)/bacula-tray-monitor
        @srcconf=tray-monitor.conf; \
 -      if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+      if  test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \
++      if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
           destconf=$$srcconf.new; \
           echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
        else \
@@ -24,8 +24,8 @@
        fi; \
 -      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \
-+      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf
++      echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
++      ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
  
  uninstall:
        (cd $(DESTDIR)$(sbindir); $(RMF) bacula-tray-monitor)
diff -r a32562a044a0 -r 6c56680cde1f sysutils/bacula/patches/patch-ap
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/bacula/patches/patch-ap  Sat May 16 08:06:56 2009 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ap,v 1.1 2009/05/16 08:06:57 adam Exp $
+
+--- src/qt-console/bat.pro.in.orig     2009-03-27 18:59:16.000000000 +0100
++++ src/qt-console/bat.pro.in
+@@ -11,8 +11,6 @@ CONFIG += qt debug @QWT@
+ 
+ bins.path = /$(DESTDIR)@sbindir@
+ bins.files = ./bat
+-confs.path = /$(DESTDIR)@sysconfdir@
+-confs.commands = ./install_conf_file   
+ help.path = /$(DESTDIR)@htmldir@
+ help.files = help/*.html images/status.png images/mail-message-new.png
+ 
+@@ -23,7 +21,7 @@ INCLUDEPATH += .. . ./console ./restore 
+ LIBS        += -L../lib -lbaccfg -lbac @OPENSSL_LIBS@
+ LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
+ LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
+-QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
++QMAKE_LINK   = $(CXX)
+ QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m 0754 -p
+ QMAKE_CLEAN += .libs/* bat
+
Prev by Date: [pkgsrc/trunk]: pkgsrc/sysutils/swapd * set LICENSE=gnu-gpl-v2
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated devel/libstatgrab to 0.16
Previous by Thread: [pkgsrc/trunk]: pkgsrc/sysutils/swapd * set LICENSE=gnu-gpl-v2
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated devel/libstatgrab to 0.16
Indexes:
Home | Main Index | Thread Index | Old Index