commit:     671e2e3ec2b27562d86c1f7bd461add563888bd9
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 12:42:06 2025 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 12:42:41 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=671e2e3e

app-backup/bacula: drop 13.0.3-r2, 13.0.4

Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 app-backup/bacula/Manifest                         |   2 -
 app-backup/bacula/bacula-13.0.3-r2.ebuild          | 449 ---------------------
 app-backup/bacula/bacula-13.0.4.ebuild             | 449 ---------------------
 .../bacula/files/bacula-11.0.2-fix-static.patch    |  63 ---
 app-backup/bacula/files/fix_slibtool.patch         |  67 ---
 5 files changed, 1030 deletions(-)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 79ac896cb237..be173fb6f717 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,3 +1 @@
-DIST bacula-13.0.3.tar.gz 6235649 BLAKE2B 
c1053e784f995aa45f2810a8b1370211a6e42f9512c11e0290f059d0e39489c24d4a7951fa055a00ecd2c4acb44581cc220271952c6d477d15c86e0a7e8680f7
 SHA512 
59ec616535959bde26b5b03a60355f3f8d80ae7a719a079d354f41c0f103b0e467177b6f813ef3eb4d30866f73c393d766e8337e20bb97f19ffd7eba5e5c59c5
-DIST bacula-13.0.4.tar.gz 6227040 BLAKE2B 
e54a754280178f74f97fdbb3c91a596b632d80739fedd5f847d183f0852ea9e82bba55ad9a745ee1ceb945bd527d33b117bc3c866783bd3073166bd20607a72a
 SHA512 
5d33714d5575c351e28676cbd165fe7648ce15a1bc2a03f6d5635528083f3ec3bd6c7137a987690dcc8b232105e5768be91ba405a033ad60c4b82f3c88d73812
 DIST bacula-15.0.2.tar.gz 6524812 BLAKE2B 
1dd0722ce2bb6363936ed9cc9df1b6d842945f17277c77f40884bafc4b0a254c5fdd2c21bd200c6ca8b77c8eb718a319552e50135c9925d2b4ad81a64ab819d2
 SHA512 
71bd206a2bb0cf3ca0f2cb6547b63946bc2a8a5f70c5506b9a589e5ed9871bb98b56205da7d12e54a41c9ab3539fe1114bc94d926f0f831ee9e15bba36f167f3

diff --git a/app-backup/bacula/bacula-13.0.3-r2.ebuild 
b/app-backup/bacula/bacula-13.0.3-r2.ebuild
deleted file mode 100644
index 952e13c53f82..000000000000
--- a/app-backup/bacula/bacula-13.0.3-r2.ebuild
+++ /dev/null
@@ -1,449 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop libtool qmake-utils systemd
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bacula.org/";
-SRC_URI="https://downloads.sourceforge.net/bacula/${MY_P}.tar.gz";
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples 
ipv6 logwatch mysql postgres qt5 readline selinux +sqlite ssl static tcpd 
vim-syntax X"
-
-DEPEND="
-       !bacula-clientonly? (
-               !bacula-nodir? ( virtual/mta )
-               postgres? ( dev-db/postgresql:=[threads(+)] )
-               mysql? ( || ( dev-db/mysql-connector-c 
dev-db/mariadb-connector-c ) )
-               sqlite? ( dev-db/sqlite:3 )
-       )
-       dev-libs/gmp:0
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtwidgets:5
-               dev-qt/qtsvg:5
-               x11-libs/qwt:6
-       )
-       logwatch? ( sys-apps/logwatch )
-       readline? ( sys-libs/readline:0 )
-       static? (
-               dev-libs/lzo[static-libs]
-               sys-libs/ncurses:=[static-libs]
-               sys-libs/zlib[static-libs]
-               acl? ( virtual/acl[static-libs(+)] )
-               ssl? (
-                       dev-libs/openssl:0=[static-libs]
-               )
-       )
-       !static? (
-               dev-libs/lzo
-               sys-libs/ncurses:=
-               sys-libs/zlib
-               acl? ( virtual/acl )
-               ssl? (
-                       dev-libs/openssl:0=
-               )
-       )
-       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-       dev-util/patchelf
-"
-RDEPEND="${DEPEND}
-       acct-user/bacula
-       acct-group/bacula
-       !bacula-clientonly? (
-               !bacula-nosd? (
-                       app-arch/mt-st
-                       sys-block/mtx
-               )
-       )
-       selinux? ( sec-policy/selinux-bacula )
-       vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-REQUIRED_USE="
-       !bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-       static? ( bacula-clientonly )
-"
-
-# suppress warning wrt 'implicit function declaration' in config logs
-# bug 900663
-QA_CONFIG_IMPL_DECL_SKIP=(
-       makedev         # designed to check availability in
-                               # used header file
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-       #XOR and !bacula-clientonly controlled by REQUIRED_USE
-       use mysql && export mydbtype="mysql"
-       use postgres && export mydbtype="postgresql"
-       use sqlite && export mydbtype="sqlite3"
-
-       if use bacula-clientonly && use static && use qt5; then
-               ewarn
-               ewarn "Building statically linked 'bat' is not supported. 
Ignorig 'qt5' useflag."
-               ewarn
-       fi
-}
-
-src_prepare() {
-       # adjusts default configuration files for several binaries
-       # to /etc/bacula/<config> instead of ./<config>
-       pushd src >&/dev/null || die
-       for f in console/console.c dird/dird.c filed/filed.c \
-               stored/bcopy.c stored/bextract.c stored/bls.c \
-               stored/bscan.c stored/btape.c stored/stored.c \
-               qt-console/main.cpp; do
-               sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' 
"${f}" \
-                       || die "sed on ${f} failed"
-       done
-       popd >&/dev/null || die
-
-       # bug 466688 drop deprecated categories from Desktop file
-       sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
-       # bug 466690 Use CXXFLAGS instead of CFLAGS
-       sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-       # drop automatic install of unneeded documentation (for bug 356499)
-       eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-       # bug #310087
-       eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-       # bug #311161
-       eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
-       # bat needs to respect LDFLAGS and CFLAGS
-       eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-
-       # tray-monitor needs to respect LDFLAGS and CFLAGS
-       eapply -p0 "${FILESDIR}"/tray-monitor-pro.patch
-
-       # bug #328701
-       eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-       eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch
-
-       # fix soname in libbaccat.so, see bugs #602952, #790140 and #845126
-       eapply "${FILESDIR}/bacula-fix-sonames-new.patch"
-
-       # correct library search path for slibtool usage (bug #914389)
-       eapply -p0 "${FILESDIR}/fix_slibtool.patch"
-
-       # do not strip binaries
-       sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-       sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-       sed -i -e "s/+= qt$/+= qt nostrip/" \
-                       src/qt-console/tray-monitor/tray-monitor.pro.in || die
-
-       eapply_user
-
-       # Fix systemd unit files:
-       # bug 497748
-       sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
-       sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
-       # bug 504370
-       sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in 
|| die
-       # bug 584442 and 504368
-       sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in 
|| die
-
-       # build 'bat' for Qt5
-       export QMAKE="$(qt5_get_bindir)"/qmake
-
-       # adapt to >=Qt-5.9 (see bug #644566)
-       # qmake needs an existing target file to generate install instructions
-       sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
-               src/qt-console/bat.pro.in || die
-       mkdir src/qt-console/.libs || die
-       touch src/qt-console/.libs/bat || die
-       chmod 755 src/qt-console/.libs/bat || die
-
-       # same for tray-monitor (bug #915605)
-       sed -i -e 's#bins.files = bac#bins.files = .libs/bac#g' \
-               src/qt-console/tray-monitor/tray-monitor.pro.in || die
-       mkdir src/qt-console/tray-monitor/.libs || die
-       touch src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
-       chmod 755 src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
-
-       eapply -p0 "${FILESDIR}/fix_tray_monitor.patch" || die
-
-       # Don't let program install man pages directly
-       sed -i -e 's/ manpages//' Makefile.in || die
-
-       # correct installation for plugins to mode 0755 (bug #725946)
-       sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" 
src/plugins/fd/Makefile ||die
-       sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" 
src/plugins/fd/docker/Makefile ||die
-
-       # fix bundled libtool (bug 466696)
-       # But first move directory with M4 macros out of the way.
-       # It is only needed by autoconf and gives errors during elibtoolize.
-       mv autoconf/libtool autoconf/libtool1 || die
-       elibtoolize
-}
-
-src_configure() {
-       local myconf=''
-
-       if use bacula-clientonly; then
-               myconf="${myconf} \
-                       $(use_enable bacula-clientonly client-only) \
-                       $(use_enable !static libtool) \
-                       $(use_enable static static-cons) \
-                       $(use_enable static static-fd)"
-       else
-               myconf="${myconf} \
-                       $(use_enable !bacula-nodir build-dird) \
-                       $(use_enable !bacula-nosd build-stored)"
-               # bug #311099
-               # database support needed by dir-only *and* sd-only
-               # build as well (for building bscan, btape, etc.)
-               myconf="${myconf}
-                       --with-${mydbtype}"
-       fi
-
-       # do not build bat if 'static' clientonly
-       if ! use bacula-clientonly || ! use static; then
-               myconf="${myconf} \
-                       $(use_enable qt5 bat)"
-       fi
-
-       myconf="${myconf} \
-               $(use_with X x) \
-               $(use_enable batch-insert) \
-               $(use_enable !readline conio) \
-               $(use_enable readline) \
-               $(use_with ssl openssl) \
-               $(use_enable ipv6) \
-               $(use_enable acl) \
-               $(use_with tcpd tcp-wrappers)"
-
-       econf \
-               --with-pid-dir=/var/run \
-               --sysconfdir=/etc/bacula \
-               --with-archivedir=/var/lib/bacula/tmp \
-               --with-subsys-dir=/var/lock/subsys \
-               --with-working-dir=/var/lib/bacula \
-               --with-logdir=/var/lib/bacula \
-               --with-scriptdir=/usr/libexec/bacula \
-               --with-systemd=$(systemd_get_systemunitdir) \
-               --with-dir-user=bacula \
-               --with-dir-group=bacula \
-               --with-sd-user=root \
-               --with-sd-group=bacula \
-               --with-fd-user=root \
-               --with-fd-group=bacula \
-               --enable-smartalloc \
-               --disable-afs \
-               --without-s3 \
-               --host=${CHOST} \
-               ${myconf}
-}
-
-src_compile() {
-       # Make build log verbose (bug #447806)
-       emake NO_ECHO=""
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-       doicon scripts/bacula.png
-       keepdir /var/lib/bacula/tmp
-
-       # remove not needed .la files #840957
-       find "${ED}" -name '*.la' -delete || die
-
-       # install bat icon and desktop file when enabled
-       # (for some reason ./configure doesn't pick this up)
-       if use qt5 && ! use static ; then
-               doicon src/qt-console/images/bat_icon.png
-               domenu scripts/bat.desktop
-       fi
-
-       # remove some scripts we don't need at all
-       rm -f 
"${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-       # rename statically linked apps
-       if use bacula-clientonly && use static ; then
-               pushd "${D}"/usr/sbin || die
-               mv static-bacula-fd bacula-fd || die
-               mv static-bconsole bconsole || die
-               popd || die
-       fi
-
-       # extra files which 'make install' doesn't cover
-       if ! use bacula-clientonly; then
-           # the database update scripts
-               diropts -m0750
-               insinto /usr/libexec/bacula/updatedb
-               insopts -m0754
-               doins "${S}"/updatedb/*
-               fperms 0640 /usr/libexec/bacula/updatedb/README
-
-               # the logrotate configuration
-               # (now unconditional wrt bug #258187)
-               diropts -m0755
-               insinto /etc/logrotate.d
-               insopts -m0644
-               newins "${S}"/scripts/logrotate bacula
-
-               # the logwatch scripts
-               if use logwatch; then
-                       diropts -m0750
-                       dodir /usr/share/logwatch/scripts/services
-                       dodir /usr/share/logwatch/scripts/shared
-                       dodir /etc/logwatch/conf/logfiles
-                       dodir /etc/logwatch/conf/services
-                       pushd "${S}"/scripts/logwatch >&/dev/null || die
-                       emake DESTDIR="${D}" install
-                       popd >&/dev/null || die
-               fi
-       fi
-
-       # Install all man pages
-       doman "${S}"/manpages/*.[18]
-
-       if ! use qt5; then
-               rm -vf "${D}"/usr/share/man/man1/bat.1*
-               rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-       fi
-
-       if use bacula-clientonly || use bacula-nodir ; then
-               rm -vf "${D}"/usr/libexec/bacula/create_*_database
-               rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-               rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-               rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-               rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-               rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-               rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-       fi
-       if use bacula-clientonly || use bacula-nosd; then
-               rm -vf "${D}"/usr/libexec/bacula/disk-changer
-               rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-               rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-       fi
-
-       # documentation
-       dodoc ChangeLog ReleaseNotes SUPPORT
-
-       # install examples (bug #457504)
-       if use examples; then
-               docinto examples/
-               dodoc -r examples/*
-       fi
-
-       # vim-files
-       if use vim-syntax; then
-               insinto /usr/share/vim/vimfiles/syntax
-               doins scripts/bacula.vim
-               insinto /usr/share/vim/vimfiles/ftdetect
-               newins scripts/filetype.vim bacula_ft.vim
-       fi
-
-       # setup init scripts
-       myscripts="bacula-fd"
-       if ! use bacula-clientonly; then
-               if ! use bacula-nodir; then
-                       myscripts="${myscripts} bacula-dir"
-               fi
-               if ! use bacula-nosd; then
-                       myscripts="${myscripts} bacula-sd"
-               fi
-       fi
-       for script in ${myscripts}; do
-               # copy over init script and config to a temporary location
-               # so we can modify them as needed
-               cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die 
"failed to copy ${script}.confd"
-               cp "${FILESDIR}/newscripts/${script}".initd 
"${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-               # now set the database dependency for the director init script
-               case "${script}" in
-                       bacula-dir)
-                               case "${mydbtype}" in
-                                       sqlite3)
-                                               # sqlite databases don't have a 
daemon
-                                               sed -i -e 's/need 
"%database%"/:/g' "${T}/${script}".initd || die
-                                               ;;
-                                       *)
-                                               # all other databases have 
daemons
-                                               sed -i -e 
"s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-                                               ;;
-                               esac
-                               ;;
-                       *)
-                               ;;
-               esac
-
-               # install init script and config
-               newinitd "${T}/${script}".initd "${script}"
-               newconfd "${T}/${script}".confd "${script}"
-       done
-
-       systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-       # make sure the working directory exists
-       diropts -m0750
-       keepdir /var/lib/bacula
-
-       # make sure bacula group can execute bacula libexec scripts
-       fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-       if use bacula-clientonly; then
-               fowners root:bacula /var/lib/bacula
-       else
-               fowners bacula:bacula /var/lib/bacula
-       fi
-
-       einfo
-       einfo "A group 'bacula' has been created. Any users you add to this"
-       einfo "group have access to files created by the daemons."
-       einfo
-       einfo "A user 'bacula' has been created.  Please see the bacula manual"
-       einfo "for information about running bacula as a non-root user."
-       einfo
-
-       if ! use bacula-clientonly && ! use bacula-nodir; then
-               einfo
-               einfo "If this is a new install, you must create the 
${mydbtype} databases with:"
-               einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-               einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-               einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-               einfo
-
-               ewarn "ATTENTION!"
-               ewarn "The format of the database may have changed."
-               ewarn "If you just upgraded from a version below 9.0.0 you must 
run"
-               ewarn "'update_bacula_tables' now."
-               ewarn "Make sure to have a backup of your catalog before."
-               ewarn
-       fi
-
-       if use sqlite; then
-               einfo
-               einfo "Be aware that Bacula does not officially support SQLite 
database anymore."
-               einfo "Best use it only for a client-only installation. See Bug 
#445540."
-               einfo
-       fi
-
-       einfo "Please note that 'bconsole' will always be installed. To compile 
'bat'"
-       einfo "you have to enable 'USE=qt5'."
-       einfo
-       einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will 
be used during"
-       einfo "restores, so be sure to set it to an appropriate in dir in the 
bacula config."
-
-       einfo
-       einfo "If you adapt the port numbers for baculas components in the 
config files"
-       einfo "make sure to adapt the file names for the pidfile accordingly"
-       einfo "(see init.d scripts)."
-}

diff --git a/app-backup/bacula/bacula-13.0.4.ebuild 
b/app-backup/bacula/bacula-13.0.4.ebuild
deleted file mode 100644
index 6a4d2259bb25..000000000000
--- a/app-backup/bacula/bacula-13.0.4.ebuild
+++ /dev/null
@@ -1,449 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop libtool qmake-utils systemd
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bacula.org/";
-SRC_URI="https://downloads.sourceforge.net/bacula/${MY_P}.tar.gz";
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples 
ipv6 logwatch mysql postgres qt5 readline selinux +sqlite ssl static tcpd 
vim-syntax X"
-
-DEPEND="
-       !bacula-clientonly? (
-               !bacula-nodir? ( virtual/mta )
-               postgres? ( dev-db/postgresql:=[threads(+)] )
-               mysql? ( || ( dev-db/mysql-connector-c 
dev-db/mariadb-connector-c ) )
-               sqlite? ( dev-db/sqlite:3 )
-       )
-       dev-libs/gmp:0
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtwidgets:5
-               dev-qt/qtsvg:5
-               x11-libs/qwt:6
-       )
-       logwatch? ( sys-apps/logwatch )
-       readline? ( sys-libs/readline:0 )
-       static? (
-               dev-libs/lzo[static-libs]
-               sys-libs/ncurses:=[static-libs]
-               sys-libs/zlib[static-libs]
-               acl? ( virtual/acl[static-libs(+)] )
-               ssl? (
-                       dev-libs/openssl:0=[static-libs]
-               )
-       )
-       !static? (
-               dev-libs/lzo
-               sys-libs/ncurses:=
-               sys-libs/zlib
-               acl? ( virtual/acl )
-               ssl? (
-                       dev-libs/openssl:0=
-               )
-       )
-       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-       dev-util/patchelf
-"
-RDEPEND="${DEPEND}
-       acct-user/bacula
-       acct-group/bacula
-       !bacula-clientonly? (
-               !bacula-nosd? (
-                       app-arch/mt-st
-                       sys-block/mtx
-               )
-       )
-       selinux? ( sec-policy/selinux-bacula )
-       vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-REQUIRED_USE="
-       !bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-       static? ( bacula-clientonly )
-"
-
-# suppress warning wrt 'implicit function declaration' in config logs
-# bug 900663
-QA_CONFIG_IMPL_DECL_SKIP=(
-       makedev         # designed to check availability in
-                               # used header file
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-       #XOR and !bacula-clientonly controlled by REQUIRED_USE
-       use mysql && export mydbtype="mysql"
-       use postgres && export mydbtype="postgresql"
-       use sqlite && export mydbtype="sqlite3"
-
-       if use bacula-clientonly && use static && use qt5; then
-               ewarn
-               ewarn "Building statically linked 'bat' is not supported. 
Ignorig 'qt5' useflag."
-               ewarn
-       fi
-}
-
-src_prepare() {
-       # adjusts default configuration files for several binaries
-       # to /etc/bacula/<config> instead of ./<config>
-       pushd src >&/dev/null || die
-       for f in console/console.c dird/dird.c filed/filed.c \
-               stored/bcopy.c stored/bextract.c stored/bls.c \
-               stored/bscan.c stored/btape.c stored/stored.c \
-               qt-console/main.cpp; do
-               sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' 
"${f}" \
-                       || die "sed on ${f} failed"
-       done
-       popd >&/dev/null || die
-
-       # bug 466688 drop deprecated categories from Desktop file
-       sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
-       # bug 466690 Use CXXFLAGS instead of CFLAGS
-       sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-       # drop automatic install of unneeded documentation (for bug 356499)
-       eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-       # bug #310087
-       eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-       # bug #311161
-       eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
-       # bat needs to respect LDFLAGS and CFLAGS
-       eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-
-       # tray-monitor needs to respect LDFLAGS and CFLAGS
-       eapply -p0 "${FILESDIR}"/tray-monitor-pro.patch
-
-       # bug #328701
-       eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-       eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch
-
-       # fix soname in libbaccat.so, see bugs #602952, #790140 and #845126
-       eapply "${FILESDIR}/bacula-fix-sonames-new.patch"
-
-       # correct library search path for slibtool usage (bug #914389)
-       eapply -p0 "${FILESDIR}/fix_slibtool.patch"
-
-       # do not strip binaries
-       sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-       sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-       sed -i -e "s/+= qt$/+= qt nostrip/" \
-                       src/qt-console/tray-monitor/tray-monitor.pro.in || die
-
-       eapply_user
-
-       # Fix systemd unit files:
-       # bug 497748
-       sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
-       sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
-       # bug 504370
-       sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in 
|| die
-       # bug 584442 and 504368
-       sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in 
|| die
-
-       # build 'bat' for Qt5
-       export QMAKE="$(qt5_get_bindir)"/qmake
-
-       # adapt to >=Qt-5.9 (see bug #644566)
-       # qmake needs an existing target file to generate install instructions
-       sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
-               src/qt-console/bat.pro.in || die
-       mkdir src/qt-console/.libs || die
-       touch src/qt-console/.libs/bat || die
-       chmod 755 src/qt-console/.libs/bat || die
-
-       # same for tray-monitor (bug #915605)
-       sed -i -e 's#bins.files = bac#bins.files = .libs/bac#g' \
-               src/qt-console/tray-monitor/tray-monitor.pro.in || die
-       mkdir src/qt-console/tray-monitor/.libs || die
-       touch src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
-       chmod 755 src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
-
-       eapply -p0 "${FILESDIR}/fix_tray_monitor.patch" || die
-
-       # Don't let program install man pages directly
-       sed -i -e 's/ manpages//' Makefile.in || die
-
-       # correct installation for plugins to mode 0755 (bug #725946)
-       sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" 
src/plugins/fd/Makefile ||die
-       sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" 
src/plugins/fd/docker/Makefile ||die
-
-       # fix bundled libtool (bug 466696)
-       # But first move directory with M4 macros out of the way.
-       # It is only needed by autoconf and gives errors during elibtoolize.
-       mv autoconf/libtool autoconf/libtool1 || die
-       elibtoolize
-}
-
-src_configure() {
-       local myconf=''
-
-       if use bacula-clientonly; then
-               myconf="${myconf} \
-                       $(use_enable bacula-clientonly client-only) \
-                       $(use_enable !static libtool) \
-                       $(use_enable static static-cons) \
-                       $(use_enable static static-fd)"
-       else
-               myconf="${myconf} \
-                       $(use_enable !bacula-nodir build-dird) \
-                       $(use_enable !bacula-nosd build-stored)"
-               # bug #311099
-               # database support needed by dir-only *and* sd-only
-               # build as well (for building bscan, btape, etc.)
-               myconf="${myconf}
-                       --with-${mydbtype}"
-       fi
-
-       # do not build bat if 'static' clientonly
-       if ! use bacula-clientonly || ! use static; then
-               myconf="${myconf} \
-                       $(use_enable qt5 bat)"
-       fi
-
-       myconf="${myconf} \
-               $(use_with X x) \
-               $(use_enable batch-insert) \
-               $(use_enable !readline conio) \
-               $(use_enable readline) \
-               $(use_with ssl openssl) \
-               $(use_enable ipv6) \
-               $(use_enable acl) \
-               $(use_with tcpd tcp-wrappers)"
-
-       econf \
-               --with-pid-dir=/var/run \
-               --sysconfdir=/etc/bacula \
-               --with-archivedir=/var/lib/bacula/tmp \
-               --with-subsys-dir=/var/lock/subsys \
-               --with-working-dir=/var/lib/bacula \
-               --with-logdir=/var/lib/bacula \
-               --with-scriptdir=/usr/libexec/bacula \
-               --with-systemd=$(systemd_get_systemunitdir) \
-               --with-dir-user=bacula \
-               --with-dir-group=bacula \
-               --with-sd-user=root \
-               --with-sd-group=bacula \
-               --with-fd-user=root \
-               --with-fd-group=bacula \
-               --enable-smartalloc \
-               --disable-afs \
-               --without-s3 \
-               --host=${CHOST} \
-               ${myconf}
-}
-
-src_compile() {
-       # Make build log verbose (bug #447806)
-       emake NO_ECHO=""
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-       doicon scripts/bacula.png
-       keepdir /var/lib/bacula/tmp
-
-       # remove not needed .la files #840957
-       find "${ED}" -name '*.la' -delete || die
-
-       # install bat icon and desktop file when enabled
-       # (for some reason ./configure doesn't pick this up)
-       if use qt5 && ! use static ; then
-               doicon src/qt-console/images/bat_icon.png
-               domenu scripts/bat.desktop
-       fi
-
-       # remove some scripts we don't need at all
-       rm -f 
"${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-       # rename statically linked apps
-       if use bacula-clientonly && use static ; then
-               pushd "${D}"/usr/sbin || die
-               mv static-bacula-fd bacula-fd || die
-               mv static-bconsole bconsole || die
-               popd || die
-       fi
-
-       # extra files which 'make install' doesn't cover
-       if ! use bacula-clientonly; then
-           # the database update scripts
-               diropts -m0750
-               insinto /usr/libexec/bacula/updatedb
-               insopts -m0754
-               doins "${S}"/updatedb/*
-               fperms 0640 /usr/libexec/bacula/updatedb/README
-
-               # the logrotate configuration
-               # (now unconditional wrt bug #258187)
-               diropts -m0755
-               insinto /etc/logrotate.d
-               insopts -m0644
-               newins "${S}"/scripts/logrotate bacula
-
-               # the logwatch scripts
-               if use logwatch; then
-                       diropts -m0750
-                       dodir /usr/share/logwatch/scripts/services
-                       dodir /usr/share/logwatch/scripts/shared
-                       dodir /etc/logwatch/conf/logfiles
-                       dodir /etc/logwatch/conf/services
-                       pushd "${S}"/scripts/logwatch >&/dev/null || die
-                       emake DESTDIR="${D}" install
-                       popd >&/dev/null || die
-               fi
-       fi
-
-       # Install all man pages
-       doman "${S}"/manpages/*.[18]
-
-       if ! use qt5; then
-               rm -vf "${D}"/usr/share/man/man1/bat.1*
-               rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-       fi
-
-       if use bacula-clientonly || use bacula-nodir ; then
-               rm -vf "${D}"/usr/libexec/bacula/create_*_database
-               rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-               rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-               rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-               rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-               rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-               rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-       fi
-       if use bacula-clientonly || use bacula-nosd; then
-               rm -vf "${D}"/usr/libexec/bacula/disk-changer
-               rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-               rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-       fi
-
-       # documentation
-       dodoc ChangeLog ReleaseNotes SUPPORT
-
-       # install examples (bug #457504)
-       if use examples; then
-               docinto examples/
-               dodoc -r examples/*
-       fi
-
-       # vim-files
-       if use vim-syntax; then
-               insinto /usr/share/vim/vimfiles/syntax
-               doins scripts/bacula.vim
-               insinto /usr/share/vim/vimfiles/ftdetect
-               newins scripts/filetype.vim bacula_ft.vim
-       fi
-
-       # setup init scripts
-       myscripts="bacula-fd"
-       if ! use bacula-clientonly; then
-               if ! use bacula-nodir; then
-                       myscripts="${myscripts} bacula-dir"
-               fi
-               if ! use bacula-nosd; then
-                       myscripts="${myscripts} bacula-sd"
-               fi
-       fi
-       for script in ${myscripts}; do
-               # copy over init script and config to a temporary location
-               # so we can modify them as needed
-               cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die 
"failed to copy ${script}.confd"
-               cp "${FILESDIR}/newscripts/${script}".initd 
"${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-               # now set the database dependency for the director init script
-               case "${script}" in
-                       bacula-dir)
-                               case "${mydbtype}" in
-                                       sqlite3)
-                                               # sqlite databases don't have a 
daemon
-                                               sed -i -e 's/need 
"%database%"/:/g' "${T}/${script}".initd || die
-                                               ;;
-                                       *)
-                                               # all other databases have 
daemons
-                                               sed -i -e 
"s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-                                               ;;
-                               esac
-                               ;;
-                       *)
-                               ;;
-               esac
-
-               # install init script and config
-               newinitd "${T}/${script}".initd "${script}"
-               newconfd "${T}/${script}".confd "${script}"
-       done
-
-       systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-       # make sure the working directory exists
-       diropts -m0750
-       keepdir /var/lib/bacula
-
-       # make sure bacula group can execute bacula libexec scripts
-       fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-       if use bacula-clientonly; then
-               fowners root:bacula /var/lib/bacula
-       else
-               fowners bacula:bacula /var/lib/bacula
-       fi
-
-       einfo
-       einfo "A group 'bacula' has been created. Any users you add to this"
-       einfo "group have access to files created by the daemons."
-       einfo
-       einfo "A user 'bacula' has been created.  Please see the bacula manual"
-       einfo "for information about running bacula as a non-root user."
-       einfo
-
-       if ! use bacula-clientonly && ! use bacula-nodir; then
-               einfo
-               einfo "If this is a new install, you must create the 
${mydbtype} databases with:"
-               einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-               einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-               einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-               einfo
-
-               ewarn "ATTENTION!"
-               ewarn "The format of the database may have changed."
-               ewarn "If you just upgraded from a version below 9.0.0 you must 
run"
-               ewarn "'update_bacula_tables' now."
-               ewarn "Make sure to have a backup of your catalog before."
-               ewarn
-       fi
-
-       if use sqlite; then
-               einfo
-               einfo "Be aware that Bacula does not officially support SQLite 
database anymore."
-               einfo "Best use it only for a client-only installation. See Bug 
#445540."
-               einfo
-       fi
-
-       einfo "Please note that 'bconsole' will always be installed. To compile 
'bat'"
-       einfo "you have to enable 'USE=qt5'."
-       einfo
-       einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will 
be used during"
-       einfo "restores, so be sure to set it to an appropriate in dir in the 
bacula config."
-
-       einfo
-       einfo "If you adapt the port numbers for baculas components in the 
config files"
-       einfo "make sure to adapt the file names for the pidfile accordingly"
-       einfo "(see init.d scripts)."
-}

diff --git a/app-backup/bacula/files/bacula-11.0.2-fix-static.patch 
b/app-backup/bacula/files/bacula-11.0.2-fix-static.patch
deleted file mode 100644
index f7ffccf0fe58..000000000000
--- a/app-backup/bacula/files/bacula-11.0.2-fix-static.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- src/console/Makefile.in.orig       2017-07-25 19:03:05.664760298 +0200
-+++ src/console/Makefile.in    2017-07-25 19:05:43.576706091 +0200
-@@ -24,6 +24,7 @@
- CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@
- CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
- JSONOBJS = bbconsjson.o console_conf.o
-+ZLIBS=@ZLIBS@
- 
- # these are the objects that are changed by the .configure process
- EXTRAOBJS = @OBJLIST@
-@@ -50,18 +51,18 @@
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) 
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
-       $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o 
$@ $(CONSOBJS) \
--            $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--            $(OPENSSL_LIBS)
-+            $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+            $(OPENSSL_LIBS) $(LIBS)
- 
- bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) 
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
-       $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o 
$@ $(JSONOBJS) \
--            $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--            $(OPENSSL_LIBS)
-+            $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+            $(OPENSSL_LIBS) $(LIBS)
- 
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a 
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
-       $(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) 
$(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
--            $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--            $(OPENSSL_LIBS)
-+            $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+            $(OPENSSL_LIBS) $(LIBS)
-       strip $@
- 
- 
---- src/filed/Makefile.in.orig 2017-07-25 19:09:19.655852979 +0200
-+++ src/filed/Makefile.in      2017-07-25 19:11:39.519558592 +0200
-@@ -69,19 +69,19 @@
- bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(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) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--        $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) 
$(AFS_LIBS) $(LZO_LIBS) $(IOKITLIBS)
-+        $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+        $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) 
$(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(IOKITLIBS)
- 
- bfdjson:  Makefile $(JSONOBJS) ../findlib/libbacfind$(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 
$@ $(JSONOBJS) \
--        $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--        $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) 
$(AFS_LIBS) $(LZO_LIBS)
-+        $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+        $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) 
$(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 
- static-bacula-fd: Makefile $(SVROBJS) 
../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) 
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) 
@WIN32@
-       $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib 
-L../findlib -o $@ $(SVROBJS) \
--         $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) 
\
--         $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) 
$(AFS_LIBS) $(LZO_LIBS)
-+         $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+         $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) 
$(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-       strip $@
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status

diff --git a/app-backup/bacula/files/fix_slibtool.patch 
b/app-backup/bacula/files/fix_slibtool.patch
deleted file mode 100644
index e38448faa30c..000000000000
--- a/app-backup/bacula/files/fix_slibtool.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-# slibtool creates library in .libs directory but need -L. to find them
-# Bug #914389
---- src/stored/Makefile.in.orig        2023-11-15 14:20:23.135630968 +0100
-+++ src/stored/Makefile.in     2023-11-15 14:22:35.771246680 +0100
-@@ -267,7 +267,7 @@
-          -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
- 
- btape: Makefile  $(TAPEOBJS) libbacsd.la drivers 
../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
--      $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib 
-L../findlib -o $@ $(TAPEOBJS) \
-+      $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib 
-L../findlib -o $@ $(TAPEOBJS) \
-         $(SD_LIBS) $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- 
-@@ -277,7 +277,7 @@
-            -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
- 
- cloud_test: Makefile cloud_test.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)  
$(BLSOBJS)  libbacsd.la drivers
--      $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib 
-L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \
-+      $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib 
-L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \
-            $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bcloud.o: bcloud.c
-@@ -286,7 +286,7 @@
-            -I$(basedir) $(DINCLUDE) $(S3_INC) $(CFLAGS) $<
- 
- bcloud: Makefile bcloud.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)  $(BLSOBJS)  
libbacsd.la drivers
--      $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib 
-L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \
-+      $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib 
-L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \
-            $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(S3_LIBS)
- 
- bls.o:        bls.c
-@@ -296,7 +296,7 @@
- 
- bls:  Makefile $(BLSOBJS) libbacsd.la drivers  
../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) \
-+      $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib 
-L../findlib -o $@ $(BLSOBJS) $(DLIB) \
-          $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bextract.o: bextract.c
-@@ -306,7 +306,7 @@
- 
- bextract: Makefile $(BEXTOBJS) libbacsd.la drivers 
../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) $(ZLIBS) $(LZO_LIBS) \
-+      $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib 
-L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \
-          $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bscan.o: bscan.c
-@@ -316,7 +316,7 @@
- 
- bscan:        Makefile $(SCNOBJS) libbacsd.la drivers 
../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) 
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
-       ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) 
../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE)
--      $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats 
-L../findlib -o $@ $(SCNOBJS) \
-+      $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib 
-L../cats -L../findlib -o $@ $(SCNOBJS) \
-          $(SD_LIBS) -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg 
-lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bcopy.o: bcopy.c
-@@ -325,7 +325,7 @@
-          -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
- 
- bcopy:        Makefile $(COPYOBJS) libbacsd.la drivers 
../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) 
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
--      $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib 
-L../findlib -o $@ $(COPYOBJS) \
-+      $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib 
-L../findlib -o $@ $(COPYOBJS) \
-          $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- cloud_parts_test: Makefile cloud_parts.c


Reply via email to