From owner-svn-ports-all@freebsd.org Thu Aug 31 14:10:28 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A4CEAE1F532; Thu, 31 Aug 2017 14:10:28 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 73F737D61F; Thu, 31 Aug 2017 14:10:28 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7VEARoF050206; Thu, 31 Aug 2017 14:10:27 GMT (envelope-from dvl@FreeBSD.org) Received: (from dvl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7VEARVQ050204; Thu, 31 Aug 2017 14:10:27 GMT (envelope-from dvl@FreeBSD.org) Message-Id: <201708311410.v7VEARVQ050204@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dvl set sender to dvl@FreeBSD.org using -f From: Dan Langille Date: Thu, 31 Aug 2017 14:10:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449035 - in head/sysutils: bacula9-bat bacula9-server X-SVN-Group: ports-head X-SVN-Commit-Author: dvl X-SVN-Commit-Paths: in head/sysutils: bacula9-bat bacula9-server X-SVN-Commit-Revision: 449035 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Aug 2017 14:10:28 -0000 Author: dvl Date: Thu Aug 31 14:10:27 2017 New Revision: 449035 URL: https://svnweb.freebsd.org/changeset/ports/449035 Log: Switch bacula9-bat to use bacula9-server as MASTERPORT In the master port, adjust the PKGNAMESUFFIX for bat to be 9-bat This allows bacula9-bat to build Modified: head/sysutils/bacula9-bat/Makefile head/sysutils/bacula9-server/Makefile.common Modified: head/sysutils/bacula9-bat/Makefile ============================================================================== --- head/sysutils/bacula9-bat/Makefile Thu Aug 31 13:59:50 2017 (r449034) +++ head/sysutils/bacula9-bat/Makefile Thu Aug 31 14:10:27 2017 (r449035) @@ -7,7 +7,7 @@ PKGNAMESUFFIX= 9-bat COMMENT= Network backup solution (GUI) LIB_DEPENDS+= libqwt.so:x11-toolkits/qwt5 \ - libbac.so:sysutils/bacula-client + libbac.so:sysutils/bacula9-client USES= pkgconfig USE_QT4= qmake_build uic_build moc_build rcc_build @@ -16,7 +16,7 @@ WITH_BAT= yes PLIST= ${.CURDIR}/pkg-plist MAKE_ENV+= MAKEOBJDIRPREFIX=/ -MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server +MASTERDIR= ${.CURDIR}/../../sysutils/bacula9-server CONFIGURE_ARGS+= --enable-bat \ --with-qwt=${LOCALBASE}/lib \ Modified: head/sysutils/bacula9-server/Makefile.common ============================================================================== --- head/sysutils/bacula9-server/Makefile.common Thu Aug 31 13:59:50 2017 (r449034) +++ head/sysutils/bacula9-server/Makefile.common Thu Aug 31 14:10:27 2017 (r449035) @@ -6,7 +6,7 @@ post-build: .endif do-install: -.if ${PKGNAMESUFFIX} == "-bat" +.if ${PKGNAMESUFFIX} == "9-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