From owner-svn-ports-head@FreeBSD.ORG Fri Sep 14 19:08:56 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 57CF6106564A; Fri, 14 Sep 2012 19:08:56 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 42FA28FC0A; Fri, 14 Sep 2012 19:08:56 +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 q8EJ8uxD088907; Fri, 14 Sep 2012 19:08:56 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8EJ8urw088905; Fri, 14 Sep 2012 19:08:56 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201209141908.q8EJ8urw088905@svn.freebsd.org> From: Bryan Drewery Date: Fri, 14 Sep 2012 19:08:56 +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: r304289 - head/net-im/jabber-pyicq X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 14 Sep 2012 19:08:56 -0000 Author: bdrewery Date: Fri Sep 14 19:08:55 2012 New Revision: 304289 URL: http://svn.freebsd.org/changeset/ports/304289 Log: - Convert to new options framework - Remove GPL LICENSE_FILE - Remove use of bsd.port.pre.mk Modified: head/net-im/jabber-pyicq/Makefile Modified: head/net-im/jabber-pyicq/Makefile ============================================================================== --- head/net-im/jabber-pyicq/Makefile Fri Sep 14 19:06:34 2012 (r304288) +++ head/net-im/jabber-pyicq/Makefile Fri Sep 14 19:08:55 2012 (r304289) @@ -17,18 +17,21 @@ DIST_SUBDIR= jabber MAINTAINER= ports@FreeBSD.org COMMENT= Python ICQ-Transport for Jabber +LICENSE= GPLv2 + RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-openssl \ ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - PROJECTHOST= pyicqt -OPTIONS= JABBER "Use with jabberd14 (net-im/jabber)" off \ - JABBERD "Use with jabberd 2.x (net-im/jabberd)" off \ - EJABBERD "Use with ejabberd (net-im/ejabberd)" off \ - TWISTED1 "Use old py-twisted 1.x" off \ - MYSQL "Support MySQL storage" off +OPTIONS_DEFINE= TWISTED1 MYSQL +OPTIONS_DEFAULT=DAEMON +OPTIONS_SINGLE= SERVER +OPTIONS_SINGLE_SERVER= JABBER JABBERD EJABBERD DAEMON +JABBER_DESC= Use with jabberd14 (net-im/jabber) +JABBERD_DESC= Use with jabberd 2.x (net-im/jabberd) +EJABBERD_DESC= Use with ejabberd (net-im/ejabberd) +DAEMON_DESC= Use builtin daemon +TWISTED1_DESC= Use old py-twisted 1.x NO_BUILD= yes USE_PYTHON= yes @@ -42,32 +45,27 @@ INST_DIR= ${PREFIX}/lib/jabber/${PORTNAM PORTDOCS= NEWS README README.jabberd14 README.jabberd2 README.external -.include +.include -.if (defined(WITH_JABBERD) && (defined(WITH_JABBER) || defined(WITH_EJABBERD))) || \ - defined(WITH_JABBER) && defined(WITH_EJABBERD) -IGNORE= options WITH_JABBER, WITH_JABBERD and WITH_EJABBERD are mutually exclusive -.endif - -.if defined(WITH_JABBER) +.if ${PORT_OPTIONS:MJABBER} JABBER_REQUIRE?= jabber JABBER_USER?= jabber JABBER_PIDDIR?= /var/run/jabberd JABBER_SPOOLDIR?= /var/spool/jabberd RUN_DEPENDS+= jabberd14:${PORTSDIR}/net-im/jabber -.elif defined(WITH_JABBERD) +.elif ${PORT_OPTIONS:MJABBERD} JABBER_REQUIRE?= jabberd JABBER_USER?= jabber JABBER_PIDDIR?= /var/jabberd/pid JABBER_SPOOLDIR?= /var/spool/jabber RUN_DEPENDS+= jabberd:${PORTSDIR}/net-im/jabberd -.elif defined(WITH_EJABBERD) +.elif ${PORT_OPTIONS:MEJABBERD} JABBER_REQUIRE?= ejabberd JABBER_USER?= ejabberd JABBER_PIDDIR?= /var/jabberd/pid JABBER_SPOOLDIR?= /var/spool/jabber RUN_DEPENDS+= ejabberdctl:${PORTSDIR}/net-im/ejabberd -.else +.elif ${PORT_OPTIONS:MDAEMON} JABBER_REQUIRE?= DAEMON JABBER_USER?= nobody JABBER_PIDDIR?= /var/run/pyicq @@ -78,7 +76,7 @@ SUB_LIST+= JABBER_REQUIRE="${JABBER_REQU JABBER_PIDDIR="${JABBER_PIDDIR}" \ JABBER_SPOOLDIR="${JABBER_SPOOLDIR}" -.if defined(WITH_TWISTED1) +.if ${PORT_OPTIONS:MTWIESTED1} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twisted .else RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore \ @@ -86,7 +84,7 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twist ${PYTHON_SITELIBDIR}/twisted/words/__init__.py:${PORTSDIR}/net-im/py-twistedWords .endif -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb .endif @@ -128,4 +126,4 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} -.include +.include