From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 3 21:50:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 3897C952 for ; Mon, 3 Jun 2013 21:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 1C3C81A11 for ; Mon, 3 Jun 2013 21:50:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r53Lo0jd046197 for ; Mon, 3 Jun 2013 21:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r53Lo0Y4046184; Mon, 3 Jun 2013 21:50:00 GMT (envelope-from gnats) Resent-Date: Mon, 3 Jun 2013 21:50:00 GMT Resent-Message-Id: <201306032150.r53Lo0Y4046184@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, Matthias Andree Received: from apollo.emma.line.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by hub.freebsd.org (Postfix) with ESMTP id 39E1462F; Mon, 3 Jun 2013 21:43:41 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mandree by apollo.emma.line.org with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1UjcXU-000EZD-GA; Mon, 03 Jun 2013 23:43:40 +0200 Message-Id: Date: Mon, 03 Jun 2013 23:43:40 +0200 From: Matthias Andree To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/179276: [PATCH] mail/dovecot: convert to optionsNG Cc: miwi@FreeBSD, yds@CoolRat.org 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: Mon, 03 Jun 2013 21:50:02 -0000 >Number: 179276 >Category: ports >Synopsis: [PATCH] mail/dovecot: convert to optionsNG >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: Mon Jun 03 21:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Matthias Andree >Release: FreeBSD 9.1-RELEASE-p3 amd64 >Organization: >Environment: System: FreeBSD apollo.emma.line.org 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013 >Description: Request portmgr approval if maintainer non-responsive. - Convert to optionsNG - Improve some descriptions - Remove KQUEUE from options and enforce it: the configure script would pick it anyways even if missing - While here, cook Makefile header. Port maintainer (yds@CoolRat.org) is cc'd. Generated with FreeBSD Port Tools 0.99_7 (mode: update, diff: ports) >How-To-Repeat: >Fix: --- dovecot-1.2.17.patch begins here --- diff -ruN /usr/ports//mail/dovecot/Makefile ./Makefile --- /usr/ports//mail/dovecot/Makefile 2013-04-27 13:59:28.000000000 +0200 +++ ./Makefile 2013-06-03 23:32:31.000000000 +0200 @@ -1,9 +1,5 @@ -# New ports collection makefile for: dovecot -# Date created: 12/08/2002 -# Whom: Dominic Marks -# -# $FreeBSD: mail/dovecot/Makefile 316662 2013-04-27 11:59:28Z mva $ -# +# Created by: Dominic Marks +# $FreeBSD$ PORTNAME= dovecot PORTVERSION= 1.2.17 @@ -11,6 +7,8 @@ MASTER_SITES= http://www.dovecot.org/releases/${DOVECOTVERSION}/ \ http://www.rename-it.nl/dovecot/${DOVECOTVERSION}/ +PATCH_DIST_STRIP= -p1 + MAINTAINER= yds@CoolRat.org COMMENT= Secure and compact IMAP and POP3 servers @@ -45,7 +43,19 @@ ${PREFIX}/lib/dovecot/pop3 \ ${PREFIX}/lib/dovecot/lda -.if defined(NOPORTDOCS) +NO_OPTIONS_SORT= yes +OPTIONS_DEFINE= SSL MANAGESIEVE GSSAPI VPOPMAIL BDB LDAP PGSQL MYSQL SQLITE +# KQUEUE removed because dovecot picks it anyways +OPTIONS_DEFAULT=SSL MANAGESIEVE KQUEUE + +MANAGESIEVE_DESC= ManageSieve filter management support +VPOPMAIL_DESC= VPopMail password lookup support +SSL_DESC= SSL/TLS support through OpenSSL +GSSAPI_DESC= GSSAPI mechanism support + +.include + +.if ! ${PORT_OPTIONS:MDOCS} CONFIGURE_ARGS+= --without-docs .else DOCS= AUTHORS COPYING COPYING.LGPL COPYING.MIT INSTALL NEWS TODO README @@ -57,17 +69,6 @@ PROTOCOLS= imap pop3 -OPTIONS= KQUEUE "kqueue(2) support" on \ - SSL "SSL support" on \ - MANAGESIEVE "ManageSieve support" on \ - GSSAPI "GSSAPI support" off \ - VPOPMAIL "VPopMail support" off \ - BDB "BerkleyDB support" off \ - LDAP "OpenLDAP support" off \ - PGSQL "PostgreSQL support" off \ - MYSQL "MySQL support" off \ - SQLITE "SQLite support" off - .include .if ${ARCH} == "arm" @@ -86,15 +87,13 @@ s![[:<:]]doc/(dovecot-[^-]+)-example.conf[[:>:]]!${EXAMPLESDIR}/\1.conf!g;\ s!\#sendmail_path = /usr/.*!sendmail_path = /usr/sbin/sendmail!g; -## kqueue(2) support +## kqueue(2) support - no longer optional, dovecots picks it anyways # -.if !defined(WITHOUT_KQUEUE) CONFIGURE_ARGS+= --with-ioloop=kqueue -.endif ## SSL support # -.if defined(WITH_SSL) +.if ${PORT_OPTIONS:MSSL} PROTOCOLS+= imaps pop3s .else CONFIGURE_ARGS+= --without-ssl @@ -102,18 +101,17 @@ ## ManageSieve support # -.if defined(WITH_MANAGESIEVE) +.if ${PORT_OPTIONS:MMANAGESIEVE} MANAGESIEVEVERSION!= ${MAKE} -C ${.CURDIR}/../dovecot-managesieve -V PORTVERSION PATCH_SITES!= ${MAKE} -C ${.CURDIR}/../dovecot-managesieve -V MASTER_SITES PATCHFILES+= dovecot-${PORTVERSION}-managesieve-${MANAGESIEVEVERSION}.diff.gz -PATCH_DIST_STRIP= -p1 PROTOCOLS+= managesieve DOCS+= README.managesieve .endif ## GSSAPI support # -.if defined(WITH_GSSAPI) +.if ${PORT_OPTIONS:MGSSAPI} CONFIGURE_ARGS+= --with-gssapi .else CONFIGURE_ARGS+= --without-gssapi @@ -121,7 +119,7 @@ ## VPopMail Support # -.if defined(WITH_VPOPMAIL) +.if ${PORT_OPTIONS:MVPOPMAIL} VPOPMAIL= ${LOCALBASE}/vpopmail/bin/vchkpw BUILD_DEPENDS+= ${VPOPMAIL}:${PORTSDIR}/mail/vpopmail CONFIGURE_ARGS+= --with-vpopmail @@ -131,7 +129,7 @@ ## BDB Support # -.if defined(WITH_BDB) +.if ${PORT_OPTIONS:MBDB} USE_BDB= 42+ CONFIGURE_ARGS+= --with-db CFLAGS+= -I${BDB_INCLUDE_DIR} -L${BDB_LIB_DIR} @@ -143,7 +141,7 @@ ## OpenLDAP Support # -.if defined(WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap PLIST_SUB+= LDAP="" @@ -155,7 +153,7 @@ ## PostgreSQL Support # -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql PLIST_SUB+= SQL="" @@ -167,7 +165,7 @@ ## MySQL Support # -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql PLIST_SUB+= SQL="" @@ -179,7 +177,7 @@ ## SQLite Support # -.if defined(WITH_SQLITE) +.if ${PORT_OPTIONS:MSQLITE} USE_SQLITE= 3 CONFIGURE_ARGS+= --with-sqlite PLIST_SUB+= SQL="" @@ -219,7 +217,7 @@ | ${SED} -e 's:^@exec ::; s:%D:${PREFIX}:g;' \ > ${WRKDIR}/.PLIST.exec \ && ${SH} ${WRKDIR}/.PLIST.exec -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} .for f in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} .endfor --- dovecot-1.2.17.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: