Date: Fri, 19 Jan 2018 22:46:55 +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: r459479 - head/www/guacamole-client Message-ID: <201801192246.w0JMktwY052911@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ultima Date: Fri Jan 19 22:46:55 2018 New Revision: 459479 URL: https://svnweb.freebsd.org/changeset/ports/459479 Log: * Remove MK_LINK option * Fixed GUACAMOLE_HOME location to ETCDIR Modified: head/www/guacamole-client/Makefile head/www/guacamole-client/pkg-plist Modified: head/www/guacamole-client/Makefile ============================================================================== --- head/www/guacamole-client/Makefile Fri Jan 19 22:35:14 2018 (r459478) +++ head/www/guacamole-client/Makefile Fri Jan 19 22:46:55 2018 (r459479) @@ -3,6 +3,7 @@ PORTNAME= guacamole-client DISTVERSION= 0.9.14 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES+= https://sourceforge.net/projects/distfiles/files/${PORTNAME}/:repo \ http://sourceforge.net/projects/distfiles/files/${PORTNAME}/:repo @@ -30,11 +31,10 @@ NO_ARCH= yes SUB_FILES= pkg-message -OPTIONS_DEFINE= MK_LINK SERVER TOMCAT -OPTIONS_DEFAULT= MK_LINK SERVER TOMCAT +OPTIONS_DEFINE= SERVER TOMCAT +OPTIONS_DEFAULT= SERVER TOMCAT OPTIONS_SUB= yes -MK_LINK_DESC= Make sybolic links SERVER_DESC= Include Guacamole Server TOMCAT_DESC= Use Tomcat as your servlet @@ -43,7 +43,10 @@ SERVER_RUN_DEPENDS= guacd:net/guacamole-server AUTH_EXTENSION= cas duo header ldap noauth openid -.include <bsd.port.pre.mk> +post-patch: + @${REINPLACE_CMD} 's|/etc/guacamole|${ETCDIR}| ; \ + s|"/etc"|"${ETCDIR:S|/${PORTNAME}||}"|' \ + ${WRKSRC}/guacamole-ext/src/main/java/org/apache/guacamole/environment/LocalEnvironment.java do-build: cd ${WRKSRC} && ${MVN} ${MVN_ARGS} @@ -64,13 +67,9 @@ do-install: ${INSTALL_DATA} ${FILESDIR}/logback.xml.sample ${STAGEDIR}${ETCDIR}/ ${INSTALL_DATA} ${FILESDIR}/guacamole.properties.sample ${STAGEDIR}${ETCDIR}/ -do-install-MK_LINK-on: - @${MKDIR} ${STAGEDIR}/root - ${RLN} ${STAGEDIR}/${ETCDIR} ${STAGEDIR}/root/.guacamole -.if ${PORT_OPTIONS:MTOMCAT} +do-install-TOMCAT-on: @${MKDIR} ${STAGEDIR}${PREFIX}/apache-tomcat-8.0/webapps ${RLN} ${STAGEDIR}${DATADIR}/guacamole.war \ ${STAGEDIR}${PREFIX}/apache-tomcat-8.0/webapps -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/www/guacamole-client/pkg-plist ============================================================================== --- head/www/guacamole-client/pkg-plist Fri Jan 19 22:35:14 2018 (r459478) +++ head/www/guacamole-client/pkg-plist Fri Jan 19 22:46:55 2018 (r459479) @@ -1,5 +1,4 @@ -%%MK_LINK%%/root/.guacamole -%%MK_LINK%%%%TOMCAT%%apache-tomcat-8.0/webapps/guacamole.war +%%TOMCAT%%apache-tomcat-8.0/webapps/guacamole.war %%ETCDIR%%/guacamole.properties.sample %%ETCDIR%%/logback.xml.sample %%ETCDIR%%/user-mapping.xml.sample
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801192246.w0JMktwY052911>