Date: Thu, 7 Aug 2014 19:21:45 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364312 - in head: net-mgmt net-mgmt/nagios-check_bacula5 sysutils sysutils/bacula5-bat sysutils/bacula5-client sysutils/bacula5-client-static sysutils/bacula5-docs sysutils/bacula5-server Message-ID: <53e3d1ca.2d1d.3b112cd0@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Thu Aug 7 19:21:45 2014 New Revision: 364312 URL: http://svnweb.freebsd.org/changeset/ports/364312 QAT: https://qat.redports.org/buildarchive/r364312/ Log: Copy bacula ports preparing to bacula 7.x update Ports have been modified to conflict with bacula- and PKGNAMESUFFIX changed accordingly. PR: 191311 Submitted by: maintainer Added: head/net-mgmt/nagios-check_bacula5/ - copied from r364070, head/net-mgmt/nagios-check_bacula/ head/sysutils/bacula5-bat/ - copied from r364070, head/sysutils/bacula-bat/ head/sysutils/bacula5-client/ - copied from r364070, head/sysutils/bacula-client/ head/sysutils/bacula5-client-static/ - copied from r364070, head/sysutils/bacula-client-static/ head/sysutils/bacula5-docs/ - copied from r364070, head/sysutils/bacula-docs/ head/sysutils/bacula5-server/ - copied from r364070, head/sysutils/bacula-server/ Modified: head/net-mgmt/Makefile head/net-mgmt/nagios-check_bacula5/Makefile head/sysutils/Makefile head/sysutils/bacula5-bat/Makefile head/sysutils/bacula5-client-static/Makefile head/sysutils/bacula5-client/Makefile head/sysutils/bacula5-docs/Makefile head/sysutils/bacula5-server/Makefile head/sysutils/bacula5-server/Makefile.common Modified: head/net-mgmt/Makefile ============================================================================== --- head/net-mgmt/Makefile Thu Aug 7 18:43:20 2014 (r364311) +++ head/net-mgmt/Makefile Thu Aug 7 19:21:45 2014 (r364312) @@ -117,6 +117,7 @@ SUBDIR += nagios SUBDIR += nagios-certexp-plugin SUBDIR += nagios-check_bacula + SUBDIR += nagios-check_bacula5 SUBDIR += nagios-check_clamav SUBDIR += nagios-check_cpu_usage SUBDIR += nagios-check_email_delivery Modified: head/net-mgmt/nagios-check_bacula5/Makefile ============================================================================== --- head/net-mgmt/nagios-check_bacula/Makefile Tue Aug 5 00:20:20 2014 (r364070) +++ head/net-mgmt/nagios-check_bacula5/Makefile Thu Aug 7 19:21:45 2014 (r364312) @@ -4,18 +4,18 @@ PORTNAME= bacula CATEGORIES= net-mgmt PKGNAMEPREFIX= nagios-check_ -PKGNAMESUFFIX= # +PKGNAMESUFFIX= 5 MAINTAINER= freebsd@troback.com COMMENT= Nagios plugin for Bacula -LIB_DEPENDS+= libbac.so:${PORTSDIR}/sysutils/bacula-client +LIB_DEPENDS+= libbac.so:${PORTSDIR}/sysutils/bacula5-client PLIST= ${.CURDIR}/pkg-plist PLIST_FILES= libexec/nagios/check_bacula PLIST_DIRS= libexec/nagios WITH_NAGIOS_CHECK_ONLY= yes -MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server +MASTERDIR= ${.CURDIR}/../../sysutils/bacula5-server CONFIGURE_ARGS= --enable-client-only \ --disable-build-dird \ Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Thu Aug 7 18:43:20 2014 (r364311) +++ head/sysutils/Makefile Thu Aug 7 19:21:45 2014 (r364312) @@ -56,6 +56,11 @@ SUBDIR += bacula-client-static SUBDIR += bacula-docs SUBDIR += bacula-server + SUBDIR += bacula5-bat + SUBDIR += bacula5-client + SUBDIR += bacula5-client-static + SUBDIR += bacula5-docs + SUBDIR += bacula5-server SUBDIR += bamf SUBDIR += bashburn SUBDIR += batmon Modified: head/sysutils/bacula5-bat/Makefile ============================================================================== --- head/sysutils/bacula-bat/Makefile Tue Aug 5 00:20:20 2014 (r364070) +++ head/sysutils/bacula5-bat/Makefile Thu Aug 7 19:21:45 2014 (r364312) @@ -2,13 +2,15 @@ # $FreeBSD$ PORTNAME= bacula -PKGNAMESUFFIX= -bat +PKGNAMESUFFIX= 5-bat PORTREVISION= 5 COMMENT= Network backup solution (GUI) LIB_DEPENDS+= libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \ - libbac.so:${PORTSDIR}/sysutils/bacula-client + libbac.so:${PORTSDIR}/sysutils/bacula5-client + +CONFLICTS= bacula-bat-* USES= pkgconfig USE_QT4= qmake_build uic_build moc_build rcc_build @@ -17,7 +19,7 @@ WITH_BAT= yes PLIST= ${.CURDIR}/pkg-plist MAKE_ENV+= MAKEOBJDIRPREFIX=/ -MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server +MASTERDIR= ${.CURDIR}/../../sysutils/bacula5-server CONFIGURE_ARGS+= --enable-bat \ --with-qwt=${LOCALBASE}/lib \ Modified: head/sysutils/bacula5-client-static/Makefile ============================================================================== --- head/sysutils/bacula-client-static/Makefile Tue Aug 5 00:20:20 2014 (r364070) +++ head/sysutils/bacula5-client-static/Makefile Thu Aug 7 19:21:45 2014 (r364312) @@ -1,12 +1,14 @@ # $FreeBSD$ PORTNAME= bacula -PKGNAMESUFFIX= -client-static +PKGNAMESUFFIX= 5-client-static COMMENT= Network backup solution (static client) +CONFLICTS= bacula-client-static-* + PLIST= ${.CURDIR}/pkg-plist -MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server +MASTERDIR= ${.CURDIR}/../../sysutils/bacula5-server PLIST_FILES= sbin/bacula-fd-static \ sbin/bconsole-static Modified: head/sysutils/bacula5-client/Makefile ============================================================================== --- head/sysutils/bacula-client/Makefile Tue Aug 5 00:20:20 2014 (r364070) +++ head/sysutils/bacula5-client/Makefile Thu Aug 7 19:21:45 2014 (r364312) @@ -1,15 +1,17 @@ # $FreeBSD$ PORTNAME= bacula -PKGNAMESUFFIX= -client +PKGNAMESUFFIX= 5-client COMMENT= Network backup solution (client) +CONFLICTS= bacula-client-* + WITH_CLIENT_ONLY=yes USE_RC_SUBR= bacula-fd PLIST= ${PKGDIR}/pkg-plist.client -MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server +MASTERDIR= ${.CURDIR}/../../sysutils/bacula5-server OPTIONS_DEFINE= NLS OPENSSL PYTHON OPTIONS_DEFAULT=NLS OPENSSL Modified: head/sysutils/bacula5-docs/Makefile ============================================================================== --- head/sysutils/bacula-docs/Makefile Tue Aug 5 00:20:20 2014 (r364070) +++ head/sysutils/bacula5-docs/Makefile Thu Aug 7 19:21:45 2014 (r364312) @@ -5,9 +5,11 @@ PORTNAME= bacula PORTVERSION= 5.2.12 CATEGORIES= sysutils MASTER_SITES= SF -PKGNAMESUFFIX= -docs +PKGNAMESUFFIX= 5-docs DISTFILES= ${PORTNAME}-docs-${PORTVERSION}.tar.bz2 +CONFLICTS= bacula-* + MAINTAINER= dan@langille.org COMMENT= Bacula document set @@ -17,15 +19,17 @@ UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= *.pdf -.ifdef NOPORTDOCS -IGNORE= consists of only documentation, please undef NOPORTDOCS and try again +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + +.if empty(PORT_OPTIONS:DOCS) +IGNORE= consists of only documentation, please enable DOCS and try again .endif -NO_STAGE= yes do-install: - ${MKDIR} ${DOCSDIR} - + ${MKDIR} ${STAGEDIR}${DOCSDIR} ${FIND} ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION}/manuals/en \ - -name "*.pdf" -exec ${INSTALL_DATA} {} ${DOCSDIR}/ \; + -name "*.pdf" -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/ \; .include <bsd.port.mk> Modified: head/sysutils/bacula5-server/Makefile ============================================================================== --- head/sysutils/bacula-server/Makefile Tue Aug 5 00:20:20 2014 (r364070) +++ head/sysutils/bacula5-server/Makefile Thu Aug 7 19:21:45 2014 (r364312) @@ -3,17 +3,19 @@ PORTNAME= bacula DISTVERSION= 5.2.12 -PORTREVISION?= 6 +PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # -PKGNAMESUFFIX?= -server +PKGNAMESUFFIX?= 5-server MAINTAINER= dan@langille.org COMMENT?= Network backup solution (server) USES+= libtool:keepla +CONFLICTS?= bacula-server-* + LIB_DEPENDS+= liblzo2.so:${PORTSDIR}/archivers/lzo2 USERS= bacula @@ -35,13 +37,13 @@ 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 +.if ${PKGNAMESUFFIX} == "5-client" || ${PKGNAMESUFFIX} == "5-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 +LIB_DEPENDS+= libbac.so:${PORTSDIR}/sysutils/bacula5-client USE_RC_SUBR?= bacula-dir bacula-sd .endif Modified: head/sysutils/bacula5-server/Makefile.common ============================================================================== --- head/sysutils/bacula-server/Makefile.common Tue Aug 5 00:20:20 2014 (r364070) +++ head/sysutils/bacula5-server/Makefile.common Thu Aug 7 19:21:45 2014 (r364312) @@ -9,7 +9,7 @@ post-build: .endif do-install: -.if ${PKGNAMESUFFIX} == "-bat" +.if ${PKGNAMESUFFIX} == "5-bat" # Install config files and preserve existing ones ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_SCRIPT} ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${PREFIX}/etc/bacula/bat.conf.sample @@ -21,7 +21,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/check_bacula \ ${STAGEDIR}${PREFIX}/libexec/nagios .endif -.if ${PKGNAMESUFFIX} == "-client-static" +.if ${PKGNAMESUFFIX} == "5-client-static" ${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bacula-fd ${STAGEDIR}${PREFIX}/sbin/bacula-fd-static ${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e3d1ca.2d1d.3b112cd0>