Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2013Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sysutils/bacula/DESCR Normal file
View File

@@ -0,0 +1,7 @@
Bacula is a set of computer programs that permit you (or the system
administrator) to manage backup, recovery, and verification of computer data
across a network of computers of different kinds. In technical terms, it is
a network client/server based backup program. Bacula is relatively easy to
use and efficient, while offering many advanced storage management features
that make it easy to find and recover lost or damaged files. Bacula source
code has been released under the GPL affero version 3 license.

18
sysutils/bacula/MESSAGE Normal file
View File

@@ -0,0 +1,18 @@
===========================================================================
$NetBSD: MESSAGE,v 1.4 2007/09/07 15:15:34 ghen Exp $
You can find some useful scripts to create, update and drop the necessary
databases, privileges and tables in ${PREFIX}/libexec/bacula/.
If you're upgrading to ${PKGNAME_NOREV} from 1.38.x or earlier, you MUST
recreate your catalog database or upgrade your old database using the
${PREFIX}/libexec/bacula/update_bacula_tables script. Later updates will
not require upgrading the database again.
The director and storage daemon systems must be upgraded simultaneously,
but you should be able to use an older file daemon with a newer director
and storage daemon if you do not use any of the new features.
Please read the full ${PKGNAME_NOREV} release notes for other important
remarks.
===========================================================================

49
sysutils/bacula/Makefile Normal file
View File

@@ -0,0 +1,49 @@
# $NetBSD: Makefile,v 1.51 2013/05/31 12:41:59 wiz Exp $
PKGREVISION= 8
CONFLICTS+= bacula-client-[0-9]* bacula-clientonly-[0-9]*
.include "options.mk"
PLIST_SRC= PLIST.common
PLIST_SRC+= PLIST.server
PLIST_SUBST+= BACULA_DB=${BACULA_DB}
MESSAGE_SUBST+= PREFIX=${PREFIX}
MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV}
# For make_catalog_backup.pl.in.
USE_TOOLS+= perl:run
CONFIGURE_ARGS+= --with-dir-group=${BACULA_GROUP}
CONFIGURE_ARGS+= --with-dir-user=${BACULA_DIR_USER}
CONFIGURE_ARGS+= --with-sd-group=${BACULA_GROUP}
CONFIGURE_ARGS+= --with-sd-user=${BACULA_SD_USER}
OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} ${ROOT_USER} ${BACULA_GROUP} 770
PKG_USERS= ${BACULA_DIR_USER}:${BACULA_GROUP}
PKG_USERS+= ${BACULA_SD_USER}:${BACULA_GROUP}
PKG_GROUPS= ${BACULA_GROUP}
CONF_FILES+= ${EXAMPLESDIR}/bacula-fd.conf ${PKG_SYSCONFDIR}/bacula-fd.conf
CONF_FILES+= ${EXAMPLESDIR}/bconsole.conf ${PKG_SYSCONFDIR}/bconsole.conf
CONF_FILES+= ${EXAMPLESDIR}/bacula-dir.conf ${PKG_SYSCONFDIR}/bacula-dir.conf
CONF_FILES+= ${EXAMPLESDIR}/bacula-sd.conf ${PKG_SYSCONFDIR}/bacula-sd.conf
RCD_SCRIPTS= bacula bacula-dir bacula-sd bacula-fd
REPLACE_PERL+= src/cats/make_catalog_backup.pl.in
.include "Makefile.common"
.if !empty(USE_DESTDIR:M[Yy][Ee][Ss])
INSTALL_MAKE_FLAGS+= dir_user= dir_group=
.endif
post-install:
${INSTALL_SCRIPT} ${FILESDIR}/chio-changer \
${DESTDIR}${PREFIX}/libexec/bacula/
.include "../../mk/bsd.pkg.mk"

82
sysutils/bacula/Makefile.common Normal file
View File

@@ -0,0 +1,82 @@
# $NetBSD: Makefile.common,v 1.61 2013/03/04 21:57:21 wiz Exp $
#
# used by sysutils/bacula-clientonly/Makefile
# used by sysutils/bacula-tray-monitor/Makefile
# used by sysutils/bacula-wx-console/Makefile
DISTNAME= bacula-5.2.12
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/}
#PATCH_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/}
#PATCHFILES=
#DIST_SUBDIR= ${DISTNAME}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.bacula.org/
COMMENT?= The Network Backup Solution
LICENSE= gnu-agpl-v3
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= msgfmt
GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
BACULA_GROUP?= bacula
BACULA_DIR_USER?= bacula-dir
BACULA_SD_USER?= bacula-sd
PKG_GROUPS_VARS+= BACULA_GROUP
PKG_USERS_VARS= BACULA_DIR_USER BACULA_SD_USER
PKG_SYSCONFSUBDIR?= bacula
BACULA_PIDDIR?= ${VARBASE}/run
BACULA_WORKINGDIR?= ${VARBASE}/spool/bacula
BUILD_DEFS+= VARBASE BACULA_PIDDIR BACULA_WORKINGDIR
FILES_SUBST+= BACULA_ETCDIR=${PKG_SYSCONFDIR}
FILES_SUBST+= BACULA_PIDDIR=${BACULA_PIDDIR}
FILES_SUBST+= BACULA_GROUP=${BACULA_GROUP}
FILES_SUBST+= BACULA_DIR_USER=${BACULA_DIR_USER}
FILES_SUBST+= BACULA_SD_USER=${BACULA_SD_USER}
SUBST_CLASSES+= egdir
SUBST_STAGE.egdir= pre-configure
SUBST_FILES.egdir= src/dird/Makefile.in
SUBST_FILES.egdir+= src/console/Makefile.in
SUBST_FILES.egdir+= src/filed/Makefile.in
SUBST_FILES.egdir+= src/stored/Makefile.in
SUBST_FILES.egdir+= src/gnome2-console/Makefile.in
SUBST_FILES.egdir+= src/wx-console/Makefile.in
SUBST_FILES.egdir+= src/tray-monitor/Makefile.in
SUBST_SED.egdir= -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g'
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-scriptdir=${PREFIX}/libexec/bacula
CONFIGURE_ARGS+= --with-sbin-perm=0755
CONFIGURE_ARGS+= --with-working-dir=${BACULA_WORKINGDIR}
CONFIGURE_ARGS+= --with-pid-dir=${BACULA_PIDDIR}
CONFIGURE_ARGS+= --with-readline=${PREFIX}/include/readline
.if ${OPSYS} == "Linux"
CONFIGURE_ARGS+= --enable-smartalloc
.endif
.if ${OPSYS} == "DragonFly"
CONFIGURE_ARGS+= --disable-xattr
.endif
PTHREAD_OPTS+= require
PTHREAD_AUTO_VARS= yes
EXAMPLESDIR= ${PREFIX}/share/examples/bacula
pre-install:
${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLESDIR}
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"

51
sysutils/bacula/PLIST.common Normal file
View File

@@ -0,0 +1,51 @@
@comment $NetBSD: PLIST.common,v 1.17 2013/05/19 11:00:03 shattered Exp $
lib/bpipe-fd.la
lib/libbac.la
lib/libbaccfg.la
lib/libbacfind.la
lib/libbacpy.la
libexec/bacula/bacula
libexec/bacula/bacula-ctl-dir
libexec/bacula/bacula-ctl-fd
libexec/bacula/bacula-ctl-sd
libexec/bacula/bacula_config
libexec/bacula/bconsole
libexec/bacula/btraceback.dbx
libexec/bacula/btraceback.gdb
libexec/bacula/btraceback.mdb
libexec/bacula/disk-changer
libexec/bacula/mtx-changer
libexec/bacula/mtx-changer.conf
libexec/bacula/query.sql
man/man1/bacula-bwxconsole.1
man/man1/bacula-tray-monitor.1
man/man1/bat.1
man/man1/bsmtp.1
man/man8/bacula-dir.8
man/man8/bacula-fd.8
man/man8/bacula-sd.8
man/man8/bacula.8
man/man8/bconsole.8
man/man8/bcopy.8
man/man8/bextract.8
man/man8/bls.8
man/man8/bregex.8
man/man8/bscan.8
man/man8/btape.8
man/man8/btraceback.8
man/man8/bwild.8
man/man8/dbcheck.8
sbin/bacula
sbin/bacula-fd
sbin/bconsole
sbin/btraceback
share/doc/bacula/ChangeLog
share/doc/bacula/INSTALL
share/doc/bacula/LICENSE
share/doc/bacula/README
share/doc/bacula/ReleaseNotes
share/doc/bacula/VERIFYING
share/doc/bacula/technotes
share/examples/bacula/bacula-fd.conf
share/examples/bacula/bconsole.conf
share/examples/rc.d/bacula-fd

36
sysutils/bacula/PLIST.server Normal file
View File

@@ -0,0 +1,36 @@
@comment $NetBSD: PLIST.server,v 1.12 2013/05/19 11:00:03 shattered Exp $
lib/libbaccats.la
lib/libbaccats-${BACULA_DB}.la
lib/libbacsql.la
libexec/bacula/chio-changer
libexec/bacula/create_${BACULA_DB}_database
libexec/bacula/create_bacula_database
libexec/bacula/delete_catalog_backup
libexec/bacula/drop_${BACULA_DB}_database
libexec/bacula/drop_${BACULA_DB}_tables
libexec/bacula/drop_bacula_database
libexec/bacula/drop_bacula_tables
libexec/bacula/grant_${BACULA_DB}_privileges
libexec/bacula/grant_bacula_privileges
libexec/bacula/make_${BACULA_DB}_tables
libexec/bacula/make_bacula_tables
libexec/bacula/make_catalog_backup
libexec/bacula/make_catalog_backup.pl
libexec/bacula/update_${BACULA_DB}_tables
libexec/bacula/update_bacula_tables
sbin/bacula-dir
sbin/bacula-sd
sbin/bcopy
sbin/bextract
sbin/bls
sbin/bregex
sbin/bscan
sbin/bsmtp
sbin/btape
sbin/bwild
sbin/dbcheck
share/examples/bacula/bacula-dir.conf
share/examples/bacula/bacula-sd.conf
share/examples/rc.d/bacula
share/examples/rc.d/bacula-dir
share/examples/rc.d/bacula-sd

12
sysutils/bacula/buildlink3.mk Normal file
View File

@@ -0,0 +1,12 @@
# $NetBSD: buildlink3.mk,v 1.1 2009/08/18 15:23:59 joerg Exp $
BUILDLINK_TREE+= bacula
.if !defined(BACULA_BUILDLINK3_MK)
BACULA_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.bacula+= {bacula,bacula-clientonly}>=3.0.1nb1
BUILDLINK_PKGSRCDIR.bacula?= ../../sysutils/bacula
.endif # BACULA_BUILDLINK3_MK
BUILDLINK_TREE+= -bacula

21
sysutils/bacula/distinfo Normal file
View File

@@ -0,0 +1,21 @@
$NetBSD: distinfo,v 1.47 2012/10/06 17:54:53 christos Exp $
SHA1 (bacula-5.2.12.tar.gz) = c53cdd185f5f4075ddcca0971953319a94276c84
RMD160 (bacula-5.2.12.tar.gz) = dd5b9f457a524acd9cdbbe0c4842670c4ee5bd5a
Size (bacula-5.2.12.tar.gz) = 4147847 bytes
SHA1 (patch-ac) = 4ba89bcf49ce82b527edc789e2b17a781cb8622e
SHA1 (patch-ad) = ce6bc29858d13dff1a0301db95f9bfedf3e66b01
SHA1 (patch-ah) = 06452df1449ed6f06af00ed2cf9d736c40044dfb
SHA1 (patch-ai) = 388e075e7ec54fb377ee9dbe8338c667efb256ee
SHA1 (patch-aj) = 125d1503406474fec32e737068328cdfa718f5c2
SHA1 (patch-am) = 28536d3f0de81940773749c3704ad7aca86d374d
SHA1 (patch-configure) = 710d6e4370099a5d6d23d1297864af01abcdae83
SHA1 (patch-src_console_conio.c) = 281d1f4c972744a936733f2a0003c6b0f993904d
SHA1 (patch-src_dird_Makefile.in) = fdce18aca972f26f16af90283756cd5bf5ad5831
SHA1 (patch-src_filed_Makefile.in) = c88ee648ef33c3f7c3a02b77b1d3fc3da8da088d
SHA1 (patch-src_findlib_attribs.c) = a0917e500d7e937164cf59917cabd992512acd1d
SHA1 (patch-src_lib_attr.c) = 287851ff2ce2a0868d597cf1d7471a6766f6f7c1
SHA1 (patch-src_plugins_fd_Makefile.in) = f1316cdbb66d9bc55d8adbd4b0bbde01443ccd2e
SHA1 (patch-src_qt-console_bat.pro.in) = 8df9381c0b35b5a3dcd237f8c017ae21d88c79ad
SHA1 (patch-src_stored_Makefile.in) = 5bee8ea8a7c288a1e4baf372ef79da34c9e35284
SHA1 (patch-src_tools_Makefile.in) = 9fbc8d0f71f34217ea29f6ae04cbd927d5ac275b

23
sysutils/bacula/files/bacula-dir.sh Normal file
View File

@@ -0,0 +1,23 @@
#!@RCD_SCRIPTS_SHELL@
#
# PROVIDE: bacula-dir
# REQUIRE: DAEMON
if [ -f /etc/rc.subr ]; then
. /etc/rc.subr
fi
name="baculadir"
rcvar=$name
command="@PREFIX@/sbin/bacula-dir"
required_files="@BACULA_ETCDIR@/bacula-dir.conf"
pidfile="@BACULA_PIDDIR@/bacula-dir.9101.pid"
command_args="-c ${required_files} -u @BACULA_DIR_USER@ -g @BACULA_GROUP@"
if [ -f /etc/rc.subr ]; then
load_rc_config $name
run_rc_command "$1"
else
echo -n " ${name}"
${command} ${baculadir_flags} -c ${required_files}
fi

23
sysutils/bacula/files/bacula-fd.sh Normal file
View File

@@ -0,0 +1,23 @@
#!@RCD_SCRIPTS_SHELL@
#
# PROVIDE: bacula-fd
# REQUIRE: DAEMON
if [ -f /etc/rc.subr ]; then
. /etc/rc.subr
fi
name="baculafd"
rcvar=$name
command="@PREFIX@/sbin/bacula-fd"
required_files="@BACULA_ETCDIR@/bacula-fd.conf"
pidfile="@BACULA_PIDDIR@/bacula-fd.9102.pid"
command_args="-c ${required_files} -g @BACULA_GROUP@"
if [ -f /etc/rc.subr ]; then
load_rc_config $name
run_rc_command "$1"
else
echo -n " ${name}"
${command} ${baculafd_flags} -c ${required_files}
fi

23
sysutils/bacula/files/bacula-sd.sh Normal file
View File

@@ -0,0 +1,23 @@
#!@RCD_SCRIPTS_SHELL@
#
# PROVIDE: bacula-sd
# REQUIRE: DAEMON
if [ -f /etc/rc.subr ]; then
. /etc/rc.subr
fi
name="baculasd"
rcvar=$name
command="@PREFIX@/sbin/bacula-sd"
required_files="@BACULA_ETCDIR@/bacula-sd.conf"
pidfile="@BACULA_PIDDIR@/bacula-sd.9103.pid"
command_args="-c ${required_files} -u @BACULA_SD_USER@ -g @BACULA_GROUP@"
if [ -f /etc/rc.subr ]; then
load_rc_config $name
run_rc_command "$1"
else
echo -n " ${name}"
${command} ${baculasd_flags} -c ${required_files}
fi

52
sysutils/bacula/files/bacula.sh Normal file
View File

@@ -0,0 +1,52 @@
#!@RCD_SCRIPTS_SHELL@
#
# KEYWORD: nostart
if [ -f /etc/rc.subr ]; then
. /etc/rc.subr
fi
rcd_dir=`/usr/bin/dirname $0`
# NOTE: run_rc_command sets $rc_arg
#
forward_commands()
{
# Backward compat with NetBSD <1.6:
[ -z "$rc_arg" ] && rc_arg=$_arg
for file in $COMMAND_LIST; do
$rcd_dir/$file $rc_arg
done
}
reverse_commands()
{
# Backward compat with NetBSD <1.6:
[ -z "$rc_arg" ] && rc_arg=$_arg
REVCOMMAND_LIST=
for file in $COMMAND_LIST; do
REVCOMMAND_LIST="$file $REVCOMMAND_LIST"
done
for file in $REVCOMMAND_LIST; do
$rcd_dir/$file $rc_arg
done
}
COMMAND_LIST="bacula-dir bacula-sd bacula-fd"
name="bacula"
start_cmd="forward_commands"
stop_cmd="reverse_commands"
reload_cmd="forward_commands"
status_cmd="forward_commands"
extra_commands="reload status"
if [ -f /etc/rc.subr ]; then
run_rc_command "$1"
else
echo -n " ${name}"
_arg="$1"
${start_cmd}
fi

97
sysutils/bacula/files/chio-changer Executable file
View File

@@ -0,0 +1,97 @@
#!/bin/sh
#
# Bacula interface to chio autoloader
#
# If you set in your Device resource
#
# Changer Command = "path-to-this-script/chio-changer %c %o %S %a %d"
# you will have the following input to this script:
#
# So Bacula will always call with all the following arguments, even though
# in come cases, not all are used.
#
# chio-changer "changer-device" "command" "slot" "archive-device" "drive-index"
# $1 $2 $3 $4 $5
#
# N.B. If you change the script, take care to return either
# the chio exit code or a 0. If the script exits with a non-zero
# exit code, Bacula will assume the request failed.
CHIO=/bin/chio
# check parameter count on commandline
check_parm_count() {
pCount=$1
pCountNeed=$2
if test $pCount -lt $pCountNeed; then
echo "usage: chio-changer ctl-device command [slot archive-device drive-index]"
echo " Insufficient number of arguments given."
if test $pCount -lt 2; then
echo " Mimimum usage is first two arguments ..."
else
echo " Command expected $pCountNeed arguments"
fi
exit 1
fi
}
# Check for special cases where only 2 arguments are needed,
# all others are a minimum of 5
case $2 in
list|listall)
check_parm_count $# 2
;;
slots)
check_parm_count $# 2
;;
transfer)
check_parm_count $# 4
;;
*)
check_parm_count $# 5
;;
esac
# Setup arguments
ctl=$1
cmd="$2"
slot=$3
device=$4
drive=$5
case $cmd in
unload)
${CHIO} -f $ctl move drive $drive slot $slot
;;
load)
${CHIO} -f $ctl move slot $slot drive $drive
;;
list)
${CHIO} -f $ctl status slot voltags | /usr/bin/awk "/</ { slot=\$2 }\
/Primary volume tag:/ { tag=\$4 }\
/From:/ { print slot tag }"
;;
listall)
echo "Not yet implemented"
;;
loaded)
${CHIO} -f $ctl status drive $drive | /usr/bin/awk "BEGIN { from=0 }\
/From:/{ from=\$3 }\
END { print from }"
;;
slots)
${CHIO} -f $ctl params | awk "/slots/{print \$2}"
;;
transfer)
${CHIO} -f $ctl move slot $slot slot $device
;;
esac
sleep 1

16
sysutils/bacula/hacks.mk Normal file
View File

@@ -0,0 +1,16 @@
# $NetBSD: hacks.mk,v 1.5 2007/01/19 11:38:33 ghen Exp $
.if !defined(BACULA_HACKS_MK)
BACULA_HACKS_MK= #defined
### gcc 4.0* has been reported to produce bad code on amd64
### with optimizations (-O2) turned on (causes segfaults).
###
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
. include "../../mk/compiler.mk"
. if !empty(CC_VERSION:Mgcc-4.0*)
PKG_HACKS+= dontoptimze
BUILDLINK_TRANSFORM+= rm:-O[0-9]*
. endif
.endif
.endif

30
sysutils/bacula/options.mk Normal file
View File

@@ -0,0 +1,30 @@
# $NetBSD: options.mk,v 1.20 2013/05/19 11:00:03 shattered Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.bacula
PKG_SUPPORTED_OPTIONS= ssl
PKG_OPTIONS_REQUIRED_GROUPS= database
PKG_OPTIONS_GROUP.database= catalog-sqlite3 catalog-pgsql catalog-mysql
PKG_SUGGESTED_OPTIONS= catalog-sqlite3
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mcatalog-sqlite3)
. include "../../databases/sqlite3/buildlink3.mk"
CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
BACULA_DB= sqlite3
.elif !empty(PKG_OPTIONS:Mcatalog-pgsql)
. include "../../mk/pgsql.buildlink3.mk"
CONFIGURE_ARGS+= --with-postgresql=${PGSQL_PREFIX}
BACULA_DB= postgresql
.elif !empty(PKG_OPTIONS:Mcatalog-mysql)
. include "../../mk/mysql.buildlink3.mk"
CONFIGURE_ARGS+= --with-mysql=${PREFIX}
BACULA_DB= mysql
.endif
.if !empty(PKG_OPTIONS:Mssl)
. include "../../security/openssl/buildlink3.mk"
CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
.else
CONFIGURE_ARGS+= --without-openssl
.endif

38
sysutils/bacula/patches/patch-ac Normal file
View File

@@ -0,0 +1,38 @@
$NetBSD: patch-ac,v 1.6 2009/08/24 08:23:41 adam Exp $
--- src/console/Makefile.in.orig 2009-06-05 15:02:10.000000000 +0200
+++ src/console/Makefile.in
@@ -48,7 +48,7 @@ all: Makefile bconsole @STATIC_CONS@
bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+ $(DLIB) $(CONS_LIBS) ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) \
$(OPENSSL_LIBS)
static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
@@ -90,19 +90,19 @@ install: all
fi
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(sbindir)/bconsole
@srcconf=bconsole.conf; \
- if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
+ if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
destconf=$$srcconf.new; \
echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
else \
destconf=$$srcconf; \
- if test -f ${DESTDIR}${sysconfdir}/console.conf; then \
+ if test -f ${DESTDIR}%%EXAMPLESDIR%%/console.conf; then \
echo "Existing console.conf moved to bconsole.conf"; \
- @$(MV) ${DESTDIR}${sysconfdir}/console.conf ${DESTDIR}${sysconfdir}/bconsole.conf; \
+ @$(MV) ${DESTDIR}%%EXAMPLESDIR%%/console.conf ${DESTDIR}%%EXAMPLESDIR%%/bconsole.conf; \
destconf=$$srcconf.new; \
fi; \
fi; \
- echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
- ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
+ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
if test -f static-bconsole; then \
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bconsole $(DESTDIR)$(sbindir)/static-bconsole; \
fi

13
sysutils/bacula/patches/patch-ad Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-ad,v 1.5 2011/03/06 03:29:02 dholland Exp $
--- src/lib/tls.c.orig 2010-04-27 19:58:29.000000000 +0000
+++ src/lib/tls.c
@@ -315,7 +315,7 @@ bool tls_postconnect_verify_host(JCR *jc
extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
if (strcmp(extname, "subjectAltName") == 0) {
-#ifdef HAVE_OPENSSLv1
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
const X509V3_EXT_METHOD *method;
#else
X509V3_EXT_METHOD *method;

31
sysutils/bacula/patches/patch-ah Normal file
View File

@@ -0,0 +1,31 @@
$NetBSD: patch-ah,v 1.9 2012/03/31 10:33:36 dholland Exp $
--- src/wx-console/Makefile.in.orig 2010-02-24 15:33:48.000000000 +0000
+++ src/wx-console/Makefile.in
@@ -81,7 +81,7 @@ bwx-console.app: bwx-console
mv bwx-console bwx-console.app/Contents/MacOS/bwx-console
cp bwx-console.conf /Library/Preferences/org.bacula.wxconsole.conf
-bwx-console: Makefile $(CONSOBJS) @WIN32@ ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+bwx-console: Makefile $(CONSOBJS) @WIN32@
$(LIBTOOL_LINK) $(CXX) $(CONSOBJS) $(WIN32RES) -o $@ -L../lib $(CONS_LDFLAGS) \
-lbaccfg -lbac $(LIBS) $(OPENSSL_LIBS)
@@ -114,14 +114,14 @@ install: all
fi
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bwx-console $(DESTDIR)$(sbindir)/bwx-console
@srcconf=bwx-console.conf; \
- if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
+ if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
destconf=$$srcconf.new; \
echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
else \
destconf=$$srcconf; \
fi; \
- echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
- ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
+ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
uninstall:
(cd $(DESTDIR)$(sbindir); $(RMF) bwx-console)

31
sysutils/bacula/patches/patch-ai Normal file
View File

@@ -0,0 +1,31 @@
$NetBSD: patch-ai,v 1.6 2009/05/16 08:06:57 adam Exp $
--- src/tray-monitor/Makefile.in.orig 2008-10-19 12:34:03.000000000 +0200
+++ src/tray-monitor/Makefile.in
@@ -45,7 +45,7 @@ all: Makefile bacula-tray-monitor
bacula-tray-monitor: Makefile $(MONITOROBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(MONITOR_LDFLAGS) -L../lib -o $@ \
- $(MONITOROBJS) $(DLIB) -lbaccfg -lbac -lm $(LIBS) $(OPENSSL_LIBS)
+ $(MONITOROBJS) $(DLIB) ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(OPENSSL_LIBS)
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \
@@ -71,14 +71,14 @@ devclean: realclean
install: all
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-tray-monitor $(DESTDIR)$(sbindir)/bacula-tray-monitor
@srcconf=tray-monitor.conf; \
- if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
+ if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
destconf=$$srcconf.new; \
echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
else \
destconf=$$srcconf; \
fi; \
- echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
- ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
+ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
uninstall:
(cd $(DESTDIR)$(sbindir); $(RMF) bacula-tray-monitor)

22
sysutils/bacula/patches/patch-aj Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-aj,v 1.6 2010/03/09 07:06:00 adam Exp $
--- manpages/Makefile.in.orig 2010-02-24 15:33:48.000000000 +0000
+++ manpages/Makefile.in
@@ -21,15 +21,11 @@ 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); \
+ do $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man8/$$I; \
done
$(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); \
+ do $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man1/$$I; \
done
uninstall:

16
sysutils/bacula/patches/patch-am Normal file
View File

@@ -0,0 +1,16 @@
$NetBSD: patch-am,v 1.3 2010/12/26 18:39:46 adam Exp $
--- scripts/Makefile.in.orig 2010-08-05 14:29:51.000000000 +0000
+++ scripts/Makefile.in
@@ -58,11 +58,6 @@ install: installdirs
$(MV) -f ${DESTDIR}${scriptdir}/disk-changer ${DESTDIR}${scriptdir}/disk-changer.old; \
fi
$(INSTALL_SCRIPT) disk-changer $(DESTDIR)$(scriptdir)/disk-changer
- @if test -f ${DESTDIR}${scriptdir}/dvd-handler; then \
- echo " ==> Saving existing dvd-handler to dvd-handler.old"; \
- $(MV) -f ${DESTDIR}${scriptdir}/dvd-handler ${DESTDIR}${scriptdir}/dvd-handler.old; \
- fi
- $(INSTALL_SCRIPT) dvd-handler $(DESTDIR)$(scriptdir)/dvd-handler
$(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb
$(INSTALL_DATA) btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx
$(INSTALL_DATA) btraceback.mdb $(DESTDIR)$(scriptdir)/btraceback.mdb

17
sysutils/bacula/patches/patch-configure Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-configure,v 1.1 2012/10/06 17:54:53 christos Exp $
use ${PREFIX} and ${PYVERSSUFFIX} instead of hunting down possible installs
--- configure.orig 2012-09-13 04:51:19.000000000 -0400
+++ configure 2012-10-04 23:54:29.000000000 -0400
@@ -22717,8 +22717,8 @@
PYTHON_INCDIR=`/usr/bin/python-config --includes`
PYTHON_LIBS=`/usr/bin/python-config --libs`
else
- for python_root in /usr /usr/local /usr/sfw; do
- for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python2.7 python3; do
+ for python_root in ${PREFIX}; do
+ for ver in python${PYVERSSUFFIX}; do
if test -f $python_root/include/${ver}/Python.h; then
PYTHON_INCDIR=-I$python_root/include/${ver}
if test -d $python_root/lib64/${ver}/config; then

25
sysutils/bacula/patches/patch-src_console_conio.c Normal file
View File

@@ -0,0 +1,25 @@
$NetBSD: patch-src_console_conio.c,v 1.1 2012/10/06 17:54:53 christos Exp $
- need termios.h, our term.h does not include it
- t_insert_line and t_delete_line are macros in term.h; undef them
--- src/console/conio.c.orig 2012-09-13 04:51:19.000000000 -0400
+++ src/console/conio.c 2012-10-05 11:29:38.000000000 -0400
@@ -61,6 +61,7 @@
#endif
+#include <termios.h>
#include <curses.h>
#include <term.h>
@@ -245,7 +246,9 @@
static char * getprev(void);
static void putline(char *newl, int newlen);
static void t_honk_horn(void);
+#undef t_insert_line
static void t_insert_line(void);
+#undef t_delete_line
static void t_delete_line(void);
static void t_clrline(int pos, int width);
void t_sendl(const char *msg, int len);

54
sysutils/bacula/patches/patch-src_dird_Makefile.in Normal file
View File

@@ -0,0 +1,54 @@
$NetBSD: patch-src_dird_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $
- use %%EXAMPLESDIR%% instead of sysconfdir
- use the .la files for linking
--- src/dird/Makefile.in.orig 2012-09-13 04:51:19.000000000 -0400
+++ src/dird/Makefile.in 2012-10-05 11:02:06.000000000 -0400
@@ -69,14 +69,14 @@
../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
- -lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
+ ../findlib/libbacfind.la ../cats/libbacsql.la ../cats/libbaccats.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
$(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
static-bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
- -lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
+ ../findlib/libbacfind.la ../cats/libbacsql.la ../cats/libbaccats.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
$(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
strip $@
@@ -105,16 +105,16 @@
install: all
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir
@srcconf=bacula-dir.conf; \
- if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
+ if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
destconf=$$srcconf.new; \
echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
else \
destconf=$$srcconf; \
fi; \
- echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
- ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
+ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
@if test "x${dir_group}" != "x"; then \
- chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \
+ chgrp -f ${dir_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ; \
fi
@if test -f ${DESTDIR}${scriptdir}/query.sql; then \
echo " ==> Saving existing query.sql to query.sql.old"; \
@@ -128,7 +128,7 @@
uninstall:
(cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir)
- (cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf bacula-dir.conf.new)
+ (cd $(DESTDIR)%%EXAMPLESDIR%%; $(RMF) bacula-dir.conf bacula-dir.conf.new)
(cd $(DESTDIR)$(scriptdir); $(RMF) query.sql)

43
sysutils/bacula/patches/patch-src_filed_Makefile.in Normal file
View File

@@ -0,0 +1,43 @@
$NetBSD: patch-src_filed_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $
- use %%EXAMPLESDIR%% instead of sysconfdir
- use the .la files for linking
--- src/filed/Makefile.in.orig 2012-09-13 04:51:19.000000000 -0400
+++ src/filed/Makefile.in 2012-10-05 11:15:25.000000000 -0400
@@ -96,12 +96,12 @@
bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(LIBS) \
$(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(LIBS) \
$(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
strip $@
@@ -139,16 +139,16 @@
install: all
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd
@srcconf=bacula-fd.conf; \
- if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
+ if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
destconf=$$srcconf.new; \
echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
else \
destconf=$$srcconf; \
fi; \
- echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
- ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
+ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
@if test "x${fd_group}" != "x"; then \
- chgrp -f ${fd_group} ${DESTDIR}${sysconfdir}/$$destconf ; \
+ chgrp -f ${fd_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ; \
fi
@if test -f static-bacula-fd; then \
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \

33
sysutils/bacula/patches/patch-src_findlib_attribs.c Normal file
View File

@@ -0,0 +1,33 @@
$NetBSD: patch-src_findlib_attribs.c,v 1.1 2012/10/06 17:54:53 christos Exp $
use intmax_t instead of int64_t
--- src/findlib/attribs.c.orig 2012-09-13 04:51:19.000000000 -0400
+++ src/findlib/attribs.c 2012-10-04 23:52:49.000000000 -0400
@@ -288,7 +288,7 @@
int decode_stat(char *buf, struct stat *statp, int stat_size, int32_t *LinkFI)
{
char *p = buf;
- int64_t val;
+ intmax_t val;
/*
* We store into the stat packet so make sure the caller's conception
@@ -380,7 +380,7 @@
int32_t decode_LinkFI(char *buf, struct stat *statp, int stat_size)
{
char *p = buf;
- int64_t val;
+ intmax_t val;
/*
* We store into the stat packet so make sure the caller's conception
* is the same as ours. They can be different if LARGEFILE is not
@@ -694,7 +694,7 @@
static bool set_win32_attributes(JCR *jcr, ATTR *attr, BFILE *ofd)
{
char *p = attr->attrEx;
- int64_t val;
+ intmax_t val;
WIN32_FILE_ATTRIBUTE_DATA atts;
ULARGE_INTEGER li;
POOLMEM *win32_ofile;

15
sysutils/bacula/patches/patch-src_lib_attr.c Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-src_lib_attr.c,v 1.1 2012/10/06 17:54:53 christos Exp $
use intmax_t instead of int64_t
--- src/lib/attr.c.orig 2012-09-13 04:51:19.000000000 -0400
+++ src/lib/attr.c 2012-10-04 23:51:53.000000000 -0400
@@ -120,7 +120,7 @@
} else {
pm_strcpy(attr->attrEx, p); /* copy extended attributes, if any */
if (attr->data_stream) {
- int64_t val;
+ intmax_t val;
while (*p++ != 0) /* skip extended attributes */
{ }
from_base64(&val, p);

14
sysutils/bacula/patches/patch-src_plugins_fd_Makefile.in Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-src_plugins_fd_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $
don't remove file we justr installed
--- src/plugins/fd/Makefile.in.orig 2012-09-13 04:51:19.000000000 -0400
+++ src/plugins/fd/Makefile.in 2012-10-05 11:19:22.000000000 -0400
@@ -45,7 +45,6 @@
install: all
$(MKDIR) $(DESTDIR)$(plugindir)
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bpipe-fd.la $(DESTDIR)$(plugindir)
- $(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.la
install-test-plugin: all
$(MKDIR) $(DESTDIR)$(plugindir)

27
sysutils/bacula/patches/patch-src_qt-console_bat.pro.in Normal file
View File

@@ -0,0 +1,27 @@
$NetBSD: patch-src_qt-console_bat.pro.in,v 1.1 2012/10/06 17:54:53 christos Exp $
- comment out the confs paths and command
- use just the compiler not libtool for QMAKE_LINK
--- src/qt-console/bat.pro.in.orig 2012-09-13 04:51:19.000000000 -0400
+++ src/qt-console/bat.pro.in 2012-10-05 11:17:23.000000000 -0400
@@ -10,8 +10,8 @@
bins.path = /$(DESTDIR)@sbindir@
bins.files = bat
-confs.path = /$(DESTDIR)@sysconfdir@
-confs.commands = ./install_conf_file
+#confs.path = /$(DESTDIR)@sysconfdir@
+#confs.commands = ./install_conf_file
help.path = /$(DESTDIR)@docdir@
help.files = help/*.html images/status.png images/mail-message-new.png
@@ -22,7 +22,7 @@
LIBS += -L../lib -lbaccfg -lbac -L../findlib -lbacfind @OPENSSL_LIBS@
LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
-QMAKE_LINK = $${LIBTOOL_LINK} $(CXX)
+QMAKE_LINK = $(CXX)
QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
QMAKE_CLEAN += .libs/* bat

88
sysutils/bacula/patches/patch-src_stored_Makefile.in Normal file
View File

@@ -0,0 +1,88 @@
$NetBSD: patch-src_stored_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $
- use %%EXAMPLESDIR%% instead of sysconfdir
- use the .la files for linking
--- src/stored/Makefile.in.orig 2012-09-13 04:51:19.000000000 -0400
+++ src/stored/Makefile.in 2012-10-05 11:07:09.000000000 -0400
@@ -96,12 +96,12 @@
bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(ZLIBS) \
- -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
+ ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
$(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
static-bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SDOBJS) $(ZLIBS) \
- -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
+ ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
$(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
strip $@
@@ -112,7 +112,7 @@
btape: Makefile $(TAPEOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(TAPEOBJS) \
- -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ ../lib/libbaccfg.la ../lib/libbac.la $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bls.o: bls.c
@echo "Compiling $<"
@@ -122,7 +122,7 @@
bls: Makefile $(BLSOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@echo "Compiling $<"
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
- -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bextract.o: bextract.c
@echo "Compiling $<"
@@ -132,7 +132,7 @@
bextract: Makefile $(BEXTOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@echo "Compiling $<"
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZOLIBS) \
- -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bscan.o: bscan.c
@echo "Compiling $<"
@@ -142,7 +142,7 @@
bscan: Makefile $(SCNOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
- -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ ../cats/libbacsql.la ../cats/libbaccats.la $(DB_LIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bcopy.o: bcopy.c
@echo "Compiling $<"
@@ -151,7 +151,7 @@
bcopy: Makefile $(COPYOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(COPYOBJS) \
- -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \
@@ -165,16 +165,16 @@
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bscan $(DESTDIR)$(sbindir)/bscan
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) btape $(DESTDIR)$(sbindir)/btape
@srcconf=bacula-sd.conf; \
- if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
+ if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
destconf=$$srcconf.new; \
echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
else \
destconf=$$srcconf; \
fi; \
- echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
- ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
+ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
@if test "x${sd_group}" != "x"; then \
- chgrp -f ${sd_group} ${DESTDIR}${sysconfdir}/$$destconf; \
+ chgrp -f ${sd_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf; \
fi
@if test -f static-bacula-sd; then \
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-sd $(DESTDIR)$(sbindir)/static-bacula-sd; \

111
sysutils/bacula/patches/patch-src_tools_Makefile.in Normal file
View File

@@ -0,0 +1,111 @@
$NetBSD: patch-src_tools_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $
- use the .la files for linking
- remove tests that don't link (using functions not in libraries)
--- src/tools/Makefile.in.orig 2012-09-13 04:51:19.000000000 -0400
+++ src/tools/Makefile.in 2012-10-05 11:13:02.000000000 -0400
@@ -37,7 +37,7 @@
DIRCONFOBJS = ../dird/dird_conf.o ../dird/ua_acl.o ../dird/run_conf.o ../dird/inc_conf.o
NODIRTOOLS = bsmtp
-DIRTOOLS = bsmtp dbcheck drivetype fstype testfind testls bregex bwild bbatch bregtest bvfs_test ing_test bpluginfo
+DIRTOOLS = bsmtp dbcheck drivetype fstype testfind bregex bwild bbatch bregtest ing_test bpluginfo
TOOLS = $(@DIR_TOOLS@)
INSNODIRTOOLS = bsmtp
@@ -58,22 +58,22 @@
@echo " "
bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o ../lib/libbac.la -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bregtest: Makefile bregtest.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o ../lib/libbac.la -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
dbcheck: Makefile dbcheck.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) $(DIRCONFOBJS)
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) \
- -lbaccats -lbacsql -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ ../cats/libbaccats.la ../cats/libbacsql.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
fstype: Makefile fstype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lbacfind -lbac -lm \
+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o ../findlib/libbacfind.la ../lib/libbac.la -lm \
$(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
drivetype: Makefile drivetype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ drivetype.o -lbacfind -lbac -lm \
+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ drivetype.o ../findlib/libbacfind.la ../lib/libbac.la -lm \
$(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
dird_conf.o: ../dird/dird_conf.c
@@ -91,34 +91,34 @@
testfind: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) $(FINDOBJS)
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -o $@ $(FINDOBJS) -L. -L../lib -L../findlib \
- $(DLIB) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ $(DLIB) ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
testls: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) testls.o
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -L../findlib -o $@ testls.o \
- $(DLIB) -lbacfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ $(DLIB) ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bregex: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bregex.o
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bregex.o \
- $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ $(DLIB) ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bwild: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bwild.o
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bwild.o \
- $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ $(DLIB) ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bbatch: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bbatch.o
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -o $@ bbatch.o \
- -lbaccats -lbacsql -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ ../cats/libbaccats.la ../cats/libbacsql.la ../lib/libbac.la -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bvfs_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bvfs_test.o
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ bvfs_test.o \
- -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ ../cats/libbaccats.la ../cats/libbacsql.la ../lib/libbac.la -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
ing_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ing_test.o
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ ing_test.o \
- -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ ../cats/libbaccats.la ../cats/libbacsql.la ../findlib/libbacfind.la ../lib/libbac.la -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
cats_test.o: cats_test.c
echo "Compiling $<"
@@ -126,7 +126,7 @@
cats_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) cats_test.o
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ cats_test.o \
- -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ ../cats/libbaccats.la ../cats/libbacsql.la ../findlib/libbacfind.la ../lib/libbac.la -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
gigaslam.o: gigaslam.c
$(CXX) $(CFLAGS) -c $<
@@ -135,13 +135,13 @@
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -o $@ gigaslam.o
grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ grow.o ../lib/libbac.la -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bpluginfo.o: bpluginfo.c
$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) -I../filed -I../dird -I../stored $(DINCLUDE) $(CFLAGS) $<
bpluginfo: Makefile bpluginfo.o
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bpluginfo.o -lbac $(GETTEXT_LIBS)
+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bpluginfo.o ../lib/libbac.la $(GETTEXT_LIBS)
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \