cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to bacula 7.0.3.

Browse Source 
ok sthen@
This commit is contained in:
ajacoutot 2014-05-21 10:12:34 +00:00
parent 70e046ecbd
commit 8da6e75884
4 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sysutils/bacula/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.73 2014/04/21 22:12:07 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.74 2014/05/21 10:12:34 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT-main= network backup solution (client)
COMMENT-server= network backup solution (server)
COMMENT-bat= network backup solution (gui-client)
V= 7.0.2
V= 7.0.3
DISTNAME= bacula-$V
FULLPKGNAME-main= bacula-client-$V
FULLPKGPATH-main= ${PKGPATH},-main
@ -15,8 +15,6 @@ FULLPKGNAME-bat= bacula-bat-$V
FULLPKGPATH-bat= ${PKGPATH},-bat
CATEGORIES= sysutils
REVISION-server= 1
SHARED_LIBS += bac 5.0
SHARED_LIBS += baccfg 5.0
SHARED_LIBS += bacfind 5.0
@ -153,6 +151,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
WANTLIB-bat += ${WANTLIB}
WANTLIB-bat += ICE QtCore QtGui SM X11 Xext Xi Xinerama Xrender bac
WANTLIB-bat += baccfg bacfind expat fontconfig freetype xcb pthread-stubs
WANTLIB-bat += ffi glib-2.0 gobject-2.0 gthread-2.0 pcre png
RUN_DEPENDS-bat= ${RUN_DEPENDS} \
devel/desktop-file-utils
LIB_DEPENDS-bat= ${LIB_DEPENDS} \

4
sysutils/bacula/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (bacula-7.0.2.tar.gz) = zE9qvzaKleTE66Upboo6dT9usi9PX7wZ+isSU8JmmZ0=
SIZE (bacula-7.0.2.tar.gz) = 3591658
SHA256 (bacula-7.0.3.tar.gz) = ol5Zio9K07FMN8BvWSxOZOaYCh5HLLmSo/bi3C9MZfQ=
SIZE (bacula-7.0.3.tar.gz) = 3595208

16
sysutils/bacula/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.15 2014/04/19 09:44:11 ajacoutot Exp $
--- configure.orig Wed Apr 2 18:32:30 2014
+++ configure Tue Apr 8 16:26:01 2014
$OpenBSD: patch-configure,v 1.16 2014/05/21 10:12:34 ajacoutot Exp $
--- configure.orig Sun May 11 12:34:12 2014
+++ configure Wed May 21 10:05:14 2014
@@ -4776,7 +4776,7 @@ $as_echo "no" >&6; }
fi
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.15 2014/04/19 09:44:11 ajacoutot Exp $
as_fn_error $? "Unable to find C++ compiler" "$LINENO" 5
fi
@@ -16640,7 +16640,7 @@ if test x$use_libtool != xno; then
@@ -16708,7 +16708,7 @@ if test x$use_libtool != xno; then
LIBTOOL_INSTALL_TARGET="libtool-install"
LIBTOOL_UNINSTALL_TARGET="libtool-uninstall"
LIBTOOL_CLEAN_TARGET="libtool-clean"
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.15 2014/04/19 09:44:11 ajacoutot Exp $
FD_PLUGIN_DIR="src/plugins/fd"
have_plugins=yes
else
@@ -22251,7 +22251,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
@@ -22319,7 +22319,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
$as_echo "#define HAVE_READLINE 1" >>confdefs.h
@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.15 2014/04/19 09:44:11 ajacoutot Exp $
got_readline="yes"
else
@@ -22290,7 +22290,7 @@ $as_echo "#define HAVE_READLINE 1" >>confdefs.h
@@ -22358,7 +22358,7 @@ $as_echo "#define HAVE_READLINE 1" >>confdefs.h
got_readline="yes"
CONS_INC="-I${TOP_DIR}/depkgs/readline"
@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.15 2014/04/19 09:44:11 ajacoutot Exp $
CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
@@ -30478,6 +30478,7 @@ openbsd)
@@ -30546,6 +30546,7 @@ openbsd)
DISTVER=`uname -a |awk '{print $3}'`
lld="qd"
llu="qu"
@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.15 2014/04/19 09:44:11 ajacoutot Exp $
TAPEDRIVE="/dev/nrst0"
PSCMD="ps -ax -o pid,command"
PTHREAD_LIB="-pthread"
@@ -30487,6 +30488,7 @@ openbsd)
@@ -30555,6 +30556,7 @@ openbsd)
platforms/openbsd/bacula-fd \
platforms/openbsd/bacula-sd \
platforms/openbsd/bacula-dir"

17
sysutils/bacula/patches/patch-src_lib_lockmgr_h
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_lib_lockmgr_h,v 1.1 2014/04/19 09:44:11 ajacoutot Exp $
From 11f7bbb53348ebeaa74ef384bb654640c905db89 Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@baculasystems.com>
Date: Fri, 11 Apr 2014 07:23:31 +0000
Subject: Fix #2047 about bthread_cond_wait_p not declared
--- src/lib/lockmgr.h.orig Wed Apr 2 19:32:30 2014
+++ src/lib/lockmgr.h Sat Apr 19 11:27:55 2014
@@ -230,6 +230,7 @@ int bthread_kill(pthread_t thread, int sig,
# define BTHREAD_MUTEX_NO_PRIORITY PTHREAD_MUTEX_INITIALIZER
# define BTHREAD_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
# define lmgr_mutex_is_locked(m) (1)
+# define bthread_cond_wait_p(w, x, y, z) pthread_cond_wait(w,x)
#endif /* _USE_LOCKMGR */