svn commit: r425012 - head/security/gnupg1

[Adam Weinberger]

Author: adamw
Date: Mon Oct 31 16:24:59 2016
New Revision: 425012
URL: https://svnweb.freebsd.org/changeset/ports/425012

Log:
  Improve the compiler check by using USES=compiler and not applying
  it blindly to 10+.
  
  PR:		213932
  Reported by:	dewayne heuristicsystems com au

Modified:
  head/security/gnupg1/Makefile

Modified: head/security/gnupg1/Makefile
==============================================================================
--- head/security/gnupg1/Makefile	Mon Oct 31 16:15:38 2016	(r425011)
+++ head/security/gnupg1/Makefile	Mon Oct 31 16:24:59 2016	(r425012)
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 CPE_VENDOR=	gnupg
 
-USES=		charsetfix cpe gmake tar:bzip2
+USES=		charsetfix compiler cpe gmake tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-camellia \
 		--enable-noexecstack
@@ -54,9 +54,9 @@ NLS_CONFIGURE_ENABLE=	nls
 SUID_GPG_PLIST_SUB=	GPGMODE=4555
 SUID_GPG_PLIST_SUB_OFF=	GPGMODE=
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${ARCH} == "i386" && (${CC} == "clang" || ${OSVERSION} >= 1000024)
+.if ${ARCH} == "i386" && ${COMPILER_TYPE} == "clang"
 CFLAGS+=	-fheinous-gnu-extensions
 .endif