Date: Sun, 17 May 2020 22:31:06 +0000 (UTC) From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535684 - head/sysutils/bareos16-server Message-ID: <202005172231.04HMV68p056685@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Sun May 17 22:31:06 2020 New Revision: 535684 URL: https://svnweb.freebsd.org/changeset/ports/535684 Log: - Fix traymonitor and client-static build Reported by: pkg-fallout Modified: head/sysutils/bareos16-server/Makefile.common Modified: head/sysutils/bareos16-server/Makefile.common ============================================================================== --- head/sysutils/bareos16-server/Makefile.common Sun May 17 22:12:04 2020 (r535683) +++ head/sysutils/bareos16-server/Makefile.common Sun May 17 22:31:06 2020 (r535684) @@ -12,38 +12,24 @@ post-build: .endif pre-install: -.if ${PKGNAMESUFFIX} == "-traymonitor" +.if ${PKGNAMESUFFIX} == "16-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 \; . endfor .endif -.if ${PKGNAMESUFFIX} == "-bat" - @${MV} ${WRKSRC}/manpages/bat.1 ${WRKSRC}/manpages/${PORTNAME:S/16//}-bat.1 - @${MV} ${WRKSRC}/src/qt-console/bat.desktop ${WRKSRC}/src/qt-console/${PORTNAME:S/16//}-bat.desktop -.endif do-install: -.if ${PKGNAMESUFFIX} == "-bat" -# Install config files and preserve existing ones - ${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${PREFIX}/etc/bareos/bat.conf.sample - ${INSTALL_MAN} ${WRKSRC}/manpages/${PORTNAME:S/16//}-bat.1 ${STAGEDIR}${PREFIX}/man/man1/ - ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${STAGEDIR}${PREFIX}/bin/${PORTNAME:S/16//}-bat - ${INSTALL_DATA} ${WRKSRC}/src/images/bat.png ${STAGEDIR}${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKSRC}/src/images/bat.svg ${STAGEDIR}${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKSRC}/src/qt-console/${PORTNAME:S/16//}-bat.desktop ${STAGEDIR}${DESKTOPDIR} -.endif .if ${PKGNAMEPREFIX} == "nagios-check_" @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios ${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bareos/check_bareos \ ${STAGEDIR}${PREFIX}/libexec/nagios .endif -.if ${PKGNAMESUFFIX} == "-client-static" +.if ${PKGNAMESUFFIX} == "16-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} == "16-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}/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005172231.04HMV68p056685>