From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Apr 11 02:20:04 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0B68106567F for ; Sat, 11 Apr 2009 02:20:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 962468FC1C for ; Sat, 11 Apr 2009 02:20:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n3B2K4qH043592 for ; Sat, 11 Apr 2009 02:20:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n3B2K4Bi043591; Sat, 11 Apr 2009 02:20:04 GMT (envelope-from gnats) Resent-Date: Sat, 11 Apr 2009 02:20:04 GMT Resent-Message-Id: <200904110220.n3B2K4Bi043591@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dan Langille Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF66F10656D1 for ; Sat, 11 Apr 2009 02:15:13 +0000 (UTC) (envelope-from dan@bast.unixathome.org) Received: from nyi.unixathome.org (nyi.unixathome.org [64.147.113.42]) by mx1.freebsd.org (Postfix) with ESMTP id 79DEE8FC24 for ; Sat, 11 Apr 2009 02:15:13 +0000 (UTC) (envelope-from dan@bast.unixathome.org) Received: from localhost (localhost [127.0.0.1]) by nyi.unixathome.org (Postfix) with ESMTP id 0D21C50A7F; Sat, 11 Apr 2009 03:03:59 +0100 (BST) Received: from nyi.unixathome.org ([127.0.0.1]) by localhost (nyi.unixathome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KAjzer0l0YP1; Sat, 11 Apr 2009 03:03:57 +0100 (BST) Received: from bast.unixathome.org (bast.unixathome.org [10.8.1.1]) by nyi.unixathome.org (Postfix) with ESMTP id DC97450A7D; Sat, 11 Apr 2009 03:03:56 +0100 (BST) Received: by bast.unixathome.org (Postfix, from userid 1001) id 995DEB8B3; Sat, 11 Apr 2009 03:03:55 +0100 (BST) Message-Id: <20090411020355.995DEB8B3@bast.unixathome.org> Date: Sat, 11 Apr 2009 03:03:55 +0100 (BST) From: Dan Langille To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Dan Langille Subject: ports/133591: [MAINTAINER-UPDATE] sysutils/bacula-server-devel upgrade to latest version X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dan Langille List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Apr 2009 02:20:05 -0000 >Number: 133591 >Category: ports >Synopsis: [MAINTAINER-UPDATE] sysutils/bacula-server-devel upgrade to latest version >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Apr 11 02:20:04 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Dan Langille >Release: FreeBSD 6.2-STABLE i386 >Organization: The FreeBSD Diary >Environment: System: FreeBSD bast.example.org 6.2-STABLE FreeBSD 6.2-STABLE #3: Wed Feb 28 22:21:12 EST 2007 dan@bast.example.org:/usr/obj/usr/src/sys/BAST i386 >Description: >How-To-Repeat: >Fix: Some significant changes here. Partly to bring it up to what the production port looks like and to start using the new Bacula features and knobs. --- bacula-server-devel.patch begins here --- diff -ruN /usr/ports/sysutils/bacula-server-devel/Makefile bacula-server-devel/Makefile --- /usr/ports/sysutils/bacula-server-devel/Makefile Wed Jan 21 20:05:03 2009 +++ bacula-server-devel/Makefile Mon Apr 6 20:16:03 2009 @@ -6,25 +6,29 @@ # PORTNAME= bacula -DISTVERSION= 2.4.4-b2 +DISTVERSION= 2.5.42-b2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= bacula PKGNAMESUFFIX?= -server-devel - MAINTAINER= dan@langille.org COMMENT?= The network backup solution (server) - DEVELOPMENT Version CONFLICTS= bacula-server-[0-9]* bacula-client-[0-9]* UNIQUENAME?=${PORTNAME}${PKGNAMESUFFIX} +.if !defined(WITH_BAT) +.if !defined(WITH_CLIENT_ONLY) USE_RC_SUBR?= bacula-dir bacula-sd +.endif + .if defined(WITH_CLIENT_ONLY) SUB_FILES+= pkg-message.client .else SUB_FILES+= pkg-message.server .endif +.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 @@ -33,12 +37,18 @@ # MANCOMPRESSED= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcp-wrappers=/usr/lib \ +CONFIGURE_ARGS+= --with-tcp-wrappers=/usr/lib \ --enable-smartalloc \ --with-working-dir=${BACULA_DIR} \ --with-scriptdir=${PREFIX}/share/${PORTNAME} \ --with-readline=yes \ - --disable-conio + --disable-conio \ + --enable-batch-insert\ + --with-dump-email=root@localhost \ + --with-job-email=root@localhost \ + --with-db-name=bacula \ + --with-db-user=bacula \ + --with-baseport=9101 .if defined(WITH_CLIENT_ONLY) CONFIGURE_ARGS+= --with-fd-user=root \ @@ -66,8 +76,10 @@ .endif .if defined(WITH_CLIENT_ONLY) -OPTIONS+= WXCONSOLE "Build with wxGTK based GUI console" off -OPTIONS+= GNOMECONSOLE "Build with GNOME based GUI console" off +OPTIONS= WXCONSOLE "Build with wxGTK based GUI console: deprecated" off +OPTIONS+= GNOMECONSOLE "Build with GNOME based GUI console: deprecated" off +.elif defined(WITH_BAT) +OPTIONS= .else OPTIONS= SQLITE3 "Use SqLite-3 database instead of SqLite-2" off OPTIONS+= MYSQL "Use MySQL database instead of SqLite" off @@ -78,7 +90,7 @@ OPTIONS+= NLS "Native Language Support via gettext utilities" on OPTIONS+= OPENSSL "Enable OpenSSL for encrypted communication" off -# Prepare if gnome-console is selected this must be happen before +# Prepare if bgnome-console is selected this must be happen before # include of bsd.port.pre.mk! WANT_GNOME= yes .if defined(WITH_GNOMECONSOLE) @@ -87,6 +99,10 @@ PLIST_SUB+= BACULA_DIR=${BACULA_DIR} +.if !defined(WITH_BAT) +PLIST_SUB+= BACULA_DIR=${BACULA_DIR} +.endif + .include .if defined(WITH_NLS) @@ -103,7 +119,7 @@ PKGDEINSTALL= ${PKGDIR}/pkg-deinstall.client PKGINSTALL= ${PKGDIR}/pkg-install.client -# Build gnome-console +# Build bgnome-console .if defined(WITH_GNOMECONSOLE) CONFIGURE_ARGS+= --enable-gnome PLIST_SUB+= GNOMECONS="" @@ -112,7 +128,7 @@ WITHOUT_GNOME= yes PLIST_SUB+= GNOMECONS="@comment " .endif -# Build wx-console +# Build bwx-console .if defined(WITH_WXCONSOLE) USE_WX= 2.4 CONFIGURE_ARGS+= --enable-wx-console @@ -158,12 +174,15 @@ CONFIGURE_ARGS+= --with-openssl .endif +.if !defined(WITH_BAT) .if defined(WITH_CLIENT_ONLY) MAN8=bacula-fd.8 bconsole.8 .else MAN8=bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 btraceback.8 dbcheck.8 -MAN1=bsmtp.1 bat.1 +MAN1=bsmtp.1 bacula-bgnome-console.1 bacula-tray-monitor.1 bacula-bwxconsole.1 +.endif .endif + MAKE_ARGS+= -E MAN8 -E MAN1 MAKE_ENV+= MAN8="${MAN8}" MAN1="${MAN1}" @@ -203,6 +222,7 @@ @${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' ${WRKSRC}/Makefile.in .endif +.if !target(pre-install) pre-install: if [ ! -d "${BACULA_DIR}" ]; then \ ${ECHO_CMD} "creating ${BACULA_DIR}" ; \ @@ -214,7 +234,10 @@ # Extend /etc/services and install UID/GID @ ${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL +.endif + +.if !target(post-install) post-install: .if defined(WITH_CLIENT_ONLY) # Extend only /etc/services @@ -230,19 +253,19 @@ ${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 ]; - ${MV} ${PREFIX}/etc/wx-console.conf ${PREFIX}/etc/wx-console.conf.sample; \ - ${ECHO_CMD} "etc/wx-console.conf.sample" >> ${TMPPLIST}; \ + if [ -f ${PREFIX}/etc/bwx-console.conf.new ]; then \ + ${ECHO_CMD} "etc/bwx-console.conf.new" >> ${TMPPLIST}; \ + elif [ -f ${PREFIX}/etc/bwx-console.conf ]; then \ + ${MV} ${PREFIX}/etc/bwx-console.conf ${PREFIX}/etc/bwx-console.conf.sample; \ + ${ECHO_CMD} "etc/bwx-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}; \ + if [ -f ${PREFIX}/etc/bgnome-console.conf.new ]; then \ + ${ECHO_CMD} "etc/bgnome-console.conf.new" >> ${TMPPLIST}; \ + elif [ -f ${PREFIX}/etc/bgnome-console.conf ]; then \ + ${MV} ${PREFIX}/etc/bgnome-console.conf ${PREFIX}/etc/bgnome-console.conf.sample; \ + ${ECHO_CMD} "etc/bgnome-console.conf.sample" >> ${TMPPLIST}; \ fi .endif @@ -274,5 +297,6 @@ done @${CAT} ${PKGMESSAGE} +.endif .include Binary files /usr/ports/sysutils/bacula-server-devel/bacula-server-devel-2.5.42.b2.tbz and bacula-server-devel/bacula-server-devel-2.5.42.b2.tbz differ diff -ruN /usr/ports/sysutils/bacula-server-devel/distinfo bacula-server-devel/distinfo --- /usr/ports/sysutils/bacula-server-devel/distinfo Fri Jan 2 19:50:16 2009 +++ bacula-server-devel/distinfo Mon Apr 6 20:24:13 2009 @@ -1,3 +1,3 @@ -MD5 (bacula-2.4.4-b2.tar.gz) = 4726a2ebb9a0a28696fb822063d5f814 -SHA256 (bacula-2.4.4-b2.tar.gz) = 8857ba355ee1eaef068a84b4e279044f459ff7ef6c52824e1f5b3a32aaba781f -SIZE (bacula-2.4.4-b2.tar.gz) = 3145178 +MD5 (bacula-2.5.42-b2.tar.gz) = b7c7b39295568ca27cd57b71008d8379 +SHA256 (bacula-2.5.42-b2.tar.gz) = 3239f2cbc1bf705567b93b40a69759254c5e615542de25acce00589239d604ff +SIZE (bacula-2.5.42-b2.tar.gz) = 3789491 diff -ruN /usr/ports/sysutils/bacula-server-devel/pkg-plist bacula-server-devel/pkg-plist --- /usr/ports/sysutils/bacula-server-devel/pkg-plist Thu Oct 5 17:21:26 2006 +++ bacula-server-devel/pkg-plist Mon Apr 6 20:31:44 2009 @@ -34,6 +34,7 @@ %%DATADIR%%/make_catalog_backup %%DATADIR%%/make_%%DBTYPE%%_tables %%DATADIR%%/mtx-changer +%%DATADIR%%/mtx-changer.conf %%DATADIR%%/query.sql %%DATADIR%%/update_bacula_tables %%DATADIR%%/update_%%DBTYPE%%_tables --- bacula-server-devel.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: