From owner-svn-ports-all@FreeBSD.ORG  Sun Sep 16 15:39:49 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 136E4106566B;
	Sun, 16 Sep 2012 15:39:49 +0000 (UTC)
	(envelope-from dinoex@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F28C68FC0A;
	Sun, 16 Sep 2012 15:39:48 +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 q8GFdm4q020207;
	Sun, 16 Sep 2012 15:39:48 GMT (envelope-from dinoex@svn.freebsd.org)
Received: (from dinoex@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8GFdmtC020205;
	Sun, 16 Sep 2012 15:39:48 GMT (envelope-from dinoex@svn.freebsd.org)
Message-Id: <201209161539.q8GFdmtC020205@svn.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sun, 16 Sep 2012 15:39:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304362 - head/mail/popa3d
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Sun, 16 Sep 2012 15:39:49 -0000

Author: dinoex
Date: Sun Sep 16 15:39:48 2012
New Revision: 304362
URL: http://svn.freebsd.org/changeset/ports/304362

Log:
  - use OPTIONS_DEFINE

Modified:
  head/mail/popa3d/Makefile

Modified: head/mail/popa3d/Makefile
==============================================================================
--- head/mail/popa3d/Makefile	Sun Sep 16 15:36:13 2012	(r304361)
+++ head/mail/popa3d/Makefile	Sun Sep 16 15:39:48 2012	(r304362)
@@ -66,11 +66,12 @@ pre-configure:
 	@${ECHO_CMD} "@exec ${MKDIR} %D/empty" >>${PLIST}
 	@${ECHO_CMD} "@dirrm empty" >>${PLIST}
 .endif
-.if defined(WITH_SMTP_AFTER_POP3) && !defined(WITHOUT_POPAUTH_M4)
+
+.if ${PORT_OPTIONS:MSMTP_AFTER_POP3} && !defined(WITHOUT_POPAUTH_M4)
 	@${ECHO_CMD} "@cwd ${CFDIR}" >>${PLIST}
 	@${ECHO_CMD} "hack/popauth.m4" >>${PLIST}
 .endif
-.if defined(WITH_STANDALONE_POP3)
+.if ${PORT_OPTIONS:MSTANDALONE_POP3}
 	@${REINPLACE_CMD} -e 's|^\(#define POP_STANDALONE\).*|\1 1|' \
 		${WRKSRC}/params.h
 .endif
@@ -89,7 +90,7 @@ do-install:
 	${INSTALL} ${COPY} -o root -g wheel -m 500 \
 	    ${WRKSRC}/popa3d ${PREFIX}/libexec/popa3d
 	${INSTALL_MAN} ${WRKSRC}/popa3d.8 ${MANPREFIX}/man/man8/
-.if defined(WITH_SMTP_AFTER_POP3) && !defined(WITHOUT_POPAUTH_M4)
+.if ${PORT_OPTIONS:MSMTP_AFTER_POP3} && !defined(WITHOUT_POPAUTH_M4)
 	${INSTALL_DATA} ${FILESDIR}/popauth.m4 ${CFDIR}/hack/
 .endif
 
@@ -97,12 +98,12 @@ do-install:
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/DESIGN ${DOCSDIR}/
 	${INSTALL_MAN} ${WRKSRC}/LICENSE ${DOCSDIR}/
-.if defined(WITH_SMTP_AFTER_POP3)
+.if ${PORT_OPTIONS:MSMTP_AFTER_POP3}
 	${INSTALL_DATA} ${FILESDIR}/POPAUTH ${DOCSDIR}/
 .endif
 .endif
 
-.if !defined(WITH_STANDALONE_POP3)
+.if ${PORT_OPTIONS:MSTANDALONE_POP3}
 post-install:
 	@ ${CAT} ${PKGMESSAGE}
 .endif