From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 9 22:30:29 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4D46C362 for ; Tue, 9 Oct 2012 22:30:29 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id 24B2A8FC30 for ; Tue, 9 Oct 2012 22:30:29 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q99MUTJC043771 for ; Tue, 9 Oct 2012 22:30:29 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q99MUTNx043770; Tue, 9 Oct 2012 22:30:29 GMT (envelope-from gnats) Resent-Date: Tue, 9 Oct 2012 22:30:29 GMT Resent-Message-Id: <201210092230.q99MUTNx043770@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Gabor Pali Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 24EDB5F0 for ; Tue, 9 Oct 2012 18:34:57 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 035628FC1D for ; Tue, 9 Oct 2012 18:34:57 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q99IYuOj042659 for ; Tue, 9 Oct 2012 18:34:56 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q99IYu8n042645; Tue, 9 Oct 2012 18:34:56 GMT (envelope-from nobody) Message-Id: <201210091834.q99IYu8n042645@red.freebsd.org> Date: Tue, 9 Oct 2012 18:34:56 GMT From: Gabor Pali To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/172555: [mail/mailutils] OptionsNG Conversion X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Oct 2012 22:30:29 -0000 >Number: 172555 >Category: ports >Synopsis: [mail/mailutils] OptionsNG Conversion >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Oct 09 22:30:28 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Gabor Pali >Release: n/a >Organization: The FreeBSD Project >Environment: n/a >Description: - Convert options to OptionsNG format >How-To-Repeat: >Fix: See the attached patch. Patch attached with submission follows: diff --git a/mail/mailutils/Makefile b/mail/mailutils/Makefile index 98e4174..7aa23a0 100644 --- a/mail/mailutils/Makefile +++ b/mail/mailutils/Makefile @@ -23,32 +23,35 @@ USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/${PORTNAME} 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 +60,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 +97,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 >Release-Note: >Audit-Trail: >Unformatted: