aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Engberg <diizzy@FreeBSD.org>2023-04-10 08:30:03 +0000
committerDaniel Engberg <diizzy@FreeBSD.org>2023-04-10 08:33:39 +0000
commit284339db15d25aae9c32a820bd5a6295686373ed (patch)
tree1da212926ec021c430e5dc3eb5c71c4d584739d0
parent017ae7006c5f61d3f88a60f7bca9755c416eef65 (diff)
downloadports-284339db15d25aae9c32a820bd5a6295686373ed.tar.gz
ports-284339db15d25aae9c32a820bd5a6295686373ed.zip
net/guacamole-server: Use upstream release archive and fix build with FFmpeg 6.0
Use upstream release archive as recommended by Porters Handbook Backport upstream commit 5cf408ebbba9544fb5dfb297d98d5a1e1751a56d to fix build with FFmpeg 6.0 References: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=261302#c46 https://github.com/apache/guacamole-server/commit/5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch PR: 270313 Reported by: antoine (via exp-run) Reviewed by: ultima (maintainer)
-rw-r--r--net/guacamole-server/Makefile7
-rw-r--r--net/guacamole-server/distinfo8
2 files changed, 9 insertions, 6 deletions
diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile
index 19d180d766e0..fa515db30220 100644
--- a/net/guacamole-server/Makefile
+++ b/net/guacamole-server/Makefile
@@ -1,6 +1,10 @@
PORTNAME= guacamole-server
DISTVERSION= 1.5.0
CATEGORIES= net
+MASTER_SITES= APACHE/guacamole/${DISTVERSION}/source/
+
+PATCH_SITES= https://github.com/apache/${PORTNAME}/commit/
+PATCHFILES= 5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch:-p1
MAINTAINER= ultima@FreeBSD.org
COMMENT= HTML5 Clientless Remote Desktop
@@ -17,9 +21,6 @@ CONFLICTS_BUILD=pulseaudio-*+jack_* ffmpeg-*+jack_*
USES= autoreconf compiler:c11 gnome jpeg libtool localbase pkgconfig \
shebangfix
-USE_GITHUB= yes
-GH_ACCOUNT= apache
-
USE_GNOME= cairo
USE_LDCONFIG= yes
USE_RC_SUBR= guacd
diff --git a/net/guacamole-server/distinfo b/net/guacamole-server/distinfo
index fb4a0a5d296e..394a47a08829 100644
--- a/net/guacamole-server/distinfo
+++ b/net/guacamole-server/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1676996246
-SHA256 (apache-guacamole-server-1.5.0_GH0.tar.gz) = f300427bf5119d85ea3831039211474e643c15617a8fb064afb0ed02e2b123b0
-SIZE (apache-guacamole-server-1.5.0_GH0.tar.gz) = 554772
+TIMESTAMP = 1679141585
+SHA256 (guacamole-server-1.5.0.tar.gz) = c6c09e4056f1edd88a3c425ef05043ff835da5c1c92348bbdbf5a99e512f5fd4
+SIZE (guacamole-server-1.5.0.tar.gz) = 1102862
+SHA256 (5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch) = fe104f8eeade04051b1ba86ecb69307dc172746b11c10892dd24ea4a8593d083
+SIZE (5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch) = 3222