From cc3c40bd1a69677f878fa19bc88943b39ca776ba Mon Sep 17 00:00:00 2001 From: jgh Date: Tue, 21 Mar 2017 17:40:46 +0000 Subject: MFH: r436623 - update to version 5.51 - address issue with fortune [1] - address master_sites for distribution as main site is no longer operational - attach xorg library dependencies - attach license - adjust make_args for destdir support PR: 217182 [1] Reported by:>>>>Richard Narron Approved by: ports-secteam (with hat) --- x11/xlockmore/Makefile | 18 +++++++++++------- x11/xlockmore/distinfo | 5 +++-- x11/xlockmore/pkg-descr | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index e4cb730..1416db8 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -2,15 +2,16 @@ # $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 \ @@ -18,7 +19,7 @@ CONFIGURE_ARGS= --without-motif --without-ttf --without-editres \ --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 @@ -46,9 +47,9 @@ 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 @@ -158,6 +159,9 @@ pre-extract: 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 diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo index f895ac2a..5d24286 100644 --- a/x11/xlockmore/distinfo +++ b/x11/xlockmore/distinfo @@ -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 diff --git a/x11/xlockmore/pkg-descr b/x11/xlockmore/pkg-descr index 9b2bc84..80c5dce 100644 --- a/x11/xlockmore/pkg-descr +++ b/x11/xlockmore/pkg-descr @@ -12,4 +12,4 @@ 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 -- cgit v1.1