Maintainer update of net-mgmt/nagios-check_bacula Fix: -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.--0x9zF43xu6JRlaS6PPau4fkpt6Ca05F5qlxwQdhEX8RuWUP3 Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" diff -ruN nagios-check_bacula_org/Makefile nagios-check_bacula/Makefile --- nagios-check_bacula_org/Makefile 2009-03-19 22:35:27.000000000 +0100 +++ nagios-check_bacula/Makefile 2009-05-13 14:12:46.000000000 +0200 @@ -6,9 +6,9 @@ # PORTNAME= check_bacula -PORTVERSION= 2.4.4 +PORTVERSION= 3.0.0 CATEGORIES= net-mgmt -MASTER_SITES= SF +MASTER_SITES= SF/bacula PKGNAMEPREFIX= nagios- DISTNAME= bacula-${PORTVERSION} @@ -17,8 +17,11 @@ WRKSRC= ${WRKDIR}/bacula-${PORTVERSION} CONFIGURE_ARGS= --enable-client-only \ + --disable-build-dird \ + --disable-build-stored \ --disable-nls GNU_CONFIGURE= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> @@ -30,7 +33,9 @@ do-install: @${MKDIR} ${PREFIX}/libexec/nagios - ${INSTALL_PROGRAM} ${WRKSRC}/src/check_bacula/check_bacula \ + ${INSTALL_PROGRAM} ${WRKSRC}/src/check_bacula/.libs/check_bacula \ ${PREFIX}/libexec/nagios/ + ${INSTALL_PROGRAM} ${WRKSRC}/src/lib/.libs/libbac.so.1 \ + ${PREFIX}/lib .include <bsd.port.post.mk> diff -ruN nagios-check_bacula_org/distinfo nagios-check_bacula/distinfo --- nagios-check_bacula_org/distinfo 2009-03-19 22:35:27.000000000 +0100 +++ nagios-check_bacula/distinfo 2009-05-13 13:18:06.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (bacula-2.4.4.tar.gz) = 4eb6155b45611018af03002d37a2ffde -SHA256 (bacula-2.4.4.tar.gz) = 3a698bdf0fd3f55733a6a4aabe8c3dc2b1ed1ad5ca7fab000f6e0f804a9d3d38 -SIZE (bacula-2.4.4.tar.gz) = 3145564 +MD5 (bacula-3.0.0.tar.gz) = 5ea5294c4f66f0d8ba1414f1ca9dc79b +SHA256 (bacula-3.0.0.tar.gz) = cafcf9e9682662d2efcef84a6d90ee09230c60c7ed15a7051b70a30f2966d45c +SIZE (bacula-3.0.0.tar.gz) = 3834280 diff -ruN nagios-check_bacula_org/files/patch-configure nagios-check_bacula/files/patch-configure --- nagios-check_bacula_org/files/patch-configure 2008-07-15 05:32:08.000000000 +0200 +++ nagios-check_bacula/files/patch-configure 2009-05-06 12:01:30.000000000 +0200 @@ -1,15 +1,15 @@ ---- configure.org 2008-07-10 12:17:10.000000000 +0000 -+++ configure 2008-07-10 12:17:32.000000000 +0000 -@@ -30111,7 +30111,7 @@ +--- configure_org 2009-04-07 18:07:30.000000000 +0200 ++++ configure 2009-05-06 12:00:56.000000000 +0200 +@@ -42767,7 +42767,7 @@ exit 1 fi --ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makef ile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_ tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges s rc/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile po/Makefile.in $PFILES" -+ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makef ile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_ tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges s rc/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile po/Makefile.in $PFILES src/check_bacula/Makefile" +-ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makef ile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_d atabase src/cats/update_sqlite_tables src/cats/make_sqlite_tables src /cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile src/win32/Makefile.inc po/Makefile.in updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_sqlite_tables_9_to_10 updatedb/update_mysql_tables_10_t o_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 $PFILES" ++ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makef ile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_d atabase src/cats/update_sqlite_tables src/cats/make_sqlite_tables src /cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile src/win32/Makefile.inc po/Makefile.in updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_sqlite_tables_9_to_10 updatedb/update_mysql_tables_10_t o_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 $PFILES src/check_bacula/Makefile" ac_config_commands="$ac_config_commands default" -@@ -30679,7 +30679,7 @@ +@@ -43686,7 +43686,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF diff -ruN nagios-check_bacula_org/files/patch-src-check_bacula-Makefile.in nagios-check_bacula/files/patch-src-check_bacula-Makefile.in --- nagios-check_bacula_org/files/patch-src-check_bacula-Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ nagios-check_bacula/files/patch-src-check_bacula-Makefile.in 2009-05-13 09:12:04.000000000 +0200 @@ -0,0 +1,62 @@ +--- src/check_bacula/Makefile.in_org 2005-05-23 08:33:05.000000000 +0200 ++++ src/check_bacula/Makefile.in 2009-05-13 09:10:54.000000000 +0200 +@@ -20,14 +20,14 @@ + dummy: + + # +-MONITORSRCS = check_bacula.c authenticate.c +-MONITOROBJS = check_bacula.o authenticate.o ++CHECKSRCS = check_bacula.c authenticate.c ++CHECKOBJS = check_bacula.o authenticate.o + + # these are the objects that are changed by the .configure process + EXTRAOBJS = @OBJLIST@ + +-MONITOR_CPPFLAGS=@TRAY_MONITOR_CPPFLAGS@ +-MONITOR_LDFLAGS=@TRAY_MONITOR_LDFLAGS@ @X_LIBS@ ++CHECK_CPPFLAGS= ++CHECK_LDFLAGS= + + .SUFFIXES: .c .o + .PHONY: +@@ -35,21 +35,26 @@ + + # inference rules + .c.o: +- $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(MONITOR_CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< ++ @echo "Compiling $<" ++ $(NO_ECHO) $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CHECK_CPPFLAGS) \ ++ -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + #------------------------------------------------------------------------- +-all: Makefile check_bacula @STATIC_CONS@ ++all: Makefile check_bacula + @echo "==== Make of check_bacula is good ====" + @echo " " + +-check_bacula: $(MONITOROBJS) ../lib/libbac.a +- $(CXX) $(LDFLAGS) $(MONITOR_LDFLAGS) -L../lib -L../cats -o $@ $(MONITOROBJS) \ +- $(DLIB) -lbac -lm $(LIBS) ++check_bacula: Makefile $(CHECKOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ++ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CHECK_LDFLAGS) -L../lib -o $@ \ ++ $(CHECKOBJS) $(DLIB) -lbac -lm $(LIBS) $(OPENSSL_LIBS) + + + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status + cd $(topdir) \ + && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + ++libtool-clean: ++ $(RMF) -r .libs _libs ++ + clean: + @$(RMF) check_bacula core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3 + +@@ -81,7 +86,7 @@ + @$(MV) Makefile Makefile.bak + @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile + @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile +- @$(CXX) -S -M $(CPPFLAGS) $(MONITOR_CPPFLAGS) -I$(srcdir) -I$(basedir) *.c >> Makefile ++ @$(CXX) -S -M $(CPPFLAGS) $(CHECK_CPPFLAGS) -I$(srcdir) -I$(basedir) *.c >> Makefile + @if test -f Makefile ; then \ + $(RMF) Makefile.bak; \ + else \ diff -ruN nagios-check_bacula_org/pkg-plist nagios-check_bacula/pkg-plist --- nagios-check_bacula_org/pkg-plist 2008-07-15 05:32:08.000000000 +0200 +++ nagios-check_bacula/pkg-plist 2009-05-13 14:03:42.000000000 +0200 @@ -1,2 +1,3 @@ libexec/nagios/check_bacula +lib/libbac.so.1 @dirrmtry libexec/nagios
Responsible Changed From-To: freebsd-ports-bugs->dhn I'll take it.
dhn 2009-05-13 17:31:30 UTC FreeBSD ports repository Modified files: net-mgmt/nagios-check_bacula Makefile distinfo pkg-plist net-mgmt/nagios-check_bacula/files patch-configure Added files: net-mgmt/nagios-check_bacula/files patch-src-check_bacula-Makefile.in patch-src-lib_jcr.c Log: - Update to 3.0.0 PR: ports/134511 Submitted by: Anders Troback <freebsd@troback.com> (maintainer) Approved by: miwi (mentor implicit) Revision Changes Path 1.4 +8 -3 ports/net-mgmt/nagios-check_bacula/Makefile 1.4 +3 -3 ports/net-mgmt/nagios-check_bacula/distinfo 1.2 +6 -6 ports/net-mgmt/nagios-check_bacula/files/patch-configure 1.1 +62 -0 ports/net-mgmt/nagios-check_bacula/files/patch-src-check_bacula-Makefile.in (new) 1.1 +11 -0 ports/net-mgmt/nagios-check_bacula/files/patch-src-lib_jcr.c (new) 1.2 +1 -0 ports/net-mgmt/nagios-check_bacula/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, with minor changes. Thanks!