6 files changed, 10 insertions, 84 deletions

diff --git a/net-mgmt/nagios-check_bacula/Makefile b/net-mgmt/nagios-check_bacula/Makefile
index 601b6b1de416..f59bd759abc8 100644
--- a/net-mgmt/nagios-check_bacula/Makefile
+++ b/net-mgmt/nagios-check_bacula/Makefile
@@ -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 --git a/net-mgmt/nagios-check_bacula/distinfo b/net-mgmt/nagios-check_bacula/distinfo
index 2343486ca3b0..4c7c210283d4 100644
--- a/net-mgmt/nagios-check_bacula/distinfo
+++ b/net-mgmt/nagios-check_bacula/distinfo
@@ -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 --git a/net-mgmt/nagios-check_bacula/files/patch-configure b/net-mgmt/nagios-check_bacula/files/patch-configure
index 9e432af3a1a7..4d5f196935f5 100644
--- a/net-mgmt/nagios-check_bacula/files/patch-configure
+++ b/net-mgmt/nagios-check_bacula/files/patch-configure
@@ -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 --git a/net-mgmt/nagios-check_bacula/files/patch-src-check_bacula-Makefile.in b/net-mgmt/nagios-check_bacula/files/patch-src-check_bacula-Makefile.in
deleted file mode 100644
index e8ed1a02aa94..000000000000
--- a/net-mgmt/nagios-check_bacula/files/patch-src-check_bacula-Makefile.in
+++ /dev/null
@@ -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 --git a/net-mgmt/nagios-check_bacula/files/patch-src-check_bacula-authenticate.c b/net-mgmt/nagios-check_bacula/files/patch-src-check_bacula-authenticate.c
index 6ebcc46e0722..d35d48842f70 100644
--- a/net-mgmt/nagios-check_bacula/files/patch-src-check_bacula-authenticate.c
+++ b/net-mgmt/nagios-check_bacula/files/patch-src-check_bacula-authenticate.c
@@ -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 --git a/net-mgmt/nagios-check_bacula/files/patch-src-lib_jcr.c b/net-mgmt/nagios-check_bacula/files/patch-src-lib_jcr.c
deleted file mode 100644
index 8a88b3608054..000000000000
--- a/net-mgmt/nagios-check_bacula/files/patch-src-lib_jcr.c
+++ /dev/null
@@ -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());