From owner-svn-ports-head@FreeBSD.ORG Fri Sep 14 19:26:38 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 3CD481065670; Fri, 14 Sep 2012 19:26:38 +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 0DBC28FC16; Fri, 14 Sep 2012 19:26:38 +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 q8EJQbFR092117; Fri, 14 Sep 2012 19:26:37 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8EJQbOA092115; Fri, 14 Sep 2012 19:26:37 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201209141926.q8EJQbOA092115@svn.freebsd.org> From: Bryan Drewery Date: Fri, 14 Sep 2012 19:26:37 +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: r304293 - head/net-im/jabber 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:26:38 -0000 Author: bdrewery Date: Fri Sep 14 19:26:37 2012 New Revision: 304293 URL: http://svn.freebsd.org/changeset/ports/304293 Log: - Convert to new options framework - Remove GPL LICENSE_FILE - Remove ABI versions from LIB_DEPENDS - Mark MAKE_JOBS_UNSAFE - Remove use of bsd.port.pre.mk Modified: head/net-im/jabber/Makefile Modified: head/net-im/jabber/Makefile ============================================================================== --- head/net-im/jabber/Makefile Fri Sep 14 19:24:20 2012 (r304292) +++ head/net-im/jabber/Makefile Fri Sep 14 19:26:37 2012 (r304293) @@ -18,20 +18,17 @@ DIST_SUBDIR= jabber MAINTAINER= ports@FreeBSD.org COMMENT= XMPP/Jabber server daemon -LIB_DEPENDS= pth.20:${PORTSDIR}/devel/pth-hard \ - popt.0:${PORTSDIR}/devel/popt \ - idn.17:${PORTSDIR}/dns/libidn \ - expat.6:${PORTSDIR}/textproc/expat2 \ - tasn1.4:${PORTSDIR}/security/libtasn1 \ - gnutls.47:${PORTSDIR}/security/gnutls \ - gcrypt.18:${PORTSDIR}/security/libgcrypt - LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS= IPV6 "Enable IPv6 support" off \ - MYSQL "Build with MySQL support" off \ - PGSQL "Build with PostgreSQL support" off +LIB_DEPENDS= pth:${PORTSDIR}/devel/pth-hard \ + popt:${PORTSDIR}/devel/popt \ + idn:${PORTSDIR}/dns/libidn \ + expat:${PORTSDIR}/textproc/expat2 \ + tasn1:${PORTSDIR}/security/libtasn1 \ + gnutls:${PORTSDIR}/security/gnutls \ + gcrypt:${PORTSDIR}/security/libgcrypt + +OPTIONS_DEFINE= IPV6 MYSQL PGSQL USE_RC_SUBR= jabber USE_ICONV= yes @@ -39,6 +36,7 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= ${PREFIX}/lib/jabber +MAKE_JOBS_UNSAFE= yes .if !defined(NO_INSTALL_MANPAGES) MAN5= jabber.xml.5 @@ -73,19 +71,19 @@ SUB_LIST+= JABBER_USER=${JABBER_USER} JA DOCS= AUTHORS ChangeLog INSTALL NEWS README README.SQL README.config \ README.filespool README.karma README.protocols TODO UPGRADE mysql.sql -.include +.include -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE} .endif -.if defined(WITH_IPV6) +.if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .endif @@ -119,4 +117,4 @@ post-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} -.include +.include