svn commit: r492738 - head/x11-wm/sway

[Jan Beich]

Author: jbeich
Date: Mon Feb 11 23:44:12 2019
New Revision: 492738
URL: https://svnweb.freebsd.org/changeset/ports/492738

Log:
  x11-wm/sway: update to 1.0.r2
  
  Changes:	https://github.com/swaywm/sway/releases/tag/1.0-rc2

Modified:
  head/x11-wm/sway/Makefile   (contents, props changed)
  head/x11-wm/sway/distinfo   (contents, props changed)

Modified: head/x11-wm/sway/Makefile
==============================================================================
--- head/x11-wm/sway/Makefile	Mon Feb 11 21:14:31 2019	(r492737)
+++ head/x11-wm/sway/Makefile	Mon Feb 11 23:44:12 2019	(r492738)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	sway
-DISTVERSION=	1.0-rc1
+DISTVERSION=	1.0-rc2
 CATEGORIES=	x11-wm
 
 MAINTAINER=	jbeich at FreeBSD.org
@@ -26,7 +26,6 @@ USE_GITHUB=	yes
 USE_GNOME=	cairo pango
 USE_XORG=	pixman
 GH_ACCOUNT=	swaywm
-MESON_ARGS=	-Dsway-version="${DISTVERSIONFULL}"
 
 OPTIONS_DEFINE=	MANPAGES PIXBUF SUID X11
 OPTIONS_DEFAULT=MANPAGES PIXBUF SUID X11
@@ -51,6 +50,10 @@ X11_MESON_OFF=		-Dxwayland=disabled
 post-patch:
 # Let @sample handle default files under etc/
 	@${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \
+		${WRKSRC}/meson.build
+# Extract (snapshot) version from the port instead of meson.build
+	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
+		-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
 		${WRKSRC}/meson.build
 
 .include <bsd.port.mk>

Modified: head/x11-wm/sway/distinfo
==============================================================================
--- head/x11-wm/sway/distinfo	Mon Feb 11 21:14:31 2019	(r492737)
+++ head/x11-wm/sway/distinfo	Mon Feb 11 23:44:12 2019	(r492738)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549184154
-SHA256 (swaywm-sway-1.0-rc1_GH0.tar.gz) = 93184f25f76a3d1c2bb39d0e52013633df49ef87b0318739d1153ce481f70535
-SIZE (swaywm-sway-1.0-rc1_GH0.tar.gz) = 5461910
+TIMESTAMP = 1549898573
+SHA256 (swaywm-sway-1.0-rc2_GH0.tar.gz) = 9579ee592dedbd2e7fdcb6d45675791c7de7b7c8e61b25f7fd9d670b7dac973b
+SIZE (swaywm-sway-1.0-rc2_GH0.tar.gz) = 5462530