From 5d93c586e3e0bb37033324e149ab1df0bef68df9 Mon Sep 17 00:00:00 2001 From: "Philip M. Gollucci" Date: Mon, 24 May 2010 20:28:24 +0000 Subject: [PATCH] - Convert to KNOBS format for APACHE PR: ports/146896 Submitted by: pgollucci@ (myself) Approved by: jatzen@gmail.com (maintainer) --- www/rubygem-passenger/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile index 3aabd16b9237..8294820dc0b2 100644 --- a/www/rubygem-passenger/Makefile +++ b/www/rubygem-passenger/Makefile @@ -14,7 +14,7 @@ PKGNAMEPREFIX= rubygem- MAINTAINER= jatzen@gmail.com COMMENT= Modules for running Ruby on Rails and Rack applications -OPTIONS= APACHEPORT "Use apache22" on \ +OPTIONS= APACHE "Use apache22" on \ NGINXPORT "Use nginx" off USE_RUBY= yes @@ -24,12 +24,12 @@ RUBYGEM_AUTOPLIST= yes .include -.if defined(WITH_APACHEPORT) && defined(WITH_NGINXPORT) +.if defined(WITH_APACHE) && defined(WITH_NGINXPORT) IGNORE= supports only one web-server: apache22 or nginx. \ Please 'make config' again .endif -.if !defined(WITHOUT_APACHEPORT) +.if !defined(WITHOUT_APACHE) USE_APACHE= 2.2+ .endif @@ -68,7 +68,7 @@ post-install: s!-lpthread!${PTHREAD_LIBS}!g' \ ${PREFIX}/${GEM_LIB_DIR}/lib/phusion_passenger/platform_info.rb -.if !defined(WITHOUT_APACHEPORT) +.if !defined(WITHOUT_APACHE) (${PREFIX}/bin/passenger-install-apache2-module --auto) @${CAT} ${PKGMESSAGE} .endif