From owner-svn-ports-head@freebsd.org Fri Jan 19 22:46:56 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1911ECD2FF; Fri, 19 Jan 2018 22:46:56 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CBBCE7A7D4; Fri, 19 Jan 2018 22:46:56 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0B9FF13BF0; Fri, 19 Jan 2018 22:46:56 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0JMktLm052914; Fri, 19 Jan 2018 22:46:55 GMT (envelope-from ultima@FreeBSD.org) Received: (from ultima@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JMktwY052911; Fri, 19 Jan 2018 22:46:55 GMT (envelope-from ultima@FreeBSD.org) Message-Id: <201801192246.w0JMktwY052911@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ultima set sender to ultima@FreeBSD.org using -f From: Richard Gallamore Date: Fri, 19 Jan 2018 22:46:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459479 - head/www/guacamole-client X-SVN-Group: ports-head X-SVN-Commit-Author: ultima X-SVN-Commit-Paths: head/www/guacamole-client X-SVN-Commit-Revision: 459479 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jan 2018 22:46:57 -0000 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 +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 +.include 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