Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Jun 2020 22:00:44 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r540545 - head/x11-servers/xwayland-devel
Message-ID:  <202006262200.05QM0iPi065688@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Jun 26 22:00:44 2020
New Revision: 540545
URL: https://svnweb.freebsd.org/changeset/ports/540545

Log:
  x11-servers/xwayland-devel: switch to GitHub mirror
  
  - GL_COMMIT is not supported by "portedit set-version"
  - GL_COMMIT is no longer necessary (bug 242329)
  - GitLab distfiles don't carry ordinal version in filename
  - GitLab .patch links have volatile footer (Git version)

Modified:
  head/x11-servers/xwayland-devel/Makefile   (contents, props changed)
  head/x11-servers/xwayland-devel/distinfo   (contents, props changed)

Modified: head/x11-servers/xwayland-devel/Makefile
==============================================================================
--- head/x11-servers/xwayland-devel/Makefile	Fri Jun 26 22:00:29 2020	(r540544)
+++ head/x11-servers/xwayland-devel/Makefile	Fri Jun 26 22:00:44 2020	(r540545)
@@ -3,13 +3,13 @@
 PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
 DISTVERSION=	1.20.0-669
-DISTVERSIONSUFFIX=	-g${GL_COMMIT:C/(.{12}).*/\1/}
+DISTVERSIONSUFFIX=	-gb67052742
 CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
 
-PATCH_SITES=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
-PATCHFILES+=	9e0086f99b39.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
-PATCHFILES+=	30ea6cb622e9.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	9e0086f99b39.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCHFILES+=	30ea6cb622e9.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	X11 server as Wayland client (development snapshot)
@@ -29,13 +29,11 @@ RUN_DEPENDS=	xkbcomp:x11/xkbcomp \
 CONFLICTS_INSTALL=	${PORTNAME}
 
 USES=		compiler:c11 gl meson pkgconfig xorg
-USE_GITLAB=	yes
+USE_GITHUB=	yes
 USE_GL=		gbm gl
 USE_XORG=	pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
-GL_SITE=	https://gitlab.freedesktop.org
-GL_ACCOUNT=	xorg
-GL_PROJECT=	xserver
-GL_COMMIT=	b67052742980fd3ec669100048da71e09aa61358
+GH_ACCOUNT=	freedesktop
+GH_PROJECT=	xorg-xserver
 MESON_ARGS=	-Dxwayland=true \
 		-Dxorg=false \
 		-Dxnest=false \

Modified: head/x11-servers/xwayland-devel/distinfo
==============================================================================
--- head/x11-servers/xwayland-devel/distinfo	Fri Jun 26 22:00:29 2020	(r540544)
+++ head/x11-servers/xwayland-devel/distinfo	Fri Jun 26 22:00:44 2020	(r540545)
@@ -1,7 +1,7 @@
 TIMESTAMP = 1593099139
-SHA256 (xorg-xserver-b67052742980fd3ec669100048da71e09aa61358_GL0.tar.gz) = 2c1a3ed63b00d7a13c54f432c2829f9d2d174d1dd92357c9eb7a94885f9e22f3
-SIZE (xorg-xserver-b67052742980fd3ec669100048da71e09aa61358_GL0.tar.gz) = 5103088
-SHA256 (9e0086f99b39.diff) = e8de09e5ca2e44dbd35924f353f903d7e3393e872732cdf0dfa638e566b43e4d
-SIZE (9e0086f99b39.diff) = 10299
-SHA256 (30ea6cb622e9.diff) = c568c39b302dea2271ffb9a711eb76154f920c17da2f90a275cf3d0535da27bf
-SIZE (30ea6cb622e9.diff) = 15620
+SHA256 (freedesktop-xorg-xserver-xorg-server-1.20.0-669-gb67052742_GH0.tar.gz) = dc3f9d66825b2b2cb8717bad7f773190ee20042e379b030bc50d7ee00ce40b64
+SIZE (freedesktop-xorg-xserver-xorg-server-1.20.0-669-gb67052742_GH0.tar.gz) = 5105667
+SHA256 (9e0086f99b39.patch) = f8af32f1aba1062e351fe43722816ba1dda43ae691bed8a0f855b58341ad8f6c
+SIZE (9e0086f99b39.patch) = 10714
+SHA256 (30ea6cb622e9.patch) = 3a99b52b7f7a451daf0620b457aa041a95caddcdcc0ae73d7b8a1b30d19f14b0
+SIZE (30ea6cb622e9.patch) = 17585



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