aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorpi <pi@FreeBSD.org>2016-03-06 19:48:10 +0800
committerpi <pi@FreeBSD.org>2016-03-06 19:48:10 +0800
commita4d88ed1eff3a51e9ac2b3d9ad8bb8054f2ac724 (patch)
tree8063a69dc7cf43527c5d7f1a29654aa0286b67cc /net
parent4416ab59c2d4467dfd3a296a2a4dfaaaa57b275b (diff)
downloadfreebsd-ports-gnome-a4d88ed1eff3a51e9ac2b3d9ad8bb8054f2ac724.tar.gz
freebsd-ports-gnome-a4d88ed1eff3a51e9ac2b3d9ad8bb8054f2ac724.tar.zst
freebsd-ports-gnome-a4d88ed1eff3a51e9ac2b3d9ad8bb8054f2ac724.zip
net/guacamole-server, misc/e2fsprogs-libuuid, misc/p5-OSSP-uuid, misc/ossp-uuid
Currently when requiring both ossp-uuid and e2fspogs-libuuid is an impossibility without the use of a jail. This patch was created to fix this conflict. The patch includes updating revisions for removal of CONFLICTS, and change LIBDEPEND change for all affected ports. The changes on ossp-uuid port includes renaming of the shared/static libs created, C/C++ manpage, and rename of pkgconfig file. PR: 207004 Submitted by: Ultima1252@gmail.com Approved by: vd
Diffstat (limited to 'net')
-rw-r--r--net/guacamole-server/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile
index b268350625e9..782a4743a9e8 100644
--- a/net/guacamole-server/Makefile
+++ b/net/guacamole-server/Makefile
@@ -3,6 +3,7 @@
PORTNAME= guacamole-server
PORTVERSION= 0.9.9
+PORTREVISION= 1
CATEGORIES= net
MAINTAINER= ultima1252@gmail.com
@@ -11,13 +12,12 @@ COMMENT= HTML5 Clientless Remote Desktop
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libuuid.so:${PORTSDIR}/misc/ossp-uuid \
+LIB_DEPENDS= libossp-uuid.so:${PORTSDIR}/misc/ossp-uuid \
libpng.so:${PORTSDIR}/graphics/png \
libcairo.so:${PORTSDIR}/graphics/cairo \
libjpeg.so:${PORTSDIR}/graphics/jpeg-turbo
-CONFLICTS_BUILD= e2fsprogs-libuuid-* pulseaudio-*+jack_* \
- ffmpeg-*+jack_*
+CONFLICTS_BUILD=pulseaudio-*+jack_* ffmpeg-*+jack_*
USE_GITHUB= yes
GH_ACCOUNT= glyptodon