Date: Tue, 10 Jul 2012 22:42:50 -0700 From: Jason Helfman <jgh@FreeBSD.org> To: marius@nuenneri.ch, freebsd-ports-bugs@FreeBSD.org Cc: umeno@rr.iij4u.or.jp Subject: Re: ports/169766: Update request: x11/xlockmore to 5.40 Message-ID: <20120711054250.GA26377@dormouse.experts-exchange.com> In-Reply-To: <201207102321.q6ANLP9a086964@freefall.freebsd.org> References: <201207102321.q6ANLP9a086964@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--RnlQjJ0d97Da+TV1 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Please consider this diff. It uses new options framework and simplifies checking of pam and xlock_group, by defining a group and being required to only choose one of the options. Also, a couple of the configure options are no longer valid. Thanks! -jgh -- Jason Helfman FreeBSD Committer | http://people.freebsd.org/~jgh | The Power To Serve --RnlQjJ0d97Da+TV1 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="xlockmore.diff" ? work Index: Makefile =================================================================== RCS file: /home/pcvs/ports/x11/xlockmore/Makefile,v retrieving revision 1.126 diff -u -r1.126 Makefile --- Makefile 14 Sep 2011 16:57:10 -0000 1.126 +++ Makefile 11 Jul 2012 05:37:35 -0000 @@ -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,10 +17,13 @@ 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= --without-motif --without-ttf --without-editres \ + --without-dtsaver --without-rplay --without-nas \ + --without-gtk --without-esound + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MKERBEROS4} CONFIGURE_ARGS+=--enable-kerberos4 KRB4LIB= -lcom_err -lcrypto .endif @@ -32,27 +35,34 @@ USE_GNOME= # USE_XORG= x11 xaw ice -LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2 +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 + +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+= PAMX +OPTIONS_SINGLE= PAMX +OPTIONS_SINGLE_PAMX= PAM XLOCK_GROUP +PAMX_DESC= Choose one of PAM or XLOCK_GROUP .include <bsd.port.pre.mk> -.if defined(WITH_MESAGL) +.if ${PORT_OPTIONS:MMESAGL} CONFIGURE_ARGS+= --with-mesa MESALIB=${PTHREAD_LIBS} USE_GL= yes @@ -61,42 +71,39 @@ 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 +112,27 @@ 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" Index: distinfo =================================================================== RCS file: /home/pcvs/ports/x11/xlockmore/distinfo,v retrieving revision 1.68 diff -u -r1.68 distinfo --- distinfo 14 Sep 2011 16:57:10 -0000 1.68 +++ distinfo 11 Jul 2012 05:37:35 -0000 @@ -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 --RnlQjJ0d97Da+TV1--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120711054250.GA26377>