Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Sep 2015 20:28:21 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r397459 - head/www/redmine
Message-ID:  <201509202028.t8KKSLYC086199@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sun Sep 20 20:28:20 2015
New Revision: 397459
URL: https://svnweb.freebsd.org/changeset/ports/397459

Log:
  - Fix OPTIONS usage: remove WWWSERVER from OPTIONS_DEFINE and OPTIONS_DEFAULT
  - Convert to new options helper

Modified:
  head/www/redmine/Makefile

Modified: head/www/redmine/Makefile
==============================================================================
--- head/www/redmine/Makefile	Sun Sep 20 20:27:35 2015	(r397458)
+++ head/www/redmine/Makefile	Sun Sep 20 20:28:20 2015	(r397459)
@@ -36,8 +36,8 @@ GROUPS=		${WWWGRP}
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 SUB_LIST=	RUBY_NAME=${RUBY_NAME}
 
-OPTIONS_DEFINE=	MYSQL MYSQL2 POSTGRESQL RMAGIC WWWSERVER
-OPTIONS_DEFAULT=MYSQL2 RMAGIC WWWSERVER THIN
+OPTIONS_DEFINE=	MYSQL MYSQL2 POSTGRESQL RMAGIC
+OPTIONS_DEFAULT=MYSQL2 RMAGIC THIN
 OPTIONS_SINGLE=	WWWSERVER
 OPTIONS_SINGLE_WWWSERVER=	THIN PASSENGER
 POSTGRESQL_DESC=Enable PostgreSQL support
@@ -49,24 +49,14 @@ NO_OPTIONS_SORT=yes
 
 MYSQL_RUN_DEPENDS=	rubygem-mysql>=2.8.1:${PORTSDIR}/databases/rubygem-mysql
 MYSQL2_RUN_DEPENDS=	rubygem-mysql2>=0:${PORTSDIR}/databases/rubygem-mysql2
+PASSENGER_RUN_DEPENDS=	passenger-config:${PORTSDIR}/www/rubygem-passenger
 POSTGRESQL_RUN_DEPENDS=	rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg
 RMAGIC_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Gemfile
 RMAGIC_RUN_DEPENDS=	rubygem-rmagick>=2.0.0:${PORTSDIR}/graphics/rubygem-rmagick
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MWWWSERVER}
-.if ${PORT_OPTIONS:MTHIN}
-RUN_DEPENDS+=	thin:${PORTSDIR}/www/rubygem-thin
-USE_RC_SUBR=	redmine
-SUB_LIST+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-thin-Gemfile
-.endif
-
-.if ${PORT_OPTIONS:MPASSENGER}
-RUN_DEPENDS+=	passenger-config:${PORTSDIR}/www/rubygem-passenger
-.endif
-.endif
+THIN_EXTRA_PATCHES=	${FILESDIR}/extra-patch-thin-Gemfile
+THIN_RUN_DEPENDS=	thin:${PORTSDIR}/www/rubygem-thin
+THIN_SUB_LIST=		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+THIN_VARS=		USE_RC_SUBR=redmine
 
 post-extract:
 	@${RM} ${WRKSRC}/.hgignore ${WRKSRC}/.travis.yml



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509202028.t8KKSLYC086199>