Date: Tue, 26 Feb 2019 08:56:31 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493951 - head/net-mgmt/nagiosql Message-ID: <201902260856.x1Q8uV3E082453@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Tue Feb 26 08:56:31 2019 New Revision: 493951 URL: https://svnweb.freebsd.org/changeset/ports/493951 Log: net-mgmt/nagiosql: Remove redundant regex escapes nagiosql's Makefile currently has some redundant escaping of single quotes in its Makefile. These get passed through as escaped single quotes to regex(3), which is an escape of an ordinary character. Such escapes will be forbidden in a future version of regex(3), so we'll get ahead of the game and remove said escapes now. While here, there are two questionable expressions: -e "s|\>/etc/nagiosql|\>${ETCDIR}|g" and the one immediately following it. \> is a word delimiter (see reformat(7)), and will only match as such. If this were to match, it would replace <word delimiter>/etc/nagiosql with >${ETCDIR} -- this likely works as intended now, but I think it was intended that it matches a literal >/etc/nagiosql, so the included patch treats it accordingly. - While here reset MAINTAINER after a timeout of 3 months and repeated previous timeouts PR: 233458 Submitted by: kevans Approved by: chris@smartt.com (maintainer timeout, 3 months) Modified: head/net-mgmt/nagiosql/Makefile Modified: head/net-mgmt/nagiosql/Makefile ============================================================================== --- head/net-mgmt/nagiosql/Makefile Tue Feb 26 08:47:42 2019 (r493950) +++ head/net-mgmt/nagiosql/Makefile Tue Feb 26 08:56:31 2019 (r493951) @@ -3,6 +3,7 @@ PORTNAME= nagiosql PORTVERSION= 3.4.0 +PORTREVISION= 1 CATEGORIES= net-mgmt www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/NagiosQL%20${PORTVERSION}/ @@ -37,15 +38,15 @@ CURL_USE= PHP=curl FTP_USE= PHP=ftp post-patch: - ${REINPLACE_CMD} -e "s|\'/etc/nagiosql/|\'${ETCDIR}/|g" \ + ${REINPLACE_CMD} -e "s|'/etc/nagiosql/|'${ETCDIR}/|g" \ -e "s|/opt/nagios/etc/objects/|${LOCALBASE}/etc/nagios/objects/|" \ -e "s|/opt/nagios/bin/nagios|${LOCALBASE}/bin/nagios|" \ -e "s|/var/nagios/nagios.lock|/var/spool/nagios/nagios.lock|" \ -e "s|/var/nagios/rw/nagios.cmd|/var/spool/nagios/rw/nagios.cmd|" \ -e "s|nagios/etc/|etc/nagios/|" \ -e "s|nagiosql/etc/|${ETCDIR}/|" \ - -e "s|\>/etc/nagiosql|\>${ETCDIR}|g" \ - -e "s|\>/etc/nagios/|\>${LOCALBASE}/etc/nagios/|g" \ + -e "s|>/etc/nagiosql|>${ETCDIR}|g" \ + -e "s|>/etc/nagios/|>${LOCALBASE}/etc/nagios/|g" \ ${WRKSRC}-${PORTVERSION}/install/sql/nagiosQL_v32_db_mysql.sql ${REINPLACE_CMD} -e "s|\"/etc/|\"${LOCALBASE}/etc/|" \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902260856.x1Q8uV3E082453>