From fb576ecfc15a3639a3f72f94dab778fe93f177c0 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 15 May 2009 10:29:05 +0000 Subject: Changes 3.0.1: * Bug fixes. * Check for job_canceled() in fd_plugin code. * Update Win32 table creation to have new DB version 11 format * Remove illegal Options in Exclude of default Win32/64 bacula-dir.conf * Remove "Reposition" message when restoring * Update projects file * Modify insertion of read Volumes in SD to be done before the drive reservation. This ensures that a Volume to be read will not be reserved for writing. Significant enhancement. Changes 3.0.0: * Fix Win32 make clean to clean correctly * Separate object/binaries in Win32 and Win64 builds. More to be done. * Add bconsole to Win64 installer. * Enhance Job messages from SD when the FD->SD protocol is incorrect and the SD hangs up. Previously this looked like a comm error. * Fixed problem in xattr and acl code trying to send empty acl or xattr streams. * Fix for bug #1261 where we send out a null stream when a file only an acl and xattr support is also turned on. * Added some warnings to configure when using libtool and static in one configure. * Fix small memory leak in fileregexp bsr code * Correct bacula32.def entry point as specified by James. * Add code to FD plugin driver to make a copy of the plugin filename to be saved to avoid save_file from zaping it. * Directly mark all files saved by plugin as being seen for Accurate. * more... --- sysutils/bacula-clientonly/Makefile | 3 +- sysutils/bacula-doc/Makefile | 24 +- sysutils/bacula-doc/PLIST | 744 +++++++++++++++++++++++++++++------ sysutils/bacula-doc/distinfo | 10 +- sysutils/bacula-doc/patches/patch-aa | 16 - sysutils/bacula-doc/patches/patch-ab | 38 -- sysutils/bacula/Makefile.common | 5 +- sysutils/bacula/PLIST.common | 18 +- sysutils/bacula/distinfo | 29 +- sysutils/bacula/patches/patch-aa | 23 +- sysutils/bacula/patches/patch-ac | 29 +- sysutils/bacula/patches/patch-ad | 18 + sysutils/bacula/patches/patch-ae | 25 +- sysutils/bacula/patches/patch-af | 72 +++- sysutils/bacula/patches/patch-ag | 25 +- sysutils/bacula/patches/patch-ah | 23 +- sysutils/bacula/patches/patch-ai | 23 +- sysutils/bacula/patches/patch-ak | 13 + sysutils/bacula/patches/patch-al | 14 + sysutils/bacula/patches/patch-am | 6 +- sysutils/bacula/patches/patch-an | 69 ++++ sysutils/bacula/patches/patch-ao | 13 + 22 files changed, 973 insertions(+), 267 deletions(-) delete mode 100644 sysutils/bacula-doc/patches/patch-aa delete mode 100644 sysutils/bacula-doc/patches/patch-ab create mode 100644 sysutils/bacula/patches/patch-ad create mode 100644 sysutils/bacula/patches/patch-ak create mode 100644 sysutils/bacula/patches/patch-al create mode 100644 sysutils/bacula/patches/patch-an create mode 100644 sysutils/bacula/patches/patch-ao (limited to 'sysutils') diff --git a/sysutils/bacula-clientonly/Makefile b/sysutils/bacula-clientonly/Makefile index 14f62b4c397..49da0b970a6 100644 --- a/sysutils/bacula-clientonly/Makefile +++ b/sysutils/bacula-clientonly/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2009/01/15 13:32:18 adam Exp $ +# $NetBSD: Makefile,v 1.12 2009/05/15 10:29:06 adam Exp $ PKGNAME= ${DISTNAME:S/-/-clientonly-/} COMMENT= The Network Backup Solution (client only) -PKGREVISION= 1 CONFLICTS= bacula-[0-9]* bacula-client-[0-9]* diff --git a/sysutils/bacula-doc/Makefile b/sysutils/bacula-doc/Makefile index 5985fa072aa..ca4fdb83888 100644 --- a/sysutils/bacula-doc/Makefile +++ b/sysutils/bacula-doc/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2009/01/06 11:29:26 adam Exp $ +# $NetBSD: Makefile,v 1.19 2009/05/15 10:29:06 adam Exp $ -DISTNAME= bacula-docs-2.4.4 +DISTNAME= bacula-docs-3.0.1 PKGNAME= ${DISTNAME:S/docs/doc/} CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/} @@ -17,12 +17,22 @@ NO_BUILD= yes DOCDIR= share/doc/bacula -INSTALLATION_DIRS= ${DOCDIR} ${DOCDIR}/manual +INSTALLATION_DIRS= ${DOCDIR} +INSTALLATION_DIRS+= ${DOCDIR}/catalog +INSTALLATION_DIRS+= ${DOCDIR}/concepts +INSTALLATION_DIRS+= ${DOCDIR}/console +INSTALLATION_DIRS+= ${DOCDIR}/developers +INSTALLATION_DIRS+= ${DOCDIR}/install +INSTALLATION_DIRS+= ${DOCDIR}/problems +INSTALLATION_DIRS+= ${DOCDIR}/utility do-install: - ${INSTALL_DATA} ${WRKSRC}/manual/bacula/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/manual/ - ${INSTALL_DATA} ${WRKSRC}/manual/bacula/bacula.css ${DESTDIR}${PREFIX}/${DOCDIR}/manual/ - ${INSTALL_DATA} ${WRKSRC}/manual/bacula/*.png ${DESTDIR}${PREFIX}/${DOCDIR}/manual/ - ${INSTALL_DATA} ${WRKSRC}/manual/bacula.pdf ${DESTDIR}${PREFIX}/${DOCDIR}/manual.pdf + ${INSTALL_DATA} ${WRKSRC}/manuals/en/catalog/catalog/* ${DESTDIR}${PREFIX}/${DOCDIR}/catalog/ + ${INSTALL_DATA} ${WRKSRC}/manuals/en/concepts/concepts/* ${DESTDIR}${PREFIX}/${DOCDIR}/concepts/ + ${INSTALL_DATA} ${WRKSRC}/manuals/en/console/console/* ${DESTDIR}${PREFIX}/${DOCDIR}/console/ + ${INSTALL_DATA} ${WRKSRC}/manuals/en/developers/developers/* ${DESTDIR}${PREFIX}/${DOCDIR}/developers/ + ${INSTALL_DATA} ${WRKSRC}/manuals/en/install/install/* ${DESTDIR}${PREFIX}/${DOCDIR}/install/ + ${INSTALL_DATA} ${WRKSRC}/manuals/en/problems/problems/* ${DESTDIR}${PREFIX}/${DOCDIR}/problems/ + ${INSTALL_DATA} ${WRKSRC}/manuals/en/utility/utility/* ${DESTDIR}${PREFIX}/${DOCDIR}/utility/ .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/bacula-doc/PLIST b/sysutils/bacula-doc/PLIST index a5c0591613f..e53087e69f2 100644 --- a/sysutils/bacula-doc/PLIST +++ b/sysutils/bacula-doc/PLIST @@ -1,125 +1,621 @@ -@comment $NetBSD: PLIST,v 1.4 2009/01/06 11:29:26 adam Exp $ -share/doc/bacula/manual.pdf -share/doc/bacula/manual/ANSI_IBM_Tape_Labels.html -share/doc/bacula/manual/About_this_document.html -share/doc/bacula/manual/Autochanger_Resource.html -share/doc/bacula/manual/Autochanger_Resource1.html -share/doc/bacula/manual/Autochanger_Support.html -share/doc/bacula/manual/Automated_Disk_Backup.html -share/doc/bacula/manual/Automatic_Volume_Recycling.html -share/doc/bacula/manual/Backup_Strategies.html -share/doc/bacula/manual/Bacula-tray-monitor.png -share/doc/bacula/manual/Bacula_Console.html -share/doc/bacula/manual/Bacula_Copyri_Tradem_Licens.html -share/doc/bacula/manual/Bacula_Freque_Asked_Questi.html -share/doc/bacula/manual/Bacula_Projects.html -share/doc/bacula/manual/Bacula_RPM_Packaging_FAQ.html -share/doc/bacula/manual/Bacula_Security_Issues.html -share/doc/bacula/manual/Bacula_TLS_Communication.html -share/doc/bacula/manual/Bacula_Users_Guide.html -share/doc/bacula/manual/Basic_Volume_Management.html -share/doc/bacula/manual/Bootstrap_File.html -share/doc/bacula/manual/Brief_Tutorial.html -share/doc/bacula/manual/Catalog_Maintenance.html -share/doc/bacula/manual/Client_Fi_daemon_Configura.html -share/doc/bacula/manual/Conf-Diagram.png -share/doc/bacula/manual/Configuring_Director.html -share/doc/bacula/manual/Console_Configuration.html -share/doc/bacula/manual/Console_Index.html -share/doc/bacula/manual/Contents.html -share/doc/bacula/manual/Critic_Items_Implem_Before.html -share/doc/bacula/manual/Current_State_Bacula.html -share/doc/bacula/manual/Customizin_Configurat_Files.html -share/doc/bacula/manual/DVD_Volumes.html -share/doc/bacula/manual/Data_Encryption.html -share/doc/bacula/manual/Data_Spooling.html -share/doc/bacula/manual/Dealing_with_Firewalls.html -share/doc/bacula/manual/Director_Index.html -share/doc/bacula/manual/Disast_Recove_Using_Bacula.html -share/doc/bacula/manual/File_Daemon_Index.html -share/doc/bacula/manual/GNU_Free_Documentat_License.html -share/doc/bacula/manual/GUI_Programs.html -share/doc/bacula/manual/General_Index.html -share/doc/bacula/manual/Getting_Started_with_Bacula.html -share/doc/bacula/manual/Installi_Configur_PostgreS.html -share/doc/bacula/manual/Installin_Configuri_SQLite.html -share/doc/bacula/manual/Installing_Bacula.html -share/doc/bacula/manual/Installing_Configurin_MySQL.html -share/doc/bacula/manual/List_Figures.html -share/doc/bacula/manual/List_Tables.html -share/doc/bacula/manual/Messages_Resource.html -share/doc/bacula/manual/Migration.html -share/doc/bacula/manual/Monitor_Configuration.html -share/doc/bacula/manual/Python_Scripting.html -share/doc/bacula/manual/Restore_Command.html -share/doc/bacula/manual/Storage_Daemon_Configuratio.html -share/doc/bacula/manual/Storage_Daemon_Index.html -share/doc/bacula/manual/Supported_Autochangers.html -share/doc/bacula/manual/Supported_Operating_Systems.html -share/doc/bacula/manual/Supported_Tape_Drives.html -share/doc/bacula/manual/System_Requirements.html -share/doc/bacula/manual/Testing_Your_Tape_Drive.html -share/doc/bacula/manual/Thanks.html -share/doc/bacula/manual/Tips_Suggestions.html -share/doc/bacula/manual/Using_Bacula_Improv_Comput.html -share/doc/bacula/manual/Using_Stunne_Encryp_Commun.html -share/doc/bacula/manual/Variable_Expansion.html -share/doc/bacula/manual/Volume_Utility_Tools.html -share/doc/bacula/manual/What_Do_When_Bacula.html -share/doc/bacula/manual/What_is_Bacula.html -share/doc/bacula/manual/Windows_Version_Bacula.html -share/doc/bacula/manual/access-is-denied.png -share/doc/bacula/manual/back.png -share/doc/bacula/manual/bacula-applications.png -share/doc/bacula/manual/bacula-logo.png -share/doc/bacula/manual/bacula-objects.png -share/doc/bacula/manual/bacula.css -share/doc/bacula/manual/bat_icon.png -share/doc/bacula/manual/bclogo.png -share/doc/bacula/manual/bimagemgr1.png -share/doc/bacula/manual/bimagemgr2.png -share/doc/bacula/manual/bimagemgr3.png -share/doc/bacula/manual/bweb-index.png -share/doc/bacula/manual/bweb-report.png -share/doc/bacula/manual/confirm.png -share/doc/bacula/manual/contents.png -share/doc/bacula/manual/error.png -share/doc/bacula/manual/faq.html -share/doc/bacula/manual/file.png -share/doc/bacula/manual/flow.png -share/doc/bacula/manual/home.png -share/doc/bacula/manual/idle.png -share/doc/bacula/manual/index.html -share/doc/bacula/manual/index.png -share/doc/bacula/manual/md5.png -share/doc/bacula/manual/menu.png -share/doc/bacula/manual/next.png -share/doc/bacula/manual/next_g.png -share/doc/bacula/manual/philosophical-gnu-sm.png -share/doc/bacula/manual/prev.png -share/doc/bacula/manual/prev_g.png -share/doc/bacula/manual/properties-security-advanced-owner.png -share/doc/bacula/manual/properties-security.png -share/doc/bacula/manual/running.png -share/doc/bacula/manual/smartall.png -share/doc/bacula/manual/thanks.png -share/doc/bacula/manual/tray-icon.png -share/doc/bacula/manual/up.png -share/doc/bacula/manual/up_g.png -share/doc/bacula/manual/view-only.png -share/doc/bacula/manual/win32-config.png -share/doc/bacula/manual/win32-finish.png -share/doc/bacula/manual/win32-installation-type.png -share/doc/bacula/manual/win32-installing.png -share/doc/bacula/manual/win32-location.png -share/doc/bacula/manual/win32-menu.png -share/doc/bacula/manual/win32-nsis.png -share/doc/bacula/manual/win32-pkg.png -share/doc/bacula/manual/win32-service-ok.png -share/doc/bacula/manual/win32-service.png -share/doc/bacula/manual/win32-start.png -share/doc/bacula/manual/win32-welcome.png -share/doc/bacula/manual/wx-console-restore1.png -share/doc/bacula/manual/wx-console-restore2.png -@dirrm share/doc/bacula/manual +@comment $NetBSD: PLIST,v 1.5 2009/05/15 10:29:06 adam Exp $ +share/doc/bacula/catalog/About_this_document.html +share/doc/bacula/catalog/Bacula-tray-monitor.png +share/doc/bacula/catalog/Bacula_Catalo_Databa_Guide.html +share/doc/bacula/catalog/Catalog_Maintenance.html +share/doc/bacula/catalog/Conf-Diagram.png +share/doc/bacula/catalog/Contents.html +share/doc/bacula/catalog/GNU_Free_Documentat_License.html +share/doc/bacula/catalog/General_Index.html +share/doc/bacula/catalog/Installi_Configur_PostgreS.html +share/doc/bacula/catalog/Installin_Configuri_SQLite.html +share/doc/bacula/catalog/Installing_Configurin_MySQL.html +share/doc/bacula/catalog/List_Figures.html +share/doc/bacula/catalog/List_Tables.html +share/doc/bacula/catalog/access-is-denied.png +share/doc/bacula/catalog/back.png +share/doc/bacula/catalog/bacula-applications.png +share/doc/bacula/catalog/bacula-logo.png +share/doc/bacula/catalog/bacula-objects.png +share/doc/bacula/catalog/bat_icon.png +share/doc/bacula/catalog/bclogo.png +share/doc/bacula/catalog/bimagemgr1.png +share/doc/bacula/catalog/bimagemgr2.png +share/doc/bacula/catalog/bimagemgr3.png +share/doc/bacula/catalog/bweb-index.png +share/doc/bacula/catalog/bweb-report.png +share/doc/bacula/catalog/catalog.css +share/doc/bacula/catalog/confirm.png +share/doc/bacula/catalog/contents.png +share/doc/bacula/catalog/different_time.png +share/doc/bacula/catalog/error.png +share/doc/bacula/catalog/file.png +share/doc/bacula/catalog/flow.png +share/doc/bacula/catalog/home.png +share/doc/bacula/catalog/idle.png +share/doc/bacula/catalog/imagename_translations +share/doc/bacula/catalog/images.idx +share/doc/bacula/catalog/images.pl +share/doc/bacula/catalog/images.tex +share/doc/bacula/catalog/index.html +share/doc/bacula/catalog/index.png +share/doc/bacula/catalog/internal_database_is_not.html +share/doc/bacula/catalog/internals.pl +share/doc/bacula/catalog/labels.pl +share/doc/bacula/catalog/md5.png +share/doc/bacula/catalog/menu.png +share/doc/bacula/catalog/next.png +share/doc/bacula/catalog/next_g.png +share/doc/bacula/catalog/philosophical-gnu-sm.png +share/doc/bacula/catalog/prev.png +share/doc/bacula/catalog/prev_g.png +share/doc/bacula/catalog/properties-security-advanced-owner.png +share/doc/bacula/catalog/properties-security.png +share/doc/bacula/catalog/running.png +share/doc/bacula/catalog/smartall.png +share/doc/bacula/catalog/thanks.png +share/doc/bacula/catalog/tray-icon.png +share/doc/bacula/catalog/up.png +share/doc/bacula/catalog/up_g.png +share/doc/bacula/catalog/view-only.png +share/doc/bacula/catalog/win32-config.png +share/doc/bacula/catalog/win32-finish.png +share/doc/bacula/catalog/win32-installation-type.png +share/doc/bacula/catalog/win32-installing.png +share/doc/bacula/catalog/win32-location.png +share/doc/bacula/catalog/win32-menu.png +share/doc/bacula/catalog/win32-nsis.png +share/doc/bacula/catalog/win32-pkg.png +share/doc/bacula/catalog/win32-service-ok.png +share/doc/bacula/catalog/win32-service.png +share/doc/bacula/catalog/win32-start.png +share/doc/bacula/catalog/win32-welcome.png +share/doc/bacula/catalog/wx-console-restore1.png +share/doc/bacula/catalog/wx-console-restore2.png +share/doc/bacula/concepts/ANSI_IBM_Tape_Labels.html +share/doc/bacula/concepts/About_this_document.html +share/doc/bacula/concepts/Autochanger_Resource.html +share/doc/bacula/concepts/Autochanger_Support.html +share/doc/bacula/concepts/Automated_Disk_Backup.html +share/doc/bacula/concepts/Automatic_Volume_Recycling.html +share/doc/bacula/concepts/Backup_Strategies.html +share/doc/bacula/concepts/Bacula-tray-monitor.png +share/doc/bacula/concepts/Bacula_Concep_Overvi_Guide.html +share/doc/bacula/concepts/Bacula_Copyri_Tradem_Licens.html +share/doc/bacula/concepts/Bacula_FD_Plugin_API.html +share/doc/bacula/concepts/Bacula_Projects.html +share/doc/bacula/concepts/Bacula_TLS_Communication.html +share/doc/bacula/concepts/Basic_Volume_Management.html +share/doc/bacula/concepts/Bootstrap_File.html +share/doc/bacula/concepts/Brief_Tutorial.html +share/doc/bacula/concepts/Conf-Diagram.png +share/doc/bacula/concepts/Console_Index.html +share/doc/bacula/concepts/Contents.html +share/doc/bacula/concepts/Current_State_Bacula.html +share/doc/bacula/concepts/DVD_Volumes.html +share/doc/bacula/concepts/Data_Encryption.html +share/doc/bacula/concepts/Data_Spooling.html +share/doc/bacula/concepts/Director_Index.html +share/doc/bacula/concepts/Disast_Recove_Using_Bacula.html +share/doc/bacula/concepts/File_Daemon_Index.html +share/doc/bacula/concepts/GNU_Free_Documentat_License.html +share/doc/bacula/concepts/General_Index.html +share/doc/bacula/concepts/List_Figures.html +share/doc/bacula/concepts/List_Tables.html +share/doc/bacula/concepts/Migration_Copy.html +share/doc/bacula/concepts/New_Features.html +share/doc/bacula/concepts/Python_Scripting.html +share/doc/bacula/concepts/Restore_Command.html +share/doc/bacula/concepts/Storage_Daemon_Index.html +share/doc/bacula/concepts/Supported_Autochangers.html +share/doc/bacula/concepts/Supported_Operating_Systems.html +share/doc/bacula/concepts/Supported_Tape_Drives.html +share/doc/bacula/concepts/System_Requirements.html +share/doc/bacula/concepts/Thanks.html +share/doc/bacula/concepts/Using_Bacula_Improv_Comput.html +share/doc/bacula/concepts/Using_Bacula_catalog_grab.html +share/doc/bacula/concepts/Using_Stunne_Encryp_Commun.html +share/doc/bacula/concepts/Variable_Expansion.html +share/doc/bacula/concepts/What_is_Bacula.html +share/doc/bacula/concepts/Windows_Version_Bacula.html +share/doc/bacula/concepts/access-is-denied.png +share/doc/bacula/concepts/back.png +share/doc/bacula/concepts/bacula-applications.png +share/doc/bacula/concepts/bacula-logo.png +share/doc/bacula/concepts/bacula-objects.png +share/doc/bacula/concepts/bat_icon.png +share/doc/bacula/concepts/bclogo.png +share/doc/bacula/concepts/bimagemgr1.png +share/doc/bacula/concepts/bimagemgr2.png +share/doc/bacula/concepts/bimagemgr3.png +share/doc/bacula/concepts/bweb-index.png +share/doc/bacula/concepts/bweb-report.png +share/doc/bacula/concepts/concepts.css +share/doc/bacula/concepts/confirm.png +share/doc/bacula/concepts/contents.png +share/doc/bacula/concepts/different_time.png +share/doc/bacula/concepts/error.png +share/doc/bacula/concepts/file.png +share/doc/bacula/concepts/flow.png +share/doc/bacula/concepts/home.png +share/doc/bacula/concepts/idle.png +share/doc/bacula/concepts/imagename_translations +share/doc/bacula/concepts/images.idx +share/doc/bacula/concepts/images.pl +share/doc/bacula/concepts/images.tex +share/doc/bacula/concepts/img1.png +share/doc/bacula/concepts/index.html +share/doc/bacula/concepts/index.png +share/doc/bacula/concepts/internals.pl +share/doc/bacula/concepts/labels.pl +share/doc/bacula/concepts/md5.png +share/doc/bacula/concepts/menu.png +share/doc/bacula/concepts/next.png +share/doc/bacula/concepts/next_g.png +share/doc/bacula/concepts/philosophical-gnu-sm.png +share/doc/bacula/concepts/prev.png +share/doc/bacula/concepts/prev_g.png +share/doc/bacula/concepts/properties-security-advanced-owner.png +share/doc/bacula/concepts/properties-security.png +share/doc/bacula/concepts/running.png +share/doc/bacula/concepts/smartall.png +share/doc/bacula/concepts/thanks.png +share/doc/bacula/concepts/tray-icon.png +share/doc/bacula/concepts/up.png +share/doc/bacula/concepts/up_g.png +share/doc/bacula/concepts/view-only.png +share/doc/bacula/concepts/win32-config.png +share/doc/bacula/concepts/win32-finish.png +share/doc/bacula/concepts/win32-installation-type.png +share/doc/bacula/concepts/win32-installing.png +share/doc/bacula/concepts/win32-location.png +share/doc/bacula/concepts/win32-menu.png +share/doc/bacula/concepts/win32-nsis.png +share/doc/bacula/concepts/win32-pkg.png +share/doc/bacula/concepts/win32-service-ok.png +share/doc/bacula/concepts/win32-service.png +share/doc/bacula/concepts/win32-start.png +share/doc/bacula/concepts/win32-welcome.png +share/doc/bacula/concepts/wx-console-restore1.png +share/doc/bacula/concepts/wx-console-restore2.png +share/doc/bacula/console/About_this_document.html +share/doc/bacula/console/Bacula-tray-monitor.png +share/doc/bacula/console/Bacula_Consol_Operat_Guide.html +share/doc/bacula/console/Bacula_Console.html +share/doc/bacula/console/Conf-Diagram.png +share/doc/bacula/console/Contents.html +share/doc/bacula/console/GNU_Free_Documentat_License.html +share/doc/bacula/console/GUI_Programs.html +share/doc/bacula/console/General_Index.html +share/doc/bacula/console/List_Figures.html +share/doc/bacula/console/List_Tables.html +share/doc/bacula/console/access-is-denied.png +share/doc/bacula/console/back.png +share/doc/bacula/console/bacula-applications.png +share/doc/bacula/console/bacula-logo.png +share/doc/bacula/console/bacula-objects.png +share/doc/bacula/console/bat_icon.png +share/doc/bacula/console/bclogo.png +share/doc/bacula/console/bimagemgr1.png +share/doc/bacula/console/bimagemgr2.png +share/doc/bacula/console/bimagemgr3.png +share/doc/bacula/console/bweb-index.png +share/doc/bacula/console/bweb-report.png +share/doc/bacula/console/confirm.png +share/doc/bacula/console/console.css +share/doc/bacula/console/contents.png +share/doc/bacula/console/different_time.png +share/doc/bacula/console/error.png +share/doc/bacula/console/file.png +share/doc/bacula/console/flow.png +share/doc/bacula/console/home.png +share/doc/bacula/console/idle.png +share/doc/bacula/console/imagename_translations +share/doc/bacula/console/images.idx +share/doc/bacula/console/images.pl +share/doc/bacula/console/images.tex +share/doc/bacula/console/index.html +share/doc/bacula/console/index.png +share/doc/bacula/console/internals.pl +share/doc/bacula/console/labels.pl +share/doc/bacula/console/md5.png +share/doc/bacula/console/menu.png +share/doc/bacula/console/next.png +share/doc/bacula/console/next_g.png +share/doc/bacula/console/philosophical-gnu-sm.png +share/doc/bacula/console/prev.png +share/doc/bacula/console/prev_g.png +share/doc/bacula/console/properties-security-advanced-owner.png +share/doc/bacula/console/properties-security.png +share/doc/bacula/console/running.png +share/doc/bacula/console/smartall.png +share/doc/bacula/console/thanks.png +share/doc/bacula/console/tray-icon.png +share/doc/bacula/console/up.png +share/doc/bacula/console/up_g.png +share/doc/bacula/console/view-only.png +share/doc/bacula/console/win32-config.png +share/doc/bacula/console/win32-finish.png +share/doc/bacula/console/win32-installation-type.png +share/doc/bacula/console/win32-installing.png +share/doc/bacula/console/win32-location.png +share/doc/bacula/console/win32-menu.png +share/doc/bacula/console/win32-nsis.png +share/doc/bacula/console/win32-pkg.png +share/doc/bacula/console/win32-service-ok.png +share/doc/bacula/console/win32-service.png +share/doc/bacula/console/win32-start.png +share/doc/bacula/console/win32-welcome.png +share/doc/bacula/console/wx-console-restore1.png +share/doc/bacula/console/wx-console-restore2.png +share/doc/bacula/developers/About_this_document.html +share/doc/bacula/developers/Additional_Error_informatio.html +share/doc/bacula/developers/Authentication_Negotiation.html +share/doc/bacula/developers/Bacula-tray-monitor.png +share/doc/bacula/developers/Bacula_Code_Submiss_Project.html +share/doc/bacula/developers/Bacula_Developer_Notes.html +share/doc/bacula/developers/Bacula_MD5_Algorithm.html +share/doc/bacula/developers/Bacula_Memory_Management.html +share/doc/bacula/developers/Bacula_Porting_Notes.html +share/doc/bacula/developers/Bacula_Regression_Testing.html +share/doc/bacula/developers/Becoming_Server.html +share/doc/bacula/developers/Block_Header.html +share/doc/bacula/developers/Bnet_API_Changes.html +share/doc/bacula/developers/Catalog_Services.html +share/doc/bacula/developers/Comman_Receiv_from_Direct.html +share/doc/bacula/developers/Comman_Receiv_from_Direct1.html +share/doc/bacula/developers/Command_Line_Message_Digest.html +share/doc/bacula/developers/Conf-Diagram.png +share/doc/bacula/developers/Contents.html +share/doc/bacula/developers/Daemon_Protocol.html +share/doc/bacula/developers/Database_Tables.html +share/doc/bacula/developers/Definitions.html +share/doc/bacula/developers/Developers_Guide.html +share/doc/bacula/developers/Developing_Bacula.html +share/doc/bacula/developers/Development_Cycle.html +share/doc/bacula/developers/Director_Services_Daemon.html +share/doc/bacula/developers/Downlo_md5_zi_Zippe_archiv.html +share/doc/bacula/developers/Downlo_smarta_Zippe_archiv.html +share/doc/bacula/developers/File_Services_Daemon.html +share/doc/bacula/developers/GNU_Free_Documentat_License.html +share/doc/bacula/developers/General.html +share/doc/bacula/developers/General1.html +share/doc/bacula/developers/General2.html +share/doc/bacula/developers/General3.html +share/doc/bacula/developers/General4.html +share/doc/bacula/developers/General5.html +share/doc/bacula/developers/General6.html +share/doc/bacula/developers/General7.html +share/doc/bacula/developers/General_Daemon_Protocol.html +share/doc/bacula/developers/General_Index.html +share/doc/bacula/developers/Higher_Level_Conventions.html +share/doc/bacula/developers/Implementing_GUI_Interface.html +share/doc/bacula/developers/Introduction_TLS.html +share/doc/bacula/developers/List_Figures.html +share/doc/bacula/developers/List_Tables.html +share/doc/bacula/developers/Low_Level_Network_Protocol.html +share/doc/bacula/developers/New_Configuratio_Directives.html +share/doc/bacula/developers/Old_Depreciated_Tape_Format.html +share/doc/bacula/developers/Overall_Format.html +share/doc/bacula/developers/Overall_Storage_Format.html +share/doc/bacula/developers/Patches_Released_Versions.html +share/doc/bacula/developers/Platform_Support.html +share/doc/bacula/developers/Porting_Requirements.html +share/doc/bacula/developers/Protoc_Used_Betwee_Direct.html +share/doc/bacula/developers/Protoc_Used_Betwee_Direct1.html +share/doc/bacula/developers/Record_Header.html +share/doc/bacula/developers/Requir_become_Suppor_Platfo.html +share/doc/bacula/developers/Running_Regression_Script.html +share/doc/bacula/developers/Running_Single_Test.html +share/doc/bacula/developers/SD_Connections_Sessions.html +share/doc/bacula/developers/SD_Data_Structures.html +share/doc/bacula/developers/SD_Design_Introduction.html +share/doc/bacula/developers/SD_Development_Outline.html +share/doc/bacula/developers/SVN_Usage.html +share/doc/bacula/developers/Save_Protocol_Between_File.html +share/doc/bacula/developers/Sequen_Creati_Record_Save.html +share/doc/bacula/developers/Serialization.html +share/doc/bacula/developers/Session_Label.html +share/doc/bacula/developers/Smart_Memory_Allocation.html +share/doc/bacula/developers/Steps_Take_Porting.html +share/doc/bacula/developers/Storage_Daemon_Design.html +share/doc/bacula/developers/Storage_Daemon_File_Output.html +share/doc/bacula/developers/Storage_Media_Output_Format.html +share/doc/bacula/developers/Subversion_Resources.html +share/doc/bacula/developers/TCP_IP_Network_Protocol.html +share/doc/bacula/developers/TLS.html +share/doc/bacula/developers/TLS_API_Implementation.html +share/doc/bacula/developers/Testing_your_distro.html +share/doc/bacula/developers/Unix_File_Attributes.html +share/doc/bacula/developers/Version_2_Record_Header.html +share/doc/bacula/developers/Version_BB02_Block_Header.html +share/doc/bacula/developers/Volume_Label_Format.html +share/doc/bacula/developers/Writing_Regression_Test.html +share/doc/bacula/developers/access-is-denied.png +share/doc/bacula/developers/back.png +share/doc/bacula/developers/bacula-applications.png +share/doc/bacula/developers/bacula-logo.png +share/doc/bacula/developers/bacula-objects.png +share/doc/bacula/developers/bat_icon.png +share/doc/bacula/developers/bclogo.png +share/doc/bacula/developers/bimagemgr1.png +share/doc/bacula/developers/bimagemgr2.png +share/doc/bacula/developers/bimagemgr3.png +share/doc/bacula/developers/bnet_Threads.html +share/doc/bacula/developers/bnet_close.html +share/doc/bacula/developers/bnet_fsend.html +share/doc/bacula/developers/bnet_open.html +share/doc/bacula/developers/bnet_recv.html +share/doc/bacula/developers/bnet_send.html +share/doc/bacula/developers/bnet_sig.html +share/doc/bacula/developers/bnet_strerror.html +share/doc/bacula/developers/bweb-index.png +share/doc/bacula/developers/bweb-report.png +share/doc/bacula/developers/confirm.png +share/doc/bacula/developers/contents.png +share/doc/bacula/developers/developers.css +share/doc/bacula/developers/different_time.png +share/doc/bacula/developers/error.png +share/doc/bacula/developers/file.png +share/doc/bacula/developers/flow.png +share/doc/bacula/developers/home.png +share/doc/bacula/developers/imagename_translations +share/doc/bacula/developers/images.tex +share/doc/bacula/developers/index.html +share/doc/bacula/developers/index.png +share/doc/bacula/developers/md5.png +share/doc/bacula/developers/menu.png +share/doc/bacula/developers/next.png +share/doc/bacula/developers/next_g.png +share/doc/bacula/developers/philosophical-gnu-sm.png +share/doc/bacula/developers/prev.png +share/doc/bacula/developers/prev_g.png +share/doc/bacula/developers/properties-security-advanced-owner.png +share/doc/bacula/developers/properties-security.png +share/doc/bacula/developers/running.png +share/doc/bacula/developers/smartall.png +share/doc/bacula/developers/thanks.png +share/doc/bacula/developers/tray-icon.png +share/doc/bacula/developers/up.png +share/doc/bacula/developers/up_g.png +share/doc/bacula/developers/view-only.png +share/doc/bacula/install/About_this_document.html +share/doc/bacula/install/Autochanger_Resource.html +share/doc/bacula/install/Bacula-tray-monitor.png +share/doc/bacula/install/Bacula_Instal_Config_Guide.html +share/doc/bacula/install/Bacula_Security_Issues.html +share/doc/bacula/install/Client_Fi_daemon_Configura.html +share/doc/bacula/install/Conf-Diagram.png +share/doc/bacula/install/Configuring_Director.html +share/doc/bacula/install/Console_Configuration.html +share/doc/bacula/install/Console_Index.html +share/doc/bacula/install/Contents.html +share/doc/bacula/install/Critic_Items_Implem_Before.html +share/doc/bacula/install/Customizin_Configurat_Files.html +share/doc/bacula/install/Director_Index.html +share/doc/bacula/install/File_Daemon_Index.html +share/doc/bacula/install/General_Index.html +share/doc/bacula/install/Getting_Started_with_Bacula.html +share/doc/bacula/install/Installing_Bacula.html +share/doc/bacula/install/List_Figures.html +share/doc/bacula/install/List_Tables.html +share/doc/bacula/install/Messages_Resource.html +share/doc/bacula/install/Monitor_Configuration.html +share/doc/bacula/install/Storage_Daemon_Configuratio.html +share/doc/bacula/install/Storage_Daemon_Index.html +share/doc/bacula/install/access-is-denied.png +share/doc/bacula/install/back.png +share/doc/bacula/install/bacula-applications.png +share/doc/bacula/install/bacula-logo.png +share/doc/bacula/install/bacula-objects.png +share/doc/bacula/install/bat_icon.png +share/doc/bacula/install/bclogo.png +share/doc/bacula/install/bimagemgr1.png +share/doc/bacula/install/bimagemgr2.png +share/doc/bacula/install/bimagemgr3.png +share/doc/bacula/install/bweb-index.png +share/doc/bacula/install/bweb-report.png +share/doc/bacula/install/confirm.png +share/doc/bacula/install/contents.png +share/doc/bacula/install/different_time.png +share/doc/bacula/install/error.png +share/doc/bacula/install/file.png +share/doc/bacula/install/flow.png +share/doc/bacula/install/home.png +share/doc/bacula/install/idle.png +share/doc/bacula/install/imagename_translations +share/doc/bacula/install/images.idx +share/doc/bacula/install/images.pl +share/doc/bacula/install/images.tex +share/doc/bacula/install/img5.png +share/doc/bacula/install/img7.png +share/doc/bacula/install/index.html +share/doc/bacula/install/index.png +share/doc/bacula/install/install.css +share/doc/bacula/install/internals.pl +share/doc/bacula/install/labels.pl +share/doc/bacula/install/md5.png +share/doc/bacula/install/menu.png +share/doc/bacula/install/next.png +share/doc/bacula/install/next_g.png +share/doc/bacula/install/philosophical-gnu-sm.png +share/doc/bacula/install/prev.png +share/doc/bacula/install/prev_g.png +share/doc/bacula/install/properties-security-advanced-owner.png +share/doc/bacula/install/properties-security.png +share/doc/bacula/install/running.png +share/doc/bacula/install/smartall.png +share/doc/bacula/install/thanks.png +share/doc/bacula/install/tray-icon.png +share/doc/bacula/install/up.png +share/doc/bacula/install/up_g.png +share/doc/bacula/install/view-only.png +share/doc/bacula/install/win32-config.png +share/doc/bacula/install/win32-finish.png +share/doc/bacula/install/win32-installation-type.png +share/doc/bacula/install/win32-installing.png +share/doc/bacula/install/win32-location.png +share/doc/bacula/install/win32-menu.png +share/doc/bacula/install/win32-nsis.png +share/doc/bacula/install/win32-pkg.png +share/doc/bacula/install/win32-service-ok.png +share/doc/bacula/install/win32-service.png +share/doc/bacula/install/win32-start.png +share/doc/bacula/install/win32-welcome.png +share/doc/bacula/install/wx-console-restore1.png +share/doc/bacula/install/wx-console-restore2.png +share/doc/bacula/problems/About_this_document.html +share/doc/bacula/problems/Bacula-tray-monitor.png +share/doc/bacula/problems/Bacula_Freque_Asked_Questi.html +share/doc/bacula/problems/Bacula_Proble_Resolu_Guide.html +share/doc/bacula/problems/Conf-Diagram.png +share/doc/bacula/problems/Contents.html +share/doc/bacula/problems/Dealing_with_Firewalls.html +share/doc/bacula/problems/GNU_Free_Documentat_License.html +share/doc/bacula/problems/General_Index.html +share/doc/bacula/problems/List_Figures.html +share/doc/bacula/problems/List_Tables.html +share/doc/bacula/problems/Testing_Your_Tape_Drive.html +share/doc/bacula/problems/Tips_Suggestions.html +share/doc/bacula/problems/What_Do_When_Bacula.html +share/doc/bacula/problems/access-is-denied.png +share/doc/bacula/problems/back.png +share/doc/bacula/problems/bacula-applications.png +share/doc/bacula/problems/bacula-logo.png +share/doc/bacula/problems/bacula-objects.png +share/doc/bacula/problems/bat_icon.png +share/doc/bacula/problems/bclogo.png +share/doc/bacula/problems/bimagemgr1.png +share/doc/bacula/problems/bimagemgr2.png +share/doc/bacula/problems/bimagemgr3.png +share/doc/bacula/problems/bweb-index.png +share/doc/bacula/problems/bweb-report.png +share/doc/bacula/problems/confirm.png +share/doc/bacula/problems/contents.png +share/doc/bacula/problems/different_time.png +share/doc/bacula/problems/error.png +share/doc/bacula/problems/file.png +share/doc/bacula/problems/flow.png +share/doc/bacula/problems/home.png +share/doc/bacula/problems/idle.png +share/doc/bacula/problems/imagename_translations +share/doc/bacula/problems/images.idx +share/doc/bacula/problems/images.pl +share/doc/bacula/problems/images.tex +share/doc/bacula/problems/index.html +share/doc/bacula/problems/index.png +share/doc/bacula/problems/internals.pl +share/doc/bacula/problems/labels.pl +share/doc/bacula/problems/md5.png +share/doc/bacula/problems/menu.png +share/doc/bacula/problems/next.png +share/doc/bacula/problems/next_g.png +share/doc/bacula/problems/philosophical-gnu-sm.png +share/doc/bacula/problems/prev.png +share/doc/bacula/problems/prev_g.png +share/doc/bacula/problems/problems.css +share/doc/bacula/problems/properties-security-advanced-owner.png +share/doc/bacula/problems/properties-security.png +share/doc/bacula/problems/running.png +share/doc/bacula/problems/smartall.png +share/doc/bacula/problems/thanks.png +share/doc/bacula/problems/tray-icon.png +share/doc/bacula/problems/up.png +share/doc/bacula/problems/up_g.png +share/doc/bacula/problems/view-only.png +share/doc/bacula/problems/win32-config.png +share/doc/bacula/problems/win32-finish.png +share/doc/bacula/problems/win32-installation-type.png +share/doc/bacula/problems/win32-installing.png +share/doc/bacula/problems/win32-location.png +share/doc/bacula/problems/win32-menu.png +share/doc/bacula/problems/win32-nsis.png +share/doc/bacula/problems/win32-pkg.png +share/doc/bacula/problems/win32-service-ok.png +share/doc/bacula/problems/win32-service.png +share/doc/bacula/problems/win32-start.png +share/doc/bacula/problems/win32-welcome.png +share/doc/bacula/problems/wx-console-restore1.png +share/doc/bacula/problems/wx-console-restore2.png +share/doc/bacula/utility/About_this_document.html +share/doc/bacula/utility/Bacula-tray-monitor.png +share/doc/bacula/utility/Bacula_RPM_Packaging_FAQ.html +share/doc/bacula/utility/Bacula_Utility_Programs.html +share/doc/bacula/utility/Conf-Diagram.png +share/doc/bacula/utility/Contents.html +share/doc/bacula/utility/GNU_Free_Documentat_License.html +share/doc/bacula/utility/General_Index.html +share/doc/bacula/utility/List_Figures.html +share/doc/bacula/utility/List_Tables.html +share/doc/bacula/utility/Volume_Utility_Tools.html +share/doc/bacula/utility/access-is-denied.png +share/doc/bacula/utility/back.png +share/doc/bacula/utility/bacula-applications.png +share/doc/bacula/utility/bacula-logo.png +share/doc/bacula/utility/bacula-objects.png +share/doc/bacula/utility/bat_icon.png +share/doc/bacula/utility/bclogo.png +share/doc/bacula/utility/bimagemgr1.png +share/doc/bacula/utility/bimagemgr2.png +share/doc/bacula/utility/bimagemgr3.png +share/doc/bacula/utility/bweb-index.png +share/doc/bacula/utility/bweb-report.png +share/doc/bacula/utility/confirm.png +share/doc/bacula/utility/contents.png +share/doc/bacula/utility/different_time.png +share/doc/bacula/utility/error.png +share/doc/bacula/utility/file.png +share/doc/bacula/utility/flow.png +share/doc/bacula/utility/home.png +share/doc/bacula/utility/idle.png +share/doc/bacula/utility/imagename_translations +share/doc/bacula/utility/images.idx +share/doc/bacula/utility/images.pl +share/doc/bacula/utility/images.tex +share/doc/bacula/utility/img1.png +share/doc/bacula/utility/img2.png +share/doc/bacula/utility/img3.png +share/doc/bacula/utility/img4.png +share/doc/bacula/utility/index.html +share/doc/bacula/utility/index.png +share/doc/bacula/utility/internals.pl +share/doc/bacula/utility/labels.pl +share/doc/bacula/utility/md5.png +share/doc/bacula/utility/menu.png +share/doc/bacula/utility/next.png +share/doc/bacula/utility/next_g.png +share/doc/bacula/utility/philosophical-gnu-sm.png +share/doc/bacula/utility/prev.png +share/doc/bacula/utility/prev_g.png +share/doc/bacula/utility/properties-security-advanced-owner.png +share/doc/bacula/utility/properties-security.png +share/doc/bacula/utility/running.png +share/doc/bacula/utility/smartall.png +share/doc/bacula/utility/thanks.png +share/doc/bacula/utility/tray-icon.png +share/doc/bacula/utility/up.png +share/doc/bacula/utility/up_g.png +share/doc/bacula/utility/utility.css +share/doc/bacula/utility/view-only.png +share/doc/bacula/utility/win32-config.png +share/doc/bacula/utility/win32-finish.png +share/doc/bacula/utility/win32-installation-type.png +share/doc/bacula/utility/win32-installing.png +share/doc/bacula/utility/win32-location.png +share/doc/bacula/utility/win32-menu.png +share/doc/bacula/utility/win32-nsis.png +share/doc/bacula/utility/win32-pkg.png +share/doc/bacula/utility/win32-service-ok.png +share/doc/bacula/utility/win32-service.png +share/doc/bacula/utility/win32-start.png +share/doc/bacula/utility/win32-welcome.png +share/doc/bacula/utility/wx-console-restore1.png +share/doc/bacula/utility/wx-console-restore2.png +@dirrm share/doc/bacula/utility +@dirrm share/doc/bacula/problems +@dirrm share/doc/bacula/install +@dirrm share/doc/bacula/developers +@dirrm share/doc/bacula/console +@dirrm share/doc/bacula/concepts +@dirrm share/doc/bacula/catalog @dirrm share/doc/bacula diff --git a/sysutils/bacula-doc/distinfo b/sysutils/bacula-doc/distinfo index b0a0e3f42e4..b3dd82a95a8 100644 --- a/sysutils/bacula-doc/distinfo +++ b/sysutils/bacula-doc/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.16 2009/01/06 11:29:26 adam Exp $ +$NetBSD: distinfo,v 1.17 2009/05/15 10:29:06 adam Exp $ -SHA1 (bacula-docs-2.4.4.tar.bz2) = ef261cd2deadf79173029b6fccab806ff2095b4e -RMD160 (bacula-docs-2.4.4.tar.bz2) = 3ff1dcc4596c1d33bf599363a88d48bde308507e -Size (bacula-docs-2.4.4.tar.bz2) = 23009484 bytes -SHA1 (patch-aa) = 52783e5e70ce0f444044474fae6ccee29711f445 -SHA1 (patch-ab) = ee8ed9aa3dbd1f689abbeee2ff8980b1c0ee9130 +SHA1 (bacula-docs-3.0.1.tar.bz2) = d6fb61cdf74147a5b948b501472a7bda2f4af2e3 +RMD160 (bacula-docs-3.0.1.tar.bz2) = bd3b01cc12486d610264de80b7d6d983b248a95e +Size (bacula-docs-3.0.1.tar.bz2) = 40756082 bytes diff --git a/sysutils/bacula-doc/patches/patch-aa b/sysutils/bacula-doc/patches/patch-aa deleted file mode 100644 index d7610dd6a65..00000000000 --- a/sysutils/bacula-doc/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2008/11/21 14:09:31 adam Exp $ - ---- manual/tips.tex.orig 2008-01-30 11:26:18.000000000 +0100 -+++ manual/tips.tex -@@ -608,6 +608,11 @@ you should take care when supplying pass - Database - Security Considerations }{BackingUpBaculaSecurityConsiderations} - section for more information. - -+If you use the make_catalog_backup script provided by Bacula, remember that -+you should take care when supplying passwords on the command line. Read the -+\ilink{BackingUpBaculaSecurityConsiderations}{Backing Up Your Bacula -+Database - Security Considerations } for more information. -+ - \section{Creating Holiday Schedules} - \label{holiday} - \index[general]{Schedules!Creating Holiday } diff --git a/sysutils/bacula-doc/patches/patch-ab b/sysutils/bacula-doc/patches/patch-ab deleted file mode 100644 index 5c5149fb5da..00000000000 --- a/sysutils/bacula-doc/patches/patch-ab +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2008/11/21 14:09:31 adam Exp $ - ---- manual/catmaintenance.tex.orig 2008-11-21 12:54:44.000000000 +0100 -+++ manual/catmaintenance.tex -@@ -641,6 +641,33 @@ Only you can decide what is appropriate - you with a starting point. We hope it helps. - - -+ -+\label{BackingUpBaculaSecurityConsiderations} -+\section{Security considerations} -+\index[general]{Backing Up Your Bacula Database - Security Considerations } -+\index[general]{Database!Backing Up Your Bacula Database - Security Considerations } -+ -+We provide make_catalog_backup as an example of what can be used to backup -+your Bacula database. We expect you to take security precautions relevant -+to your situation. make_catalog_backup is designed to take a password on -+the command line. This is fine on machines with only trusted users. It is -+not acceptable on machines without trusted users. Most database systems -+provide a alternative method, which does not place the password on the -+command line. -+ -+The make_catalog_backup contains some warnings about how to use it. Please -+read those tips. -+ -+To help you get started, we know PostgreSQL has a password file, -+\elink{ -+.pgpass}{http://www.postgresql.org/docs/8.2/static/libpq-pgpass.html}, and -+we know MySQL has -+\elink{ .my.cnf}{http://dev.mysql.com/doc/refman/4.1/en/password-security.html}. -+ -+Only you can decide what is appropriate for your situation. We have provided -+you with a starting point. We hope it helps. -+ -+ - \label{BackingUPOtherDBs} - \section{Backing Up Third Party Databases} - \index[general]{Backing Up Third Party Databases } diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common index 7fce1857d8c..e60554d63b0 100644 --- a/sysutils/bacula/Makefile.common +++ b/sysutils/bacula/Makefile.common @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.49 2009/01/12 17:37:11 shattered Exp $ +# $NetBSD: Makefile.common,v 1.50 2009/05/15 10:29:05 adam Exp $ # # used by sysutils/bacula-clientonly/Makefile # used by sysutils/bacula-gnome-console/Makefile # used by sysutils/bacula-tray-monitor/Makefile # used by sysutils/bacula-wx-console/Makefile -DISTNAME= bacula-2.4.4 +DISTNAME= bacula-3.0.1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/} @@ -18,6 +18,7 @@ HOMEPAGE= http://www.bacula.org/ COMMENT?= The Network Backup Solution USE_LANGUAGES= c c++ +USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= msgfmt GNU_CONFIGURE= yes diff --git a/sysutils/bacula/PLIST.common b/sysutils/bacula/PLIST.common index 8b3c3685374..3cce6ddf1b6 100644 --- a/sysutils/bacula/PLIST.common +++ b/sysutils/bacula/PLIST.common @@ -1,4 +1,11 @@ -@comment $NetBSD: PLIST.common,v 1.8 2009/01/15 13:32:18 adam Exp $ +@comment $NetBSD: PLIST.common,v 1.9 2009/05/15 10:29:05 adam Exp $ +lib/bpipe-fd.a +lib/bpipe-fd.so +lib/libbac.la +lib/libbaccfg.la +lib/libbacfind.la +lib/libbacpy.la +lib/libbacsql.la libexec/bacula/bacula libexec/bacula/bacula-ctl-dir libexec/bacula/bacula-ctl-fd @@ -9,6 +16,7 @@ libexec/bacula/btraceback.gdb libexec/bacula/disk-changer libexec/bacula/gconsole libexec/bacula/mtx-changer +libexec/bacula/mtx-changer.conf libexec/bacula/startmysql libexec/bacula/stopmysql man/man1/bacula-bgnome-console.1 @@ -28,11 +36,19 @@ man/man8/bscan.8 man/man8/btape.8 man/man8/btraceback.8 man/man8/dbcheck.8 +sbin/bacula sbin/bacula-fd sbin/bconsole sbin/btraceback ${STATIC}sbin/static-bacula-fd ${STATIC}sbin/static-bconsole +share/doc/ChangeLog +share/doc/INSTALL +share/doc/LICENSE +share/doc/README +share/doc/ReleaseNotes +share/doc/VERIFYING +share/doc/technotes share/examples/bacula/bacula-fd.conf share/examples/bacula/bconsole.conf share/examples/bacula/dvd-handler diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo index 47b756c7262..8ed060ec871 100644 --- a/sysutils/bacula/distinfo +++ b/sysutils/bacula/distinfo @@ -1,15 +1,20 @@ -$NetBSD: distinfo,v 1.32 2009/01/06 11:29:26 adam Exp $ +$NetBSD: distinfo,v 1.33 2009/05/15 10:29:05 adam Exp $ -SHA1 (bacula-2.4.4.tar.gz) = ccdcf82bf975d5d7c7b5d9101f6d0a12a1f94c09 -RMD160 (bacula-2.4.4.tar.gz) = a613b2d731f3d37aff38b3ae050bbd51c1b35670 -Size (bacula-2.4.4.tar.gz) = 3145564 bytes -SHA1 (patch-aa) = c1e5ec7c3e78c125b9fbaba97190ead10adbc599 +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-ab) = 760c5214dc9a4e4c11e812842e790b973c502c1a -SHA1 (patch-ac) = ee3771bc026d7f6e714f5e77dec920d07d4c12cf -SHA1 (patch-ae) = 80f2adb5e905f775fbfe6568654ba8495b4c456e -SHA1 (patch-af) = e2e60b5ecba58ced41855f01719c6bc6e27e6a1d -SHA1 (patch-ag) = a2734446ac79380692dd5a2647928919c9b2f2b8 -SHA1 (patch-ah) = 83b156ac18b64d19ea0022103c50c431f3b86b87 -SHA1 (patch-ai) = 7965e5f65b010174cdf6490455d3967b316a36ec +SHA1 (patch-ac) = d9dc44741297924355a3ac86d9fc204b28c73daf +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-aj) = df5eba3c80d36ecc26c6acb1566a4411c308b2f0 -SHA1 (patch-am) = 0b5b81543eb66ad191d94b59c986561e492a069d +SHA1 (patch-ak) = d4c41a8a52d5420e1a9228d725dfd21e52c2fb3a +SHA1 (patch-al) = 1fc78c0de4461c9294325e835e5ed529228e32c4 +SHA1 (patch-am) = a2bfd8f345ce2c68b9387b02b08437cb9fc5772b +SHA1 (patch-an) = 365e6ee90c178349b6ca127accb47b9c7de7ce94 +SHA1 (patch-ao) = e2e005d7fa2f769f650fb3f6f2e1c52d611352ad diff --git a/sysutils/bacula/patches/patch-aa b/sysutils/bacula/patches/patch-aa index 4dca4267995..03cf02cb9a8 100644 --- a/sysutils/bacula/patches/patch-aa +++ b/sysutils/bacula/patches/patch-aa @@ -1,13 +1,22 @@ -$NetBSD: patch-aa,v 1.2 2005/12/08 01:04:45 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2009/05/15 10:29:05 adam Exp $ ---- src/dird/Makefile.in.orig 2005-09-28 21:24:56.000000000 +0200 +--- src/dird/Makefile.in.orig 2009-02-18 12:40:09.000000000 +0100 +++ src/dird/Makefile.in -@@ -110,14 +110,14 @@ devclean: realclean +@@ -63,7 +63,7 @@ all: Makefile bacula-dir @STATIC_DIR@ + bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ +- -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \ ++ ../findlib/libbacfind.la ../cats/libbacsql.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \ + $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + static-bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) +@@ -97,14 +97,14 @@ devclean: realclean install: all - $(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir + $(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}%%EXAMPLESDIR%%/$$srcconf; then \ ++ if test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \ destconf=$$srcconf.new; \ echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ else \ @@ -15,8 +24,8 @@ $NetBSD: patch-aa,v 1.2 2005/12/08 01:04:45 wiz Exp $ fi; \ - echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ - ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf -+ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ -+ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ++ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \ ++ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$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 --git a/sysutils/bacula/patches/patch-ac b/sysutils/bacula/patches/patch-ac index b44c7fed128..cca271eec7a 100644 --- a/sysutils/bacula/patches/patch-ac +++ b/sysutils/bacula/patches/patch-ac @@ -1,29 +1,38 @@ -$NetBSD: patch-ac,v 1.3 2008/11/21 14:09:31 adam Exp $ +$NetBSD: patch-ac,v 1.4 2009/05/15 10:29:05 adam Exp $ ---- src/console/Makefile.in.orig 2007-05-27 11:34:40.000000000 +0200 +--- src/console/Makefile.in.orig 2009-02-18 12:40:09.000000000 +0100 +++ src/console/Makefile.in -@@ -87,19 +87,19 @@ install: all +@@ -48,7 +48,7 @@ all: Makefile bconsole @STATIC_CONS@ + + bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ +- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ ++ $(DLIB) $(CONS_LIBS) ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) \ + $(OPENSSL_LIBS) + + static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) +@@ -90,19 +90,19 @@ install: all fi - $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(sbindir)/bconsole + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(sbindir)/bconsole @srcconf=bconsole.conf; \ - if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \ -+ if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \ ++ if test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$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}%%EXAMPLESDIR%%/console.conf; then \ ++ if test -f ${DESTDIR}/usr/pkg/share/examples/bacula/console.conf; then \ echo "Existing console.conf moved to bconsole.conf"; \ - @$(MV) ${DESTDIR}${sysconfdir}/console.conf ${DESTDIR}${sysconfdir}/bconsole.conf; \ -+ @$(MV) ${DESTDIR}%%EXAMPLESDIR%%/console.conf ${DESTDIR}%%EXAMPLESDIR%%/bconsole.conf; \ ++ @$(MV) ${DESTDIR}/usr/pkg/share/examples/bacula/console.conf ${DESTDIR}/usr/pkg/share/examples/bacula/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}%%EXAMPLESDIR%%/$$destconf"; \ -+ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ++ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \ ++ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf if test -f static-bconsole; then \ - $(INSTALL_PROGRAM) static-bconsole $(DESTDIR)$(sbindir)/static-bconsole; \ + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bconsole $(DESTDIR)$(sbindir)/static-bconsole; \ fi diff --git a/sysutils/bacula/patches/patch-ad b/sysutils/bacula/patches/patch-ad new file mode 100644 index 00000000000..98ea067ee8c --- /dev/null +++ b/sysutils/bacula/patches/patch-ad @@ -0,0 +1,18 @@ +$NetBSD: patch-ad,v 1.1 2009/05/15 10:29:05 adam Exp $ + +--- src/lib/jcr.c.orig 2009-04-10 13:12:50.000000000 +0200 ++++ src/lib/jcr.c +@@ -1059,13 +1059,8 @@ void _dbg_print_jcr(FILE *fp) + + fprintf(fp, "JCR=%p JobId=%i name=%s JobStatus=%c\n", + jcr, jcr->JobId, jcr->Job, jcr->JobStatus); +-#ifdef HAVE_WIN32 + fprintf(fp, "\tuse_count=%i\n", + jcr->use_count()); +-#else +- fprintf(fp, "\tuse_count=%i threadid=0x%x\n", +- jcr->use_count(), (int)jcr->my_thread_id); +-#endif + fprintf(fp, "\tJobType=%c JobLevel=%c\n", + jcr->get_JobType(), jcr->get_JobLevel()); + bstrftime(buf1, sizeof(buf1), jcr->sched_time); diff --git a/sysutils/bacula/patches/patch-ae b/sysutils/bacula/patches/patch-ae index 7e293a840f8..f7855858289 100644 --- a/sysutils/bacula/patches/patch-ae +++ b/sysutils/bacula/patches/patch-ae @@ -1,13 +1,22 @@ -$NetBSD: patch-ae,v 1.3 2008/11/21 14:09:31 adam Exp $ +$NetBSD: patch-ae,v 1.4 2009/05/15 10:29:05 adam Exp $ ---- src/filed/Makefile.in.orig 2007-05-27 11:34:40.000000000 +0200 +--- src/filed/Makefile.in.orig 2009-02-18 12:40:09.000000000 +0100 +++ src/filed/Makefile.in -@@ -120,14 +120,14 @@ devclean: realclean +@@ -86,7 +86,7 @@ win32: $(WIN32OBJS) + bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ +- $(WIN32LIBS) $(FDLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \ ++ $(WIN32LIBS) $(FDLIBS) ../findlib/libbacfind.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(LIBS) \ + $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ +@@ -129,14 +129,14 @@ devclean: realclean install: all - $(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd + $(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}%%EXAMPLESDIR%%/$$srcconf; then \ ++ if test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \ destconf=$$srcconf.new; \ echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ else \ @@ -15,8 +24,8 @@ $NetBSD: patch-ae,v 1.3 2008/11/21 14:09:31 adam Exp $ fi; \ - echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ - ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf -+ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ -+ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ++ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \ ++ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf @if test -f static-bacula-fd; then \ - $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \ + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \ fi diff --git a/sysutils/bacula/patches/patch-af b/sysutils/bacula/patches/patch-af index 6b532df943f..64589180168 100644 --- a/sysutils/bacula/patches/patch-af +++ b/sysutils/bacula/patches/patch-af @@ -1,13 +1,67 @@ -$NetBSD: patch-af,v 1.3 2008/11/21 14:09:31 adam Exp $ +$NetBSD: patch-af,v 1.4 2009/05/15 10:29:05 adam Exp $ ---- src/stored/Makefile.in.orig 2008-08-28 14:54:56.000000000 +0200 +--- src/stored/Makefile.in.orig 2009-02-18 12:40:09.000000000 +0100 +++ src/stored/Makefile.in -@@ -157,14 +157,14 @@ install: all - $(INSTALL_PROGRAM) bscan $(DESTDIR)$(sbindir)/bscan - $(INSTALL_PROGRAM) btape $(DESTDIR)$(sbindir)/btape +@@ -90,7 +90,7 @@ all: Makefile bacula-sd @STATIC_SD@ bls + bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(FDLIBS) \ +- -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \ ++ ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \ + $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + static-bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) +@@ -106,7 +106,7 @@ btape.o: btape.c + + btape: Makefile $(TAPEOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -o $@ $(TAPEOBJS) \ +- -lbacsql -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ ../cats/libbacsql.la ../lib/libbaccfg.la ../lib/libbac.la $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bls.o: bls.c + @echo "Compiling $<" +@@ -116,7 +116,7 @@ bls.o: bls.c + bls: Makefile $(BLSOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + @echo "Compiling $<" + $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ +- -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bextract.o: bextract.c + @echo "Compiling $<" +@@ -126,7 +126,7 @@ bextract.o: bextract.c + bextract: Makefile $(BEXTOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + @echo "Compiling $<" + $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(FDLIBS) \ +- -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bscan.o: bscan.c + @echo "Compiling $<" +@@ -135,7 +135,7 @@ bscan.o: bscan.c + + bscan: Makefile $(SCNOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ +- -lbacsql $(DB_LIBS) $(FDLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ ../cats/libbacsql.la $(DB_LIBS) $(FDLIBS) ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bcopy.o: bcopy.c + @echo "Compiling $<" +@@ -144,7 +144,7 @@ bcopy.o: bcopy.c + + bcopy: Makefile $(COPYOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(COPYOBJS) \ +- -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status + cd $(topdir) \ +@@ -158,14 +158,14 @@ install: all + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bscan $(DESTDIR)$(sbindir)/bscan + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) btape $(DESTDIR)$(sbindir)/btape @srcconf=bacula-sd.conf; \ - if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \ -+ if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \ ++ if test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \ destconf=$$srcconf.new; \ echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ else \ @@ -15,8 +69,8 @@ $NetBSD: patch-af,v 1.3 2008/11/21 14:09:31 adam Exp $ fi; \ - echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ - ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf -+ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ -+ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ++ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \ ++ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf @if test -f static-bacula-sd; then \ - $(INSTALL_PROGRAM) static-bacula-sd $(DESTDIR)$(sbindir)/static-bacula-sd; \ + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-sd $(DESTDIR)$(sbindir)/static-bacula-sd; \ fi diff --git a/sysutils/bacula/patches/patch-ag b/sysutils/bacula/patches/patch-ag index 89073bb7b6d..7190146c8cf 100644 --- a/sysutils/bacula/patches/patch-ag +++ b/sysutils/bacula/patches/patch-ag @@ -1,13 +1,22 @@ -$NetBSD: patch-ag,v 1.4 2007/09/07 15:15:35 ghen Exp $ +$NetBSD: patch-ag,v 1.5 2009/05/15 10:29:05 adam Exp $ ---- src/gnome2-console/Makefile.in.orig 2007-06-14 18:54:30.000000000 +0200 +--- src/gnome2-console/Makefile.in.orig 2009-02-18 12:40:09.000000000 +0100 +++ src/gnome2-console/Makefile.in -@@ -103,14 +103,14 @@ install: all +@@ -64,7 +64,7 @@ support.o: support.c + + bgnome-console: Makefile $(CONSOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -o $@ $(CONSOBJS) \ +- $(LIBS) $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm ++ $(LIBS) $(DLIB) $(CONS_LIBS) ../lib/libbaccfg.la ../lib/libbac.la -lm + + static-console: static-bgnome-console + +@@ -106,14 +106,14 @@ install: all fi - $(INSTALL_PROGRAM) bgnome-console $(DESTDIR)$(sbindir)/bgnome-console + $(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}%%EXAMPLESDIR%%/$$srcconf; then \ ++ if test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \ destconf=$$srcconf.new; \ echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ else \ @@ -15,8 +24,8 @@ $NetBSD: patch-ag,v 1.4 2007/09/07 15:15:35 ghen Exp $ fi; \ - echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ - ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf -+ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ -+ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ++ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \ ++ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf if test -f static-bgnome-console; then \ - $(INSTALL_PROGRAM) static-bgnome-console $(DESTDIR)$(sbindir)/static-bgnome-console; \ + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bgnome-console $(DESTDIR)$(sbindir)/static-bgnome-console; \ fi diff --git a/sysutils/bacula/patches/patch-ah b/sysutils/bacula/patches/patch-ah index f7b3d7f3567..7d6f0b210c1 100644 --- a/sysutils/bacula/patches/patch-ah +++ b/sysutils/bacula/patches/patch-ah @@ -1,13 +1,22 @@ -$NetBSD: patch-ah,v 1.4 2007/09/07 15:15:35 ghen Exp $ +$NetBSD: patch-ah,v 1.5 2009/05/15 10:29:05 adam Exp $ ---- src/wx-console/Makefile.in.orig 2007-05-27 11:34:40.000000000 +0200 +--- src/wx-console/Makefile.in.orig 2009-03-09 16:34:05.000000000 +0100 +++ src/wx-console/Makefile.in -@@ -111,14 +111,14 @@ install: all +@@ -83,7 +83,7 @@ bwx-console.app: bwx-console + + bwx-console: Makefile $(CONSOBJS) @WIN32@ ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) $(CONSOBJS) $(WIN32RES) -o $@ $(LIBS) -L../lib $(CONS_LDFLAGS) \ +- -lbaccfg -lbac $(OPENSSL_LIBS) ++ ../lib/libbaccfg.la ../lib/libbac.la $(OPENSSL_LIBS) + + win32: bwx-console_private.res + +@@ -114,14 +114,14 @@ install: all fi - $(INSTALL_PROGRAM) bwx-console $(DESTDIR)$(sbindir)/bwx-console + $(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}%%EXAMPLESDIR%%/$$srcconf; then \ ++ if test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \ destconf=$$srcconf.new; \ echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ else \ @@ -15,8 +24,8 @@ $NetBSD: patch-ah,v 1.4 2007/09/07 15:15:35 ghen Exp $ fi; \ - echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ - ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf -+ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ -+ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ++ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \ ++ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf uninstall: (cd $(DESTDIR)$(sbindir); $(RMF) bwx-console) diff --git a/sysutils/bacula/patches/patch-ai b/sysutils/bacula/patches/patch-ai index ef63d1ee47f..4b95de91946 100644 --- a/sysutils/bacula/patches/patch-ai +++ b/sysutils/bacula/patches/patch-ai @@ -1,13 +1,22 @@ -$NetBSD: patch-ai,v 1.4 2008/11/21 14:09:31 adam Exp $ +$NetBSD: patch-ai,v 1.5 2009/05/15 10:29:05 adam Exp $ ---- src/tray-monitor/Makefile.in.orig 2007-08-16 10:44:39.000000000 +0200 +--- src/tray-monitor/Makefile.in.orig 2008-10-19 12:34:03.000000000 +0200 +++ src/tray-monitor/Makefile.in -@@ -69,14 +69,14 @@ devclean: realclean +@@ -45,7 +45,7 @@ all: Makefile bacula-tray-monitor + + bacula-tray-monitor: Makefile $(MONITOROBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(MONITOR_LDFLAGS) -L../lib -o $@ \ +- $(MONITOROBJS) $(DLIB) -lbaccfg -lbac -lm $(LIBS) $(OPENSSL_LIBS) ++ $(MONITOROBJS) $(DLIB) ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(OPENSSL_LIBS) + + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status + cd $(topdir) \ +@@ -71,14 +71,14 @@ devclean: realclean install: all - $(INSTALL_PROGRAM) bacula-tray-monitor $(DESTDIR)$(sbindir)/bacula-tray-monitor + $(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}%%EXAMPLESDIR%%/$$srcconf; then \ ++ if test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \ destconf=$$srcconf.new; \ echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ else \ @@ -15,8 +24,8 @@ $NetBSD: patch-ai,v 1.4 2008/11/21 14:09:31 adam Exp $ fi; \ - echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ - ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf -+ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ -+ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ++ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \ ++ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf uninstall: (cd $(DESTDIR)$(sbindir); $(RMF) bacula-tray-monitor) diff --git a/sysutils/bacula/patches/patch-ak b/sysutils/bacula/patches/patch-ak new file mode 100644 index 00000000000..5bc30a36576 --- /dev/null +++ b/sysutils/bacula/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.5 2009/05/15 10:29:05 adam Exp $ + +--- src/findlib/Makefile.in.orig 2009-04-10 13:34:22.000000000 +0200 ++++ src/findlib/Makefile.in +@@ -47,7 +47,7 @@ LIBBACFIND_LT_AGE = 0 + @echo "Compiling $<" + $(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + #------------------------------------------------------------------------- +-all: Makefile libbacfind$(DEFAULT_ARCHIVE_TYPE) libbacfind.a ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ++all: Makefile libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + @echo "==== Make of findlib is good ====" + @echo " " + diff --git a/sysutils/bacula/patches/patch-al b/sysutils/bacula/patches/patch-al new file mode 100644 index 00000000000..af70805fb9f --- /dev/null +++ b/sysutils/bacula/patches/patch-al @@ -0,0 +1,14 @@ +$NetBSD: patch-al,v 1.3 2009/05/15 10:29:05 adam Exp $ + +--- src/cats/sql.c.orig 2009-04-10 13:40:54.000000000 +0200 ++++ src/cats/sql.c +@@ -758,9 +758,6 @@ void _dbg_print_db(JCR *jcr, FILE *fp) + fprintf(fp, "\tcmd=\"%s\" changes=%i\n", NPRTB(mdb->cmd), mdb->changes); + if (mdb->lock.valid == RWLOCK_VALID) { + fprintf(fp, "\tRWLOCK=%p w_active=%i w_wait=%i\n", &mdb->lock, mdb->lock.w_active, mdb->lock.w_wait); +-#ifndef HAVE_WIN32 +- fprintf(fp, "\t\tthreadid=0x%x mutex=%p\n", (int)mdb->lock.writer_id, &mdb->lock.mutex); +-#endif + } + } + diff --git a/sysutils/bacula/patches/patch-am b/sysutils/bacula/patches/patch-am index 9fa21512a4f..dc63398cd87 100644 --- a/sysutils/bacula/patches/patch-am +++ b/sysutils/bacula/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.1 2008/01/08 16:52:20 ghen Exp $ +$NetBSD: patch-am,v 1.2 2009/05/15 10:29:05 adam Exp $ ---- scripts/Makefile.in.orig 2007-04-18 19:06:43.000000000 +0200 +--- scripts/Makefile.in.orig 2009-03-12 19:05:33.000000000 +0100 +++ scripts/Makefile.in -@@ -51,11 +51,6 @@ install: installdirs +@@ -58,11 +58,6 @@ install: installdirs $(MV) -f ${DESTDIR}${scriptdir}/disk-changer ${DESTDIR}${scriptdir}/disk-changer.old; \ fi $(INSTALL_SCRIPT) disk-changer $(DESTDIR)$(scriptdir)/disk-changer diff --git a/sysutils/bacula/patches/patch-an b/sysutils/bacula/patches/patch-an new file mode 100644 index 00000000000..f71c173a687 --- /dev/null +++ b/sysutils/bacula/patches/patch-an @@ -0,0 +1,69 @@ +$NetBSD: patch-an,v 1.1 2009/05/15 10:29:05 adam Exp $ + +--- src/tools/Makefile.in.orig 2009-04-14 23:04:07.000000000 +0200 ++++ src/tools/Makefile.in +@@ -57,21 +57,21 @@ all: Makefile $(TOOLS) gigaslam grow + @echo " " + + bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o ../lib/libbac.la -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bregtest: Makefile bregtest.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o ../lib/libbac.la -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + dbcheck: Makefile dbcheck.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) $(DIRCONFOBJS) + $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) \ +- -lbacsql -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ ../cats/libbacsql.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + fstype: Makefile fstype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lbacfind -lbac -lm \ ++ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o ../findlib/libbacfind.la ../lib/libbac.la -lm \ + $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + drivetype: Makefile drivetype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ drivetype.o -lbacfind -lbac -lm \ ++ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ drivetype.o ../findlib/libbacfind.la ../lib/libbac.la -lm \ + $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + dird_conf.o: ../dird/dird_conf.c +@@ -85,23 +85,23 @@ inc_conf.o: ../dird/inc_conf.c + + testfind: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) $(FINDOBJS) + $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -o $@ $(FINDOBJS) -L. -L../lib -L../findlib \ +- $(DLIB) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ $(DLIB) ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + testls: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) testls.o + $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -L../findlib -o $@ testls.o \ +- $(DLIB) -lbacfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ $(DLIB) ../findlib/libbacfind.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bregex: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bregex.o + $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bregex.o \ +- $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ $(DLIB) ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bwild: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bwild.o + $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bwild.o \ +- $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ $(DLIB) ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bbatch: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) bbatch.o + $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -o $@ bbatch.o \ +- -lbacsql -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ ../cats/libbacsql.la ../lib/libbac.la -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + gigaslam.o: gigaslam.c + $(CC) -c $< +@@ -110,7 +110,7 @@ gigaslam: gigaslam.o + $(CC) -o $@ gigaslam.o + + grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ grow.o ../lib/libbac.la -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status + cd $(topdir) \ diff --git a/sysutils/bacula/patches/patch-ao b/sysutils/bacula/patches/patch-ao new file mode 100644 index 00000000000..377f740ce3e --- /dev/null +++ b/sysutils/bacula/patches/patch-ao @@ -0,0 +1,13 @@ +$NetBSD: patch-ao,v 1.1 2009/05/15 10:29:05 adam Exp $ + +--- configure.orig 2009-05-15 10:52:32.000000000 +0200 ++++ configure +@@ -45609,7 +45609,7 @@ if test "${support_bat}" = "yes" ; then + exit 1 + fi + +- QMAKEBIN="qmake" ++ QMAKEBIN=${QMAKE} + + if test "x$QMAKEQT4" != "xnone"; then + QMAKEBIN=qmake-qt4 -- cgit v1.2.3