aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Gallamore <ultima@FreeBSD.org>2017-08-03 20:26:27 +0000
committerRichard Gallamore <ultima@FreeBSD.org>2017-08-03 20:26:27 +0000
commitd92a546599b5d03024af13495fa62791e7921c6f (patch)
tree6078ab04f1960c46e330dae805869b54042d826a
parentf9be250901cbb77ff812e60e6f37633a0ecbe4e6 (diff)
downloadports-d92a546599b5d03024af13495fa62791e7921c6f.tar.gz
ports-d92a546599b5d03024af13495fa62791e7921c6f.zip
* Updated to 0.9.13
* Sorted USES section to better comply with PHB * Changed custom etc dir to ETCDIR, added note in UPDATING * Sorted and enhanced option section * Added a guacd sample file * Added NLS knob Changelog: https://guacamole.incubator.apache.org/releases/0.9.13-incubating Reviewed by: matthew (mentor), mat Approved by: matthew (mentor) Differential Revision: https://reviews.freebsd.org/D11816
Notes
Notes: svn path=/head/; revision=447280
-rw-r--r--UPDATING7
-rw-r--r--net/guacamole-server/Makefile41
-rw-r--r--net/guacamole-server/distinfo6
-rw-r--r--net/guacamole-server/files/guacd.conf.sample17
-rw-r--r--net/guacamole-server/pkg-plist3
5 files changed, 54 insertions, 20 deletions
diff --git a/UPDATING b/UPDATING
index 8729e361547c..44e4ca23175b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,13 @@ You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20170803:
+ AFFECTS: users of net/guacamole-server
+ AUTHOR: ultima@FreeBSD.org
+
+ As of version 0.9.13, the configuration directory for guacamole-server
+ has changed from /usr/local/etc/guacd to /usr/local/etc/guacamole-server.
+
+20170803:
AFFECTS: users of sysutils/terraform
AUTHOR: lifanov@FreeBSD.org
diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile
index 75a9e5fb8dbc..8cd1982c588a 100644
--- a/net/guacamole-server/Makefile
+++ b/net/guacamole-server/Makefile
@@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= guacamole-server
-PORTVERSION= 0.9.12
+PORTVERSION= 0.9.13
DISTVERSIONSUFFIX= -incubating
-PORTREVISION= 2
CATEGORIES= net
MAINTAINER= ultima@FreeBSD.org
@@ -18,50 +17,60 @@ LIB_DEPENDS= libossp-uuid.so:misc/ossp-uuid \
CONFLICTS_BUILD=pulseaudio-*+jack_* ffmpeg-*+jack_*
+USES= autoreconf jpeg libtool localbase \
+ pkgconfig shebangfix ssl
+
USE_GITHUB= yes
GH_ACCOUNT= apache
GH_PROJECT= incubator-guacamole-server
-USES= autoreconf gettext-runtime jpeg libtool localbase \
- pkgconfig shebangfix ssl
USE_GNOME= cairo
+USE_LDCONFIG= yes
+USE_RC_SUBR= guacd
SHEBANG_FILES= ${WRKSRC}/src/protocols/rdp/keymaps/generate.pl
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-guacd-conf=${PREFIX}/etc/guacd/guacd.conf
-USE_LDCONFIG= yes
+CONFIGURE_ARGS= --with-guacd-conf=${ETCDIR}/guacd.conf
INSTALL_TARGET= install-strip
USERS= guacamole
GROUPS= guacamole
-USE_RC_SUBR= guacd
-SUB_LIST+= GUACD_USER=${USERS} \
+SUB_LIST= GUACD_USER=${USERS} \
GUACD_GROUP=${GROUPS}
-OPTIONS_DEFINE= RDP SSH VNC VORBIS PULSEAUDIO WEBP GUACENC
+OPTIONS_DEFINE= WEBP GUACENC NLS
OPTIONS_DEFAULT= RDP SSH VNC VORBIS PULSEAUDIO WEBP GUACENC
+OPTIONS_GROUP= SP AUDIO
+OPTIONS_GROUP_SP= RDP SSH VNC
+OPTIONS_GROUP_AUDIO= VORBIS PULSEAUDIO
OPTIONS_SUB= yes
+
+AUDIO_DESC= Audio Support
+GUACENC_DESC= Video Encoding Utility
+PULSEAUDIO_DESC= VNC audio support (Experimental)
+RDP_DESC= RDP protocol support
+SP_DESC= Supported Protocols
+VNC_DESC= VNC protocol support
+
GUACENC_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
-GUACENC_DESC?= Video Encoding Utility
+NLS_USES= gettext-runtime
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
-PULSEAUDIO_DESC?= VNC audio support (Experimental)
RDP_LIB_DEPENDS= libfreerdp1.so:net/freerdp1
-RDP_DESC?= RDP Protocal Support
SSH_LIB_DEPENDS= libssh2.so:security/libssh2
SSH_USE= GNOME=pango
-SSH_DESC?= SSH Support
VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver
-VNC_DESC?= VNC Protocol Support
VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \
libogg.so:audio/libogg
-VORBIS_DESC?= Ogg Vorbis for compression
WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
-WEBP_DESC?= WebP support
post-patch:
@${REINPLACE_CMD} 's|/etc/ssl|${PREFIX}/etc/ssl|g ; \
s|/etc/guacamole|${PREFIX}/etc/guacd|g' \
${WRKSRC}/src/guacd/man/guacd.conf.5
+post-install:
+ @${MKDIR} ${STAGEDIR}${ETCDIR}
+ ${INSTALL_DATA} ${FILESDIR}/guacd.conf.sample ${STAGEDIR}${ETCDIR}
+
.include <bsd.port.mk>
diff --git a/net/guacamole-server/distinfo b/net/guacamole-server/distinfo
index a85688f080c9..cdefbf0a5aac 100644
--- a/net/guacamole-server/distinfo
+++ b/net/guacamole-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491360075
-SHA256 (apache-incubator-guacamole-server-0.9.12-incubating_GH0.tar.gz) = ac13b7ba9e13cf78eba9cea187eaf49579269ba29787e5ebd4922697d79e9c03
-SIZE (apache-incubator-guacamole-server-0.9.12-incubating_GH0.tar.gz) = 386900
+TIMESTAMP = 1501623757
+SHA256 (apache-incubator-guacamole-server-0.9.13-incubating_GH0.tar.gz) = 09338af682ac966394eb79ac3c1422a38a58c1d77139b06a90fef195f7ec69b8
+SIZE (apache-incubator-guacamole-server-0.9.13-incubating_GH0.tar.gz) = 396012
diff --git a/net/guacamole-server/files/guacd.conf.sample b/net/guacamole-server/files/guacd.conf.sample
new file mode 100644
index 000000000000..f86a4b06b90f
--- /dev/null
+++ b/net/guacamole-server/files/guacd.conf.sample
@@ -0,0 +1,17 @@
+#
+# guacd.conf example
+#
+
+[daemon]
+# Possible log_level variables are:
+# trace, debug, info, warning, and error
+# Default is info
+log_level = info
+
+[server]
+bind_host = localhost
+bind_port = 4822
+
+[ssl]
+#server_certificate = /usr/local/etc/ssl/certs/guacd.crt
+#server_key = /usr/local/etc/ssl/private/guacd.key
diff --git a/net/guacamole-server/pkg-plist b/net/guacamole-server/pkg-plist
index 89b727228a65..f64663739eb6 100644
--- a/net/guacamole-server/pkg-plist
+++ b/net/guacamole-server/pkg-plist
@@ -1,3 +1,4 @@
+%%ETCDIR%%/guacd.conf.sample
include/guacamole/audio-fntypes.h
include/guacamole/audio-types.h
include/guacamole/audio.h
@@ -53,7 +54,7 @@ include/guacamole/user.h
lib/libguac.a
lib/libguac.so
lib/libguac.so.12
-lib/libguac.so.12.1.0
+lib/libguac.so.12.2.0
man/man5/guacd.conf.5.gz
man/man8/guacd.8.gz
%%GUACENC%%man/man1/guacenc.1.gz