Date: Thu, 3 Aug 2017 20:26:27 +0000 (UTC) From: Richard Gallamore <ultima@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447280 - in head: . net/guacamole-server net/guacamole-server/files Message-ID: <201708032026.v73KQRIi020799@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ultima Date: Thu Aug 3 20:26:27 2017 New Revision: 447280 URL: https://svnweb.freebsd.org/changeset/ports/447280 Log: * 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 Added: head/net/guacamole-server/files/guacd.conf.sample (contents, props changed) Modified: head/UPDATING head/net/guacamole-server/Makefile head/net/guacamole-server/distinfo head/net/guacamole-server/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu Aug 3 20:09:55 2017 (r447279) +++ head/UPDATING Thu Aug 3 20:26:27 2017 (r447280) @@ -6,6 +6,13 @@ You should get into the habit of checking this file fo 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 Modified: head/net/guacamole-server/Makefile ============================================================================== --- head/net/guacamole-server/Makefile Thu Aug 3 20:09:55 2017 (r447279) +++ head/net/guacamole-server/Makefile Thu Aug 3 20:26:27 2017 (r447280) @@ -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> Modified: head/net/guacamole-server/distinfo ============================================================================== --- head/net/guacamole-server/distinfo Thu Aug 3 20:09:55 2017 (r447279) +++ head/net/guacamole-server/distinfo Thu Aug 3 20:26:27 2017 (r447280) @@ -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 Added: head/net/guacamole-server/files/guacd.conf.sample ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/guacamole-server/files/guacd.conf.sample Thu Aug 3 20:26:27 2017 (r447280) @@ -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 Modified: head/net/guacamole-server/pkg-plist ============================================================================== --- head/net/guacamole-server/pkg-plist Thu Aug 3 20:09:55 2017 (r447279) +++ head/net/guacamole-server/pkg-plist Thu Aug 3 20:26:27 2017 (r447280) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708032026.v73KQRIi020799>