From owner-svn-ports-head@FreeBSD.ORG  Wed Feb 20 23:04:38 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 91E917FD;
 Wed, 20 Feb 2013 23:04:38 +0000 (UTC)
 (envelope-from rene@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 851EB119;
 Wed, 20 Feb 2013 23:04:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1KN4csa066508;
 Wed, 20 Feb 2013 23:04:38 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1KN4cDm066507;
 Wed, 20 Feb 2013 23:04:38 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201302202304.r1KN4cDm066507@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Wed, 20 Feb 2013 23:04:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r312682 - head/mail/mdpop3d
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Feb 2013 23:04:38 -0000

Author: rene
Date: Wed Feb 20 23:04:37 2013
New Revision: 312682
URL: http://svnweb.freebsd.org/changeset/ports/312682

Log:
  - convert to optionsNG
  - convert Makefile header

Modified:
  head/mail/mdpop3d/Makefile

Modified: head/mail/mdpop3d/Makefile
==============================================================================
--- head/mail/mdpop3d/Makefile	Wed Feb 20 22:59:10 2013	(r312681)
+++ head/mail/mdpop3d/Makefile	Wed Feb 20 23:04:37 2013	(r312682)
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	mdpop3d
-# Date created:		2 July 2006
-# Whom:			Alexander Logvinov <info@logvinov.com>
-#
+# Created by: Alexander Logvinov <info@logvinov.com>
 # $FreeBSD$
 
 PORTNAME=	mdpop3d
@@ -16,15 +13,15 @@ PLIST_FILES=	libexec/mdpop3d
 MAN8=		mdpop3d.8
 MANCOMPRESSED=	no
 
-OPTIONS=	PAM	"Build with PAM support"	off \
-		APOP	"Build with APOP command support (requires PAM)"	off
+OPTIONS_DEFINE=	PAM APOP
+APOP_DESC=	Build with APOP command support (requires PAM)
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|LIBS = -lpam -ldl|LIBS = -lpam|;/^CC[[:blank:]]*=/d' \
 		${WRKSRC}/Makefile
-.if defined(WITHOUT_PAM)
+.if ! ${PORT_OPTIONS:MPAM}
 	@${REINPLACE_CMD} -e 's|LIBS = -lpam|LIBS = -lcrypt|' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|DEFS = -DUSE_PAM|#DEFS = -DUSE_PAM|' \
@@ -32,7 +29,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|OPTS = -DUSE_APOP|#OPTS = -DUSE_APOP|' \
 		${WRKSRC}/Makefile
 .endif
-.if defined(WITHOUT_APOP)
+.if ! ${PORT_OPTIONS:MAPOP}
 	@${REINPLACE_CMD} -e 's|OPTS = -DUSE_APOP|#OPTS = -DUSE_APOP|' \
 		${WRKSRC}/Makefile
 .endif
@@ -41,4 +38,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/libexec
 	${INSTALL_MAN} ${WRKSRC}/mdpop3d.8 ${PREFIX}/man/man8
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>