update to Bacula 5.2.6, ok ajacoutot@ merdely@

- don't use ports libtool, it passes invalid flags to the linker
- since libbaccats-${BACKEND} must have the same .so version as
libbaccats, use a variable to make sure they are kept in-sync
- mark as being SHARED_ONLY and sync/merge plists
This commit is contained in:
sthen 2012-03-06 20:11:33 +00:00
parent 644d721dfc
commit 78137264de
12 changed files with 128 additions and 71 deletions

View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.38 2011/12/12 09:15:09 sthen Exp $
# $OpenBSD: Makefile,v 1.39 2012/03/06 20:11:33 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= network backup solution (client)
COMMENT-server= network backup solution (server)
COMMENT-bat= network backup solution (gui-client)
V= 5.2.2
V= 5.2.6
DISTNAME= bacula-$V
FULLPKGNAME-main= bacula-client-$V
FULLPKGPATH-main= ${PKGPATH},-main
@ -13,12 +15,14 @@ FULLPKGNAME-bat= bacula-bat-$V
FULLPKGPATH-bat= ${PKGPATH},-bat
CATEGORIES= sysutils
SHARED_LIBS += bac 2.0 # 5.2.1
SHARED_LIBS += baccfg 2.0 # 5.2.1
SHARED_LIBS += bacpy 2.0 # 5.2.1
SHARED_LIBS += bacfind 2.0 # 5.2.1
SHARED_LIBS += bacsql 2.0 # 5.2.1
SHARED_LIBS += baccats 0.0 # 5.2.1
# XXX build fails if a previous version is installed
SHARED_LIBS += bac 3.0
SHARED_LIBS += baccfg 3.0
SHARED_LIBS += bacpy 3.0
SHARED_LIBS += bacfind 3.0
SHARED_LIBS += bacsql 3.0
BACCATS_LIBV = 1.0
SHARED_LIBS += baccats ${BACCATS_LIBV}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/}
HOMEPAGE= http://www.bacula.org/
@ -42,7 +46,7 @@ SUBST_VARS= BACULACONF BACULASTATE TRUEPREFIX
CONFIGURE_STYLE= simple
USE_GMAKE= yes
USE_GROFF= yes
USE_LIBTOOL= yes
USE_LIBTOOL= gnu # ports libtool passes libtool-only parameters to linker
NO_REGRESS= yes
PSEUDO_FLAVORS= no_bat no_server
@ -113,14 +117,14 @@ CONFIGURE_ARGS+= --enable-client-only \
--disable-build-dird \
--disable-build-stored
.else
SHARED_LIBS += baccats-${BACKEND} 0.0 # sync with LIBbaccats_VERSION
SHARED_LIBS += baccats-${BACKEND} ${BACCATS_LIBV}
CONFIGURE_ARGS+= --with-dir-user=_bacula \
--with-dir-group=_bacula \
--with-sd-user=_bacula-sd \
--with-sd-group=_bacula
. if ${FLAVOR:Mpgsql}
WANTLIB-server += pq>=2 com_err
WANTLIB-server += pq>=2
CONFIGURE_ARGS+= --with-postgresql
LIB_DEPENDS-server+= databases/postgresql
BACKEND += postgresql
@ -196,5 +200,6 @@ post-install:
mv ${WRKINST}/etc/bacula/* ${PREFIX}/share/examples/bacula/
rm ${PREFIX}/man/man1/bacula-{bwxconsole,tray-monitor}.1
rmdir ${WRKINST}/{etc,var}/bacula
mv ${PREFIX}/libexec/bacula/query.sql{,.dist}
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (bacula-5.2.2.tar.gz) = InuI9WrghdqPSII7Ig1Mhw==
RMD160 (bacula-5.2.2.tar.gz) = FDQqzTPQvnoRxxtU0+noJICHs6U=
SHA1 (bacula-5.2.2.tar.gz) = g758FHDB36Srzcz5XVUg+DOa0JY=
SHA256 (bacula-5.2.2.tar.gz) = 2A81Mr2cNT2uAFMrUu+mCgHo3Of/BFpxentC2CDKCVk=
SIZE (bacula-5.2.2.tar.gz) = 4011125
MD5 (bacula-5.2.6.tar.gz) = kUSDuSU5WYZ4VCvS3bKAQw==
RMD160 (bacula-5.2.6.tar.gz) = JJTZ4cm4ApxK1pklUCPKsWxDSQM=
SHA1 (bacula-5.2.6.tar.gz) = RxzyJNVWbmWjps69WdE8JfCCWoo=
SHA256 (bacula-5.2.6.tar.gz) = fMYN9OzK4MccJtLNtLGiUk+V6ICRMmTPT0/Mel2UmSc=
SIZE (bacula-5.2.6.tar.gz) = 4035050

View File

@ -0,0 +1,29 @@
$OpenBSD: patch-Makefile_in,v 1.1 2012/03/06 20:11:33 sthen Exp $
stop building when an error occurs, rather than just keep on with the
next subdir..
--- Makefile.in.orig Tue Jan 24 13:41:48 2012
+++ Makefile.in Tue Jan 24 13:42:10 2012
@@ -43,18 +43,18 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
#-------------------------------------------------------------------------
all: Makefile
- @for I in ${all_subdirs}; \
+ @set -e; for I in ${all_subdirs}; \
do (cd $$I; echo "==>Entering directory `pwd`"; \
$(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \
echo ""; echo ""; exit 1;)); \
done
depend:
- @for I in ${all_subdirs}; \
+ @set -e; for I in ${all_subdirs}; \
do (cd $$I; echo "==>Entering directory `pwd`"; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
bacula-fd: Makefile
- @for I in ${fd_subdirs}; \
+ @set -e; for I in ${fd_subdirs}; \
do (cd $$I; echo "==>Entering directory `pwd`"; \
$(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \
echo ""; echo ""; exit 1;)); \

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.9 2011/12/12 09:15:09 sthen Exp $
--- configure.orig Sat Nov 26 14:08:12 2011
+++ configure Sun Dec 4 11:54:53 2011
$OpenBSD: patch-configure,v 1.10 2012/03/06 20:11:33 sthen Exp $
--- configure.orig Wed Jan 18 14:57:49 2012
+++ configure Tue Jan 24 01:04:36 2012
@@ -4792,7 +4792,7 @@ $as_echo "no" >&6; }
fi
@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.9 2011/12/12 09:15:09 sthen Exp $
CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
@@ -29764,13 +29764,13 @@ $as_echo "#define HAVE_XATTR 1" >>confdefs.h
@@ -29755,13 +29755,13 @@ $as_echo "#define HAVE_XATTR 1" >>confdefs.h
fi
PTHREAD_LIB=""
@ -54,7 +54,7 @@ $OpenBSD: patch-configure,v 1.9 2011/12/12 09:15:09 sthen Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -29801,7 +29801,7 @@ fi
@@ -29792,7 +29792,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
@ -63,7 +63,7 @@ $OpenBSD: patch-configure,v 1.9 2011/12/12 09:15:09 sthen Exp $
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5
@@ -30169,7 +30169,8 @@ openbsd)
@@ -30160,7 +30160,8 @@ openbsd)
DISTVER=`uname -a |awk '{print $3}'`
lld="qd"
llu="qu"
@ -73,7 +73,7 @@ $OpenBSD: patch-configure,v 1.9 2011/12/12 09:15:09 sthen Exp $
PSCMD="ps -ax -o pid,command"
PTHREAD_LIB="-pthread"
CFLAGS="${CFLAGS} -pthread"
@@ -30178,6 +30179,7 @@ openbsd)
@@ -30169,6 +30170,7 @@ openbsd)
platforms/openbsd/bacula-fd \
platforms/openbsd/bacula-sd \
platforms/openbsd/bacula-dir"

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-manpages_Makefile_in,v 1.4 2012/03/06 20:11:33 sthen Exp $
--- manpages/Makefile.in.orig Mon Mar 5 10:01:00 2012
+++ manpages/Makefile.in Mon Mar 5 10:01:42 2012
@@ -20,17 +20,9 @@ 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); \
- done
+ $(INSTALL_DATA) ${MAN8} $(DESTDIR)$(mandir)/man8/
$(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); \
- done
+ $(INSTALL_DATA) ${MAN1} $(DESTDIR)$(mandir)/man1/
uninstall:
for I in ${MAN8}; \

View File

@ -1,9 +1,6 @@
$OpenBSD: patch-scripts_mtx-changer_in,v 1.6 2011/11/17 23:45:56 ajacoutot Exp $
XXX first hunk hand-rolled for CVS keyword, Id
--- scripts/mtx-changer.in.orig Sun Oct 30 13:03:42 2011
+++ scripts/mtx-changer.in Mon Nov 14 10:19:54 2011
$OpenBSD: patch-scripts_mtx-changer_in,v 1.7 2012/03/06 20:11:33 sthen Exp $
--- scripts/mtx-changer.in.orig Tue Feb 21 15:59:33 2012
+++ scripts/mtx-changer.in Mon Mar 5 12:43:07 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
@ -25,7 +22,7 @@ XXX first hunk hand-rolled for CVS keyword, Id
# exit code, Bacula will assume the request failed.
#
@@ -152,7 +152,7 @@ debug "Parms: $ctl $cmd $slot $device $drive"
@@ -175,7 +175,7 @@ debug "Parms: $ctl $cmd $slot $device $drive"
case $cmd in
unload)
@ -34,23 +31,25 @@ XXX first hunk hand-rolled for CVS keyword, Id
if test ${offline} -eq 1 ; then
mt -f $device offline
@@ -160,12 +160,12 @@ case $cmd in
if test ${offline_sleep} -ne 0 ; then
@@ -184,7 +184,7 @@ case $cmd in
sleep ${offline_sleep}
fi
- ${MTX} -f $ctl unload $slot $drive
+ ${MTX} -f $ctl move drive $drive slot $slot
;;
make_err_file
- ${MTX} -f $ctl unload $slot $drive 2>${ERRFILE}
+ ${MTX} -f $ctl move slot $slot drive $drive 2>${ERRFILE}
rtn=$?
cat ${ERRFILE}
rm -f ${ERRFILE} >/dev/null 2>&1
@@ -194,7 +194,7 @@ case $cmd in
load)
- debug "Doing mtx -f $ctl load $slot $drive"
- ${MTX} -f $ctl load $slot $drive
+ debug "Doing chio -f $ctl move slot $slot drive $drive"
+ ${MTX} -f $ctl move slot $slot drive $drive
debug "Doing mtx -f $ctl load $slot $drive"
make_err_file
- ${MTX} -f $ctl load $slot $drive 2>${ERRFILE}
+ ${MTX} -f $ctl slot $slot drive $drive 2>${ERRFILE}
rtn=$?
if test ${load_sleep} -ne 0 ; then
sleep ${load_sleep}
@@ -175,61 +175,21 @@ case $cmd in
@@ -206,61 +206,21 @@ case $cmd in
;;
list)
@ -117,7 +116,7 @@ XXX first hunk hand-rolled for CVS keyword, Id
;;
transfer)
@@ -241,18 +201,19 @@ case $cmd in
@@ -272,18 +232,19 @@ case $cmd in
;;
loaded)

View File

@ -1,32 +1,34 @@
$OpenBSD: patch-src_cats_Makefile_in,v 1.2 2011/11/17 23:45:56 ajacoutot Exp $
--- src/cats/Makefile.in.orig Sun Oct 30 13:03:42 2011
+++ src/cats/Makefile.in Mon Nov 14 15:56:11 2011
@@ -142,23 +142,23 @@ libbaccats.a: $(LIBBACCATS_OBJS)
$OpenBSD: patch-src_cats_Makefile_in,v 1.3 2012/03/06 20:11:33 sthen Exp $
--- src/cats/Makefile.in.orig Wed Jan 18 14:57:49 2012
+++ src/cats/Makefile.in Tue Jan 24 01:09:59 2012
@@ -142,25 +142,25 @@ libbaccats.a: $(LIBBACCATS_OBJS)
libbacsql.la: Makefile $(LIBBACSQL_LOBJS)
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_RELEASE) $(DB_LIBS)
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) ${LIBbacsql_VERSION} $(DB_LIBS)
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) $(LIBbacsql_VERSION) $(DB_LIBS)
libbaccats.la: Makefile cats_dummy.lo
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE)
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) ${LIBbaccats_VERSION}
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) $(LIBbaccats_VERSION)
libbaccats-mysql.la: Makefile $(MYSQL_LOBJS)
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) $(MYSQL_LIBS)
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) ${LIBbaccats_VERSION} $(MYSQL_LIBS)
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) $(LIBbaccats_VERSION) \
-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(MYSQL_LIBS)
libbaccats-postgresql.la: Makefile $(POSTGRESQL_LOBJS)
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) $(POSTGRESQL_LIBS)
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) ${LIBbaccats_VERSION} $(POSTGRESQL_LIBS)
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) $(LIBbaccats_VERSION) \
-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(POSTGRESQL_LIBS)
libbaccats-sqlite3.la: Makefile $(SQLITE_LOBJS)
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) $(SQLITE_LIBS)
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) ${LIBbaccats_VERSION} $(SQLITE_LIBS)
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) $(LIBbaccats_VERSION) \
-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(SQLITE_LIBS)
#libbaccats-ingres.la: Makefile $(INGRES_LOBJS)
# @echo "Making $@ ..."

View File

@ -1,6 +0,0 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.1 2009/10/02 02:34:05 merdely Exp $
lib/bpipe-fd.so
@lib lib/libbac.so.${LIBbac_VERSION}
@lib lib/libbaccfg.so.${LIBbaccfg_VERSION}
@lib lib/libbacfind.so.${LIBbacfind_VERSION}
@lib lib/libbacpy.so.${LIBbacpy_VERSION}

View File

@ -1,4 +0,0 @@
@comment $OpenBSD: PFRAG.shared-server,v 1.2 2011/11/17 23:45:56 ajacoutot Exp $
@lib lib/libbaccats.so.${LIBbaccats_VERSION}
@lib lib/libbaccats-${BACKEND}.so.${LIBbaccats-${BACKEND}_VERSION}
@lib lib/libbacsql.so.${LIBbacsql_VERSION}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-bat,v 1.8 2011/11/17 23:45:56 ajacoutot Exp $
@comment $OpenBSD: PLIST-bat,v 1.9 2012/03/06 20:11:33 sthen Exp $
@newgroup _bacula:591
@newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin
@newuser _bacula-sd:599:_bacula:daemon:Bacula Storage Daemon:/nonexistent:/sbin/nologin
@ -9,7 +9,6 @@
@sample ${BACULACONF}/
@mode
@group
share/applications/
share/applications/bat.desktop
share/doc/bacula/html/
share/doc/bacula/html/clients.html

View File

@ -1,25 +1,33 @@
@comment $OpenBSD: PLIST-main,v 1.11 2011/11/25 11:00:27 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.12 2012/03/06 20:11:33 sthen Exp $
@conflict bacula-server-<5.2.1
@pkgpath sysutils/bacula,-client
@newgroup _bacula:591
@newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin
%%SHARED%%
@comment lib/bpipe-fd.a
lib/bpipe-fd.so
lib/libbac.a
lib/libbac.la
@lib lib/libbac.so.${LIBbac_VERSION}
lib/libbaccfg.a
lib/libbaccfg.la
@lib lib/libbaccfg.so.${LIBbaccfg_VERSION}
lib/libbacfind.a
lib/libbacfind.la
@lib lib/libbacfind.so.${LIBbacfind_VERSION}
lib/libbacpy.a
lib/libbacpy.la
@lib lib/libbacpy.so.${LIBbacpy_VERSION}
libexec/bacula/
libexec/bacula/bacula-ctl-fd
libexec/bacula/bacula_config
libexec/bacula/bconsole
libexec/bacula/mtx-changer.conf
libexec/bacula/query.sql.dist
@sample libexec/bacula/query.sql
@man man/man8/bacula-fd.8
@man man/man8/bconsole.8
@man man/man8/bregex.8
@man man/man8/bwild.8
sbin/bacula
@bin sbin/bacula-fd
@bin sbin/bconsole

View File

@ -1,13 +1,15 @@
@comment $OpenBSD: PLIST-server,v 1.9 2011/11/17 23:45:56 ajacoutot Exp $
@comment $OpenBSD: PLIST-server,v 1.10 2012/03/06 20:11:33 sthen Exp $
@conflict bacula-<2.2.7
@newgroup _bacula:591
@newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin
@newuser _bacula-sd:599:_bacula:daemon:Bacula Storage Daemon:/nonexistent:/sbin/nologin
%%SHARED%%
lib/libbacsql.a
lib/libbacsql.la
@lib lib/libbacsql.so.${LIBbacsql_VERSION}
lib/libbaccats-${BACKEND}.a
lib/libbaccats-${BACKEND}.la
@lib lib/libbaccats.so.${LIBbaccats_VERSION}
@lib lib/libbaccats-${BACKEND}.so.${LIBbaccats-${BACKEND}_VERSION}
libexec/bacula/
libexec/bacula/bacula
libexec/bacula/bacula-ctl-dir