- Update to 0.9.4

- Add optional Gantt chart support
- Replace mandatory thin dependency with optional thin or Apache/nginx support
- Improve pkg-plist

PR:             145633
Submitted by:   Artem Naluzhnyy <tut (at) nhamon.com.ua>
Approved by:    beat (co-mentor)
Security:       http://www.vuxml.org/freebsd/fcc39d22-5777-11df-bf33-001a92771ec2.html

3 files changed, 32 insertions, 14 deletions

diff --git a/www/redmine/Makefile b/www/redmine/Makefile
index 24e28b3d404..7fd67bf1a7f 100644
--- a/www/redmine/Makefile
+++ b/www/redmine/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	redmine
-PORTVERSION=	0.9.3
-PORTREVISION=	2
+PORTVERSION=	0.9.4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,18 +14,19 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	A flexible project management web application
 
-RUN_DEPENDS=	rackup:${PORTSDIR}/www/rubygem-rack \
-		thin:${PORTSDIR}/www/rubygem-thin
+RUN_DEPENDS=	rackup:${PORTSDIR}/www/rubygem-rack
 
 USE_RUBY=	yes
 USE_RUBY_FEATURES=	iconv
 USE_RAKE=	yes
 NO_BUILD=	yes
-USE_RC_SUBR=	redmine
 SUB_LIST+=	RUBY_NAME=${RUBY_NAME}
 
-OPTIONS=	MYSQL	"Enable MySQL Support" on \
-		POSTGRESQL "Enable PostgreSQL Support" off
+OPTIONS=	MYSQL "Enable MySQL support" on \
+		POSTGRESQL "Enable PostgreSQL support" off \
+		RMAGIC "Enable Gantt charts support" on \
+		THIN "Use Thin WEB server" on \
+		PASSENGER "Use Apache/Nginx WEB server" off
 
 .include <bsd.port.pre.mk>
 
@@ -38,6 +38,24 @@ RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/mysql.so:${PORTSDIR}/databases/ruby-mysql
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/pg.so:${PORTSDIR}/databases/ruby-pg
 .endif
 
+.if defined(WITH_RMAGIC)
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/RMagick2.so:${PORTSDIR}/graphics/ruby-rmagick
+.endif
+
+.if defined(WITH_THIN)
+RUN_DEPENDS+=	thin:${PORTSDIR}/www/rubygem-thin
+USE_RC_SUBR=	redmine
+.endif
+
+.if defined(WITH_PASSENGER)
+RUN_DEPENDS+=	passenger-config:${PORTSDIR}/www/rubygem-passenger
+.endif
+
+.if !defined(WITH_THIN) && !defined(WITH_PASSENGER)
+IGNORE=		Either Thin or Apache/Nginx WEB server option required. \
+		Please 'make config' again.
+.endif
+
 do-install:
 	${MKDIR} ${WWWDIR}
 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "*" ${WWWDIR} "! -name *.orig")
diff --git a/www/redmine/distinfo b/www/redmine/distinfo
index 6890f12095b..420cf1d3f54 100644
--- a/www/redmine/distinfo
+++ b/www/redmine/distinfo
@@ -1,3 +1,3 @@
-MD5 (redmine-0.9.3.tar.gz) = 5a95eec4d26ec3819ffeff42137d5023
-SHA256 (redmine-0.9.3.tar.gz) = 5f404ac93b4acd59eadc5ce67477cba6f7b9d4fa340fa67e5c5f05fbbd1ce027
-SIZE (redmine-0.9.3.tar.gz) = 4587740
+MD5 (redmine-0.9.4.tar.gz) = 43c2ab81ad086cc78802b0f3670e5f07
+SHA256 (redmine-0.9.4.tar.gz) = c5fd50c79a13746d3025e7f9ff5640f0db9d7952a5b33dca2979f63e1a10d30c
+SIZE (redmine-0.9.4.tar.gz) = 4588816
diff --git a/www/redmine/pkg-plist b/www/redmine/pkg-plist
index 033ebb636fc..ae56920066e 100644
--- a/www/redmine/pkg-plist
+++ b/www/redmine/pkg-plist
@@ -3585,13 +3585,13 @@
 @dirrm %%WWWDIR%%/vendor/plugins/acts_as_attachable
 @dirrm %%WWWDIR%%/vendor/plugins/acts_as_activity_provider/lib
 @dirrm %%WWWDIR%%/vendor/plugins/acts_as_activity_provider
-@dirrm %%WWWDIR%%/vendor/plugins
+@dirrmtry %%WWWDIR%%/vendor/plugins
 @dirrm %%WWWDIR%%/vendor/gems/rubytree-0.5.2/test
 @dirrm %%WWWDIR%%/vendor/gems/rubytree-0.5.2/lib/tree
 @dirrm %%WWWDIR%%/vendor/gems/rubytree-0.5.2/lib
 @dirrm %%WWWDIR%%/vendor/gems/rubytree-0.5.2
 @dirrm %%WWWDIR%%/vendor/gems
-@dirrm %%WWWDIR%%/vendor
+@dirrmtry %%WWWDIR%%/vendor
 @dirrm %%WWWDIR%%/tmp/test
 @dirrm %%WWWDIR%%/tmp/sockets
 @dirrmtry %%WWWDIR%%/tmp/sessions
@@ -3690,10 +3690,10 @@
 @dirrm %%WWWDIR%%/extra
 @dirrm %%WWWDIR%%/doc
 @dirrm %%WWWDIR%%/db/migrate
-@dirrmtry %%WWWDIR%%/db
+@dirrm %%WWWDIR%%/db
 @dirrm %%WWWDIR%%/config/locales
 @dirrmtry %%WWWDIR%%/config/initializers
-@dirrm %%WWWDIR%%/config/environments
+@dirrmtry %%WWWDIR%%/config/environments
 @dirrmtry %%WWWDIR%%/config
 @dirrm %%WWWDIR%%/app/views/workflows
 @dirrm %%WWWDIR%%/app/views/wikis