- update to 5.40 [1]

- while here without-{gl,sx} are no longer valid options, update to optionsNG and pet portlint [2]
PR:	ports/169766
Submitted by:	umeno@rr.iij4u.or.jp [1], jgh@ [2]
Approved by:	maintainer timeout, marius@nuenneri.ch ( 15 days )

2 files changed, 57 insertions, 50 deletions

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 71579623a96c..b81b024404a9 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xlockmore
-PORTVERSION=	5.34
+PORTVERSION=	5.40
 CATEGORIES?=	x11
 MASTER_SITES=	ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
 		http://www.tux.org/~bagleyd/xlock/${PORTNAME}-${PORTVERSION}/ \
@@ -17,42 +17,55 @@ COMMENT=	Like XLock session locker/screen saver, but just more
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-gl --without-motif --without-sx --without-ttf \
-		--without-editres --without-dtsaver --without-rplay \
-		--without-nas --without-gtk --without-esound
-.if defined(MAKE_KERBEROS4)
-CONFIGURE_ARGS+=--enable-kerberos4
-KRB4LIB=	-lcom_err -lcrypto
-.endif
-.if defined(KRB5_HOME) && exists(${KRB5_HOME})
-CONFIGURE_ARGS+=--enable-kerberos5
-CFLAGS+=	-I${KRB5_HOME}/include
-KRB5LIB=	-L${KRB5_HOME}/lib
-.endif
+CONFIGURE_ARGS=	--without-motif --without-ttf --without-editres \
+		--without-dtsaver --without-rplay --without-nas \
+		--without-gtk --without-esound
+
 USE_GNOME=	#
 USE_XORG=	x11 xaw ice
 
-LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2
+.include <bsd.port.pre.mk>
+
+LIB_DEPENDS+=	freetype:${PORTSDIR}/print/freetype2
 
 MAN1=		xlock.1
 PLIST_FILES=	bin/xlock lib/X11/app-defaults/XLock
 
-OPTIONS=MESAGL			"Enable Mesa 3D (for GL modes)"		off \
-	MB			"Enable Xmb function series"		off \
-	SYSLOG			"Enable syslog logging"			off \
-	DISABLE_ALLOW_ROOT	"Allows users to turn off allowroot"	off \
-	NICE_ONLY		"Enable only low cpu modes"		off \
-	BLANK_ONLY		"Enable blank mode only (boring)"	off \
-	PAM			"Enable PAM authentication support"	off \
-	BAD_PAM			"Xlock will ask PAM with root rights"	off \
-	GTK2			"Build Gtk2 graphical shell"		off \
-	XLOCK_GROUP		"Allow xlock group to logout"		off \
-	TIME_BOMB		"Allow autologout"			off \
-	CUSTOMIZATION		"Allow tune through resource file"	off
+OPTIONS_DEFINE=	MESAGL MB SYSLOG DISABLE_ALLOW_ROOT NICE_ONLY BLANK_ONLY \
+		KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION
 
-.include <bsd.port.pre.mk>
+MESAGL_DESC=	Mesa 3D (for GL modes)
+MB_DESC=	Xmb function series
+SYSLOG_DESC=	Syslog logging
+DISABLE_ALLOW_ROOT_DESC=	Allows users to turn off allowroot
+NICE_ONLY_DESC=	Only low cpu modes
+BLANK_ONLY_DESC=	Blank mode only (boring)
+BAD_PAM_DESC=	Xlock will ask PAM with root rights
+GTK2_DESC=	Build Gtk2 graphical shell
+XLOCK_GROUP_DESC=	Allow xlock group to logout
+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
 
-.if defined(WITH_MESAGL)
+NO_OPTIONS_SORT=yes
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MKERBEROS4}
+CONFIGURE_ARGS+=--enable-kerberos4
+KRB4LIB=	-lcom_err -lcrypto
+.endif
+.if defined(KRB5_HOME) && exists(${KRB5_HOME})
+CONFIGURE_ARGS+=--enable-kerberos5
+CFLAGS+=	-I${KRB5_HOME}/include
+KRB5LIB=	-L${KRB5_HOME}/lib
+.endif
+
+.if ${PORT_OPTIONS:MMESAGL}
 CONFIGURE_ARGS+=	--with-mesa
 MESALIB=${PTHREAD_LIBS}
 USE_GL=	yes
@@ -61,42 +74,39 @@ CFLAGS+=	-I${LOCALBASE}/include/FTGL
 CONFIGURE_ARGS+=	--without-mesa --without-opengl
 .endif
 
-.if defined(WITH_NICE_ONLY)
+.if ${PORT_OPTIONS:MNICE_ONLY}
 CONFIGURE_ARGS+=	--enable-nice-only
 .endif
 
-.if defined(WITH_BAD_PAM)
+.if ${PORT_OPTIONS:MBAD_PAM}
 CONFIGURE_ARGS+=	--enable-bad-pam
 .endif
 
-.if defined(WITH_PAM)
+.if ${PORT_OPTIONS:MPAM}
 CONFIGURE_ARGS+=	--enable-pam
-.if defined(WITH_XLOCK_GROUP)
-BROKEN=			PAM and xlock group simultaneously breaks the build
-.endif
 .endif
 
-.if defined(WITH_NICE_ONLY)
+.if ${PORT_OPTIONS:MNICE_ONLY}
 CONFIGURE_ARGS+=	--enable-nice-only
 .endif
 
-.if defined(WITH_BLANK_ONLY)
+.if ${PORT_OPTIONS:MBLANK_ONLY}
 CONFIGURE_ARGS+=	--enable-blank-only
 .endif
 
-.if defined(WITH_MB)
+.if ${PORT_OPTIONS:MMB}
 CONFIGURE_ARGS+=	--enable-use-mb
 .endif
 
-.if defined(XLOCKMORE_LANG)
+.if ${PORT_OPTIONS:MXLOCKMORE_LANG}
 CONFIGURE_ARGS+=	--with-lang=${XLOCKMORE_LANG}
 .endif
 
-.if defined(WITH_SYSLOG)
+.if ${PORT_OPTIONS:MSYSLOG}
 CONFIGURE_ARGS+=	--enable-syslog
 .endif
 
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 CONFIGURE_ARGS+=	--with-gtk2
 USE_GNOME+=	gtk20
 PLIST_FILES+=	bin/xglock share/xlock/xglockrc
@@ -105,30 +115,27 @@ PLIST_DIRS+=	share/xlock
 CONFIGURE_ARGS+=	--without-gtk2
 .endif
 
-.if defined(WITH_XLOCK_GROUP)
+.if ${PORT_OPTIONS:MXLOCK_GROUP}
 CONFIGURE_ARGS+=	--enable-xlock-group
-.if defined(WITH_PAM)
-BROKEN=			PAM and xlock group simultaneously breaks the build
-.endif
 .endif
 
-.if defined(WITH_TIME_BOMB)
+.if ${PORT_OPTIONS:MTIME_BOMB)
 CONFIGURE_ARGS+=	--enable-bomb
 .else
 CONFIGURE_ARGS+=	--disable-bomb
 .endif
 
-.if defined(WITH_CUSTOMIZATION)
+.if ${PORT_OPTIONS:MCUSTOMIZATION)
 CONFIGURE_ARGS+=	--enable-customization
 .endif
 
 CONFIGURE_ENV+=		XLOCKLIBS="${KRB5LIB} ${KRB4LIB} ${MESALIB}"
 
-.if defined(WITH_DISABLE_ALLOW_ROOT)
+.if ${PORT_OPTIONS:MDISABLE_ALLOW_ROOT)
 CONFIGURE_ARGS+=	--disable-allow-root
 .endif
 
-.if defined(WITH_PAM) && !defined (WITH_BAD_PAM)
+.if ${PORT_OPTIONS:MPAM} && empty(PORT_OPTIONS:MBAD_PAM)
 pre-extract:
 	@${ECHO}
 	@${ECHO} "You have enabled PAM support. If you want to authenticate against"
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index d481b0e4fdbe..43d93754dd5c 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xlockmore-5.34.tar.bz2) = f83275b86ac2ab0a6c793a3d028040e41e42bbf924adc27b995be29e94ff4264
-SIZE (xlockmore-5.34.tar.bz2) = 1955203
+SHA256 (xlockmore-5.40.tar.bz2) = 38ff3e32983b3f9df957431f7f8ed50e823d10246aeb0319e83876793ce5c1b3
+SIZE (xlockmore-5.40.tar.bz2) = 1962001