From owner-svn-ports-all@freebsd.org Sun May 17 22:31:55 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C27092F80DF; Sun, 17 May 2020 22:31:55 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49QH234MGgz3ZW8; Sun, 17 May 2020 22:31:55 +0000 (UTC) (envelope-from acm@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 90C97177BA; Sun, 17 May 2020 22:31:55 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04HMVtlo059181; Sun, 17 May 2020 22:31:55 GMT (envelope-from acm@FreeBSD.org) Received: (from acm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04HMVtbm059180; Sun, 17 May 2020 22:31:55 GMT (envelope-from acm@FreeBSD.org) Message-Id: <202005172231.04HMVtbm059180@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: acm set sender to acm@FreeBSD.org using -f From: Jose Alonso Cardenas Marquez Date: Sun, 17 May 2020 22:31:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535685 - head/sysutils/bareos17-server X-SVN-Group: ports-head X-SVN-Commit-Author: acm X-SVN-Commit-Paths: head/sysutils/bareos17-server X-SVN-Commit-Revision: 535685 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.33 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: Sun, 17 May 2020 22:31:55 -0000 Author: acm Date: Sun May 17 22:31:55 2020 New Revision: 535685 URL: https://svnweb.freebsd.org/changeset/ports/535685 Log: - Fix traymonitor and client-static build Reported by: pkg-fallout Modified: head/sysutils/bareos17-server/Makefile.common Modified: head/sysutils/bareos17-server/Makefile.common ============================================================================== --- head/sysutils/bareos17-server/Makefile.common Sun May 17 22:31:06 2020 (r535684) +++ head/sysutils/bareos17-server/Makefile.common Sun May 17 22:31:55 2020 (r535685) @@ -11,7 +11,7 @@ post-build: .endif pre-install: -.if ${PKGNAMESUFFIX} == "-traymonitor" +.if ${PKGNAMESUFFIX} == "17-traymonitor" . for d in client director monitor storage ${MKDIR} ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d} ${FIND} ${WRKSRC}/src/defaultconfigs/tray-monitor.d/${d} -type f -name '*.conf' -exec ${MV} -v {} {}.sample \; @@ -24,11 +24,11 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bareos/check_bareos \ ${STAGEDIR}${PREFIX}/libexec/nagios .endif -.if ${PKGNAMESUFFIX} == "-client-static" +.if ${PKGNAMESUFFIX} == "17-client-static" ${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bareos-fd ${STAGEDIR}${PREFIX}/sbin/bareos-fd-static ${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static .endif -.if ${PKGNAMESUFFIX} == "-traymonitor" +.if ${PKGNAMESUFFIX} == "17-traymonitor" # Install config files and preserve existing ones .for d in client director monitor storage ${INSTALL_SCRIPT} ${WRKSRC}/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/