Index: branches/2017Q1/x11/xlockmore/Makefile =================================================================== --- branches/2017Q1/x11/xlockmore/Makefile (revision 436623) +++ branches/2017Q1/x11/xlockmore/Makefile (revision 436624) @@ -1,165 +1,169 @@ # Created by: Scott Mace # $FreeBSD$ PORTNAME= xlockmore -PORTVERSION= 5.46 -PORTREVISION= 1 +PORTVERSION= 5.51 CATEGORIES?= x11 -MASTER_SITES= http://www.tux.org/~bagleyd/xlock/ \ +MASTER_SITES= http://www.sillycycle.com/xlock/ \ LOCAL/jgh/x11/${PORTNAME}/ MAINTAINER= jgh@FreeBSD.org COMMENT= Like XLock session locker/screen saver, but just more +LICENSE= BSD2CLAUSE + USES= tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-motif --without-ttf --without-editres \ --without-dtsaver --without-rplay --without-nas \ --without-gtk --without-esound --disable-setuid USE_GNOME= # -USE_XORG= x11 xaw ice +USE_XORG= x11 xaw ice sm xpm xext xinerama LIB_DEPENDS+= libfreetype.so:print/freetype2 OPTIONS_DEFINE= MESAGL MB SYSLOG DISABLE_ALLOW_ROOT NICE_ONLY BLANK_ONLY \ KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION MAGICK JP \ XINERAMA OPTIONS_DEFAULT= XINERAMA OPTIONS_SUB= yes 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 JP_DESC= Japanese Language Support OPTIONS_RADIO= ONE OPTIONS_RADIO_ONE= PAM XLOCK_GROUP NO_OPTIONS_SORT=yes -MAKE_ARGS+= bindir=${STAGEDIR}${PREFIX}/bin \ - mandir=${STAGEDIR}${PREFIX}/man/man1 \ - datarootdir=${STAGEDIR}${PREFIX}/share \ +MAKE_ARGS+= bindir=${PREFIX}/bin \ + mandir=${PREFIX}/man/man1 \ + datarootdir=${PREFIX}/share \ xapploaddir=${PREFIX}/lib/X11/app-defaults .include .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= -lpthread USE_GL= yes CFLAGS+= -I${LOCALBASE}/include/FTGL -I${LOCALBASE}/include/freetype2 .else CONFIGURE_ARGS+= --without-mesa --without-opengl .endif .if ${PORT_OPTIONS:MNICE_ONLY} CONFIGURE_ARGS+= --enable-nice-only .endif .if ${PORT_OPTIONS:MBAD_PAM} CONFIGURE_ARGS+= --enable-bad-pam .endif .if ${PORT_OPTIONS:MPAM} CONFIGURE_ARGS+= --enable-pam .endif .if ${PORT_OPTIONS:MNICE_ONLY} CONFIGURE_ARGS+= --enable-nice-only .endif .if ${PORT_OPTIONS:MBLANK_ONLY} CONFIGURE_ARGS+= --enable-blank-only .endif .if ${PORT_OPTIONS:MMB} CONFIGURE_ARGS+= --enable-use-mb .endif .if ${PORT_OPTIONS:MJP} XLOCKMORE_LANG= ja CATEGORIES+= japanese PORT_OPTIONS+= MB .endif .if defined(XLOCKMORE_LANG) CONFIGURE_ARGS+= --with-lang=${XLOCKMORE_LANG} .endif .if ${PORT_OPTIONS:MSYSLOG} CONFIGURE_ARGS+= --enable-syslog .endif .if ${PORT_OPTIONS:MGTK2} CONFIGURE_ARGS+= --with-gtk2 USE_GNOME+= gtk20 .else CONFIGURE_ARGS+= --without-gtk2 .endif .if ${PORT_OPTIONS:MXLOCK_GROUP} CONFIGURE_ARGS+= --enable-xlock-group .endif .if ${PORT_OPTIONS:MTIME_BOMB} CONFIGURE_ARGS+= --enable-bomb .else CONFIGURE_ARGS+= --disable-bomb .endif .if ${PORT_OPTIONS:MCUSTOMIZATION} CONFIGURE_ARGS+= --enable-customization .endif .if ${PORT_OPTIONS:MMAGICK} LIB_DEPENDS+= libMagickCore-6.so:graphics/ImageMagick .else CONFIGURE_ARGS+= --without-magick .endif CONFIGURE_ENV+= XLOCKLIBS="${KRB5LIB} ${KRB4LIB} ${MESALIB}" .if ${PORT_OPTIONS:MDISABLE_ALLOW_ROOT} CONFIGURE_ARGS+= --disable-allow-root .endif .if ${PORT_OPTIONS:MXINERAMA} CONFIGURE_ARGS+= --with-xinerama .endif .if ${PORT_OPTIONS:MPAM} && empty(PORT_OPTIONS:MBAD_PAM) pre-extract: @${ECHO} @${ECHO} "You have enabled PAM support. If you want to authenticate against" @${ECHO} "root only accessible PAM modules then define WITH_BAD_PAM=yes also." @${ECHO} "For example, pam_unix requires root rights to access shadow passwords." @${ECHO} .endif post-patch: @${REINPLACE_CMD} -e '/xglockrc/ s|PROGRAM|DATA|' ${WRKSRC}/xglock/Makefile.in +.if ${OSVERSION} > 1003500 + @${REINPLACE_CMD} -e 's|/usr/games/fortune|/usr/bin/fortune|' ${WRKSRC}/modes/Makefile.in +.endif post-configure: ${REINPLACE_CMD} -e 's/-lXdpms//g' ${WRKSRC}/modes/Makefile .include Index: branches/2017Q1/x11/xlockmore/distinfo =================================================================== --- branches/2017Q1/x11/xlockmore/distinfo (revision 436623) +++ branches/2017Q1/x11/xlockmore/distinfo (revision 436624) @@ -1,2 +1,3 @@ -SHA256 (xlockmore-5.46.tar.xz) = 32b3be122c4fde5ae70dba5899bbcc20cd7e80119e246d79455d84046d6d40df -SIZE (xlockmore-5.46.tar.xz) = 1610356 +TIMESTAMP = 1490033477 +SHA256 (xlockmore-5.51.tar.xz) = 47118e718e5c892e52ecb21ff4ccfc65592643696768c57c388095732f42608d +SIZE (xlockmore-5.51.tar.xz) = 1633736 Index: branches/2017Q1/x11/xlockmore/pkg-descr =================================================================== --- branches/2017Q1/x11/xlockmore/pkg-descr (revision 436623) +++ branches/2017Q1/x11/xlockmore/pkg-descr (revision 436624) @@ -1,15 +1,15 @@ xlock locks the X server till the user enters their pass- word at the keyboard. While xlock is running, all new server connections are refused. The screen saver is disabled. The mouse cursor is turned off. The screen is blanked and a changing pattern is put on the screen. If a key or a mouse button is pressed then the user is prompted for the password of the user who started xlock. If the correct password is typed, then the screen is unlocked and the X server is restored. When typing the password Control-U and Control-H are active as kill and erase respectively. To return to the locked screen, click in the small icon version of the changing pattern. -WWW: http://www.tux.org/~bagleyd/xlockmore.html +WWW: http://sillycycle.com/xlockmore.html Index: branches/2017Q1 =================================================================== --- branches/2017Q1 (revision 436623) +++ branches/2017Q1 (revision 436624) Property changes on: branches/2017Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r436623