From owner-svn-ports-all@freebsd.org Thu Jun 14 22:33:12 2018 Return-Path: Delivered-To: svn-ports-all@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 052E910115B7; Thu, 14 Jun 2018 22:33:12 +0000 (UTC) (envelope-from swills@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 A81EE87714; Thu, 14 Jun 2018 22:33:11 +0000 (UTC) (envelope-from swills@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 86BD26FC7; Thu, 14 Jun 2018 22:33:11 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5EMXBJv058210; Thu, 14 Jun 2018 22:33:11 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5EMXBDg058208; Thu, 14 Jun 2018 22:33:11 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201806142233.w5EMXBDg058208@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Thu, 14 Jun 2018 22:33:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472402 - in head/www/redmine: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/www/redmine: . files X-SVN-Commit-Revision: 472402 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jun 2018 22:33:12 -0000 Author: swills Date: Thu Jun 14 22:33:10 2018 New Revision: 472402 URL: https://svnweb.freebsd.org/changeset/ports/472402 Log: 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: head/www/redmine/files/ldap.rb Modified: head/www/redmine/Makefile (contents, props changed) head/www/redmine/pkg-plist (contents, props changed) Modified: head/www/redmine/Makefile ============================================================================== --- head/www/redmine/Makefile Thu Jun 14 21:51:36 2018 (r472401) +++ head/www/redmine/Makefile Thu Jun 14 22:33:10 2018 (r472402) @@ -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: head/www/redmine/pkg-plist ============================================================================== --- head/www/redmine/pkg-plist Thu Jun 14 21:51:36 2018 (r472401) +++ head/www/redmine/pkg-plist Thu Jun 14 22:33:10 2018 (r472402) @@ -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