Index: head/sysutils/bacula-server/Makefile =================================================================== --- head/sysutils/bacula-server/Makefile (revision 148134) +++ head/sysutils/bacula-server/Makefile (revision 148135) @@ -1,297 +1,319 @@ # New ports collection makefile for: bacula # Date created: 24 February 2003 # Whom: Dmitry Sivachenko # # $FreeBSD$ # PORTNAME= bacula -PORTVERSION= 1.36.3 +PORTVERSION= 1.38.0 #PORTREVISION= 0 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= bacula PKGNAMESUFFIX?= -server -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz ${PORTNAME}-doc-${PORTVERSION}.tar.gz +DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz ${PORTNAME}-docs-${PORTVERSION}.tar.gz MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE COMMENT?= The network backup solution (server) # 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_DIR?=/var/db/bacula # USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tcp-wrappers=/usr/lib \ --enable-smartalloc \ --with-working-dir=${BACULA_DIR} \ --with-scriptdir=${PREFIX}/share/bacula \ --with-fd-user=root \ --with-fd-group=wheel \ --with-dir-user=bacula \ --with-dir-group=bacula \ --with-sd-user=bacula \ --with-sd-group=operator \ --with-readline=yes \ --disable-conio CONFIGURE_ENV+= CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -ALL_OPTIONS= CLIENT_ONLY WXCONSOLE GNOMECONSOLE MYSQL POSTGRESQL MTX +ALL_OPTIONS= CLIENT_ONLY WXCONSOLE GNOMECONSOLE SQLITE3 MYSQL POSTGRESQL MTX OPENSSL .for opt in ${ALL_OPTIONS} .if defined(WITH_${opt}) BATCH= yes .endif .endfor .if !defined(BATCH) IS_INTERACTIVE= yes .endif .if defined(WITH_CLIENT_ONLY) OPTIONS+= WXCONSOLE "Build with wxGTK based GUI console" off OPTIONS+= GNOMECONSOLE "Build with GNOME based GUI console" off .else -OPTIONS= MYSQL "Use MySQL database instead of SqLite" off +OPTIONS= SQLITE3 "Use SqLite-3 database instead of SqLite-2" off +OPTIONS+= MYSQL "Use MySQL database instead of SqLite" off OPTIONS+= POSTGRESQL "Use PostgreSQL database instead of SqLite" off OPTIONS+= MTX "Install mtx for control of autochanger devices" off .endif +OPTIONS+= OPENSSL "Enable OpenSSL for encrypted communication" off + # Prepare if gnome-console is selected this must be happen before # include of bsd.port.pre.mk! WANT_GNOME= yes .if defined(WITH_GNOMECONSOLE) USE_GNOME= libgnome .endif -.include - PLIST_SUB+= BACULA_DIR=${BACULA_DIR} +.include + # Client only or full server version .if defined(WITH_CLIENT_ONLY) CONFFILES= fd CONFIGURE_ARGS+= --enable-client-only -PORTDOCS= ReleaseNotes bacula.pdf developers.pdf kernstodo html-manual web-manual +PORTDOCS= ReleaseNotes bacula.pdf developers.pdf kernstodo manual bacula-web PKGDEINSTALL= ${PKGDIR}/pkg-deinstall.client PKGINSTALL= ${PKGDIR}/pkg-install.client # Build gnome-console .if defined(WITH_GNOMECONSOLE) CONFIGURE_ARGS+= --enable-gnome PLIST_SUB+= GNOMECONS="" .else # We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!) WITHOUT_GNOME= yes PLIST_SUB+= GNOMECONS="@comment " .endif # Build wx-console .if defined(WITH_WXCONSOLE) CONFIGURE_ARGS+= --enable-wx-console LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 CONFIGURE_ENV+= WXCONFIG=${X11BASE}/bin/wxgtk2-2.4-config PLIST_SUB+= WXCONS="" .else # We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!) WITHOUT_GNOME= yes PLIST_SUB+= WXCONS="@comment " .endif .else # Server only Options PLIST_SUB+= GNOMECONS="@comment " PLIST_SUB+= WXCONS="@comment " CONFFILES= sd dir .if defined(WITH_MYSQL) CONFIGURE_ARGS+= --with-mysql=yes USE_MYSQL= yes DBTYPE= mysql .elif defined(WITH_POSTGRESQL) USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgresql=yes DBTYPE= postgresql +.elif defined(WITH_SQLITE3) +CONFIGURE_ARGS+= --with-sqlite3=yes +LIB_DEPENDS+= sqlite.3:${PORTSDIR}/databases/sqlite3 +DBTYPE= sqlite .else CONFIGURE_ARGS+= --with-sqlite=yes LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 DBTYPE= sqlite .endif PLIST_SUB+= DBTYPE=${DBTYPE} # Install mtx .if defined(WITH_MTX) RUN_DEPENDS+= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx .endif .endif +.if defined(WITH_OPENSSL) +CONFIGURE_ARGS+= --with-openssl +.endif + +.if defined(WITH_CLIENT_ONLY) +MAN8=bacula.8 +.endif + pre-everything:: .if !defined(WITH_CLIENT_ONLY) @${ECHO_MSG} "=======> ATTENTION <=======" @${ECHO_MSG} "===> Note that there is a pthreads problem, which leads to the loss of 500kB" @${ECHO_MSG} "===> of data at the end of an tape. This is corrected in newer versions of FreeBSD" @${ECHO_MSG} "===> READ ${WRKSRC}/platforms/freebsd/pthreads-fix.txt" @${ECHO_MSG} "" @${ECHO_MSG} "You may use the following build options (or make config):" @${ECHO_MSG} "" @${ECHO_MSG} " WITH_CLIENT_ONLY=yes if you only want the file daemon." @${ECHO_MSG} " WITH_WXCONSOLE=yes if you only want a wxGTK based GUI console." @${ECHO_MSG} " WITH_GNOMECONSOLE=yes if you only want a GNOME based GUI console." @${ECHO_MSG} " WITH_MTX=yes if you want to use mtx instead of chio for autochanger control." + @${ECHO_MSG} " WITH_SQLITE3=yes if you want SqLite-3 instead of SqLite-2 as the database." .if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL) @${ECHO_MSG} " WITH_MYSQL=yes if you want MySQL instead of SqLite as the database." @${ECHO_MSG} " WITH_POSTGRESQL=yes if you want PostgreSQL instead of SqLite as the database." @${ECHO_MSG} "" @${ECHO_MSG} "The default DB is SQLite!" .endif @${ECHO_MSG} "" @${ECHO_MSG} "===> Using ${DBTYPE} as the bacula database." @${ECHO_MSG} "" .else @${ECHO_MSG} "===> Building file daemon only." .endif post-patch: # Default bconsole.conf is ${PREFIX}/etc @${REINPLACE_CMD} -e 's|./bconsole.conf|${PREFIX}/etc/bconsole.conf|g' ${WRKSRC}/src/console/console.c .if defined(WITH_CLIENT_ONLY) # In client port only install startup script out of script dir (see below post-install) # Dont mkdir ${PREFIX}/share/bacule 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 's|^all_subdirs = .*|all_subdirs = scripts src\/lib src\/findlib $${subdirs}|g' ${WRKSRC}/Makefile.in .endif post-install: # Migration: move existing bacula.sh to z-bacula.sh to start bacula AFTER DB start if [ -f ${PREFIX}/etc/rc.d/bacula.sh ]; then \ ${MV} ${PREFIX}/etc/rc.d/bacula.sh ${PREFIX}/etc/rc.d/z-bacula.sh; \ fi if [ -f ${PREFIX}/etc/rc.d/bacula.sh.sample ]; then \ ${MV} ${PREFIX}/etc/rc.d/bacula.sh.sample ${PREFIX}/etc/rc.d/z-bacula.sh.sample; \ fi .if defined(WITH_CLIENT_ONLY) # Install start script ${INSTALL_SCRIPT} ${WRKSRC}/scripts/bacula ${PREFIX}/etc/rc.d/z-bacula.sh.sample # Extend only /etc/services @ ${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PORTNAME} # Console stuff if [ -f ${PREFIX}/etc/bconsole.conf.new ]; then \ ${ECHO_CMD} "etc/bconsole.conf.new" >> ${TMPPLIST}; \ elif [ -f ${PREFIX}/etc/bconsole.conf ]; then \ ${MV} ${PREFIX}/etc/bconsole.conf ${PREFIX}/etc/bconsole.conf.sample; \ ${ECHO_CMD} "etc/bconsole.conf.sample" >> ${TMPPLIST}; \ fi .if defined(WITH_WXCONSOLE) if [ -f ${PREFIX}/etc/wx-console.conf.new ]; then \ ${ECHO_CMD} "etc/wx-console.conf.new" >> ${TMPPLIST}; \ elif [ -f ${PREFIX}/etc/wx-console.conf ]; then \ ${MV} ${PREFIX}/etc/wx-console.conf ${PREFIX}/etc/wx-console.conf.sample; \ ${ECHO_CMD} "etc/wx-console.conf.sample" >> ${TMPPLIST}; \ fi .endif .if defined(WITH_GNOMECONSOLE) if [ -f ${PREFIX}/etc/gnome-console.conf.new ]; then \ ${ECHO_CMD} "etc/gnome-console.conf.new" >> ${TMPPLIST}; \ elif [ -f ${PREFIX}/etc/gnome-console.conf ]; then \ ${MV} ${PREFIX}/etc/gnome-console.conf ${PREFIX}/etc/gnome-console.conf.sample; \ ${ECHO_CMD} "etc/gnome-console.conf.sample" >> ${TMPPLIST}; \ fi .endif + +# @${CHMOD} a+x ${WRKSRC}/scripts/bacula.man +.if defined(WITH_CLIENT_ONLY) + ${INSTALL_MAN} ${WRKSRC}/scripts/bacula.man ${PREFIX}/man/man8/bacula.8 +.endif + # Documentaion is only installed in -client port .if !defined(NOPORTDOCS) - for na in html-manual web-manual; do \ + for na in manual bacula-web; do \ ${MKDIR} ${DOCSDIR}/$$na ;\ - cd ${WRKDIR}/${PORTNAME}-doc-${PORTVERSION} && ${FIND} $$na | \ + cd ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION} && ${FIND} $$na | \ ${CPIO} -pdm -L -R root:wheel ${DOCSDIR}; \ done - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-doc-${PORTVERSION}/ReleaseNotes ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-doc-${PORTVERSION}/bacula.pdf ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-doc-${PORTVERSION}/developers.pdf ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-doc-${PORTVERSION}/kernstodo ${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ReleaseNotes ${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION}/manual/bacula.pdf ${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION}/developers/developers.pdf ${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/kernstodo ${DOCSDIR} .endif .else # Extend /etc/services and install UID/GID @ ${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL # Install config files and preserve existing ones ${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${PREFIX}/sbin if [ -f ${PREFIX}/etc/bacula-barcodes ]; then \ ${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${PREFIX}/etc/bacula-barcodes.new ; \ ${ECHO_CMD} "etc/bacula-barcodes.new" >> ${TMPPLIST}; \ else \ ${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${PREFIX}/etc/bacula-barcodes.samples ; \ ${ECHO_CMD} "etc/bacula-barcodes.samples" >> ${TMPPLIST}; \ fi # chmod of bsmtp program so bacula can use it with dropped down permissions ${CHMOD} o+x ${PREFIX}/sbin/bsmtp ${CHOWN} -R bacula:bacula ${PREFIX}/share/bacula .endif # Install leaves existing conf files untouched. Respect this here! for na in ${CONFFILES}; do \ if [ -f ${PREFIX}/etc/bacula-$$na.conf.new ]; then \ ${ECHO_CMD} "etc/bacula-$$na.conf.new" >> ${TMPPLIST}; \ elif [ -f ${PREFIX}/etc/bacula-$$na.conf ]; then \ ${MV} ${PREFIX}/etc/bacula-$$na.conf ${PREFIX}/etc/bacula-$$na.conf.sample; \ ${ECHO_CMD} "etc/bacula-$$na.conf.sample" >> ${TMPPLIST}; \ fi; \ done # Inform user after install about important things .... @${ECHO_MSG} "*********************************************************************" @${ECHO_MSG} "NOTE:" @${ECHO_MSG} "Sample files are installed in ${PREFIX}/etc:" @${ECHO_MSG} " bconsole.conf.sample, bacula-barcodes.sample, bacula-fd.conf.sample" .if !defined(WITH_CLIENT_ONLY) @${ECHO_MSG} " bacula-sd.conf.sample, bacula-dir.conf.sample" @${ECHO_MSG} "" @${ECHO_MSG} "An auto-changer manipulation script based on FreeBSDs" @${ECHO_MSG} "chio command is included and installed at" @${ECHO_MSG} "" @${ECHO_MSG} " ${PREFIX}/sbin/chio-bacula" @${ECHO_MSG} "" @${ECHO_MSG} "Please have a look at it if you want to use an" @${ECHO_MSG} "autochanger. You have to configure the usage in" @${ECHO_MSG} "" @${ECHO_MSG} " ${PREFIX}/etc/bacula-dir.conf" @${ECHO_MSG} "" @${ECHO_MSG} "Take care of correct permissions for changer and" @${ECHO_MSG} "tape device (e.g. /dev/ch0 and /dev/n[r]sa0) i.e." @${ECHO_MSG} "they must be accessible by user bacula." @${ECHO_MSG} "" @${ECHO_MSG} "Due to lack of some features in the FreeBSD tape driver" @${ECHO_MSG} "implementation you MUST add some OS dependent options to" @${ECHO_MSG} "the bacula-sd.conf file:" @${ECHO_MSG} "" @${ECHO_MSG} " Hardware End of Medium = no;" @${ECHO_MSG} " Backward Space Record = no;" @${ECHO_MSG} " Backward Space File = no;" @${ECHO_MSG} "" @${ECHO_MSG} "With 2 filemarks at EOT (see man mt):" @${ECHO_MSG} " Fast Forward Space File = no;" @${ECHO_MSG} " BSF at EOM = yes;" @${ECHO_MSG} " TWO EOF = yes;" @${ECHO_MSG} "" @${ECHO_MSG} "With 1 filemarks at EOT (see man mt):" @${ECHO_MSG} " Fast Forward Space File = yes;" @${ECHO_MSG} " BSF at EOM = no;" @${ECHO_MSG} " TWO EOF = no;" @${ECHO_MSG} "" @${ECHO_MSG} "NOTE: YOU CAN SWITCH EOT model ONLY when starting" @${ECHO_MSG} " from scratch with EMPTY tapes!!!!" @${ECHO_MSG} "" @${ECHO_MSG} "It is also important that all the scripts accessed" @${ECHO_MSG} "by RunBeforeJob and RunAfterJob can be executed by" @${ECHO_MSG} "the user bacula." .endif @${ECHO_MSG} "*********************************************************************" .if !defined(WITH_CLIENT_ONLY) ${CAT} pkg-message .endif .include Property changes on: head/sysutils/bacula-server/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.50 \ No newline at end of property +1.51 \ No newline at end of property Index: head/sysutils/bacula-server/distinfo =================================================================== --- head/sysutils/bacula-server/distinfo (revision 148134) +++ head/sysutils/bacula-server/distinfo (revision 148135) @@ -1,4 +1,4 @@ -MD5 (bacula-1.36.3.tar.gz) = 9499d6277b8673ae7c24dcdbf89ee026 -SIZE (bacula-1.36.3.tar.gz) = 11153154 -MD5 (bacula-doc-1.36.3.tar.gz) = db08859bc193e777c76bcbf5e60f0c7e -SIZE (bacula-doc-1.36.3.tar.gz) = 4506465 +MD5 (bacula-1.38.0.tar.gz) = 872f5b86404e5c9b47bd56b9ffcb107c +SIZE (bacula-1.38.0.tar.gz) = 1847955 +MD5 (bacula-docs-1.38.0.tar.gz) = b8b10ca59a23c132cf4658c55103b85e +SIZE (bacula-docs-1.38.0.tar.gz) = 22003257 Property changes on: head/sysutils/bacula-server/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.15 \ No newline at end of property +1.16 \ No newline at end of property Index: head/sysutils/bacula-server/files/patch-autoconf-Make.common.in =================================================================== --- head/sysutils/bacula-server/files/patch-autoconf-Make.common.in (revision 148134) +++ head/sysutils/bacula-server/files/patch-autoconf-Make.common.in (nonexistent) @@ -1,19 +0,0 @@ -*** autoconf/Make.common.in.orig Sat Jun 19 23:16:06 2004 ---- autoconf/Make.common.in Sun Jun 27 18:38:11 2004 -*************** -*** 43,49 **** - RANLIB = @RANLIB@ - INSTALL = @INSTALL@ - # add the -s to the following in PRODUCTION mode -! INSTALL_PROGRAM = @INSTALL@ -m @SBINPERM@ - INSTALL_DATA = @INSTALL@ -m 644 - INSTALL_SCRIPT = @INSTALL@ -m @SBINPERM@ - INSTALL_CONFIG = @INSTALL@ -m 640 ---- 44,50 ---- - RANLIB = @RANLIB@ - INSTALL = @INSTALL@ - # add the -s to the following in PRODUCTION mode -! INSTALL_PROGRAM = @INSTALL@ -s -m @SBINPERM@ - INSTALL_DATA = @INSTALL@ -m 644 - INSTALL_SCRIPT = @INSTALL@ -m @SBINPERM@ - INSTALL_CONFIG = @INSTALL@ -m 640 Property changes on: head/sysutils/bacula-server/files/patch-autoconf-Make.common.in ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.5 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/sysutils/bacula-server/files/patch-configure =================================================================== --- head/sysutils/bacula-server/files/patch-configure (revision 148134) +++ head/sysutils/bacula-server/files/patch-configure (revision 148135) @@ -1,21 +1,21 @@ *** configure.org Sun Mar 6 16:46:54 2005 --- configure Sun Mar 6 16:49:20 2005 *************** -*** 21037,21044 **** +*** 29490,29497 **** DISTVER=`uname -a |awk '{print $3}'` VER=`echo $DISTVER | cut -c 1` if test x$VER = x4 ; then ! PTHREAD_LIB="-pthread" ! CFLAGS="${CFLAGS} -pthread" fi lld="qd" llu="qu" --- 21037,21044 ---- DISTVER=`uname -a |awk '{print $3}'` VER=`echo $DISTVER | cut -c 1` if test x$VER = x4 ; then ! PTHREAD_LIB="${PTHREAD_LIBS}" ! CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" fi lld="qd" llu="qu" Property changes on: head/sysutils/bacula-server/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/sysutils/bacula-server/files/patch-scripts-Makefile.in =================================================================== --- head/sysutils/bacula-server/files/patch-scripts-Makefile.in (revision 148134) +++ head/sysutils/bacula-server/files/patch-scripts-Makefile.in (revision 148135) @@ -1,43 +1,48 @@ -*** scripts/Makefile.in.orig Wed Nov 17 23:48:21 2004 ---- scripts/Makefile.in Sun Nov 28 15:00:56 2004 +*** scripts/Makefile.in.orig Sun Nov 13 17:48:12 2005 +--- scripts/Makefile.in Sun Nov 13 17:48:25 2005 *************** -*** 32,50 **** - $(MKDIR) $(DESTDIR)$(scriptdir) +*** 33,43 **** + $(MKDIR) $(DESTDIR)$(mandir) install: installdirs ! $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql ! $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql ! $(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole ! $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole ! $(INSTALL_SCRIPT) bacula $(DESTDIR)$(scriptdir)/bacula @if test -f ${DESTDIR}${scriptdir}/mtx-changer; then \ echo " ==> Saving existing mtx-changer to mtx-changer.old"; \ $(MV) -f ${DESTDIR}${scriptdir}/mtx-changer ${DESTDIR}${scriptdir}/mtx-changer.old; \ - fi - $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer -! $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb -! $(INSTALL_DATA) btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx -! $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback +--- 33,43 ---- + $(MKDIR) $(DESTDIR)$(mandir) - uninstall: - (cd $(DESTDIR)$(scriptdir); $(RMF) startmysql) ---- 32,50 ---- - $(MKDIR) $(DESTDIR)$(scriptdir) - install: installdirs ! # $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql ! # $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql ! # $(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole ! # $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole -! $(INSTALL_SCRIPT) bacula $(DESTDIR)$(sysconfdir)/rc.d/bacula.sh.sample +! $(INSTALL_SCRIPT) bacula (DESTDIR)$(sysconfdir)/rc.d/z-bacula.sh.sample @if test -f ${DESTDIR}${scriptdir}/mtx-changer; then \ echo " ==> Saving existing mtx-changer to mtx-changer.old"; \ $(MV) -f ${DESTDIR}${scriptdir}/mtx-changer ${DESTDIR}${scriptdir}/mtx-changer.old; \ +*************** +*** 48,56 **** + $(MV) -f ${DESTDIR}${scriptdir}/dvd-handler ${DESTDIR}${scriptdir}/dvd-handler.old; \ fi - $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer + $(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_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback + gzip bacula.8.gz + $(INSTALL_DATA) bacula.8.gz $(DESTDIR)$(mandir)/bacula.8.gz + @rm -f bacula.8.gz +--- 48,56 ---- + $(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_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback - - uninstall: - (cd $(DESTDIR)$(scriptdir); $(RMF) startmysql) + gzip bacula.8.gz + $(INSTALL_DATA) bacula.8.gz $(DESTDIR)$(mandir)/bacula.8.gz + @rm -f bacula.8.gz Property changes on: head/sysutils/bacula-server/files/patch-scripts-Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/sysutils/bacula-server/pkg-plist =================================================================== --- head/sysutils/bacula-server/pkg-plist (revision 148134) +++ head/sysutils/bacula-server/pkg-plist (revision 148135) @@ -1,34 +1,36 @@ %%DATADIR%%/query.sql etc/rc.d/z-bacula.sh.sample sbin/chio-bacula sbin/bacula-dir sbin/bacula-sd sbin/bcopy sbin/bextract sbin/bls sbin/bscan sbin/btape %%WXCONS%%sbin/wx-console %%GNOMECONS%%sbin/gnome-console sbin/dbcheck sbin/bsmtp @unexec if cmp -s %D/share/bacula/mtx-changer.old %D/share/bacula/mtx-changer; then rm -f %D/share/bacula/mtx-changer.old; fi %%DATADIR%%/mtx-changer %%DATADIR%%/create_bacula_database %%DATADIR%%/create_%%DBTYPE%%_database %%DATADIR%%/drop_bacula_database %%DATADIR%%/drop_%%DBTYPE%%_database %%DATADIR%%/drop_bacula_tables %%DATADIR%%/drop_%%DBTYPE%%_tables %%DATADIR%%/grant_bacula_privileges %%DATADIR%%/grant_%%DBTYPE%%_privileges %%DATADIR%%/make_bacula_tables %%DATADIR%%/make_%%DBTYPE%%_tables %%DATADIR%%/update_bacula_tables %%DATADIR%%/update_%%DBTYPE%%_tables %%DATADIR%%/delete_catalog_backup %%DATADIR%%/make_catalog_backup +%%DATADIR%%/dvd-handler + @dirrm %%DATADIR%% @unexec /usr/bin/killall badula-sd > /dev/null 2>&1 || true @unexec /usr/bin/killall bacula-dir > /dev/null 2>&1 || true @exec mkdir -p %%BACULA_DIR%% Property changes on: head/sysutils/bacula-server/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.16 \ No newline at end of property +1.17 \ No newline at end of property