Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 18 Jul 2018 20:41:56 +0000 (UTC)
From:      Jason Helfman <jgh@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r474901 - in branches/2018Q3/x11/xlockmore: . files
Message-ID:  <201807182041.w6IKfuLf010413@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jgh
Date: Wed Jul 18 20:41:56 2018
New Revision: 474901
URL: https://svnweb.freebsd.org/changeset/ports/474901

Log:
  MFH: r474899
  
  - update to 5.55
  - fix CLANG 6.0.0 compile issue [1]
  - address DESTDIR and INSTALL_PROGRAM issues
  
  PR:		225827
  Submitted by:	tobik@ [1 (patch)]
  Reported by:	ohartmann@walstatt.org [1]
  
  Approved by:	ports-secteam

Added:
  branches/2018Q3/x11/xlockmore/files/
     - copied from r474899, head/x11/xlockmore/files/
Modified:
  branches/2018Q3/x11/xlockmore/Makefile
  branches/2018Q3/x11/xlockmore/distinfo
  branches/2018Q3/x11/xlockmore/pkg-plist
Directory Properties:
  branches/2018Q3/   (props changed)

Modified: branches/2018Q3/x11/xlockmore/Makefile
==============================================================================
--- branches/2018Q3/x11/xlockmore/Makefile	Wed Jul 18 20:38:41 2018	(r474900)
+++ branches/2018Q3/x11/xlockmore/Makefile	Wed Jul 18 20:41:56 2018	(r474901)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xlockmore
-PORTVERSION=	5.54
-PORTREVISION=	2
+PORTVERSION=	5.55
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.sillycycle.com/xlock/ \
 		LOCAL/jgh/x11/${PORTNAME}/
@@ -161,6 +160,8 @@ pre-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e '/xglockrc/ s|PROGRAM|DATA|' ${WRKSRC}/xglock/Makefile.in
+	@${REINPLACE_CMD} -e 's|$$(SOUNDPATH)|$$(DESTDIR)$$(SOUNDPATH)|g' ${WRKSRC}/modes/Makefile.in
+	@${REINPLACE_CMD} -e '/$$(ETCDIR)play.sh/ s|$$(INSTALL_PROGRAM)|$$(INSTALL_PROGRAM:N-s)|' ${WRKSRC}/modes/Makefile.in
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100000
 	@${REINPLACE_CMD} -e 's|/usr/games/fortune|/usr/bin/fortune|' ${WRKSRC}/modes/Makefile.in
 .endif

Modified: branches/2018Q3/x11/xlockmore/distinfo
==============================================================================
--- branches/2018Q3/x11/xlockmore/distinfo	Wed Jul 18 20:38:41 2018	(r474900)
+++ branches/2018Q3/x11/xlockmore/distinfo	Wed Jul 18 20:41:56 2018	(r474901)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501006779
-SHA256 (xlockmore-5.54.tar.xz) = 9f4facb9721cc01450db0c11ffecd26a739b046e425e02628831a66080a0af55
-SIZE (xlockmore-5.54.tar.xz) = 1647652
+TIMESTAMP = 1531500962
+SHA256 (xlockmore-5.55.tar.xz) = d4f1fa5b19efc20262d77207636aa54fc66ba40aa867119f03a15981b3396ef8
+SIZE (xlockmore-5.55.tar.xz) = 1650116

Modified: branches/2018Q3/x11/xlockmore/pkg-plist
==============================================================================
--- branches/2018Q3/x11/xlockmore/pkg-plist	Wed Jul 18 20:38:41 2018	(r474900)
+++ branches/2018Q3/x11/xlockmore/pkg-plist	Wed Jul 18 20:41:56 2018	(r474901)
@@ -2,8 +2,13 @@
 @mode 4111
 @owner root
 bin/xlock
+bin/play.sh
 @mode
 @owner
 lib/X11/app-defaults/XLock
 man/man1/xlock.1.gz
+share/xlock/sounds/complete.au
+share/xlock/sounds/identify-please.au
+share/xlock/sounds/not-programmed.au
+share/xlock/sounds/thank-you.au
 %%GTK2%%share/xlock/xglockrc



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807182041.w6IKfuLf010413>