svn commit: r472444 - in branches/2018Q2/www/redmine: . files

[Mark Felder]

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