Index: head/sysutils/bacula-server/Makefile =================================================================== --- head/sysutils/bacula-server/Makefile (revision 360662) +++ head/sysutils/bacula-server/Makefile (revision 360663) @@ -1,194 +1,190 @@ # Created by: Dmitry Sivachenko # $FreeBSD$ PORTNAME= bacula DISTVERSION= 5.2.12 -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # PKGNAMESUFFIX?= -server MAINTAINER= dan@langille.org COMMENT?= Network backup solution (server) -USES+= libtool +USES+= libtool:keepla LIB_DEPENDS+= liblzo2.so:${PORTSDIR}/archivers/lzo2 USERS= bacula GROUPS= ${USERS} PLIST_SUB+= MAJOR=${PORTVERSION:R:R} GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE?= SQLITE3 MYSQL PGSQL MTX PYTHON NLS OPENSSL OPTIONS_DEFAULT?= NLS OPENSSL PGSQL MTX_DESC= Install mtx for control of autochanger devices OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} OPENSSL_CONFIGURE_OFF= --with-openssl="no" .if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server" #Till end of the file PYTHON_USE= PYTHON=yes PYTHON_CONFIGURE_ON= --with-python=yes .if !defined(WITH_CLIENT_ONLY) LIB_DEPENDS+= libbac.so:${PORTSDIR}/sysutils/bacula-client USE_RC_SUBR?= bacula-dir bacula-sd .endif .if defined(WITH_CLIENT_ONLY) SUB_FILES+= pkg-install.client pkg-deinstall.client pkg-message.client .else -SUB_FILES+= pkg-install.server pkg-deinstall.server pkg-message.server +SUB_FILES+= pkg-message.server .endif MANCOMPRESSED= yes CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \ --enable-smartalloc \ --sysconfdir=${ETCDIR} \ --with-working-dir=${BACULA_DIR} \ --with-scriptdir=${PREFIX}/share/${PORTNAME} \ --with-readline=yes \ --disable-conio \ --enable-batch-insert \ --with-plugindir=${PREFIX}/lib \ --with-dump-email=root@localhost \ --with-job-email=root@localhost \ --with-db-name=bacula \ --with-sbin-perm=755 \ --with-db-user=bacula \ --with-baseport=9101 .if defined(WITH_CLIENT_ONLY) CONFIGURE_ARGS+=--with-fd-user=root \ --with-fd-group=wheel .else CONFIGURE_ARGS+=--with-dir-user=${BACULA_USER} \ --with-dir-group=${BACULA_GROUP} \ --with-sd-user=${BACULA_USER} \ --with-sd-group=operator .endif # The user/group IDs below are registered, see # http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID # BACULA_USER?= bacula BACULA_GROUP?= ${BACULA_USER} BACULA_UID?= 910 BACULA_GID?= ${BACULA_UID} BACULA_DIR?= /var/db/bacula PLIST_SUB+= BACULA_DIR=${BACULA_DIR} SUB_LIST= BACULA_USER=${BACULA_USER} \ BACULA_GROUP=${BACULA_GROUP} \ BACULA_UID=${BACULA_UID} \ BACULA_GID=${BACULA_GID} \ BACULA_DIR=${BACULA_DIR} NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -# overridden if client install -PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.server -PKGINSTALL= ${FILESDIR}/pkg-install.server - # Client only or full server version .if defined(WITH_CLIENT_ONLY) CONFFILES= fd CONFIGURE_ARGS+= --enable-client-only PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.client PKGINSTALL= ${FILESDIR}/pkg-install.client .else # Server only Options CONFFILES= sd dir # Server default database MYSQL_CONFIGURE_ON= --with-mysql=yes MYSQL_USE= MYSQL=yes SQLITE3_CONFIGURE_ON= --with=sqlite3=yes SQLITE3_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 PGSQL_CONFIGURE_ON= --with-postgresql=yes PGSQL_USES= pgsql MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx .include .if ${PORT_OPTIONS:MMYSQL} DBTYPE= mysql SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" .elif ${PORT_OPTIONS:MSQLITE3} DBTYPE= sqlite3 .else DBTYPE= postgresql SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql .endif PLIST_SUB+= DBTYPE=${DBTYPE} .endif .if defined(WITH_CLIENT_ONLY) MP8+= bacula-fd.8 bconsole.8 .else MP8+= bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \ btape.8 btraceback.8 dbcheck.8 bwild.8 bregex.8 MP1+= bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1 .endif -MAKE_ENV+= MO8="${MAN8}" MAN1="${MP1}" +MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: # This port does not install docs. See bacula-docs for that ${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in # Change $(ECHO) to echo in some Makefile.in files @${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g' ${WRKSRC}/src/filed/Makefile.in \ ${WRKSRC}/src/console/Makefile.in # Default bconsole.conf is in ${ETCDIR} @${REINPLACE_CMD} -e 's|./bconsole.conf|${ETCDIR}/bconsole.conf|g' ${WRKSRC}/src/console/console.c @${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in .if defined(WITH_CLIENT_ONLY) # In client port only install startup script out of script dir (see below post-install) # Dont mkdir ${PREFIX}/share/bacula cause it's empty @${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in ${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in .else # In server port don't install filed @${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \ -e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|../lib/|$$(LOCALBASE)/lib/|g' -e 's|../findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \ ${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in @${REINPLACE_CMD} -e 's|fd_plugins.h|filed/fd_plugins.h|g' -e 's|dir_plugins.h|dird/dir_plugins.h|g' -e 's|stored.h|stored/stored.h|g' \ ${WRKSRC}/src/tools/bpluginfo.c .endif pre-install: ${MKDIR} ${STAGEDIR}${BACULA_DIR} .if !target(post-install) post-install: .if defined(WITH_CLIENT_ONLY) ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample .else ${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.sample ${CHMOD} o+x ${STAGEDIR}${PREFIX}/sbin/bsmtp .endif for na in ${CONFFILES}; do \ ${MV} ${STAGEDIR}${ETCDIR}/bacula-$$na.conf ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.sample; \ done .endif .else .include "${MASTERDIR}/Makefile.common" .endif # -client and -server are defined .include Index: head/sysutils/bacula-server/files/pkg-deinstall.server.in =================================================================== --- head/sysutils/bacula-server/files/pkg-deinstall.server.in (revision 360662) +++ head/sysutils/bacula-server/files/pkg-deinstall.server.in (nonexistent) @@ -1,34 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/bin:/usr/sbin - -# Note how to delete UID/GID -USER=%%BACULA_USER%% -GROUP=%%BACULA_GROUP%% -UID=%%BACULA_UID%% -GID=%%BACULA_UID%% -BACULA_DIR=%%BACULA_DIR%% - -TMPFILE=/tmp/services-$RANDOM-$$ - -case "$2" in -"DEINSTALL") - # Delete entries in /etc/services - sed -e '/# Bacula port start/,/# Bacule port end/{' \ - -e 'd' \ - -e '}' /etc/services > $TMPFILE - mv -f $TMPFILE /etc/services - - if [ -d ${BACULA_DIR} ]; then - rmdir ${BACULA_DIR}; - fi - if [ -d ${BACULA_DIR} ]; then - echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port." - fi - - if pw usershow "${USER}" 2>/dev/null 1>&2; then - echo "To delete Bacula user permanently, use 'pw userdel ${USER}'" - echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'" - fi - ;; -esac Property changes on: head/sysutils/bacula-server/files/pkg-deinstall.server.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/bacula-server/files/pkg-install.server.in =================================================================== --- head/sysutils/bacula-server/files/pkg-install.server.in (revision 360662) +++ head/sysutils/bacula-server/files/pkg-install.server.in (nonexistent) @@ -1,13 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/bin:/usr/sbin - -# Always add lines in /etc/services -grep -q "bacula-dir" /etc/services -if [ "$?" != "0" ]; then - echo "# Bacula port start -bacula-dir 9101/tcp #Bacula director daemon -bacula-fd 9102/tcp #Bacula file daemon -bacula-sd 9103/tcp #Bacula storage daemon -# Bacule port end" >> /etc/services -fi Property changes on: head/sysutils/bacula-server/files/pkg-install.server.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/bacula-server/pkg-plist =================================================================== --- head/sysutils/bacula-server/pkg-plist (revision 360662) +++ head/sysutils/bacula-server/pkg-plist (revision 360663) @@ -1,82 +1,79 @@ @sample %%ETCDIR%%/bacula-barcodes.sample @group bacula @sample %%ETCDIR%%/bacula-dir.conf.sample @group wheel @sample %%ETCDIR%%/bacula-sd.conf.sample +lib/libbaccats.la lib/libbaccats.so lib/libbaccats.so.5 lib/libbaccats.so.5.0.2 +lib/libbaccats-%%DBTYPE%%.la lib/libbaccats-%%DBTYPE%%.so lib/libbaccats-%%DBTYPE%%.so.5 lib/libbaccats-%%DBTYPE%%.so.5.0.2 +lib/libbacsql.la lib/libbacsql.so lib/libbacsql.so.5 lib/libbacsql.so.5.0.2 man/man1/bacula-bwxconsole.1.gz man/man1/bacula-tray-monitor.1.gz man/man1/bsmtp.1.gz man/man8/bacula-dir.8.gz -man/man8/bacula-fd.8.gz man/man8/bacula-sd.8.gz man/man8/bacula.8.gz -man/man8/bconsole.8.gz man/man8/bcopy.8.gz man/man8/bextract.8.gz man/man8/bls.8.gz man/man8/bregex.8.gz man/man8/bscan.8.gz man/man8/btape.8.gz man/man8/btraceback.8.gz man/man8/bwild.8.gz man/man8/dbcheck.8.gz sbin/bacula sbin/bacula-dir sbin/bacula-sd sbin/bcopy sbin/bextract sbin/bls sbin/bregex sbin/bscan sbin/bsmtp sbin/btape sbin/btraceback sbin/bwild sbin/chio-bacula @group bacula sbin/dbcheck @owner bacula %%DATADIR%%/bacula %%DATADIR%%/bacula-ctl-dir %%DATADIR%%/bacula-ctl-fd %%DATADIR%%/bacula-ctl-sd %%DATADIR%%/bacula_config %%DATADIR%%/bconsole %%DATADIR%%/btraceback.dbx %%DATADIR%%/btraceback.gdb %%DATADIR%%/btraceback.mdb %%DATADIR%%/create_bacula_database %%DATADIR%%/create_%%DBTYPE%%_database %%DATADIR%%/delete_catalog_backup %%DATADIR%%/disk-changer %%DATADIR%%/drop_bacula_database %%DATADIR%%/drop_bacula_tables %%DATADIR%%/drop_%%DBTYPE%%_database %%DATADIR%%/drop_%%DBTYPE%%_tables %%DATADIR%%/dvd-handler %%DATADIR%%/grant_bacula_privileges %%DATADIR%%/grant_%%DBTYPE%%_privileges %%DATADIR%%/make_bacula_tables %%DATADIR%%/make_catalog_backup %%DATADIR%%/make_catalog_backup.pl %%DATADIR%%/make_%%DBTYPE%%_tables %%DATADIR%%/mtx-changer %%DATADIR%%/mtx-changer.conf %%DATADIR%%/query.sql %%DATADIR%%/update_bacula_tables %%DATADIR%%/update_%%DBTYPE%%_tables @owner root @group wheel -@dirrm %%DATADIR%% -@exec mkdir -p %%BACULA_DIR%% -@dirrmtry %%BACULA_DIR%% -@dirrmtry %%ETCDIR%% Index: head/sysutils/bacula-server/pkg-plist.client =================================================================== --- head/sysutils/bacula-server/pkg-plist.client (revision 360662) +++ head/sysutils/bacula-server/pkg-plist.client (revision 360663) @@ -1,39 +1,31 @@ @sample %%ETCDIR%%/bacula-fd.conf.sample @group bacula @sample %%ETCDIR%%/bconsole.conf.sample @group wheel +lib/libbac.la lib/libbac.so lib/libbac.so.5 lib/libbac.so.5.0.2 +lib/libbaccfg.la lib/libbaccfg.so lib/libbaccfg.so.5 lib/libbaccfg.so.5.0.2 +lib/libbacfind.la lib/libbacfind.so lib/libbacfind.so.5 lib/libbacfind.so.5.0.2 +lib/libbacpy.la lib/libbacpy.so lib/libbacpy.so.5 lib/libbacpy.so.5.0.2 lib/bpipe-fd.so -man/man8/bacula-dir.8.gz man/man8/bacula-fd.8.gz -man/man8/bacula-sd.8.gz -man/man8/bacula.8.gz man/man8/bconsole.8.gz -man/man8/bcopy.8.gz -man/man8/bextract.8.gz -man/man8/bls.8.gz -man/man8/bregex.8.gz -man/man8/bscan.8.gz -man/man8/btape.8.gz -man/man8/btraceback.8.gz -man/man8/bwild.8.gz -man/man8/dbcheck.8.gz sbin/bacula-fd @group bacula sbin/bconsole @group wheel @exec mkdir -p %%BACULA_DIR%% @dirrmtry %%BACULA_DIR%% @dirrmtry share/bacula @dirrmtry %%ETCDIR%%