diff options
29 files changed, 337 insertions, 226 deletions
diff --git a/sysutils/bacula-clientonly/Makefile b/sysutils/bacula-clientonly/Makefile index f345b1cbd76..7593a9540a7 100644 --- a/sysutils/bacula-clientonly/Makefile +++ b/sysutils/bacula-clientonly/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.18 2012/09/08 12:36:57 shattered Exp $ +# $NetBSD: Makefile,v 1.19 2012/10/06 17:54:53 christos Exp $ PKGNAME= ${DISTNAME:S/-/-clientonly-/} COMMENT= The Network Backup Solution (client only) -PKGREVISION= 1 +#PKGREVISION= 1 CONFLICTS= bacula-[0-9]* bacula-client-[0-9]* diff --git a/sysutils/bacula-doc/Makefile b/sysutils/bacula-doc/Makefile index 6898f62608a..40f45f74819 100644 --- a/sysutils/bacula-doc/Makefile +++ b/sysutils/bacula-doc/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.25 2010/12/26 18:39:46 adam Exp $ +# $NetBSD: Makefile,v 1.26 2012/10/06 17:54:53 christos Exp $ -DISTNAME= bacula-docs-5.0.3 +DISTNAME= bacula-docs-5.2.12 PKGNAME= ${DISTNAME:S/docs/doc/} CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/} diff --git a/sysutils/bacula-doc/PLIST b/sysutils/bacula-doc/PLIST index 36e9ec2b933..64a8403e2f8 100644 --- a/sysutils/bacula-doc/PLIST +++ b/sysutils/bacula-doc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2010/05/08 09:05:47 adam Exp $ +@comment $NetBSD: PLIST,v 1.11 2012/10/06 17:54:53 christos Exp $ share/doc/bacula/console/About_this_document.html share/doc/bacula/console/Bacula_Console.html share/doc/bacula/console/Bacula_Console_Operators_Gu.html @@ -11,7 +11,6 @@ share/doc/bacula/console/images.idx share/doc/bacula/console/images.pl share/doc/bacula/console/images.tex share/doc/bacula/console/img1.png -share/doc/bacula/console/img2.png share/doc/bacula/console/index.html share/doc/bacula/console/index.png share/doc/bacula/console/internals.pl @@ -65,7 +64,7 @@ share/doc/bacula/developers/Introduction_TLS.html share/doc/bacula/developers/Loading_Plugins.html share/doc/bacula/developers/Low_Level_Network_Protocol.html share/doc/bacula/developers/New_Configuration_Directive.html -share/doc/bacula/developers/Normal_vs_Command_Plugins.html +share/doc/bacula/developers/Normal_vs_Command_vs.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 diff --git a/sysutils/bacula-doc/distinfo b/sysutils/bacula-doc/distinfo index 634216601d1..741121b5a83 100644 --- a/sysutils/bacula-doc/distinfo +++ b/sysutils/bacula-doc/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.22 2010/12/26 18:39:46 adam Exp $ +$NetBSD: distinfo,v 1.23 2012/10/06 17:54:53 christos Exp $ -SHA1 (bacula-docs-5.0.3.tar.bz2) = dfe867bc4ac7f82ea01a34fd5ada3c0310aac25f -RMD160 (bacula-docs-5.0.3.tar.bz2) = 9e0af6364d3f36d5580d0af5f4a831fd6033f670 -Size (bacula-docs-5.0.3.tar.bz2) = 34519440 bytes +SHA1 (bacula-docs-5.2.12.tar.bz2) = 27726dfac1d651bacf9c1286cd8c06f2f19f143c +RMD160 (bacula-docs-5.2.12.tar.bz2) = 9b2a3eeb9883973dcb0f01f20e5588f98a38a7f3 +Size (bacula-docs-5.2.12.tar.bz2) = 41968688 bytes diff --git a/sysutils/bacula-qt-console/Makefile b/sysutils/bacula-qt-console/Makefile index 4daddc438ea..e777a420e21 100644 --- a/sysutils/bacula-qt-console/Makefile +++ b/sysutils/bacula-qt-console/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2012/10/02 17:11:56 tron Exp $ +# $NetBSD: Makefile,v 1.25 2012/10/06 17:54:53 christos Exp $ PKGNAME= ${DISTNAME:S/-/-qt-console-/} -PKGREVISION= 9 +#PKGREVISION= 9 COMMENT= Qt-based console for Bacula - The Network Backup Solution PKG_DESTDIR_SUPPORT= user-destdir diff --git a/sysutils/bacula-qt-console/PLIST b/sysutils/bacula-qt-console/PLIST index 2553b7a1ba7..f87b622d083 100644 --- a/sysutils/bacula-qt-console/PLIST +++ b/sysutils/bacula-qt-console/PLIST @@ -1,15 +1,15 @@ -@comment $NetBSD: PLIST,v 1.3 2009/08/24 09:20:29 adam Exp $ +@comment $NetBSD: PLIST,v 1.4 2012/10/06 17:54:53 christos Exp $ sbin/bat -share/doc/bacula/html/clients.html -share/doc/bacula/html/console.html -share/doc/bacula/html/filesets.html -share/doc/bacula/html/index.html -share/doc/bacula/html/joblist.html -share/doc/bacula/html/jobplot.html -share/doc/bacula/html/jobs.html -share/doc/bacula/html/mail-message-new.png -share/doc/bacula/html/media.html -share/doc/bacula/html/restore.html -share/doc/bacula/html/status.png -share/doc/bacula/html/storage.html +share/doc/bacula/clients.html +share/doc/bacula/console.html +share/doc/bacula/filesets.html +share/doc/bacula/index.html +share/doc/bacula/joblist.html +share/doc/bacula/jobplot.html +share/doc/bacula/jobs.html +share/doc/bacula/mail-message-new.png +share/doc/bacula/media.html +share/doc/bacula/restore.html +share/doc/bacula/status.png +share/doc/bacula/storage.html share/examples/bacula/bat.conf diff --git a/sysutils/bacula-tray-monitor/Makefile b/sysutils/bacula-tray-monitor/Makefile index 05f193a9b0b..b90ce640b67 100644 --- a/sysutils/bacula-tray-monitor/Makefile +++ b/sysutils/bacula-tray-monitor/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2012/10/02 17:11:56 tron Exp $ +# $NetBSD: Makefile,v 1.26 2012/10/06 17:54:54 christos Exp $ PKGNAME= ${DISTNAME:S/-/-tray-monitor-/} -PKGREVISION= 8 +#PKGREVISION= 8 COMMENT= System tray monitor for Bacula - The Network Backup Solution PKG_DESTDIR_SUPPORT= user-destdir diff --git a/sysutils/bacula-wx-console/Makefile b/sysutils/bacula-wx-console/Makefile index 363a2dc5f21..416b8115918 100644 --- a/sysutils/bacula-wx-console/Makefile +++ b/sysutils/bacula-wx-console/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2012/10/02 17:11:56 tron Exp $ +# $NetBSD: Makefile,v 1.30 2012/10/06 17:54:54 christos Exp $ PKGNAME= ${DISTNAME:S/-/-wx-console-/} -PKGREVISION= 8 +#PKGREVISION= 8 COMMENT= wxWindows-based console for Bacula - The Network Backup Solution PKG_DESTDIR_SUPPORT= user-destdir diff --git a/sysutils/bacula/DESCR b/sysutils/bacula/DESCR index d4490552aec..94c205d4fd5 100644 --- a/sysutils/bacula/DESCR +++ b/sysutils/bacula/DESCR @@ -4,4 +4,4 @@ across a network of computers of different kinds. In technical terms, it is a network client/server based backup program. Bacula is relatively easy to use and efficient, while offering many advanced storage management features that make it easy to find and recover lost or damaged files. Bacula source -code has been released under the GPL version 2 license. +code has been released under the GPL affero version 3 license. diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile index 463b7b535ed..80b94546ab5 100644 --- a/sysutils/bacula/Makefile +++ b/sysutils/bacula/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.40 2012/09/08 12:36:57 shattered Exp $ +# $NetBSD: Makefile,v 1.41 2012/10/06 17:54:53 christos Exp $ -PKGREVISION= 3 +#PKGREVISION= 3 CONFLICTS+= bacula-client-[0-9]* bacula-clientonly-[0-9]* diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common index 47aa14e5515..9e891b85c81 100644 --- a/sysutils/bacula/Makefile.common +++ b/sysutils/bacula/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.58 2012/04/07 19:35:48 dholland Exp $ +# $NetBSD: Makefile.common,v 1.59 2012/10/06 17:54:53 christos Exp $ # # used by sysutils/bacula-clientonly/Makefile # used by sysutils/bacula-tray-monitor/Makefile # used by sysutils/bacula-wx-console/Makefile -DISTNAME= bacula-5.0.3 +DISTNAME= bacula-5.2.12 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/} diff --git a/sysutils/bacula/PLIST.common b/sysutils/bacula/PLIST.common index b3dd1fe3ad4..eeeb8650125 100644 --- a/sysutils/bacula/PLIST.common +++ b/sysutils/bacula/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.13 2010/12/26 18:39:45 adam Exp $ +@comment $NetBSD: PLIST.common,v 1.14 2012/10/06 17:54:53 christos Exp $ lib/bpipe-fd.la lib/libbac.la lib/libbaccfg.la @@ -16,8 +16,6 @@ libexec/bacula/btraceback.mdb libexec/bacula/disk-changer libexec/bacula/mtx-changer libexec/bacula/mtx-changer.conf -libexec/bacula/startmysql -libexec/bacula/stopmysql man/man1/bacula-bwxconsole.1 man/man1/bacula-tray-monitor.1 man/man1/bat.1 @@ -40,13 +38,6 @@ 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/PLIST.server b/sysutils/bacula/PLIST.server index ba26624f79a..71371e24cff 100644 --- a/sysutils/bacula/PLIST.server +++ b/sysutils/bacula/PLIST.server @@ -1,4 +1,6 @@ -@comment $NetBSD: PLIST.server,v 1.6 2010/03/09 07:06:00 adam Exp $ +@comment $NetBSD: PLIST.server,v 1.7 2012/10/06 17:54:53 christos Exp $ +lib/libbaccats.la +lib/libbaccats-sqlite3.la lib/libbacsql.la libexec/bacula/chio-changer libexec/bacula/create_${BACULA_DB}_database diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo index 2d4cdc9c7f4..326a21b431e 100644 --- a/sysutils/bacula/distinfo +++ b/sysutils/bacula/distinfo @@ -1,20 +1,21 @@ -$NetBSD: distinfo,v 1.46 2012/03/31 10:33:36 dholland Exp $ +$NetBSD: distinfo,v 1.47 2012/10/06 17:54:53 christos Exp $ -SHA1 (bacula-5.0.3.tar.gz) = 4ced1c4f8984a063a1134b59968d163243017611 -RMD160 (bacula-5.0.3.tar.gz) = 0ae8f303b379daffdf09e4eab9b35182759add41 -Size (bacula-5.0.3.tar.gz) = 3800556 bytes -SHA1 (patch-aa) = 088623d447102579d2723f0ff0a1e802d83cfdd0 -SHA1 (patch-ab) = f5b5c8ee67d35ec5e92bd2732e63a956596ae6d8 +SHA1 (bacula-5.2.12.tar.gz) = c53cdd185f5f4075ddcca0971953319a94276c84 +RMD160 (bacula-5.2.12.tar.gz) = dd5b9f457a524acd9cdbbe0c4842670c4ee5bd5a +Size (bacula-5.2.12.tar.gz) = 4147847 bytes SHA1 (patch-ac) = 4ba89bcf49ce82b527edc789e2b17a781cb8622e SHA1 (patch-ad) = ce6bc29858d13dff1a0301db95f9bfedf3e66b01 -SHA1 (patch-ae) = 09a5a722c7acf384881198a23ed97d723f4c9698 -SHA1 (patch-af) = eb573f4b823c6c693634989883d2f94d2fa81f98 -SHA1 (patch-ag) = 53454345615422267e9e50b28a7aac10fd257df0 SHA1 (patch-ah) = 06452df1449ed6f06af00ed2cf9d736c40044dfb SHA1 (patch-ai) = 388e075e7ec54fb377ee9dbe8338c667efb256ee SHA1 (patch-aj) = 125d1503406474fec32e737068328cdfa718f5c2 SHA1 (patch-am) = 28536d3f0de81940773749c3704ad7aca86d374d -SHA1 (patch-an) = dbad88c5a6f60c501176103e794e85ab9400dd1a -SHA1 (patch-ao) = eae5e8fb98b61e23285d89d70824181308993ace -SHA1 (patch-ap) = 383a4449e6503e518bc40d2053127e5968ad3cd4 -SHA1 (patch-aq) = a8cabf3b43e1a2a878105875d68d5b000fe6632a +SHA1 (patch-configure) = 710d6e4370099a5d6d23d1297864af01abcdae83 +SHA1 (patch-src_console_conio.c) = 281d1f4c972744a936733f2a0003c6b0f993904d +SHA1 (patch-src_dird_Makefile.in) = fdce18aca972f26f16af90283756cd5bf5ad5831 +SHA1 (patch-src_filed_Makefile.in) = c88ee648ef33c3f7c3a02b77b1d3fc3da8da088d +SHA1 (patch-src_findlib_attribs.c) = a0917e500d7e937164cf59917cabd992512acd1d +SHA1 (patch-src_lib_attr.c) = 287851ff2ce2a0868d597cf1d7471a6766f6f7c1 +SHA1 (patch-src_plugins_fd_Makefile.in) = f1316cdbb66d9bc55d8adbd4b0bbde01443ccd2e +SHA1 (patch-src_qt-console_bat.pro.in) = 8df9381c0b35b5a3dcd237f8c017ae21d88c79ad +SHA1 (patch-src_stored_Makefile.in) = 5bee8ea8a7c288a1e4baf372ef79da34c9e35284 +SHA1 (patch-src_tools_Makefile.in) = 9fbc8d0f71f34217ea29f6ae04cbd927d5ac275b diff --git a/sysutils/bacula/patches/patch-aa b/sysutils/bacula/patches/patch-aa deleted file mode 100644 index fdebb080e1d..00000000000 --- a/sysutils/bacula/patches/patch-aa +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2010/03/09 07:06:00 adam Exp $ - ---- src/dird/Makefile.in.orig 2010-02-24 15:33:48.000000000 +0000 -+++ src/dird/Makefile.in -@@ -64,7 +64,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) $(CAP_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) -@@ -98,14 +98,14 @@ devclean: realclean - install: all - $(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 \ - destconf=$$srcconf.new; \ - echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ - else \ - destconf=$$srcconf; \ - 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 - @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-ab b/sysutils/bacula/patches/patch-ab deleted file mode 100644 index d0dbe42f0b5..00000000000 --- a/sysutils/bacula/patches/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ab,v 1.7 2010/12/26 18:39:46 adam Exp $ - ---- src/findlib/attribs.c.orig 2010-08-05 14:29:51.000000000 +0000 -+++ src/findlib/attribs.c -@@ -240,7 +240,7 @@ void encode_stat(char *buf, struct stat - int decode_stat(char *buf, struct stat *statp, int32_t *LinkFI) - { - char *p = buf; -- int64_t val; -+ intmax_t val; - - p += from_base64(&val, p); - plug(statp->st_dev, val); -@@ -325,7 +325,7 @@ int decode_stat(char *buf, struct stat * - int32_t decode_LinkFI(char *buf, struct stat *statp) - { - char *p = buf; -- int64_t val; -+ intmax_t val; - - skip_nonspaces(&p); /* st_dev */ - p++; /* skip space */ -@@ -632,7 +632,7 @@ int encode_attribsEx(JCR *jcr, char *att - static bool set_win32_attributes(JCR *jcr, ATTR *attr, BFILE *ofd) - { - char *p = attr->attrEx; -- int64_t val; -+ intmax_t val; - WIN32_FILE_ATTRIBUTE_DATA atts; - ULARGE_INTEGER li; - POOLMEM *win32_ofile; diff --git a/sysutils/bacula/patches/patch-ag b/sysutils/bacula/patches/patch-ag deleted file mode 100644 index 6635347f82b..00000000000 --- a/sysutils/bacula/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.9 2010/12/26 18:39:46 adam Exp $ - ---- src/lib/attr.c.orig 2010-12-26 18:20:15.000000000 +0000 -+++ src/lib/attr.c -@@ -106,7 +106,7 @@ int unpack_attributes_record(JCR *jcr, i - pm_strcpy(attr->attrEx, p); /* copy extended attributes, if any */ - - if (attr->data_stream) { -- int64_t val; -+ intmax_t val; - while (*p++ != 0) /* skip extended attributes */ - { } - from_base64(&val, p); diff --git a/sysutils/bacula/patches/patch-ap b/sysutils/bacula/patches/patch-ap deleted file mode 100644 index cbffac02dfb..00000000000 --- a/sysutils/bacula/patches/patch-ap +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ap,v 1.3 2010/05/08 09:05:47 adam Exp $ - ---- src/qt-console/bat.pro.in.orig 2010-04-27 19:58:29.000000000 +0000 -+++ src/qt-console/bat.pro.in -@@ -11,8 +11,6 @@ CONFIG += qt debug @QWT@ - - bins.path = /$(DESTDIR)@sbindir@ - bins.files = bat --confs.path = /$(DESTDIR)@sysconfdir@ --confs.commands = ./install_conf_file - help.path = /$(DESTDIR)@htmldir@ - help.files = help/*.html images/status.png images/mail-message-new.png - -@@ -23,7 +21,7 @@ INCLUDEPATH += .. . ./console ./restore - LIBS += -L../lib -lbaccfg -lbac @OPENSSL_LIBS@ - LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link - LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install --QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) -+QMAKE_LINK = $(CXX) - QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p - QMAKE_CLEAN += .libs/* bat - diff --git a/sysutils/bacula/patches/patch-aq b/sysutils/bacula/patches/patch-aq deleted file mode 100644 index e63990619b0..00000000000 --- a/sysutils/bacula/patches/patch-aq +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aq,v 1.2 2010/03/09 07:06:00 adam Exp $ - ---- src/plugins/fd/Makefile.in.orig 2010-02-24 15:33:48.000000000 +0000 -+++ src/plugins/fd/Makefile.in -@@ -28,7 +28,6 @@ bpipe-fd.la: Makefile bpipe-fd$(DEFAULT_ - install: all - $(MKDIR) $(DESTDIR)$(plugindir) - $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bpipe-fd.la $(DESTDIR)$(plugindir) -- $(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.la - - libtool-clean: - @find . -name '*.lo' -print | xargs $(LIBTOOL_CLEAN) $(RMF) diff --git a/sysutils/bacula/patches/patch-ao b/sysutils/bacula/patches/patch-configure index 9ebef601116..46aec92f727 100644 --- a/sysutils/bacula/patches/patch-ao +++ b/sysutils/bacula/patches/patch-configure @@ -1,24 +1,17 @@ -$NetBSD: patch-ao,v 1.6 2011/06/18 10:40:33 shattered Exp $ +$NetBSD: patch-configure,v 1.1 2012/10/06 17:54:53 christos Exp $ ---- configure.orig 2010-08-05 14:29:51.000000000 +0000 -+++ configure -@@ -26254,8 +26254,8 @@ if test "${with_python+set}" = set; then +use ${PREFIX} and ${PYVERSSUFFIX} instead of hunting down possible installs + +--- configure.orig 2012-09-13 04:51:19.000000000 -0400 ++++ configure 2012-10-04 23:54:29.000000000 -0400 +@@ -22717,8 +22717,8 @@ PYTHON_INCDIR=`/usr/bin/python-config --includes` PYTHON_LIBS=`/usr/bin/python-config --libs` else - for python_root in /usr /usr/local /usr/sfw; do -- for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python3; do +- for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python2.7 python3; do + for python_root in ${PREFIX}; do + for ver in python${PYVERSSUFFIX}; do if test -f $python_root/include/${ver}/Python.h; then PYTHON_INCDIR=-I$python_root/include/${ver} if test -d $python_root/lib64/${ver}/config; then -@@ -47521,7 +47523,7 @@ echo "$as_me: error: Could not find qmak - { (exit 1); exit 1; }; } - fi - -- QMAKEBIN="qmake" -+ QMAKEBIN=${QMAKE} - cd src/qt-console - echo "Creating bat Makefile" - touch bat diff --git a/sysutils/bacula/patches/patch-src_console_conio.c b/sysutils/bacula/patches/patch-src_console_conio.c new file mode 100644 index 00000000000..da63086ad5a --- /dev/null +++ b/sysutils/bacula/patches/patch-src_console_conio.c @@ -0,0 +1,25 @@ +$NetBSD: patch-src_console_conio.c,v 1.1 2012/10/06 17:54:53 christos Exp $ + +- need termios.h, our term.h does not include it +- t_insert_line and t_delete_line are macros in term.h; undef them + +--- src/console/conio.c.orig 2012-09-13 04:51:19.000000000 -0400 ++++ src/console/conio.c 2012-10-05 11:29:38.000000000 -0400 +@@ -61,6 +61,7 @@ + + #endif + ++#include <termios.h> + #include <curses.h> + #include <term.h> + +@@ -245,7 +246,9 @@ + static char * getprev(void); + static void putline(char *newl, int newlen); + static void t_honk_horn(void); ++#undef t_insert_line + static void t_insert_line(void); ++#undef t_delete_line + static void t_delete_line(void); + static void t_clrline(int pos, int width); + void t_sendl(const char *msg, int len); diff --git a/sysutils/bacula/patches/patch-src_dird_Makefile.in b/sysutils/bacula/patches/patch-src_dird_Makefile.in new file mode 100644 index 00000000000..de09db03e99 --- /dev/null +++ b/sysutils/bacula/patches/patch-src_dird_Makefile.in @@ -0,0 +1,54 @@ +$NetBSD: patch-src_dird_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $ + +- use %%EXAMPLESDIR%% instead of sysconfdir +- use the .la files for linking + +--- src/dird/Makefile.in.orig 2012-09-13 04:51:19.000000000 -0400 ++++ src/dird/Makefile.in 2012-10-05 11:02:06.000000000 -0400 +@@ -69,14 +69,14 @@ + ../cats/libbaccats$(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 -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \ ++ ../findlib/libbacfind.la ../cats/libbacsql.la ../cats/libbaccats.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \ + $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_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) \ + ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ +- -lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \ ++ ../findlib/libbacfind.la ../cats/libbacsql.la ../cats/libbaccats.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \ + $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) + strip $@ + +@@ -105,16 +105,16 @@ + install: all + $(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 \ + destconf=$$srcconf.new; \ + echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ + else \ + destconf=$$srcconf; \ + 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 + @if test "x${dir_group}" != "x"; then \ +- chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \ ++ chgrp -f ${dir_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ; \ + fi + @if test -f ${DESTDIR}${scriptdir}/query.sql; then \ + echo " ==> Saving existing query.sql to query.sql.old"; \ +@@ -128,7 +128,7 @@ + + uninstall: + (cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir) +- (cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf bacula-dir.conf.new) ++ (cd $(DESTDIR)%%EXAMPLESDIR%%; $(RMF) bacula-dir.conf bacula-dir.conf.new) + (cd $(DESTDIR)$(scriptdir); $(RMF) query.sql) + + diff --git a/sysutils/bacula/patches/patch-ae b/sysutils/bacula/patches/patch-src_filed_Makefile.in index 9f54621409d..7787d57c6d2 100644 --- a/sysutils/bacula/patches/patch-ae +++ b/sysutils/bacula/patches/patch-src_filed_Makefile.in @@ -1,17 +1,26 @@ -$NetBSD: patch-ae,v 1.7 2010/12/26 18:39:46 adam Exp $ +$NetBSD: patch-src_filed_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $ ---- src/filed/Makefile.in.orig 2010-08-05 14:29:51.000000000 +0000 -+++ src/filed/Makefile.in -@@ -94,7 +94,7 @@ win32: $(WIN32OBJS) +- use %%EXAMPLESDIR%% instead of sysconfdir +- use the .la files for linking + +--- src/filed/Makefile.in.orig 2012-09-13 04:51:19.000000000 -0400 ++++ src/filed/Makefile.in 2012-10-05 11:15:25.000000000 -0400 +@@ -96,12 +96,12 @@ 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) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \ + $(WIN32LIBS) $(FDLIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(LIBS) \ - $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) + $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ -@@ -137,14 +137,14 @@ devclean: realclean + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ +- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \ ++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(LIBS) \ + $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) + strip $@ + +@@ -139,16 +139,16 @@ install: all $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd @srcconf=bacula-fd.conf; \ @@ -26,6 +35,9 @@ $NetBSD: patch-ae,v 1.7 2010/12/26 18:39:46 adam Exp $ - ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf + echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ + ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf + @if test "x${fd_group}" != "x"; then \ +- chgrp -f ${fd_group} ${DESTDIR}${sysconfdir}/$$destconf ; \ ++ chgrp -f ${fd_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ; \ + fi @if test -f static-bacula-fd; then \ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \ - fi diff --git a/sysutils/bacula/patches/patch-src_findlib_attribs.c b/sysutils/bacula/patches/patch-src_findlib_attribs.c new file mode 100644 index 00000000000..c8e0c5c3c81 --- /dev/null +++ b/sysutils/bacula/patches/patch-src_findlib_attribs.c @@ -0,0 +1,33 @@ +$NetBSD: patch-src_findlib_attribs.c,v 1.1 2012/10/06 17:54:53 christos Exp $ + +use intmax_t instead of int64_t + +--- src/findlib/attribs.c.orig 2012-09-13 04:51:19.000000000 -0400 ++++ src/findlib/attribs.c 2012-10-04 23:52:49.000000000 -0400 +@@ -288,7 +288,7 @@ + int decode_stat(char *buf, struct stat *statp, int stat_size, int32_t *LinkFI) + { + char *p = buf; +- int64_t val; ++ intmax_t val; + + /* + * We store into the stat packet so make sure the caller's conception +@@ -380,7 +380,7 @@ + int32_t decode_LinkFI(char *buf, struct stat *statp, int stat_size) + { + char *p = buf; +- int64_t val; ++ intmax_t val; + /* + * We store into the stat packet so make sure the caller's conception + * is the same as ours. They can be different if LARGEFILE is not +@@ -694,7 +694,7 @@ + static bool set_win32_attributes(JCR *jcr, ATTR *attr, BFILE *ofd) + { + char *p = attr->attrEx; +- int64_t val; ++ intmax_t val; + WIN32_FILE_ATTRIBUTE_DATA atts; + ULARGE_INTEGER li; + POOLMEM *win32_ofile; diff --git a/sysutils/bacula/patches/patch-src_lib_attr.c b/sysutils/bacula/patches/patch-src_lib_attr.c new file mode 100644 index 00000000000..062501573d2 --- /dev/null +++ b/sysutils/bacula/patches/patch-src_lib_attr.c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_lib_attr.c,v 1.1 2012/10/06 17:54:53 christos Exp $ + +use intmax_t instead of int64_t + +--- src/lib/attr.c.orig 2012-09-13 04:51:19.000000000 -0400 ++++ src/lib/attr.c 2012-10-04 23:51:53.000000000 -0400 +@@ -120,7 +120,7 @@ + } else { + pm_strcpy(attr->attrEx, p); /* copy extended attributes, if any */ + if (attr->data_stream) { +- int64_t val; ++ intmax_t val; + while (*p++ != 0) /* skip extended attributes */ + { } + from_base64(&val, p); diff --git a/sysutils/bacula/patches/patch-src_plugins_fd_Makefile.in b/sysutils/bacula/patches/patch-src_plugins_fd_Makefile.in new file mode 100644 index 00000000000..1edf75cd53a --- /dev/null +++ b/sysutils/bacula/patches/patch-src_plugins_fd_Makefile.in @@ -0,0 +1,14 @@ +$NetBSD: patch-src_plugins_fd_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $ + +don't remove file we justr installed + +--- src/plugins/fd/Makefile.in.orig 2012-09-13 04:51:19.000000000 -0400 ++++ src/plugins/fd/Makefile.in 2012-10-05 11:19:22.000000000 -0400 +@@ -45,7 +45,6 @@ + install: all + $(MKDIR) $(DESTDIR)$(plugindir) + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bpipe-fd.la $(DESTDIR)$(plugindir) +- $(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.la + + install-test-plugin: all + $(MKDIR) $(DESTDIR)$(plugindir) diff --git a/sysutils/bacula/patches/patch-src_qt-console_bat.pro.in b/sysutils/bacula/patches/patch-src_qt-console_bat.pro.in new file mode 100644 index 00000000000..1e6e8dba8c5 --- /dev/null +++ b/sysutils/bacula/patches/patch-src_qt-console_bat.pro.in @@ -0,0 +1,27 @@ +$NetBSD: patch-src_qt-console_bat.pro.in,v 1.1 2012/10/06 17:54:53 christos Exp $ + +- comment out the confs paths and command +- use just the compiler not libtool for QMAKE_LINK + +--- src/qt-console/bat.pro.in.orig 2012-09-13 04:51:19.000000000 -0400 ++++ src/qt-console/bat.pro.in 2012-10-05 11:17:23.000000000 -0400 +@@ -10,8 +10,8 @@ + + bins.path = /$(DESTDIR)@sbindir@ + bins.files = bat +-confs.path = /$(DESTDIR)@sysconfdir@ +-confs.commands = ./install_conf_file ++#confs.path = /$(DESTDIR)@sysconfdir@ ++#confs.commands = ./install_conf_file + help.path = /$(DESTDIR)@docdir@ + help.files = help/*.html images/status.png images/mail-message-new.png + +@@ -22,7 +22,7 @@ + LIBS += -L../lib -lbaccfg -lbac -L../findlib -lbacfind @OPENSSL_LIBS@ + LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link + LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install +-QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) ++QMAKE_LINK = $(CXX) + QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p + QMAKE_CLEAN += .libs/* bat + diff --git a/sysutils/bacula/patches/patch-af b/sysutils/bacula/patches/patch-src_stored_Makefile.in index 8fe2a26eba9..2ebea1bc275 100644 --- a/sysutils/bacula/patches/patch-af +++ b/sysutils/bacula/patches/patch-src_stored_Makefile.in @@ -1,26 +1,35 @@ -$NetBSD: patch-af,v 1.6 2010/03/09 07:06:00 adam Exp $ +$NetBSD: patch-src_stored_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $ ---- src/stored/Makefile.in.orig 2010-02-24 15:33:48.000000000 +0000 -+++ src/stored/Makefile.in -@@ -91,7 +91,7 @@ all: Makefile bacula-sd @STATIC_SD@ bls +- use %%EXAMPLESDIR%% instead of sysconfdir +- use the .la files for linking + +--- src/stored/Makefile.in.orig 2012-09-13 04:51:19.000000000 -0400 ++++ src/stored/Makefile.in 2012-10-05 11:07:09.000000000 -0400 +@@ -96,12 +96,12 @@ 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) \ + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(ZLIBS) \ - -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) $(CAP_LIBS) static-bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) -@@ -107,7 +107,7 @@ btape.o: btape.c + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SDOBJS) $(ZLIBS) \ +- -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) $(CAP_LIBS) + strip $@ - 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) +@@ -112,7 +112,7 @@ + + btape: Makefile $(TAPEOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(TAPEOBJS) \ +- -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ ../lib/libbaccfg.la ../lib/libbac.la $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) bls.o: bls.c @echo "Compiling $<" -@@ -117,7 +117,7 @@ bls.o: bls.c +@@ -122,7 +122,7 @@ 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) \ @@ -29,25 +38,25 @@ $NetBSD: patch-af,v 1.6 2010/03/09 07:06:00 adam Exp $ bextract.o: bextract.c @echo "Compiling $<" -@@ -127,7 +127,7 @@ bextract.o: bextract.c +@@ -132,7 +132,7 @@ 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) \ + $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZOLIBS) \ - -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 $<" -@@ -136,7 +136,7 @@ bscan.o: bscan.c - - bscan: Makefile $(SCNOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) +@@ -142,7 +142,7 @@ + bscan: Makefile $(SCNOBJS) ../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) \ -- -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) +- -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ ../cats/libbacsql.la ../cats/libbaccats.la $(DB_LIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) bcopy.o: bcopy.c @echo "Compiling $<" -@@ -145,7 +145,7 @@ bcopy.o: bcopy.c +@@ -151,7 +151,7 @@ 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) \ @@ -56,7 +65,7 @@ $NetBSD: patch-af,v 1.6 2010/03/09 07:06:00 adam Exp $ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status cd $(topdir) \ -@@ -159,14 +159,14 @@ install: all +@@ -165,16 +165,16 @@ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bscan $(DESTDIR)$(sbindir)/bscan $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) btape $(DESTDIR)$(sbindir)/btape @srcconf=bacula-sd.conf; \ @@ -71,6 +80,9 @@ $NetBSD: patch-af,v 1.6 2010/03/09 07:06:00 adam Exp $ - ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf + echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ + ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf + @if test "x${sd_group}" != "x"; then \ +- chgrp -f ${sd_group} ${DESTDIR}${sysconfdir}/$$destconf; \ ++ chgrp -f ${sd_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf; \ + fi @if test -f static-bacula-sd; then \ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-sd $(DESTDIR)$(sbindir)/static-bacula-sd; \ - fi diff --git a/sysutils/bacula/patches/patch-an b/sysutils/bacula/patches/patch-src_tools_Makefile.in index 499eab407fa..97a0c003eb0 100644 --- a/sysutils/bacula/patches/patch-an +++ b/sysutils/bacula/patches/patch-src_tools_Makefile.in @@ -1,8 +1,20 @@ -$NetBSD: patch-an,v 1.3 2010/05/08 09:05:47 adam Exp $ +$NetBSD: patch-src_tools_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $ ---- src/tools/Makefile.in.orig 2010-04-27 19:58:29.000000000 +0000 -+++ src/tools/Makefile.in -@@ -57,21 +57,21 @@ all: Makefile $(TOOLS) gigaslam grow +- use the .la files for linking +- remove tests that don't link (using functions not in libraries) + +--- src/tools/Makefile.in.orig 2012-09-13 04:51:19.000000000 -0400 ++++ src/tools/Makefile.in 2012-10-05 11:13:02.000000000 -0400 +@@ -37,7 +37,7 @@ + DIRCONFOBJS = ../dird/dird_conf.o ../dird/ua_acl.o ../dird/run_conf.o ../dird/inc_conf.o + + NODIRTOOLS = bsmtp +-DIRTOOLS = bsmtp dbcheck drivetype fstype testfind testls bregex bwild bbatch bregtest bvfs_test ing_test bpluginfo ++DIRTOOLS = bsmtp dbcheck drivetype fstype testfind bregex bwild bbatch bregtest ing_test bpluginfo + TOOLS = $(@DIR_TOOLS@) + + INSNODIRTOOLS = bsmtp +@@ -58,22 +58,22 @@ @echo " " bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @@ -13,10 +25,11 @@ $NetBSD: patch-an,v 1.3 2010/05/08 09:05:47 adam Exp $ - $(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) + dbcheck: Makefile dbcheck.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \ + ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(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) +- -lbaccats -lbacsql -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ ../cats/libbaccats.la ../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 \ @@ -29,9 +42,9 @@ $NetBSD: patch-an,v 1.3 2010/05/08 09:05:47 adam Exp $ $(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) +@@ -91,34 +91,34 @@ + 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) @@ -39,7 +52,7 @@ $NetBSD: patch-an,v 1.3 2010/05/08 09:05:47 adam Exp $ 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) ++ $(DLIB) ../findlib/libbacfind.la ../lib/libbaccfg.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 \ @@ -51,19 +64,48 @@ $NetBSD: patch-an,v 1.3 2010/05/08 09:05:47 adam Exp $ - $(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 + bbatch: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \ + ../cats/libbaccats$(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) +- -lbaccats -lbacsql -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ ../cats/libbaccats.la ../cats/libbacsql.la ../lib/libbac.la -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - bvfs_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) bvfs_test.o + bvfs_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \ + ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bvfs_test.o $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ bvfs_test.o \ -@@ -118,7 +118,7 @@ gigaslam: gigaslam.o +- -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ ../cats/libbaccats.la ../cats/libbacsql.la ../lib/libbac.la -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + ing_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \ + ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ing_test.o + $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ ing_test.o \ +- -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ ../cats/libbaccats.la ../cats/libbacsql.la ../findlib/libbacfind.la ../lib/libbac.la -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + cats_test.o: cats_test.c + echo "Compiling $<" +@@ -126,7 +126,7 @@ + + cats_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) cats_test.o + $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ cats_test.o \ +- -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ++ ../cats/libbaccats.la ../cats/libbacsql.la ../findlib/libbacfind.la ../lib/libbac.la -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + gigaslam.o: gigaslam.c + $(CXX) $(CFLAGS) -c $< +@@ -135,13 +135,13 @@ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -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) + bpluginfo.o: bpluginfo.c + $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) -I../filed -I../dird -I../stored $(DINCLUDE) $(CFLAGS) $< + + bpluginfo: Makefile bpluginfo.o +- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bpluginfo.o -lbac $(GETTEXT_LIBS) ++ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bpluginfo.o ../lib/libbac.la $(GETTEXT_LIBS) + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status cd $(topdir) \ |