From owner-svn-ports-head@freebsd.org Mon Jan 9 10:02:40 2017 Return-Path: Delivered-To: svn-ports-head@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 8BA2ECA5EEB; Mon, 9 Jan 2017 10:02:40 +0000 (UTC) (envelope-from amdmi3@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 5AEF31F4F; Mon, 9 Jan 2017 10:02:40 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v09A2dNl007335; Mon, 9 Jan 2017 10:02:39 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v09A2dcA007334; Mon, 9 Jan 2017 10:02:39 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201701091002.v09A2dcA007334@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 9 Jan 2017 10:02:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430934 - head/net/zmap X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jan 2017 10:02:40 -0000 Author: amdmi3 Date: Mon Jan 9 10:02:39 2017 New Revision: 430934 URL: https://svnweb.freebsd.org/changeset/ports/430934 Log: - Switch to opt_CMAKE_BOOL - Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL Approved by: portmgr blanket Modified: head/net/zmap/Makefile Modified: head/net/zmap/Makefile ============================================================================== --- head/net/zmap/Makefile Mon Jan 9 10:00:14 2017 (r430933) +++ head/net/zmap/Makefile Mon Jan 9 10:02:39 2017 (r430934) @@ -27,22 +27,13 @@ OPTIONS_DEFAULT=JSON JSON_DESC= Build with support for JSON REDIS_LIB_DEPENDS= libhiredis.so:/databases/hiredis -REDIS_CMAKE_ON+= -DWITH_REDIS=ON -REDIS_CMAKE_OFF+= -DWITH_REDIS=OFF +REDIS_CMAKE_BOOL= WITH_REDIS -MONGO_LIB_DEPENDS+= libmongoc-1.0.so:/devel/mongo-c-driver -MONGO_CMAKE_ON+= -DWITH_MONGO=ON -MONGO_CMAKE_OFF+= -DWITH_MONGO=OFF +MONGO_LIB_DEPENDS= libmongoc-1.0.so:/devel/mongo-c-driver +MONGO_CMAKE_BOOL= WITH_MONGO JSON_LIB_DEPENDS= libjson-c.so:devel/json-c -JSON_CMAKE_ON+= -DWITH_JSON=ON -JSON_CMAKE_OFF+= -DWITH_JSON=OFF - -.include - -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -.endif +JSON_CMAKE_BOOL= WITH_JSON post-patch: @${REINPLACE_CMD} -i '' -e 's|/etc/zmap|${LOCALBASE}/etc/zmap|g' -e 's|/usr/local|${LOCALBASE}|g' \ @@ -55,10 +46,6 @@ post-patch: @${REINPLACE_CMD} -i '' -e 's|/etc/zmap/blacklist.conf|${LOCALBASE}/etc/zmap/blacklist.conf|g' \ ${WRKSRC}/conf/zmap.conf \ ${WRKSRC}/src/zmap.c -.if ${OSVERSION} < 1000033 - @${REINPLACE_CMD} -i '' -e 's|COMMAND flex |COMMAND ${LOCALBASE}/bin/flex |g' \ - ${WRKSRC}/src/CMakeLists.txt -.endif post-install: .for m in ${MANPAGE}