Index: head/net/guacamole-server/Makefile =================================================================== --- head/net/guacamole-server/Makefile (revision 432194) +++ head/net/guacamole-server/Makefile (revision 432195) @@ -1,77 +1,68 @@ # Created by: Ultima # $FreeBSD$ PORTNAME= guacamole-server -PORTVERSION= 0.9.9 -PORTREVISION= 3 +PORTVERSION= 0.9.10 +DISTVERSIONSUFFIX= -incubating CATEGORIES= net MAINTAINER= ultima1252@gmail.com COMMENT= HTML5 Clientless Remote Desktop -LICENSE= MIT +LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libossp-uuid.so:misc/ossp-uuid \ libpng.so:graphics/png CONFLICTS_BUILD=pulseaudio-*+jack_* ffmpeg-*+jack_* USE_GITHUB= yes -GH_ACCOUNT= glyptodon +GH_ACCOUNT= apache +GH_PROJECT= incubator-guacamole-server -USES= autoreconf jpeg libtool localbase pkgconfig shebangfix ssl +USES= autoreconf gettext-runtime jpeg libtool localbase \ + pkgconfig shebangfix ssl USE_GNOME= cairo 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 -MAKE_JOBS_UNSAFE= yes +INSTALL_TARGET= install-strip + USERS= guacamole GROUPS= guacamole USE_RC_SUBR= guacd SUB_LIST+= GUACD_USER=${USERS} \ GUACD_GROUP=${GROUPS} -OPTIONS_DEFINE= RDP SSH VNC VORBIS PULSEAUDIO WEBP -OPTIONS_DEFAULT= RDP SSH VNC VORBIS PULSEAUDIO WEBP +OPTIONS_DEFINE= RDP SSH VNC VORBIS PULSEAUDIO WEBP GUACENC +OPTIONS_DEFAULT= RDP SSH VNC VORBIS PULSEAUDIO WEBP GUACENC OPTIONS_SUB= yes +GUACENC_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg +GUACENC_DESC?= Video Encoding Utility 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 -.include - 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: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libguac.so.* -.if ${PORT_OPTIONS:MSSH} - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libguac-client-ssh.so.* -.endif -.if ${PORT_OPTIONS:MRDP} - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/freerdp/guacsnd-client.so - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/freerdp/guacdr-client.so - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/freerdp/guacsvc-client.so - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libguac-client-rdp.so.* -.endif -.if ${PORT_OPTIONS:MVNC} - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libguac-client-vnc.so.* -.endif + @${REINPLACE_CMD} 's/-Werror//' \ + ${WRKSRC}/src/guacenc/Makefile.am -.include +.include Index: head/net/guacamole-server/distinfo =================================================================== --- head/net/guacamole-server/distinfo (revision 432194) +++ head/net/guacamole-server/distinfo (revision 432195) @@ -1,2 +1,3 @@ -SHA256 (glyptodon-guacamole-server-0.9.9_GH0.tar.gz) = 53d26e2e7e028b0d9fbc502b94acd02e2d04e3a491c8be4a3e16290c2ec58321 -SIZE (glyptodon-guacamole-server-0.9.9_GH0.tar.gz) = 265031 +TIMESTAMP = 1485059653 +SHA256 (apache-incubator-guacamole-server-0.9.10-incubating_GH0.tar.gz) = e123d1a43d03b0104dc41c480612e0757cd34a636dee538b62a6c4f810efd65e +SIZE (apache-incubator-guacamole-server-0.9.10-incubating_GH0.tar.gz) = 377895 Index: head/net/guacamole-server/pkg-descr =================================================================== --- head/net/guacamole-server/pkg-descr (revision 432194) +++ head/net/guacamole-server/pkg-descr (revision 432195) @@ -1,13 +1,13 @@ The guacamole-server package is a set of software which forms the basis of the Guacamole stack. It consists of guacd, libguac, and several protocol support libraries. guacd is the Guacamole proxy daemon used by the Guacamole web application and framework. As JavaScript cannot handle binary protocols (like VNC and remote desktop) efficiently, a new test-based protocol was developed which would contain a common superset of the operations needed for efficient remote desktop access, but would be easy for JavaScript programs to process. guacd is the proxy which translates between arbitrary protocols and the Guacamole protocol. -WWW: https://github.com/glyptodon/guacamole-server +WWW: http://guacamole.incubator.apache.org Index: head/net/guacamole-server/pkg-plist =================================================================== --- head/net/guacamole-server/pkg-plist (revision 432194) +++ head/net/guacamole-server/pkg-plist (revision 432195) @@ -1,55 +1,61 @@ include/guacamole/audio-fntypes.h include/guacamole/audio-types.h include/guacamole/audio.h include/guacamole/client-constants.h include/guacamole/client-fntypes.h include/guacamole/client-types.h include/guacamole/client.h include/guacamole/error-types.h include/guacamole/error.h include/guacamole/hash.h -include/guacamole/instruction-constants.h -include/guacamole/instruction-types.h -include/guacamole/instruction.h +include/guacamole/parser-constants.h +include/guacamole/parser-types.h +include/guacamole/parser.h include/guacamole/layer-types.h include/guacamole/layer.h include/guacamole/object-types.h include/guacamole/object.h include/guacamole/plugin-constants.h -include/guacamole/plugin-types.h include/guacamole/plugin.h include/guacamole/pool-types.h include/guacamole/pool.h include/guacamole/protocol-types.h include/guacamole/protocol.h include/guacamole/socket-constants.h include/guacamole/socket-fntypes.h include/guacamole/socket-types.h include/guacamole/socket.h include/guacamole/stream-types.h include/guacamole/stream.h include/guacamole/timestamp-types.h include/guacamole/timestamp.h include/guacamole/unicode.h +include/guacamole/user-constants.h +include/guacamole/user-fntypes.h +include/guacamole/user-types.h +include/guacamole/user.h +%%RDP%%lib/freerdp/guacai-client.so %%RDP%%lib/freerdp/guacdr-client.so %%RDP%%lib/freerdp/guacsnd-client.so %%RDP%%lib/freerdp/guacsvc-client.so %%RDP%%lib/libguac-client-rdp.a %%RDP%%lib/libguac-client-rdp.so %%RDP%%lib/libguac-client-rdp.so.0 %%RDP%%lib/libguac-client-rdp.so.0.0.0 %%SSH%%lib/libguac-client-ssh.a %%SSH%%lib/libguac-client-ssh.so %%SSH%%lib/libguac-client-ssh.so.0 %%SSH%%lib/libguac-client-ssh.so.0.0.0 %%VNC%%lib/libguac-client-vnc.a %%VNC%%lib/libguac-client-vnc.so %%VNC%%lib/libguac-client-vnc.so.0 %%VNC%%lib/libguac-client-vnc.so.0.0.0 lib/libguac.a lib/libguac.so -lib/libguac.so.11 -lib/libguac.so.11.0.0 +lib/libguac.so.12 +lib/libguac.so.12.0.0 man/man5/guacd.conf.5.gz man/man8/guacd.8.gz +%%GUACENC%%man/man1/guacenc.1.gz sbin/guacd +%%GUACENC%%bin/guacenc