From owner-svn-ports-head@freebsd.org Mon Jul 6 17:46:40 2015 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 AD28299487E; Mon, 6 Jul 2015 17:46:40 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 5E1F8352A; Mon, 6 Jul 2015 17:46:40 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t66HkerE091726; Mon, 6 Jul 2015 17:46:40 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t66HkedG091725; Mon, 6 Jul 2015 17:46:40 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201507061746.t66HkedG091725@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Mon, 6 Jul 2015 17:46:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391450 - head/textproc/p5-XML-XML2JSON 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.20 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, 06 Jul 2015 17:46:40 -0000 Author: sunpoet Date: Mon Jul 6 17:46:39 2015 New Revision: 391450 URL: https://svnweb.freebsd.org/changeset/ports/391450 Log: - Use OPTIONS_MULTI instead of OPTIONS_DEFINE - Add NO_ARCH - Convert to new options helper Modified: head/textproc/p5-XML-XML2JSON/Makefile Modified: head/textproc/p5-XML-XML2JSON/Makefile ============================================================================== --- head/textproc/p5-XML-XML2JSON/Makefile Mon Jul 6 17:46:35 2015 (r391449) +++ head/textproc/p5-XML-XML2JSON/Makefile Mon Jul 6 17:46:39 2015 (r391450) @@ -18,40 +18,25 @@ BUILD_DEPENDS= p5-XML-LibXML>=1.59:${POR RUN_DEPENDS:= ${BUILD_DEPENDS} # the order of options follows the search order of JSON module by XML::XML2JSON -OPTIONS_DEFINE= JSON_SYCK JSON_XS JSON JSON_DWIW +OPTIONS_MULTI= JSON_BACKEND +OPTIONS_MULTI_JSON_BACKEND= JSON_SYCK JSON_XS JSON JSON_DWIW OPTIONS_DEFAULT=JSON_SYCK JSON_SYCK_DESC= Use JSON::Syck JSON_XS_DESC= Use JSON::XS JSON_DESC= Use JSON JSON_DWIW_DESC= Use JSON::DWIW +NO_ARCH= yes USE_PERL5= configure USES= perl5 -.include - -.if !${PORT_OPTIONS:MJSON_SYCK} && !${PORT_OPTIONS:MJSON_XS} && !${PORT_OPTIONS:MJSON} && !${PORT_OPTIONS:MJSON_DWIW} -IGNORE= you must choose at least one JSON module -.endif - -.if ${PORT_OPTIONS:MJSON_SYCK} -BUILD_DEPENDS+= p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck -RUN_DEPENDS+= p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck -.endif - -.if ${PORT_OPTIONS:MJSON_XS} -BUILD_DEPENDS+= p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS -RUN_DEPENDS+= p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS -.endif - -.if ${PORT_OPTIONS:MJSON} -BUILD_DEPENDS+= p5-JSON>=0:${PORTSDIR}/converters/p5-JSON -RUN_DEPENDS+= p5-JSON>=0:${PORTSDIR}/converters/p5-JSON -.endif - -.if ${PORT_OPTIONS:MJSON_DWIW} -BUILD_DEPENDS+= p5-JSON-DWIW>=0:${PORTSDIR}/converters/p5-JSON-DWIW -RUN_DEPENDS+= p5-JSON-DWIW>=0:${PORTSDIR}/converters/p5-JSON-DWIW -.endif +JSON_BUILD_DEPENDS= p5-JSON>=0:${PORTSDIR}/converters/p5-JSON +JSON_DWIW_BUILD_DEPENDS=p5-JSON-DWIW>=0:${PORTSDIR}/converters/p5-JSON-DWIW +JSON_DWIW_RUN_DEPENDS= p5-JSON-DWIW>=0:${PORTSDIR}/converters/p5-JSON-DWIW +JSON_RUN_DEPENDS= p5-JSON>=0:${PORTSDIR}/converters/p5-JSON +JSON_SYCK_BUILD_DEPENDS=p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck +JSON_SYCK_RUN_DEPENDS= p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck +JSON_XS_BUILD_DEPENDS= p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS +JSON_XS_RUN_DEPENDS= p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS .include