Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id B16A67A2D3 for ; Wed, 14 Dec 2016 22:47:07 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 5FB5585608; Wed, 14 Dec 2016 22:47:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E4B00855AA for ; Wed, 14 Dec 2016 22:47:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id E1yZQCiRN-O9 for ; Wed, 14 Dec 2016 22:47:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 79A9285581 for ; Wed, 14 Dec 2016 22:47:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 74B9FFBA6; Wed, 14 Dec 2016 22:47:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1481755626187520" MIME-Version: 1.0 Date: Wed, 14 Dec 2016 22:47:06 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/net/nmap To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20161214224706.74B9FFBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1481755626187520 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Dec 14 22:47:06 UTC 2016 Modified Files: pkgsrc/net/nmap: options.mk Log Message: Move ndiff option handling below the one for zenmap, since the latter restricts the allowed python versions. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/nmap/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1481755626187520 Content-Disposition: inline Content-Length: 1657 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/nmap/options.mk diff -u pkgsrc/net/nmap/options.mk:1.16 pkgsrc/net/nmap/options.mk:1.17 --- pkgsrc/net/nmap/options.mk:1.16 Sat Jul 9 13:03:59 2016 +++ pkgsrc/net/nmap/options.mk Wed Dec 14 22:47:06 2016 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.16 2016/07/09 13:03:59 wiz Exp $ +# $NetBSD: options.mk,v 1.17 2016/12/14 22:47:06 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.nmap @@ -15,22 +15,6 @@ CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --disable-ipv6 .endif -.if !empty(PKG_OPTIONS:Mndiff) -CONFIGURE_ARGS+= --with-ndiff -PLIST.ndiff= yes -PY_PATCHPLIST= yes -REPLACE_PYTHON+= ndiff/*.py -SUBST_CLASSES+= paths -SUBST_STAGE.paths= post-patch -SUBST_FILES.paths= ndiff/setup.py -SUBST_VARS.paths= PKGMANDIR -SUBST_MESSAGE.paths= Fixing paths. -.include "../../lang/python/application.mk" -.include "../../lang/python/extension.mk" -.else -CONFIGURE_ARGS+= --without-ndiff -.endif - # Enable dynamically loadable preprocessors, detection engine # and rules libraries. .if !empty(PKG_OPTIONS:Mzenmap) @@ -59,3 +43,20 @@ PLIST.lua= yes .else CONFIGURE_ARGS+= --without-liblua .endif + +# this needs to be below zenmap option handling, because that restricts python versions +.if !empty(PKG_OPTIONS:Mndiff) +CONFIGURE_ARGS+= --with-ndiff +PLIST.ndiff= yes +PY_PATCHPLIST= yes +REPLACE_PYTHON+= ndiff/*.py +SUBST_CLASSES+= paths +SUBST_STAGE.paths= post-patch +SUBST_FILES.paths= ndiff/setup.py +SUBST_VARS.paths= PKGMANDIR +SUBST_MESSAGE.paths= Fixing paths. +.include "../../lang/python/application.mk" +.include "../../lang/python/extension.mk" +.else +CONFIGURE_ARGS+= --without-ndiff +.endif --_----------=_1481755626187520--