From owner-svn-ports-all@FreeBSD.ORG Sun Oct 7 15:25:12 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 094EF106566B; Sun, 7 Oct 2012 15:25:12 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CF1458FC08; Sun, 7 Oct 2012 15:25:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q97FPBCM023096; Sun, 7 Oct 2012 15:25:11 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q97FPBr3023094; Sun, 7 Oct 2012 15:25:11 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201210071525.q97FPBr3023094@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sun, 7 Oct 2012 15:25:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r305492 - head/textproc/p5-XML-XML2JSON X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Oct 2012 15:25:12 -0000 Author: sunpoet Date: Sun Oct 7 15:25:11 2012 New Revision: 305492 URL: http://svn.freebsd.org/changeset/ports/305492 Log: - Add LICENSE - Convert to new options framework - Fix typo - Cleanup Makefile header Modified: head/textproc/p5-XML-XML2JSON/Makefile (contents, props changed) Modified: head/textproc/p5-XML-XML2JSON/Makefile ============================================================================== --- head/textproc/p5-XML-XML2JSON/Makefile Sun Oct 7 15:22:42 2012 (r305491) +++ head/textproc/p5-XML-XML2JSON/Makefile Sun Oct 7 15:25:11 2012 (r305492) @@ -1,9 +1,5 @@ -# New ports collection makefile for: p5-XML-XML2JSON -# Date created: 2011-07-11 -# Whom: Sunpoet Po-Chuan Hsieh -# +# Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ -# PORTNAME= XML-XML2JSON PORTVERSION= 0.06 @@ -14,14 +10,19 @@ PKGNAMEPREFIX= p5- MAINTAINER= sunpoet@FreeBSD.org COMMENT= Convert XML into JSON (and back again) using XML::LibXML +LICENSE= ART10 GPLv1 +LICENSE_COMB= dual + BUILD_DEPENDS= p5-XML-LibXML>=1.59:${PORTSDIR}/textproc/p5-XML-LibXML -RUN_DEPENDS= p5-XML-LibXML>=1.59:${PORTSDIR}/textproc/p5-XML-LibXML +RUN_DEPENDS:= ${BUILD_DEPENDS} # the order of options follows the search order of JSON module by XML::XML2JSON -OPTIONS= JSON_SYCK "Use JSON::Syck" on \ - JSON_XS "Use JSON::XS" off \ - JSON "Use JSON" off \ - JSON_DWIW "Use JSON::DWIW" off +OPTIONS_DEFINE= 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 PERL_CONFIGURE= yes @@ -29,26 +30,26 @@ MAN3= XML::XML2JSON.3 .include -.if defined(WITHOUT_JSON_SYCK) && !defined(WITH_JSON_XS) && !defined(WITH_JSON) && !defined(WITH_JSON_DWIW) +.if empty(PORT_OPTIONS:MJSON_SYCK) && empty(PORT_OPTIONS:MJSON_XS) && empty(PORT_OPTIONS:MJSON) && empty(PORT_OPTIONS:MJSON_DWIW) IGNORE= you must choose at least one JSON module .endif -.if !defined(WITHOUT_JSON_SYCK) +.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 defined(WITH_JSON_XS) +.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 defined(WITH_JSON) +.if ${PORT_OPTIONS:MJSON} BUILD_DEPENDS+= p5-JSON>=0:${PORTSDIR}/converters/p5-JSON RUN_DEPENDS+= p5-JSON>=0:${PORTSDIR}/converters/p5-JSON .endif -.if defined(WITH_JSON_) +.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