Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 11 Dec 2012 07:36:58 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r308667 - head/x11/xlockmore
Message-ID:  <201212110736.qBB7aw7D030677@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



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