svn commit: r436624 - branches/2017Q1/x11/xlockmore

[Jason Helfman]

Author: jgh
Date: Tue Mar 21 17:40:46 2017
New Revision: 436624
URL: https://svnweb.freebsd.org/changeset/ports/436624

Log:
  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 <comet.berkeley at gmail.com>
  
  Approved by:  ports-secteam (with hat)

Modified:
  branches/2017Q1/x11/xlockmore/Makefile
  branches/2017Q1/x11/xlockmore/distinfo
  branches/2017Q1/x11/xlockmore/pkg-descr
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/x11/xlockmore/Makefile
==============================================================================
--- branches/2017Q1/x11/xlockmore/Makefile	Tue Mar 21 17:37:09 2017	(r436623)
+++ branches/2017Q1/x11/xlockmore/Makefile	Tue Mar 21 17:40:46 2017	(r436624)
@@ -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 at 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 --withou
 		--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 <bsd.port.options.mk>
@@ -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

Modified: branches/2017Q1/x11/xlockmore/distinfo
==============================================================================
--- branches/2017Q1/x11/xlockmore/distinfo	Tue Mar 21 17:37:09 2017	(r436623)
+++ branches/2017Q1/x11/xlockmore/distinfo	Tue Mar 21 17:40:46 2017	(r436624)
@@ -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

Modified: branches/2017Q1/x11/xlockmore/pkg-descr
==============================================================================
--- branches/2017Q1/x11/xlockmore/pkg-descr	Tue Mar 21 17:37:09 2017	(r436623)
+++ branches/2017Q1/x11/xlockmore/pkg-descr	Tue Mar 21 17:40:46 2017	(r436624)
@@ -12,4 +12,4 @@ password Control-U and Control-H are act
 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