From anders@mail.gelita.se  Mon Sep 28 18:26:42 2009
Return-Path: <anders@mail.gelita.se>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F2AFE106568B
	for <freebsd-gnats-submit@freebsd.org>; Mon, 28 Sep 2009 18:26:42 +0000 (UTC)
	(envelope-from anders@mail.gelita.se)
Received: from mail.gelita.se (212-162-182-244.skbbip.com [212.162.182.244])
	by mx1.freebsd.org (Postfix) with ESMTP id 74B568FC16
	for <freebsd-gnats-submit@freebsd.org>; Mon, 28 Sep 2009 18:26:42 +0000 (UTC)
Received: by mail.gelita.se (Postfix, from userid 1003)
	id C74E110EE61; Mon, 28 Sep 2009 20:10:40 +0200 (CEST)
Message-Id: <20090928181040.C74E110EE61@mail.gelita.se>
Date: Mon, 28 Sep 2009 20:10:40 +0200 (CEST)
From: freebsd@troback.com
Reply-To: freebsd@troback.com
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Maintainer update: net-mgmt/nagios-check_bacula
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         139221
>Category:       ports
>Synopsis:       Maintainer update: net-mgmt/nagios-check_bacula
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 28 18:30:03 UTC 2009
>Closed-Date:    Sat Nov 28 13:49:20 UTC 2009
>Last-Modified:  Sat Nov 28 13:50:01 UTC 2009
>Originator:     Anders Troback
>Release:        
>Organization:
>Environment:
>Description:
Maintainer update of net-mgmt/nagios-check_bacula!
>How-To-Repeat:
>Fix:
diff -ruN nagios-check_bacula_org/Makefile nagios-check_bacula/Makefile
--- nagios-check_bacula_org/Makefile	2009-09-28 14:55:56.000000000 +0200
+++ nagios-check_bacula/Makefile	2009-09-28 15:22:08.000000000 +0200
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	check_bacula
-PORTVERSION=	3.0.0
-PORTREVISION=	1
+PORTVERSION=	3.0.2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX=	nagios-
diff -ruN nagios-check_bacula_org/distinfo nagios-check_bacula/distinfo
--- nagios-check_bacula_org/distinfo	2009-09-28 14:55:56.000000000 +0200
+++ nagios-check_bacula/distinfo	2009-09-28 14:57:36.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (bacula-3.0.0.tar.gz) = 5ea5294c4f66f0d8ba1414f1ca9dc79b
-SHA256 (bacula-3.0.0.tar.gz) = cafcf9e9682662d2efcef84a6d90ee09230c60c7ed15a7051b70a30f2966d45c
-SIZE (bacula-3.0.0.tar.gz) = 3834280
+MD5 (bacula-3.0.2.tar.gz) = 52f4bc25d8988dffcff429bb5e1ee81b
+SHA256 (bacula-3.0.2.tar.gz) = 8f5e0bf4734c21949f83129209e0109acf054a362b4fce7cb87a87f1815904a5
+SIZE (bacula-3.0.2.tar.gz) = 3910414
diff -ruN nagios-check_bacula_org/files/patch-configure nagios-check_bacula/files/patch-configure
--- nagios-check_bacula_org/files/patch-configure	2009-09-28 14:55:56.000000000 +0200
+++ nagios-check_bacula/files/patch-configure	2009-09-28 15:18:36.000000000 +0200
@@ -1,6 +1,6 @@
---- configure_org	2009-04-07 18:07:30.000000000 +0200
-+++ configure	2009-05-06 12:00:56.000000000 +0200
-@@ -42767,7 +42767,7 @@
+--- configure.org	2009-07-10 16:12:39.000000000 +0200
++++ configure	2009-09-28 15:10:56.000000000 +0200
+@@ -42884,7 +42884,7 @@
     exit 1
  fi
  
@@ -9,7 +9,7 @@
  
  ac_config_commands="$ac_config_commands default"
  
-@@ -43686,7 +43686,7 @@
+@@ -43803,7 +43803,7 @@
  
  cat >>$CONFIG_STATUS <<\_ACEOF
  
diff -ruN nagios-check_bacula_org/files/patch-src-check_bacula-Makefile.in nagios-check_bacula/files/patch-src-check_bacula-Makefile.in
--- nagios-check_bacula_org/files/patch-src-check_bacula-Makefile.in	2009-09-28 14:55:56.000000000 +0200
+++ nagios-check_bacula/files/patch-src-check_bacula-Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,62 +0,0 @@
---- src/check_bacula/Makefile.in_org	2005-05-23 08:33:05.000000000 +0200
-+++ src/check_bacula/Makefile.in	2009-05-13 09:10:54.000000000 +0200
-@@ -20,14 +20,14 @@
- dummy:
- 
- #
--MONITORSRCS = check_bacula.c authenticate.c
--MONITOROBJS = check_bacula.o authenticate.o
-+CHECKSRCS = check_bacula.c authenticate.c
-+CHECKOBJS = check_bacula.o authenticate.o
- 
- # these are the objects that are changed by the .configure process
- EXTRAOBJS = @OBJLIST@
- 
--MONITOR_CPPFLAGS=@TRAY_MONITOR_CPPFLAGS@
--MONITOR_LDFLAGS=@TRAY_MONITOR_LDFLAGS@ @X_LIBS@
-+CHECK_CPPFLAGS=
-+CHECK_LDFLAGS=
- 
- .SUFFIXES:	.c .o
- .PHONY:
-@@ -35,21 +35,26 @@
- 
- # inference rules
- .c.o:
--	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(MONITOR_CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
-+	@echo "Compiling $<"
-+	$(NO_ECHO) $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CHECK_CPPFLAGS) \
-+ -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
- #-------------------------------------------------------------------------
--all: Makefile check_bacula @STATIC_CONS@
-+all: Makefile check_bacula
- 	@echo "==== Make of check_bacula is good ===="
- 	@echo " "
- 
--check_bacula: $(MONITOROBJS) ../lib/libbac.a
--	$(CXX) $(LDFLAGS) $(MONITOR_LDFLAGS) -L../lib -L../cats -o $@ $(MONITOROBJS) \
--	      $(DLIB) -lbac -lm $(LIBS) 
-+check_bacula: Makefile $(CHECKOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
-+	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CHECK_LDFLAGS) -L../lib -o $@ \
-+	  $(CHECKOBJS) $(DLIB) -lbac -lm $(LIBS) $(OPENSSL_LIBS)
- 
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
- 	  && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
-+libtool-clean:
-+	$(RMF) -r .libs _libs
-+
- clean:
- 	@$(RMF) check_bacula core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
- 
-@@ -81,7 +86,7 @@
- 	@$(MV) Makefile Makefile.bak
- 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
- 	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
--	@$(CXX) -S -M $(CPPFLAGS) $(MONITOR_CPPFLAGS) -I$(srcdir) -I$(basedir) *.c >> Makefile
-+	@$(CXX) -S -M $(CPPFLAGS) $(CHECK_CPPFLAGS) -I$(srcdir) -I$(basedir) *.c >> Makefile
- 	@if test -f Makefile ; then \
- 	    $(RMF) Makefile.bak; \
- 	else \
diff -ruN nagios-check_bacula_org/files/patch-src-check_bacula-authenticate.c nagios-check_bacula/files/patch-src-check_bacula-authenticate.c
--- nagios-check_bacula_org/files/patch-src-check_bacula-authenticate.c	2009-09-28 14:55:56.000000000 +0200
+++ nagios-check_bacula/files/patch-src-check_bacula-authenticate.c	2009-09-28 16:19:22.000000000 +0200
@@ -1,5 +1,5 @@
---- src/check_bacula/authenticate.c.orig	2007-11-22 12:45:01.000000000 +0100
-+++ src/check_bacula/authenticate.c	2009-05-14 20:45:52.000000000 +0200
+--- src/check_bacula/authenticate.c.org	2009-09-28 16:16:01.000000000 +0200
++++ src/check_bacula/authenticate.c	2009-09-28 16:16:34.000000000 +0200
 @@ -57,7 +57,7 @@
  /* Response from SD */
  static char SDOKhello[]   = "3000 OK Hello\n";
diff -ruN nagios-check_bacula_org/files/patch-src-lib_jcr.c nagios-check_bacula/files/patch-src-lib_jcr.c
--- nagios-check_bacula_org/files/patch-src-lib_jcr.c	2009-09-28 14:55:56.000000000 +0200
+++ nagios-check_bacula/files/patch-src-lib_jcr.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- src/lib/jcr.c.orig	2009-05-13 19:00:23.000000000 +0200
-+++ src/lib/jcr.c	2009-05-13 19:00:43.000000000 +0200
-@@ -1064,7 +1064,7 @@
-               jcr->use_count());
- #else
-       fprintf(fp, "\tuse_count=%i threadid=0x%x\n",
--              jcr->use_count(), (int)jcr->my_thread_id);
-+              jcr->use_count(), jcr->my_thread_id);
- #endif
-       fprintf(fp, "\tJobType=%c JobLevel=%c\n",
-               jcr->get_JobType(), jcr->get_JobLevel());

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Mon Sep 28 23:09:12 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139221 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Nov 28 13:49:17 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139221 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/139221: commit references a PR
Date: Sat, 28 Nov 2009 13:49:20 +0000 (UTC)

 miwi        2009-11-28 13:49:11 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-mgmt/nagios-check_bacula Makefile distinfo 
     net-mgmt/nagios-check_bacula/files patch-configure 
                                        patch-src-check_bacula-authenticate.c 
   Removed files:
     net-mgmt/nagios-check_bacula/files 
                                        patch-src-check_bacula-Makefile.in 
                                        patch-src-lib_jcr.c 
   Log:
   - Update to 3.0.2
   
   PR:             139221
   Submitted by:   maintainer
   
   Revision  Changes    Path
   1.7       +1 -2      ports/net-mgmt/nagios-check_bacula/Makefile
   1.5       +3 -3      ports/net-mgmt/nagios-check_bacula/distinfo
   1.3       +4 -4      ports/net-mgmt/nagios-check_bacula/files/patch-configure
   1.2       +0 -62     ports/net-mgmt/nagios-check_bacula/files/patch-src-check_bacula-Makefile.in (dead)
   1.2       +2 -2      ports/net-mgmt/nagios-check_bacula/files/patch-src-check_bacula-authenticate.c
   1.2       +0 -11     ports/net-mgmt/nagios-check_bacula/files/patch-src-lib_jcr.c (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
