Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Jan 2017 19:22: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: r432796 - in head/graphics: rawtherapee rawtherapee-devel
Message-ID:  <201701291922.v0TJMlQE038923@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sun Jan 29 19:22:47 2017
New Revision: 432796
URL: https://svnweb.freebsd.org/changeset/ports/432796

Log:
  graphics/rawtherapee(-devel): Fix OSVERSION, use with OPSYS
  
  The OSVERSION for FreeBSD 10.3 is 1003000, not 1030000.  The last commit
  blocked FreeBSD 10.3 too.  OSVERSION is also supposed to be used in
  conjunction with OPSYS.
  
  Approved by:	just-fix-it

Modified:
  head/graphics/rawtherapee-devel/Makefile
  head/graphics/rawtherapee/Makefile

Modified: head/graphics/rawtherapee-devel/Makefile
==============================================================================
--- head/graphics/rawtherapee-devel/Makefile	Sun Jan 29 19:19:06 2017	(r432795)
+++ head/graphics/rawtherapee-devel/Makefile	Sun Jan 29 19:22:47 2017	(r432796)
@@ -76,7 +76,8 @@ OPTIMIZED_CFLAGS_CFLAGS=	-O3 -funroll-lo
 # -------------------------------------------------------------------
 #
 
-.if ${OSVERSION} < 1030000
+.if ${OPSYS} == FreeBSD
+.if ${OSVERSION} < 1003000
 IGNORE=	is only for supported FreeBSD releases
 .endif
 
@@ -87,6 +88,7 @@ IGNORE=	is only for supported FreeBSD re
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=Only amd64 is supported on non-released FreeBSD versions.
 .endif
+.endif
 
 .if ${PORT_OPTIONS:MNATIVE}
 CMAKE_ARGS+=	-DPROC_TARGET_NUMBER="2"

Modified: head/graphics/rawtherapee/Makefile
==============================================================================
--- head/graphics/rawtherapee/Makefile	Sun Jan 29 19:19:06 2017	(r432795)
+++ head/graphics/rawtherapee/Makefile	Sun Jan 29 19:22:47 2017	(r432796)
@@ -74,7 +74,8 @@ OPTIMIZED_CFLAGS_CFLAGS=	-O3 -funroll-lo
 # -------------------------------------------------------------------
 #
 
-.if ${OSVERSION} < 1030000
+.if ${OPSYS} == FreeBSD
+.if ${OSVERSION} < 1003000
 IGNORE=	is only for supported FreeBSD releases
 .endif
 
@@ -85,6 +86,7 @@ IGNORE=	is only for supported FreeBSD re
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=Only amd64 is supported on non-released FreeBSD versions.
 .endif
+.endif
 
 .if ${PORT_OPTIONS:MNATIVE}
 CMAKE_ARGS+=	-DPROC_TARGET_NUMBER="2"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701291922.v0TJMlQE038923>