Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 Sep 2012 15:18:43 +0000 (UTC)
From:      Dirk Meyer <dinoex@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r304356 - in head/mail: popa3d popa3d-before-sendmail
Message-ID:  <201209161518.q8GFIhDc015855@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dinoex
Date: Sun Sep 16 15:18:42 2012
New Revision: 304356
URL: http://svn.freebsd.org/changeset/ports/304356

Log:
  - use OPTIONS_DEFINE

Modified:
  head/mail/popa3d-before-sendmail/Makefile
  head/mail/popa3d/Makefile

Modified: head/mail/popa3d-before-sendmail/Makefile
==============================================================================
--- head/mail/popa3d-before-sendmail/Makefile	Sun Sep 16 15:08:09 2012	(r304355)
+++ head/mail/popa3d-before-sendmail/Makefile	Sun Sep 16 15:18:42 2012	(r304356)
@@ -12,9 +12,7 @@ MAINTAINER=	dinoex@FreeBSD.org
 WITH_SMTP_AFTER_POP3=	yes
 MASTERDIR?=	${.CURDIR}/../popa3d
 
-OPTIONS?=	SMTP_AFTER_POP3 "Enable SMTP-after-POP mode" on \
-		STANDALONE_POP3 "Enable standalone server mode" off \
-		SETPROCTITLE "Enable setproctitle mode" off
+OPTIONS_DEFAULT=	SMTP_AFTER_POP3
 
 .if exists(${.CURDIR}/Makefile.local)
 .include "${.CURDIR}/Makefile.local"

Modified: head/mail/popa3d/Makefile
==============================================================================
--- head/mail/popa3d/Makefile	Sun Sep 16 15:08:09 2012	(r304355)
+++ head/mail/popa3d/Makefile	Sun Sep 16 15:18:42 2012	(r304356)
@@ -22,21 +22,15 @@ PLIST=		${WRKDIR}/.PLIST.more
 CFLAGS+=	-DPREFIX=${PREFIX}
 UNIQUENAME=	${.CURDIR:T}
 
-OPTIONS?=	SMTP_AFTER_POP3 "Enable SMTP-after-POP mode" off \
-		STANDALONE_POP3 "Enable standalone server mode" off \
-		SETPROCTITLE "Enable setproctitle mode" off
+OPTIONS_DEFINE=	SMTP_AFTER_POP3 STANDALONE_POP3 SETPROCTITLE
+NO_OPTIONS_SORT=yes
+SMTP_AFTER_POP3_DESC=Enable SMTP-after-POP support
+STANDALONE_POP3_DESC=Enable standalone server mode
+SETPROCTITLE_DESC=Enable setproctitle() support
 
 .include <bsd.port.options.mk>
 
-# honor old flags
-.if defined(STANDALONE_POP3)
-WITH_STANDALONE_POP3=	yes
-.endif
-.if defined(SMTP_AFTER_POP3)
-WITH_SMTP_AFTER_POP3=	yes
-.endif
-
-.if defined(WITH_STANDALONE_POP3)
+.if ${PORT_OPTIONS:MSTANDALONE_POP3}
 STANDALONE_SUFFIX=	-standalone
 PLIST_SUB+=	STANDALONE_POP3=""
 CONFLICTS?=	popa3d-0.* popa3d-before-sendmail-0.*
@@ -48,7 +42,7 @@ SUB_FILES=	pkg-message
 PLIST_SUB+=	STANDALONE_POP3="@comment "
 .endif
 
-.if defined(WITH_SMTP_AFTER_POP3)
+.if ${PORT_OPTIONS:MSMTP_AFTER_POP3}
 SMTP_AFTER_POP3_SUFFIX=	-before-sendmail
 EXTRA_PATCHES+=	${FILESDIR}/pop-before-sendmail.patch
 PLIST_SUB+=	SMTP_AFTER_POP3=""
@@ -58,7 +52,7 @@ PLIST_SUB+=	SMTP_AFTER_POP3="@comment "
 CONFLICTS?=	popa3d-standalone-0.* popa3d-before-sendmail-0.*
 .endif
 
-.if defined(WITH_SETPROCTITLE)
+.if ${PORT_OPTIONS:MSETPROCTITLE}
 EXTRA_PATCHES+=	${FILESDIR}/setproctitle.patch
 .endif
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209161518.q8GFIhDc015855>