Date: Tue, 21 Jun 2016 08:09:47 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417189 - head/multimedia/zoneminder Message-ID: <201606210809.u5L89ljU053764@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Jun 21 08:09:47 2016 New Revision: 417189 URL: https://svnweb.freebsd.org/changeset/ports/417189 Log: multimedia/zoneminder: Fix Malformed conditional introduced by last commit Without an inclusion, OSVERSION and ARCH aren't defined. While here, couple OSVERSION with OPSYS. It's not strictly necessary in this case, but it maintains consistency with other ports. The previous change was apparently committed without any verification. Approved by: just-fix-it Modified: head/multimedia/zoneminder/Makefile Modified: head/multimedia/zoneminder/Makefile ============================================================================== --- head/multimedia/zoneminder/Makefile Tue Jun 21 08:02:57 2016 (r417188) +++ head/multimedia/zoneminder/Makefile Tue Jun 21 08:09:47 2016 (r417189) @@ -78,7 +78,9 @@ CMAKE_ARGS+= -DZM_PERL_MM_PARMS=INSTALLD -DHAVE_SENDFILE=0 \ -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" -.if ${OSVERSION} < 1000000 && ${ARCH} == i386 +.include <bsd.port.pre.mk> + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ${ARCH} == i386 CFLAGS+= -msse .endif @@ -107,4 +109,4 @@ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606210809.u5L89ljU053764>