From owner-svn-ports-branches@freebsd.org Fri Jun 15 13:13:07 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93D951002C6A; Fri, 15 Jun 2018 13:13:07 +0000 (UTC) (envelope-from feld@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 480866C7BC; Fri, 15 Jun 2018 13:13:07 +0000 (UTC) (envelope-from feld@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 28FBC17D99; Fri, 15 Jun 2018 13:13:07 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5FDD7KJ012792; Fri, 15 Jun 2018 13:13:07 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5FDD676012791; Fri, 15 Jun 2018 13:13:06 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201806151313.w5FDD676012791@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 15 Jun 2018 13:13:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r472444 - in branches/2018Q2/www/redmine: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2018Q2/www/redmine: . files X-SVN-Commit-Revision: 472444 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jun 2018 13:13:07 -0000 Author: feld Date: Fri Jun 15 13:13:06 2018 New Revision: 472444 URL: https://svnweb.freebsd.org/changeset/ports/472444 Log: MFH: r472402 www/redmine: remove ldap option This fixes the issues with redmine depending on net-ldap twice. PR: 213085 Submitted by: feld Reported by: xmj Deleted: branches/2018Q2/www/redmine/files/ldap.rb Modified: branches/2018Q2/www/redmine/Makefile branches/2018Q2/www/redmine/pkg-plist Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/redmine/Makefile ============================================================================== --- branches/2018Q2/www/redmine/Makefile Fri Jun 15 12:55:15 2018 (r472443) +++ branches/2018Q2/www/redmine/Makefile Fri Jun 15 13:13:06 2018 (r472444) @@ -3,6 +3,7 @@ PORTNAME= redmine PORTVERSION= 3.4.5 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.redmine.org/releases/ @@ -43,11 +44,10 @@ GROUPS= ${WWWGRP} PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} SUB_LIST= RUBY_NAME=${RUBY_NAME} -OPTIONS_DEFINE= MYSQL POSTGRESQL LDAP MARKDOWN RMAGIC THIN +OPTIONS_DEFINE= MYSQL POSTGRESQL MARKDOWN RMAGIC THIN OPTIONS_DEFAULT=MYSQL MARKDOWN RMAGIC THIN OPTIONS_SUB= yes POSTGRESQL_DESC=Enable PostgreSQL support -LDAP_DESC= Enable LDAP Authentification MARKDOWN_DESC= Enable Markdown support RMAGIC_DESC= Enable Gantt charts support THIN_DESC= Use Thin WEB server @@ -94,9 +94,6 @@ do-install-MYSQL-on: do-install-POSTGRESQL-on: ${CP} ${FILESDIR}/pg.rb ${STAGEDIR}${WWWDIR}/bundler.d - -do-install-LDAP-on: - ${CP} ${FILESDIR}/ldap.rb ${STAGEDIR}${WWWDIR}/bundler.d do-install-MARKDOWN-on: ${CP} ${FILESDIR}/markdown.rb ${STAGEDIR}${WWWDIR}/bundler.d Modified: branches/2018Q2/www/redmine/pkg-plist ============================================================================== --- branches/2018Q2/www/redmine/pkg-plist Fri Jun 15 12:55:15 2018 (r472443) +++ branches/2018Q2/www/redmine/pkg-plist Fri Jun 15 13:13:06 2018 (r472444) @@ -611,7 +611,6 @@ %%WWWDIR%%/bin/bundle %%WWWDIR%%/bin/rails %%WWWDIR%%/bin/rake -%%LDAP%%%%WWWDIR%%/bundler.d/ldap.rb %%MARKDOWN%%%%WWWDIR%%/bundler.d/markdown.rb %%MYSQL%%%%WWWDIR%%/bundler.d/mysql.rb %%POSTGRESQL%%%%WWWDIR%%/bundler.d/pg.rb