From owner-svn-ports-all@FreeBSD.ORG  Tue Dec 11 07:36:58 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 85991687;
 Tue, 11 Dec 2012 07:36:58 +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 6AAF98FC27;
 Tue, 11 Dec 2012 07:36:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBB7awh6030678;
 Tue, 11 Dec 2012 07:36:58 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBB7aw7D030677;
 Tue, 11 Dec 2012 07:36:58 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212110736.qBB7aw7D030677@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 11 Dec 2012 07:36:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308667 - head/x11/xlockmore
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: Tue, 11 Dec 2012 07:36:58 -0000

Author: bapt
Date: Tue Dec 11 07:36:57 2012
New Revision: 308667
URL: http://svnweb.freebsd.org/changeset/ports/308667

Log:
  Convert SINGLE to RADIO option
  Removed useless bsd.port.{pre,post}.mk which was wrong and used to work by
  accident, bsd.port.options.mk should never be included after bsd.port.pre.mk
  
  Reported by:	flo
  Reviewed by:	jgh (maintainer)

Modified:
  head/x11/xlockmore/Makefile

Modified: head/x11/xlockmore/Makefile
==============================================================================
--- head/x11/xlockmore/Makefile	Tue Dec 11 07:29:59 2012	(r308666)
+++ head/x11/xlockmore/Makefile	Tue Dec 11 07:36:57 2012	(r308667)
@@ -21,8 +21,6 @@ CONFIGURE_ARGS=	--without-motif --withou
 USE_GNOME=	#
 USE_XORG=	x11 xaw ice
 
-.include <bsd.port.pre.mk>
-
 LIB_DEPENDS+=	freetype:${PORTSDIR}/print/freetype2
 
 MAN1=		xlock.1
@@ -43,10 +41,8 @@ XLOCK_GROUP_DESC=	Allow xlock group to l
 TIME_BOMB_DESC=	Allow autologout
 CUSTOMIZATION_DESC=	Allow tune through resource file
 
-OPTIONS_DEFINE+=	ONE
-OPTIONS_SINGLE=	ONE
-OPTIONS_SINGLE_ONE=	PAM XLOCK_GROUP
-ONE_DESC=	Choose one of PAM or XLOCK_GROUP
+OPTIONS_RADIO=	ONE
+OPTIONS_RADIO_ONE=	PAM XLOCK_GROUP
 
 NO_OPTIONS_SORT=yes
 
@@ -147,4 +143,4 @@ post-patch:
 post-configure:
 	${REINPLACE_CMD} -e 's/-lXdpms//g' ${WRKSRC}/modes/Makefile
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>