From owner-svn-ports-all@freebsd.org  Tue Jun 21 08:09:48 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
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 D0DF0AC5E7E;
 Tue, 21 Jun 2016 08:09:48 +0000 (UTC)
 (envelope-from marino@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 A1CDE1735;
 Tue, 21 Jun 2016 08:09:48 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5L89lZL053765;
 Tue, 21 Jun 2016 08:09:47 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5L89ljU053764;
 Tue, 21 Jun 2016 08:09:47 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201606210809.u5L89ljU053764@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Tue, 21 Jun 2016 08:09:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r417189 - head/multimedia/zoneminder
X-SVN-Group: ports-head
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.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2016 08:09:48 -0000

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>