Index: head/www/guacamole-client/Makefile =================================================================== --- head/www/guacamole-client/Makefile (revision 433469) +++ head/www/guacamole-client/Makefile (revision 433470) @@ -1,72 +1,76 @@ # Created by: Ultima # $FreeBSD$ PORTNAME= guacamole-client -PORTVERSION= 0.9.10 +PORTVERSION= 0.9.11 DISTVERSIONSUFFIX= -incubating CATEGORIES= www java MASTER_SITES+= https://sourceforge.net/projects/distfiles/files/${PORTNAME}/:repo \ http://sourceforge.net/projects/distfiles/files/${PORTNAME}/:repo DISTFILES= repository-${PORTVERSION}${EXTRACT_SUFX}:repo DIST_SUBDIR= ${PORTNAME} MAINTAINER= ultima1252@gmail.com COMMENT= HTML5 Clientless Remote Desktop LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/share/java/maven33/bin/mvn:devel/maven33 USE_GITHUB= yes GH_ACCOUNT= apache GH_PROJECT= incubator-guacamole-client MVN= mvn MVN_ARGS= package -Duser.home=${WRKDIR} USE_JAVA= yes JAVA_VERSION= 1.8+ +OPTIONS_SUB= yes +SUB_FILES= pkg-message + OPTIONS_DEFINE= MK_LINK SERVER TOMCAT OPTIONS_DEFAULT= MK_LINK SERVER TOMCAT -OPTIONS_SUB= yes MK_LINK_DESC= Make sybolic links TOMCAT_RUN_DEPENDS= ${LOCALBASE}/apache-tomcat-8.0/bin/bootstrap.jar:www/tomcat8 TOMCAT_DESC= Use Tomcat as your servlet SERVER_RUN_DEPENDS= guacd:net/guacamole-server SERVER_DESC= Include Guacamole Server GUACAMOLE_CONF= ${PREFIX}/etc/guacamole GUACAMOLE_DATA= ${PREFIX}/share/${PORTNAME} .include do-build: cd ${WRKSRC} && ${MVN} ${MVN_ARGS} do-install: @${MKDIR} ${STAGEDIR}${GUACAMOLE_DATA} @${MKDIR} ${STAGEDIR}${GUACAMOLE_CONF} @${CP} ${WRKSRC}/guacamole/target/guacamole-${DISTVERSIONFULL}.war \ ${STAGEDIR}${GUACAMOLE_DATA}/guacamole.war + @${CP} ${WRKSRC}/extensions/guacamole-auth-duo/target/guacamole-auth-duo-${DISTVERSIONFULL}.tar.gz \ + ${STAGEDIR}/${GUACAMOLE_DATA}/guacamole-auth-duo.tar.gz @${CP} ${WRKSRC}/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/target/guacamole-auth-jdbc-${DISTVERSIONFULL}.tar.gz \ ${STAGEDIR}/${GUACAMOLE_DATA}/guacamole-auth-jdbc.tar.gz @${CP} ${WRKSRC}/extensions/guacamole-auth-ldap/target/guacamole-auth-ldap-${DISTVERSIONFULL}.tar.gz \ ${STAGEDIR}/${GUACAMOLE_DATA}/guacamole-auth-ldap.tar.gz @${CP} ${WRKSRC}/extensions/guacamole-auth-noauth/target/guacamole-auth-noauth-${DISTVERSIONFULL}.tar.gz \ ${STAGEDIR}/${GUACAMOLE_DATA}/guacamole-auth-noauth.tar.gz .if ${PORT_OPTIONS:MMK_LINK} @${MKDIR} ${STAGEDIR}/root @${MKDIR} ${STAGEDIR}${PREFIX}/apache-tomcat-8.0/webapps @${LN} -s ${GUACAMOLE_CONF} ${STAGEDIR}/root/.guacamole @${LN} -s ${GUACAMOLE_DATA}/guacamole.war \ ${STAGEDIR}${PREFIX}/apache-tomcat-8.0/webapps/ .endif @${CP} ${FILESDIR}/user-mapping.xml.sample ${STAGEDIR}${GUACAMOLE_CONF}/ @${CP} ${FILESDIR}/logback.xml.sample ${STAGEDIR}${GUACAMOLE_CONF}/ @${CP} ${FILESDIR}/guacamole.properties.sample ${STAGEDIR}${GUACAMOLE_CONF}/ .include Index: head/www/guacamole-client/distinfo =================================================================== --- head/www/guacamole-client/distinfo (revision 433469) +++ head/www/guacamole-client/distinfo (revision 433470) @@ -1,5 +1,5 @@ -TIMESTAMP = 1485061789 -SHA256 (guacamole-client/repository-0.9.10.tar.gz) = 4c30e44d0e0edef514fb902fab60d18d790f41faf6a33b484e89ed3b1454df12 -SIZE (guacamole-client/repository-0.9.10.tar.gz) = 45766702 -SHA256 (guacamole-client/apache-incubator-guacamole-client-0.9.10-incubating_GH0.tar.gz) = c48d1b89d0b32b1236e8b6557ea3c9bd8c0afc5a8ab785d33b488b53b617a1b7 -SIZE (guacamole-client/apache-incubator-guacamole-client-0.9.10-incubating_GH0.tar.gz) = 1625433 +TIMESTAMP = 1486162040 +SHA256 (guacamole-client/repository-0.9.11.tar.gz) = 6a09d9832775f771713bb8ddce4de5b8fbc3958cf9041b651dc068cb47e86fff +SIZE (guacamole-client/repository-0.9.11.tar.gz) = 57555410 +SHA256 (guacamole-client/apache-incubator-guacamole-client-0.9.11-incubating_GH0.tar.gz) = 7e18f47674971bc77dc6551a273a0d1e9a33d2a56ff577ebf50e312228c46a09 +SIZE (guacamole-client/apache-incubator-guacamole-client-0.9.11-incubating_GH0.tar.gz) = 1666459 Index: head/www/guacamole-client/files/pkg-message.in =================================================================== --- head/www/guacamole-client/files/pkg-message.in (revision 433469) +++ head/www/guacamole-client/files/pkg-message.in (revision 433470) @@ -1,8 +1,6 @@ -### Guacamole-client requires authentecation to start. -### cp %%PREFIX%%/etc/guacamole/user-mapping.xml.sample \ -### %%PREFIX%%/etc/guacamole/user-mapping.xml -### -### Once tomcat8 and guacd are running -### http://localhost:8080/guacamole Only ssh is installed -### by default. To add more protocols, rebuild guacamole- -### server. + Guacamole-client requires authentecation to start. + cp %%PREFIX%%/etc/guacamole/user-mapping.xml.sample \ + %%PREFIX%%/etc/guacamole/user-mapping.xml + + Once tomcat8 and guacd are running + http://localhost:8080/guacamole Index: head/www/guacamole-client/pkg-plist =================================================================== --- head/www/guacamole-client/pkg-plist (revision 433469) +++ head/www/guacamole-client/pkg-plist (revision 433470) @@ -1,9 +1,10 @@ %%MK_LINK%%/root/.guacamole %%TOMCAT%%apache-tomcat-8.0/webapps/guacamole.war etc/guacamole/guacamole.properties.sample etc/guacamole/logback.xml.sample etc/guacamole/user-mapping.xml.sample +%%DATADIR%%/guacamole-auth-duo.tar.gz %%DATADIR%%/guacamole-auth-jdbc.tar.gz %%DATADIR%%/guacamole-auth-ldap.tar.gz %%DATADIR%%/guacamole-auth-noauth.tar.gz %%DATADIR%%/guacamole.war