[csw-devel] SF.net SVN: gar:[21301] csw/mgar/pkg/bacula/trunk

wilbury at users.sourceforge.net wilbury at users.sourceforge.net
Fri Jun 7 15:23:48 CEST 2013


Revision: 21301
          http://gar.svn.sourceforge.net/gar/?rev=21301&view=rev
Author:   wilbury
Date:     2013-06-07 13:23:44 +0000 (Fri, 07 Jun 2013)
Log Message:
-----------
bacula/trunk: Update to 5.2.6, take 1

Modified Paths:
--------------
    csw/mgar/pkg/bacula/trunk/Makefile
    csw/mgar/pkg/bacula/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/bacula/trunk/files/0001-Do-not-compress-manual-pages.patch

Removed Paths:
-------------
    csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch

Modified: csw/mgar/pkg/bacula/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bacula/trunk/Makefile	2013-06-07 12:46:10 UTC (rev 21300)
+++ csw/mgar/pkg/bacula/trunk/Makefile	2013-06-07 13:23:44 UTC (rev 21301)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = bacula
-VERSION = 5.0.3
+VERSION = 5.2.6
 GARTYPE = v2
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
@@ -22,10 +22,7 @@
 DISTFILES += CSWbacula-fd.postinstall
 DISTFILES += CSWbacula-console.postinstall
 DISTFILES += postmsg
-PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch
-PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch
-PATCHFILES += 0003-Make-the-solaris-init-scripts-user-group-aware.patch
-PATCHFILES += 0004-Update-man-page-installation-so-we-don-t-get-gzipped.patch
+PATCHFILES += 0001-Do-not-compress-manual-pages.patch
 
 BUILD_DEP_PKGS  = CSWmysql-dev CSWiconv CSWlibwrap1 CSWlibssl-dev
 BUILD_DEP_PKGS += CSWreadline CSWggettext-dev CSWlibcairo-dev
@@ -50,13 +47,8 @@
 SPKG_DESC_CSWbacula-console = $(DESCRIPTION) - Console
 OBSOLETED_BY_CSWbacula-console = CSWbaculaclient
 RUNTIME_DEP_PKGS_CSWbacula-console = CSWbacula-common
-RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibwrap1
-RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibncurses5
-RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibz1
 RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibhistory6
 RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibreadline6
-RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibgcc-s1
 PKGFILES_CSWbacula-console  = .*sbin/bconsole .*man8/bconsole.* .*bconsole.conf.CSW
@@ -80,47 +72,34 @@
 SPKG_DESC_CSWbacula-doc = $(DESCRIPTION) - Documentation
 PKGFILES_CSWbacula-doc += .*doc/$(NAME)/.*
 ARCHALL_CSWbacula-doc = 1
-CHECKPKG_OVERRIDES_CSWbacula-doc += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWbacula-doc += missing-dependency|CSWpython
-CHECKPKG_OVERRIDES_CSWbacula-doc += missing-dependency|CSWperl
+RUNTIME_DEP_PKGS_CSWbacula-doc += CSWpython
+RUNTIME_DEP_PKGS_CSWbacula-doc += CSWperl
 
 CATALOGNAME_CSWbacula-tray-monitor = bacula_tray_monitor
 SPKG_DESC_CSWbacula-tray-monitor = $(DESCRIPTION) - Tray monitor
 OBSOLETED_BY_CSWbacula-tray-monitor = CSWbaculaclient
 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWbacula-common
-RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibwrap1
-RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibz1
-RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibatk1-0-0
 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWpango
-RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgdk-x11-2-0-0
 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgdk-pixbuf2-0-0
 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgtk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgio2-0-0
 PKGFILES_CSWbacula-tray-monitor = .*tray-monitor.*
 
 CATALOGNAME_CSWbacula-common = bacula_common
 SPKG_DESC_CSWbacula-common = $(DESCRIPTION) - shared files
 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibmysqlclient18
 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibwrap1
 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibz1
 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibpython2-6-1-0
 PKGFILES_CSWbacula-common += .*libbac-$(VERSION).so .*libbac.so
-PKGFILES_CSWbacula-common +=  .*libbaccfg-$(VERSION).so .*libbaccfg.so
+PKGFILES_CSWbacula-common += .*libbaccats-$(VERSION).so .*libbaccats.so
+PKGFILES_CSWbacula-common += .*libbaccfg-$(VERSION).so .*libbaccfg.so
 PKGFILES_CSWbacula-common += .*libbacfind-$(VERSION).so .*libbacfind.so
 PKGFILES_CSWbacula-common += .*libbacpy-$(VERSION).so .*libbacpy.so
 PKGFILES_CSWbacula-common += .*libbacsql-$(VERSION).so .*libbacsql.so
@@ -128,18 +107,16 @@
 PKGFILES_CSWbacula-common += .*man1/bsmtp.1 .*man1/btraceback.1
 PKGFILES_CSWbacula-common += .*man8/bacula.8
 PKGFILES_CSWbacula-common += /etc/opt/csw//bacula/scripts/btraceback.*
-CHECKPKG_OVERRIDES_CSWbacula-common += file-with-bad-content|/usr/share|root/opt/csw/share/man/man8/bacula.8
 
 CATALOGNAME_CSWbacula-fd = bacula_fd
 SPKG_DESC_CSWbacula-fd = $(DESCRIPTION) - File Daemon
 RUNTIME_DEP_PKGS_CSWbacula-fd = CSWbacula-common
 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibwrap1
 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibz1
 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibpython2-6-1-0
-RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWbacula-fd += CSWliblzo2-2
 PKGFILES_CSWbacula-fd += .*init.d/cswbacula-fd
 PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd .*bacula/working
 PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8 .*bacula/bacula-fd.conf.CSW
@@ -153,12 +130,9 @@
 RUNTIME_DEP_PKGS_CSWbacula-sd = CSWbacula-common
 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibmysqlclient18
-RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibwrap1
 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibz1
-RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibpython2-6-1-0
-RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWbacula-sd += CSWliblzo2-2
 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWmtx
 PKGFILES_CSWbacula-sd += .*init.d/cswbacula-sd
 PKGFILES_CSWbacula-sd += /etc/opt/csw/bacula/.*disk-changer.CSW
@@ -183,12 +157,8 @@
 RUNTIME_DEP_PKGS_CSWbacula-director = CSWbacula-common
 RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibmysqlclient18
-RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibwrap1
 RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibz1
 RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibpython2-6-1-0
-RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWbacula-director += CSWperl
 PKGFILES_CSWbacula-director += .*init.d/cswbacula-dir
 PKGFILES_CSWbacula-director += .*sbin/bregex .*sbin/bwild .*sbin/bacula-dir

Modified: csw/mgar/pkg/bacula/trunk/checksums
===================================================================
--- csw/mgar/pkg/bacula/trunk/checksums	2013-06-07 12:46:10 UTC (rev 21300)
+++ csw/mgar/pkg/bacula/trunk/checksums	2013-06-07 13:23:44 UTC (rev 21301)
@@ -1 +1 @@
-9de254ae39cab0587fdb2f5d8d90b03b  bacula-5.0.3.tar.gz
+914483b92539598678542bd2ddb28043  bacula-5.2.6.tar.gz

Added: csw/mgar/pkg/bacula/trunk/files/0001-Do-not-compress-manual-pages.patch
===================================================================
--- csw/mgar/pkg/bacula/trunk/files/0001-Do-not-compress-manual-pages.patch	                        (rev 0)
+++ csw/mgar/pkg/bacula/trunk/files/0001-Do-not-compress-manual-pages.patch	2013-06-07 13:23:44 UTC (rev 21301)
@@ -0,0 +1,44 @@
+From 591de1c22236564111941b5244d109ca0f6bc860 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Fri, 7 Jun 2013 14:44:24 +0200
+Subject: [PATCH] Do not compress manual pages.
+
+---
+ manpages/Makefile.in | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/manpages/Makefile.in b/manpages/Makefile.in
+index bbbc6ae..5b1beda 100644
+--- a/manpages/Makefile.in
++++ b/manpages/Makefile.in
+@@ -21,23 +21,19 @@ depend:
+ install:
+ 	$(MKDIR) $(DESTDIR)/$(mandir)/man8
+ 	for I in ${MAN8}; \
+-	  do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \
+-	     $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man8/$$I.gz; \
+-	     rm -f $$I.gz); \
++	  do ($(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man8/$$I;); \
+ 	done
+ 	$(MKDIR) $(DESTDIR)/$(mandir)/man1
+ 	for I in ${MAN1}; \
+-	  do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \
+-	     $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man1/$$I.gz; \
+-	     rm -f $$I.gz); \
++	  do ($(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man1/$$I;); \
+ 	done
+ 
+ uninstall:
+ 	for I in ${MAN8}; \
+-	  do (rm -f $(DESTDIR)$(mandir)/man8/$$I.gz); \
++	  do (rm -f $(DESTDIR)$(mandir)/man8/$$I); \
+ 	done
+ 	for I in ${MAN1}; \
+-	  do (rm -f $(DESTDIR)$(mandir)/man1/$$I.gz); \
++	  do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \
+ 	done
+ 
+ clean:
+-- 
+1.8.1.4
+

Deleted: csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch
===================================================================
--- csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch	2013-06-07 12:46:10 UTC (rev 21300)
+++ csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch	2013-06-07 13:23:44 UTC (rev 21301)
@@ -1,38 +0,0 @@
-From b7109446f989d6b9bb449dca6cde6bc9dfddb1fe Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Wed, 13 Apr 2011 22:08:21 +0200
-Subject: [PATCH] Update AC_INIT use to make configure handle docdir
-
-This patch allows AC_INIT to properly set the PACKAGE variables in the
-Makefiles.  In turn, this allows docdir use to work correctly.  With
-the new behaviour, things placed in docdir go to share/doc/bacula.
-Previously the would end up in share/doc.
-
-We move the detection of the source directory to a separate
-AC_CONFIG_SRCDIR macro call.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- autoconf/configure.in |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/autoconf/configure.in b/autoconf/configure.in
-index 0ce9d94..1115e7a 100644
---- a/autoconf/configure.in
-+++ b/autoconf/configure.in
-@@ -3,8 +3,10 @@ dnl
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl require a recent autoconf
--AC_PREREQ(2.61)
--AC_INIT(src/version.h)
-+AC_PREREQ(2.62)
-+
-+AC_INIT([bacula], m4_esyscmd([sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' `pwd`/src/version.h | tr -d '\n']))
-+AC_CONFIG_SRCDIR(src/version.h)
- BUILD_DIR=`pwd`
- cd ..
- TOP_DIR=`pwd`
--- 
-1.7.3.2
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list