From owner-svn-ports-all@FreeBSD.ORG Thu Oct 11 13:24:42 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 18D03E7A; Thu, 11 Oct 2012 13:24:42 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F41BB8FC14; Thu, 11 Oct 2012 13:24:41 +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 q9BDOfiH029116; Thu, 11 Oct 2012 13:24:41 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9BDOfdH029113; Thu, 11 Oct 2012 13:24:41 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201210111324.q9BDOfdH029113@svn.freebsd.org> From: Ruslan Mahmatkhanov Date: Thu, 11 Oct 2012 13:24:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305720 - head/mail/dbmail22 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: Thu, 11 Oct 2012 13:24:42 -0000 Author: rm Date: Thu Oct 11 13:24:41 2012 New Revision: 305720 URL: http://svn.freebsd.org/changeset/ports/305720 Log: - convert to optionsng while here: - trim Makefile header - remove indefinite article - remove conflicts with port versions we don't have in the tree - fix portlint warning (shlib versions) - remove redundant MANCOMPRESSED=no - use bsd.port.options.mk instead of bsd.port.pre/post.mk - tab -> space change in pkg-descr:WWW PR: 172380 Submitted by: Alan Hicks (maintainer) Feature safe: yes Modified: head/mail/dbmail22/Makefile head/mail/dbmail22/pkg-descr Modified: head/mail/dbmail22/Makefile ============================================================================== --- head/mail/dbmail22/Makefile Thu Oct 11 13:23:57 2012 (r305719) +++ head/mail/dbmail22/Makefile Thu Oct 11 13:24:41 2012 (r305720) @@ -1,9 +1,5 @@ -# New ports collection makefile for: dbmail -# Date created: 07/26/2003 -# Whom: Clement Laforet -# +# Created by: Clement Laforet # $FreeBSD$ -# PORTNAME= dbmail PORTVERSION= 2.2.18 @@ -11,19 +7,17 @@ CATEGORIES= mail MASTER_SITES= http://www.dbmail.org/download/2.2/ MAINTAINER= ahicks@p-o.co.uk -COMMENT= An SQL database-based mail system (POP3 and IMAP) +COMMENT= SQL database-based mail system (POP3 and IMAP) LICENSE= GPLv2 -LIB_DEPENDS= gmime-2.0.4:${PORTSDIR}/mail/gmime2 +LIB_DEPENDS= gmime-2.0:${PORTSDIR}/mail/gmime2 -CONFLICTS= dbmail-*-2.0.* dbmail-2.1.* dbmail-3.* +CONFLICTS= dbmail-3.* -OPTIONS= MYSQL "Build with MySQL support" on \ - POSTGRESQL "Build with PostgreSQL support" off \ - SQLITE "Build with SQLite support" off \ - SIEVE "Build w. support for Sieve mail sorting language" off \ - LDAP "Build with support for LDAP authentication" off +OPTIONS_DEFINE= MYSQL PGSQL SQLITE SIEVE LDAP +OPTIONS_DEFAULT=MYSQL +SIEVE_DESC= Support for Sieve mail sorting language LATEST_LINK= dbmail22 USE_AUTOTOOLS= libtool @@ -49,7 +43,6 @@ MAN5= dbmail.conf.5 MAN8= dbmail-export.8 dbmail-imapd.8 dbmail-lmtpd.8 \ dbmail-pop3d.8 dbmail-sievecmd.8 dbmail-timsieved.8 \ dbmail-users.8 dbmail-util.8 -MANCOMPRESSED= no SUB_FILES= pkg-message PLIST_SUB+= PORTNAME=${PORTNAME} @@ -59,9 +52,9 @@ PLIST_SUB+= PORTDOCS="@comment " PLIST_SUB+= PORTDOCS="" .endif -.include +.include -.if !defined(WITHOUT_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} CONFIGURE_ARGS+=--with-mysql USE_MYSQL= yes DATABASE+= mysql @@ -70,7 +63,7 @@ PLIST_SUB+= MYSQL="" PLIST_SUB+= MYSQL="@comment " .endif -.if defined(WITH_POSTGRESQL) +.if ${PORT_OPTIONS:MPGSQL} CONFIGURE_ARGS+=--with-pgsql USE_PGSQL= yes DATABASE+= postgresql @@ -79,7 +72,7 @@ PLIST_SUB+= PGSQL="" PLIST_SUB+= PGSQL="@comment " .endif -.if defined(WITH_SQLITE) +.if ${PORT_OPTIONS:MSQLITE} CONFIGURE_ARGS+=--with-sqlite USE_SQLITE= yes DATABASE+= sqlite @@ -88,15 +81,15 @@ PLIST_SUB+= SQLITE="" PLIST_SUB+= SQLITE="@comment " .endif -.if defined(WITH_SIEVE) +.if ${PORT_OPTIONS:MSIEVE} CONFIGURE_ARGS+=--with-sieve=${LOCALBASE}/include -LIB_DEPENDS+= sieve.1:${PORTSDIR}/mail/libsieve +LIB_DEPENDS+= sieve:${PORTSDIR}/mail/libsieve PLIST_SUB+= SIEVE="" .else PLIST_SUB+= SIEVE="@comment " .endif -.if defined(WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} CONFIGURE_ARGS+=--with-auth-ldap=${LOCALBASE}/include USE_OPENLDAP= yes PLIST_SUB+= LDAP="" @@ -104,7 +97,7 @@ PLIST_SUB+= LDAP="" PLIST_SUB+= LDAP="@comment " .endif -.if defined(WITHOUT_MYSQL) && !defined(WITH_POSTGRESQL) && !defined(WITH_SQLITE) +.if empty(${PORT_OPTIONS:MMYSQL}) && empty(${PORT_OPTIONS:MPGSQL}) && empty(${PORT_OPTIONS:MSQLITE}) IGNORE="requires at least one database backend selected. Run 'make config'" .endif @@ -141,4 +134,4 @@ post-install: .endif @${CAT} ${PKGMESSAGE} -.include +.include Modified: head/mail/dbmail22/pkg-descr ============================================================================== --- head/mail/dbmail22/pkg-descr Thu Oct 11 13:23:57 2012 (r305719) +++ head/mail/dbmail22/pkg-descr Thu Oct 11 13:24:41 2012 (r305720) @@ -21,4 +21,4 @@ PostgreSQL or SQLite). Changes on a Dbmail system (adding of users, changing passwords etc.) are effective immediately. -WWW: http://www.dbmail.org/ +WWW: http://www.dbmail.org/