svn commit: r496122 - head/security/softether5

[Koichiro Iwao]

Author: meta
Date: Mon Mar 18 05:19:32 2019
New Revision: 496122
URL: https://svnweb.freebsd.org/changeset/ports/496122

Log:
  security/softether5: conditionalize dependence on devel/cpu_features
  
  devel/cpu_features is not available on some architectures after r496118.
  Furturemore, upstream doesn't require cpu_features on some architectures
  such as armv7l, aarch64, s390x. Add CFLAGS=-DSKIP_CPU_FEATURES on
  architectures devel/cpu_features is not available.
  
  Tested no-harm on amd64.

Modified:
  head/security/softether5/Makefile

Modified: head/security/softether5/Makefile
==============================================================================
--- head/security/softether5/Makefile	Mon Mar 18 05:04:07 2019	(r496121)
+++ head/security/softether5/Makefile	Mon Mar 18 05:19:32 2019	(r496122)
@@ -2,7 +2,7 @@
 
 PORTNAME=	softether
 DISTVERSION=	5.01.9669
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 PKGNAMESUFFIX=	5
 
@@ -12,8 +12,6 @@ COMMENT=	SoftEther VPN 5 (Developer Edition)
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/cpu_features_macros.h:devel/cpu_features
-
 USES+=		cmake:noninja dos2unix iconv:wchar_t localbase:ldflags ncurses readline ssl
 USE_RC_SUBR=	softether_bridge softether_client softether_server
 USE_LDCONFIG=	yes
@@ -45,8 +43,16 @@ PLIST_SUB=	SE_DBDIR="${SE_DBDIR}" SE_LOGDIR="${SE_LOGD
 SUB_LIST=	SE_DBDIR="${SE_DBDIR}" SE_LOGDIR="${SE_LOGDIR}"
 SUB_FILES=	pkg-message
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
+# devel/cpu_features not available on these archs, see devel/cpu_features/Makefile
+.if (${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == mips || ${ARCH} == mips64)
+# skip cpu_features when devel/cpu_features is not available
+CFLAGS+=	-DSKIP_CPU_FEATURES
+.else
+BUILD_DEPENDS+=	${LOCALBASE}/include/cpu_features_macros.h:devel/cpu_features
+.endif
+
 pre-configure:
 	# not a GNU configure
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./configure
@@ -107,4 +113,4 @@ post-install-DOCS-on:
 	${FIND} ${WRKSRC} -name ${doc} -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR} \;
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>