From owner-svn-ports-all@FreeBSD.ORG  Mon Dec 31 12:36:46 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 CD024B7E;
 Mon, 31 Dec 2012 12:36:46 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B21D78FC08;
 Mon, 31 Dec 2012 12:36:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBVCakED031582;
 Mon, 31 Dec 2012 12:36:46 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBVCaknQ031581;
 Mon, 31 Dec 2012 12:36:46 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212311236.qBVCaknQ031581@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 31 Dec 2012 12:36:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309728 - head/mail/prayer
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Dec 2012 12:36:46 -0000

Author: bapt
Date: Mon Dec 31 12:36:46 2012
New Revision: 309728
URL: http://svnweb.freebsd.org/changeset/ports/309728

Log:
  Finish conversion to optionsng
  Trim headers

Modified:
  head/mail/prayer/Makefile

Modified: head/mail/prayer/Makefile
==============================================================================
--- head/mail/prayer/Makefile	Mon Dec 31 12:23:29 2012	(r309727)
+++ head/mail/prayer/Makefile	Mon Dec 31 12:36:46 2012	(r309728)
@@ -9,9 +9,8 @@ MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Prayer Webmail System
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/docs/LICENCE
 
-LIB_DEPENDS=	c-client4.9:${PORTSDIR}/mail/cclient
+LIB_DEPENDS=	c-client4:${PORTSDIR}/mail/cclient
 
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
@@ -26,7 +25,7 @@ PORTDOCS=	ACCOUNTD CMD_LINE DESIGN DONE 
 
 USE_RC_SUBR=	prayer
 
-OPTIONS_DEFINE=	SESSIONCACHE TIDY SSL LDAP
+OPTIONS_DEFINE=	SESSIONCACHE TIDY SSL LDAP DOCS
 OPTIONS_DEFAULT=	SESSIONCACHE TIDY SSL LDAP
 
 SESSIONCACHE_DESC=	Activate Session Cache
@@ -37,7 +36,7 @@ GROUPS=		prayer
 MAN5=		prayer.cf.5
 MAN8=		prayer-session.8 prayer-ssl-prune.8 prayer.8
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSESSIONCACHE}
 USE_BDB=	yes
@@ -64,7 +63,7 @@ post-patch:
 	@${REINPLACE_CMD} "s#%%PREFIX%%#${PREFIX}#" ${WRKSRC}/Config
 
 post-configure:
-.if defined(WITH_SESSIONCACHE)
+.if ${PORT_OPTIONS:MSESSIONCACHE}
 	@${REINPLACE_CMD} "s|^#DB_INCLUDE=.*|DB_INCLUDE=-I${BDB_INCLUDE_DIR}|" ${WRKSRC}/Config
 	@${REINPLACE_CMD} "s|^#DB_LIBS=.*|DB_LIBS=-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}|" ${WRKSRC}/Config
 .else
@@ -72,17 +71,17 @@ post-configure:
 .endif
 	@${REINPLACE_CMD} "s#^RW_USER    = prayer#RW_USER    = _prayer#" ${WRKSRC}/Config
 
-.if defined(WITHOUT_SSL)
-	@${REINPLACE_CMD} "s#^SSL_ENABLE           = true#SSL_ENABLE           = false#" ${WRKSRC}/Config
-.else
+.if ${PORT_OPTIONS:MSSL}
 	@${REINPLACE_CMD} "s#CCLIENT_SSL_ENABLE   = false#CCLIENT_SSL_ENABLE   = true#" ${WRKSRC}/Config
+.else
+	@${REINPLACE_CMD} "s#^SSL_ENABLE           = true#SSL_ENABLE           = false#" ${WRKSRC}/Config
 .endif
 
-.if defined(WITHOUT_LDAP)
+.if ! ${PORT_OPTIONS:MLDAP}
 	@${REINPLACE_CMD} "s#LDAP_ENABLE          = true#LDAP_ENABLE          = false#" ${WRKSRC}/Config
 .endif
 
-.if defined(WITHOUT_TIDY)
+.if ! ${PORT_OPTIONS:MTIDY}
 	@${REINPLACE_CMD} "s#TIDY_ENABLE          = true#TIDY_ENABLE          = false#" ${WRKSRC}/Config
 .else
 	@${REINPLACE_CMD} "s#TIDY_INCLUDE=-I/usr/include/tidy#TIDY_INCLUDE=-I${LOCALBASE}/include/tidy#" ${WRKSRC}/Config
@@ -92,9 +91,9 @@ pre-install:
 	@${MKDIR} ${PREFIX}/etc/prayer
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/docs && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>