From owner-svn-ports-all@freebsd.org  Thu Aug  4 03:00:27 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 D3D60BAE491;
 Thu,  4 Aug 2016 03:00:27 +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 A06EF1834;
 Thu,  4 Aug 2016 03:00:27 +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 u7430QdD001796;
 Thu, 4 Aug 2016 03:00:26 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7430Q5o001795;
 Thu, 4 Aug 2016 03:00:26 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201608040300.u7430Q5o001795@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: Thu, 4 Aug 2016 03:00:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r419581 - head/math/R
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: Thu, 04 Aug 2016 03:00:27 -0000

Author: marino
Date: Thu Aug  4 03:00:26 2016
New Revision: 419581
URL: https://svnweb.freebsd.org/changeset/ports/419581

Log:
  math/R: Tweak previous ${OSVERSION} without ${OPSYS} commit
  
  I made a mistake; some of the post-patch target does apply to DragonFly
  as well as the pre-configure target.  Tighten up which code is designated
  as FreeBSD only.  (again, a No-Op for FreeBSD)
  
  Approved by:	OSVERSION/OPSYS blanket

Modified:
  head/math/R/Makefile

Modified: head/math/R/Makefile
==============================================================================
--- head/math/R/Makefile	Thu Aug  4 02:54:25 2016	(r419580)
+++ head/math/R/Makefile	Thu Aug  4 03:00:26 2016	(r419581)
@@ -163,8 +163,7 @@ PLIST_SUB=		R_SOVERSION="${R_SOVERSION}"
 .include "compiler.mk"
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD
-.if ${OSVERSION} > 1000052 && \
+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000052 && \
 (${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64 || ${ARCH} == pc98 || \
 ${ARCH} == sparc64)
 .for i in coshl erfcl erfl lgammal powl sinhl tanhl tgammal
@@ -174,6 +173,7 @@ LDFLAGS+=		-fno-builtin-${i}
 .endif
 
 post-patch:
+.if ${OPSYS} == FreeBSD
 .if !${PORT_OPTIONS:MMISSING}
 .if ${OSVERSION} < 1000016
 	@${REINPLACE_CMD} -e \
@@ -204,6 +204,7 @@ ${ARCH} == sparc64)
 '\|#[[:blank:]]*include[[:blank:]]*<complex.h>|{x;s|^.*$$|#include "missing_complex.h"|;H;x;}' \
 		${WRKSRC}/src/main/complex.c
 .endif # !PORT_OPTIONS:MMISSING
+.endif  # ${OPSYS} == FreeBSD
 	@${REINPLACE_CMD} -e \
 '\|#[[:blank:]]*include[[:blank:]]*<math.h>|{x;s|^.*$$|#include ${LIBMH}|;H;x;}'\
 		${WRKSRC}/src/nmath/nmath.h \
@@ -223,7 +224,6 @@ pre-configure:
 		compiler and architecture: please enable the MISSING option."; \
 	fi
 .endif
-.endif  # ${OPSYS} == FreeBSD
 
 post-install:
 .for L in R Rblas Rlapack