From owner-svn-ports-branches@freebsd.org Wed Jul 18 20:41:58 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB2B21032943; Wed, 18 Jul 2018 20:41:57 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9DD148C5A4; Wed, 18 Jul 2018 20:41:57 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 64D021F623; Wed, 18 Jul 2018 20:41:57 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6IKfvJd010416; Wed, 18 Jul 2018 20:41:57 GMT (envelope-from jgh@FreeBSD.org) Received: (from jgh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6IKfuLf010413; Wed, 18 Jul 2018 20:41:56 GMT (envelope-from jgh@FreeBSD.org) Message-Id: <201807182041.w6IKfuLf010413@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jgh set sender to jgh@FreeBSD.org using -f From: Jason Helfman Date: Wed, 18 Jul 2018 20:41:56 +0000 (UTC) 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 X-SVN-Group: ports-branches X-SVN-Commit-Author: jgh X-SVN-Commit-Paths: in branches/2018Q3/x11/xlockmore: . files X-SVN-Commit-Revision: 474901 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jul 2018 20:41:58 -0000 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