From owner-svn-ports-all@FreeBSD.ORG Wed Oct 17 09:10:09 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 B9B08BAC; Wed, 17 Oct 2012 09:10:09 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 992C08FC14; Wed, 17 Oct 2012 09:10:09 +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 q9H9A9Eu037215; Wed, 17 Oct 2012 09:10:09 GMT (envelope-from pgj@svn.freebsd.org) Received: (from pgj@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9H9A9e3037213; Wed, 17 Oct 2012 09:10:09 GMT (envelope-from pgj@svn.freebsd.org) Message-Id: <201210170910.q9H9A9e3037213@svn.freebsd.org> From: Gabor Pali Date: Wed, 17 Oct 2012 09:10:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306006 - head/mail/mailutils X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 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: Wed, 17 Oct 2012 09:10:09 -0000 Author: pgj Date: Wed Oct 17 09:10:09 2012 New Revision: 306006 URL: http://svn.freebsd.org/changeset/ports/306006 Log: - Convert options to the new format PR: ports/172555 Submitted by: pgj Approved by: maintainer Feature safe: yes Modified: head/mail/mailutils/Makefile Modified: head/mail/mailutils/Makefile ============================================================================== --- head/mail/mailutils/Makefile Wed Oct 17 09:07:26 2012 (r306005) +++ head/mail/mailutils/Makefile Wed Oct 17 09:10:09 2012 (r306006) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mailutils -# Date created: 2011-07-05 -# Whom: Attila Nagy -# +# Created by: Attila Nagy # $FreeBSD$ -# PORTNAME= mailutils PORTVERSION= 2.2 @@ -23,32 +19,35 @@ USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/li INFO= ${PORTNAME} MAN1= imap4d.1 mail.1 pop3d.1 popauth.1 -OPTIONS= GDBM "Use GNU DBM" Off \ - BDB "Use Berkeley DB" Off \ - TOKYOCABINET "Use Tokyo Cabinet" Off \ - GNUTLS "Enable GNUTLS support" Off \ - MYSQL "Enable MySQL support" Off \ - PGSQL "Enable Postgres support" Off \ - LDAP "Enable LDAP support" Off \ - PYTHON "Enable Python support" Off +OPTIONS_DEFINE= GDBM BDB TOKYOCABINET GNUTLS MYSQL PGSQL LDAP PYTHON +OPTIONS_DEFAULT= + +GDBM_DESC= Use GNU DBM +BDB_DESC= Use Berkeley DB +TOKYOCABINET_DESC= Use Tokyo Cabinet +GNUTLS_DESC= Enable GNUTLS support +MYSQL_DESC= Enable MySQL support +PGSQL_DESC= Enable Postgres support +LDAP_DESC= Enable LDAP support +PYTHON_DESC= Enable Python support .include -.if defined(WITH_GDBM) +.if ${PORT_OPTIONS:MGDBM} CONFIGURE_ARGS+= --with-gdbm LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm .else CONFIGURE_ARGS+= --without-gdbm .endif -.if defined(WITH_BDB) +.if ${PORT_OPTIONS:MBDB} USE_BDB= yes CONFIGURE_ARGS+= --with-berkeley-db .else CONFIGURE_ARGS+= --without-berkeley-db .endif -.if defined(WITH_TOKYOCABINET) +.if ${PORT_OPTIONS:MTOKYOCABINET} CONFIGURE_ARGS+= --with-tokyocabinet LIB_DEPENDS+= tokyocabinet.9:${PORTSDIR}/databases/tokyocabinet PLIST_SUB+= TOKYOCABINET="" @@ -57,35 +56,35 @@ CONFIGURE_ARGS+= --without-tokyocabinet PLIST_SUB+= TOKYOCABINET="@comment " .endif -.if defined(WITH_GNUTLS) +.if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+= --with-gnutls .else CONFIGURE_ARGS+= --without-gnutls .endif -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql .else CONFIGURE_ARGS+= --without-mysql .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgres .else CONFIGURE_ARGS+= --without-postgres .endif -.if defined(WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap .else CONFIGURE_ARGS+= --without-ldap .endif -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} CONFIGURE_ARGS+= --with-python --with-pythondir=${PYTHON_SITELIBDIR} USE_PYTHON= 2.5+ PLIST_SUB+= PYTHON="" @@ -94,7 +93,7 @@ CONFIGURE_ARGS+= --without-python PLIST_SUB+= PYTHON="@comment " .endif -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" .else