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

[bdwalton at users.sourceforge.net]

Revision: 14161
          http://gar.svn.sourceforge.net/gar/?rev=14161&view=rev
Author:   bdwalton
Date:     2011-04-13 19:12:58 +0000 (Wed, 13 Apr 2011)

Log Message:
-----------
bacula/trunk: update the autoconf patch so it can be submitted upstream (make version string dynamic)

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

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

Removed Paths:
-------------
    csw/mgar/pkg/bacula/trunk/files/0001-correct-the-autoconf-initializations.patch

Modified: csw/mgar/pkg/bacula/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bacula/trunk/Makefile	2011-04-13 17:42:04 UTC (rev 14160)
+++ csw/mgar/pkg/bacula/trunk/Makefile	2011-04-13 19:12:58 UTC (rev 14161)
@@ -10,7 +10,7 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(DISTNAME).tar.gz
-PATCHFILES += 0001-correct-the-autoconf-initializations.patch
+PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch
 
 BUILD_DEP_PKGS  = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel
 BUILD_DEP_PKGS += CSWreadline CSWggettext-dev

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch	2011-04-13 19:12:58 UTC (rev 14161)
@@ -0,0 +1,38 @@
+From 1530af24085deb5d6798c88147fe7090f0048c72 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Wed, 13 Apr 2011 20:54:02 +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..dffcd5f 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_CONFIG_SRCDIR(src/version.h)
++AC_INIT([bacula], my_esyscmd([sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h]))
++
+ BUILD_DIR=`pwd`
+ cd ..
+ TOP_DIR=`pwd`
+-- 
+1.7.3.2
+

Deleted: csw/mgar/pkg/bacula/trunk/files/0001-correct-the-autoconf-initializations.patch
===================================================================
--- csw/mgar/pkg/bacula/trunk/files/0001-correct-the-autoconf-initializations.patch	2011-04-13 17:42:04 UTC (rev 14160)
+++ csw/mgar/pkg/bacula/trunk/files/0001-correct-the-autoconf-initializations.patch	2011-04-13 19:12:58 UTC (rev 14161)
@@ -1,27 +0,0 @@
-From 7abbac2b02f54436652774ec86107105ef220db8 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Wed, 13 Apr 2011 15:48:18 +0200
-Subject: [PATCH] correct the autoconf initializations
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- autoconf/configure.in |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/autoconf/configure.in b/autoconf/configure.in
-index 0ce9d94..45c623a 100644
---- a/autoconf/configure.in
-+++ b/autoconf/configure.in
-@@ -4,7 +4,8 @@ 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_INIT([bacula], [5.0.3])
-+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.