From owner-svn-ports-all@freebsd.org  Mon Jan  4 07:10:16 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 46779A5FFD5;
 Mon,  4 Jan 2016 07:10:16 +0000 (UTC)
 (envelope-from miwi@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1705810FF;
 Mon,  4 Jan 2016 07:10:16 +0000 (UTC)
 (envelope-from miwi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u047AFZZ083133;
 Mon, 4 Jan 2016 07:10:15 GMT (envelope-from miwi@FreeBSD.org)
Received: (from miwi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u047AFXp083132;
 Mon, 4 Jan 2016 07:10:15 GMT (envelope-from miwi@FreeBSD.org)
Message-Id: <201601040710.u047AFXp083132@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: miwi set sender to
 miwi@FreeBSD.org using -f
From: Martin Wilke <miwi@FreeBSD.org>
Date: Mon, 4 Jan 2016 07:10:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r405217 - head/mail/emailrelay
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jan 2016 07:10:16 -0000

Author: miwi
Date: Mon Jan  4 07:10:15 2016
New Revision: 405217
URL: https://svnweb.freebsd.org/changeset/ports/405217

Log:
  - Make IPV6 optional
  
  On system without any IPv6 addresses emailrelay fails to start with messages:
  # service emailrelay start
  emailrelay: error: cannot bind the listening port: :::25
  emailrelay: exception: cannot bind the listening port: :::25
  /usr/local/etc/rc.d/emailrelay: WARNING: failed to start emailrelay
  
  PR:		204126
  Submitted by:	Dmitry Afanasiev
  Approved by:	maintainer timeout

Modified:
  head/mail/emailrelay/Makefile

Modified: head/mail/emailrelay/Makefile
==============================================================================
--- head/mail/emailrelay/Makefile	Mon Jan  4 07:03:16 2016	(r405216)
+++ head/mail/emailrelay/Makefile	Mon Jan  4 07:10:15 2016	(r405217)
@@ -3,6 +3,7 @@
 
 PORTNAME=	emailrelay
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF
 EXTRACT_SUFX=	-src.tar.gz
@@ -16,10 +17,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		autoreconf pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	e_spooldir=${PREFIX}/var/spool/emailrelay
-CONFIGURE_ARGS=	--without-pam --enable-ipv6
+CONFIGURE_ARGS=	--without-pam
 USE_RC_SUBR=	${PORTNAME}
 
-OPTIONS_DEFINE=		DOCS DOXYGEN GUI OPENSSL
+OPTIONS_DEFINE=		DOCS DOXYGEN GUI OPENSSL IPV6
 OPTIONS_DEFAULT=	OPENSSL
 OPTIONS_SUB=		yes
 
@@ -33,6 +34,8 @@ GUI_USE=		QT4=gui,moc
 OPENSSL_CONFIGURE_WITH=	openssl
 OPENSSL_USE=		OPENSSL=yes
 
+IPV6_CONFIGURE_ENABLE=	ipv6
+
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/etc/emailrelay.auth.template \
 		${STAGEDIR}${PREFIX}/etc/emailrelay.auth.sample