diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile index d7da49121b4a..0529938dcd6d 100644 --- a/net/guacamole-server/Makefile +++ b/net/guacamole-server/Makefile @@ -1,111 +1,117 @@ PORTNAME= guacamole-server DISTVERSION= 1.5.4 PORTREVISION= 1 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 WWW= https://guacamole.incubator.apache.org LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libossp-uuid.so:misc/ossp-uuid \ libpng.so:graphics/png CONFLICTS_BUILD=pulseaudio-*+jack_* ffmpeg-*+jack_* USES= autoreconf compiler:c11 gnome jpeg libtool localbase pkgconfig \ shebangfix USE_GNOME= cairo USE_LDCONFIG= yes USE_RC_SUBR= guacd SHEBANG_FILES= ${WRKSRC}/src/protocols/rdp/keymaps/generate.pl GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --with-guacd-conf=${ETCDIR}/guacd.conf INSTALL_TARGET= install-strip CFLAGS+= -Wno-error=newline-eof GUACAMOLE_HOME?= ${PREFIX}/guacamole USERS= guacamole GROUPS= guacamole SUB_LIST= GUACD_USER=${USERS} \ GUACD_GROUP=${GROUPS} \ GUACD_HOME=${GUACAMOLE_HOME} PLIST_SUB= GUACD_USER=${USERS} \ GUACD_GROUP=${GROUPS} \ GUACD_HOME=${GUACAMOLE_HOME} OPTIONS_DEFINE= GUACENC GUACLOG NLS SSL WEBP OPTIONS_DEFAULT= GUACENC GUACLOG KUBERNETES PULSEAUDIO RDP \ SSH SSL VNC VORBIS WEBP OPTIONS_GROUP= SP AUDIO OPTIONS_GROUP_SP= KUBERNETES RDP SSH VNC OPTIONS_GROUP_AUDIO= VORBIS PULSEAUDIO OPTIONS_SUB= yes AUDIO_DESC= Audio Support GUACENC_DESC= Video Encoding Utility GUACLOG_DESC= Input log interpreter KUBERNETES_DESC= Kubernetes protocol support RDP_DESC= RDP protocol support SP_DESC= Supported Protocols VNC_DESC= VNC protocol support GUACENC_CONFIGURE_ENABLE= guacenc GUACENC_CONFIGURE_WITH= libavcodec libavutil libswscale GUACENC_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg GUACENC_CFLAGS= -Wno-error=deprecated GUACLOG_CONFIGURE_ENABLE= guaclog KUBERNETES_CONFIGURE_ENABLE= kubernetes -KUBERNETES_CONFIGURE_WITH= pango terminal KUBERNETES_LIB_DEPENDS= libwebsockets.so:net/libwebsockets \ libharfbuzz.so:print/harfbuzz -KUBERNETES_USE= GNOME=pango NLS_USES= gettext-runtime PULSEAUDIO_CONFIGURE_WITH= pulse PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio RDP_CONFIGURE_WITH= rdp RDP_LIB_DEPENDS= libfreerdp2.so:net/freerdp -SSH_CONFIGURE_WITH= pango ssh terminal +SSH_CONFIGURE_WITH= ssh SSH_IMPLIES= SSL SSH_LIB_DEPENDS= libssh2.so:security/libssh2 -SSH_USE= GNOME=pango SSL_CONFIGURE_WITH= ssl SSL_USES= ssl VNC_CONFIGURE_WITH= vnc VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver VORBIS_CONFIGURE_WITH= vorbis VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp -.include +.include + +.if ${PORT_OPTIONS:MKUBERNETES}${PORT_OPTIONS:MSSH} +CONFIGURE_ARGS+= --with-pango --with-terminal +PLIST_SUB+= TERMINAL="" +USE_GNOME+= pango +.else +CONFIGURE_ARGS+= --without-pango --without-terminal +PLIST_SUB+= TERMINAL="@comment " +.endif .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) CFLAGS+= -Wno-error=strict-prototypes \ -Wno-error=unused-but-set-variable .endif post-patch: @${REINPLACE_CMD} 's/-Werror//' ${WRKSRC}/src/libguac/Makefile.am \ ${WRKSRC}/src/protocols/vnc/Makefile.am @${REINPLACE_CMD} 's|/etc/ssl|${PREFIX}/etc/ssl|g ; \ s|/etc/guacamole|${ETCDIR}|g' \ ${WRKSRC}/src/guacd/man/guacd.conf.5.in post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${GUACAMOLE_HOME} ${INSTALL_DATA} ${FILESDIR}/guacd.conf.sample ${STAGEDIR}${ETCDIR} -.include +.include diff --git a/net/guacamole-server/pkg-plist b/net/guacamole-server/pkg-plist index 5cf72710b626..0303899e3170 100644 --- a/net/guacamole-server/pkg-plist +++ b/net/guacamole-server/pkg-plist @@ -1,85 +1,85 @@ %%GUACENC%%bin/guacenc %%GUACLOG%%bin/guaclog %%ETCDIR%%/guacd.conf.sample include/guacamole/argv-constants.h include/guacamole/argv-fntypes.h include/guacamole/argv.h 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/fips.h include/guacamole/hash.h include/guacamole/layer-types.h include/guacamole/layer.h include/guacamole/mem.h include/guacamole/object-types.h include/guacamole/object.h include/guacamole/parser-constants.h include/guacamole/parser-types.h include/guacamole/parser.h include/guacamole/plugin-constants.h include/guacamole/plugin.h include/guacamole/pool-types.h include/guacamole/pool.h include/guacamole/private/mem.h include/guacamole/protocol-constants.h include/guacamole/protocol-types.h include/guacamole/protocol.h include/guacamole/recording.h include/guacamole/rwlock.h include/guacamole/socket-constants.h include/guacamole/socket-fntypes.h %%SSL%%include/guacamole/socket-ssl.h include/guacamole/socket-types.h include/guacamole/socket.h include/guacamole/stream-types.h include/guacamole/stream.h include/guacamole/string.h -include/guacamole/terminal/terminal.h +%%TERMINAL%%include/guacamole/terminal/terminal.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 include/guacamole/wol-constants.h include/guacamole/wol.h %%RDP%%lib/freerdp2/libguac-common-svc-client.so %%RDP%%lib/freerdp2/libguacai-client.so %%KUBERNETES%%lib/libguac-client-kubernetes.a %%KUBERNETES%%lib/libguac-client-kubernetes.so %%KUBERNETES%%lib/libguac-client-kubernetes.so.0 %%KUBERNETES%%lib/libguac-client-kubernetes.so.0.0.0 %%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.23 lib/libguac.so.23.0.0 -lib/libguac-terminal.a -lib/libguac-terminal.so -lib/libguac-terminal.so.0 -lib/libguac-terminal.so.0.1.0 +%%TERMINAL%%lib/libguac-terminal.a +%%TERMINAL%%lib/libguac-terminal.so +%%TERMINAL%%lib/libguac-terminal.so.0 +%%TERMINAL%%lib/libguac-terminal.so.0.1.0 %%GUACENC%%share/man/man1/guacenc.1.gz %%GUACLOG%%share/man/man1/guaclog.1.gz share/man/man5/guacd.conf.5.gz share/man/man8/guacd.8.gz sbin/guacd @dir(%%GUACD_USER%%,%%GUACD_GROUP%%,) %%GUACD_HOME%%