diff options
| author | Mark Felder <feld@FreeBSD.org> | 2018-06-15 13:13:06 +0000 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2018-06-15 13:13:06 +0000 |
| commit | 02f75ce3202174c363048d36316504ea522a6881 (patch) | |
| tree | 9a1113828016ed808290be1a5e9bcd8b2e6f21be | |
| parent | ae3cfef26b4b2bc9fadcf86d09b936a233f83133 (diff) | |
| download | ports-02f75ce3202174c363048d36316504ea522a6881.tar.gz ports-02f75ce3202174c363048d36316504ea522a6881.zip | |
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
Notes
Notes:
svn path=/branches/2018Q2/; revision=472444
| -rw-r--r-- | www/redmine/Makefile | 7 | ||||
| -rw-r--r-- | www/redmine/files/ldap.rb | 1 | ||||
| -rw-r--r-- | www/redmine/pkg-plist | 1 |
3 files changed, 2 insertions, 7 deletions
diff --git a/www/redmine/Makefile b/www/redmine/Makefile index 665aaadbf6cf..ace1aab33504 100644 --- a/www/redmine/Makefile +++ b/www/redmine/Makefile @@ -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 @@ -95,9 +95,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 diff --git a/www/redmine/files/ldap.rb b/www/redmine/files/ldap.rb deleted file mode 100644 index e5f4b2222a0e..000000000000 --- a/www/redmine/files/ldap.rb +++ /dev/null @@ -1 +0,0 @@ -gem "net-ldap", ">= 0.12.0" diff --git a/www/redmine/pkg-plist b/www/redmine/pkg-plist index de3067dae317..ba74aef53b21 100644 --- a/www/redmine/pkg-plist +++ b/www/redmine/pkg-plist @@ -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 |