--- Makefile.bak 2014-06-11 13:43:20.000000000 +0400 +++ Makefile 2014-06-11 15:03:07.000000000 +0400 @@ -3,6 +3,7 @@ PORTNAME= passenger PORTVERSION= 4.0.44 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMEPREFIX= rubygem- @@ -12,11 +13,11 @@ OPTIONS_DEFINE= DEBUG SYMLINK OPTIONS_SINGLE= SERVER -OPTIONS_SINGLE_SERVER= APACHE22 NGINX -APACHE22_DESC= Build with apache22 support +OPTIONS_SINGLE_SERVER= APACHE NGINX +APACHE_DESC= Build with APACHE support NGINX_DESC= Build with nginx support SYMLINK_DESC= Create passenger symlink -OPTIONS_DEFAULT= APACHE22 +OPTIONS_DEFAULT= APACHE USE_RUBY= yes USE_RAKE= yes @@ -25,7 +26,7 @@ .include -.if ${PORT_OPTIONS:MAPACHE22} +.if ${PORT_OPTIONS:MAPACHE} USE_APACHE= 22+ .endif @@ -101,7 +102,7 @@ ${WRKSRC}/lib/phusion_passenger/platform_info/cxx_portability.rb post-build: -.if ${PORT_OPTIONS:MAPACHE22} +.if ${PORT_OPTIONS:MAPACHE} (CC=${CC} CXX=${CXX} ${WRKSRC}/bin/passenger-install-apache2-module --auto) .endif @@ -109,7 +110,8 @@ (cd ${WRKSRC} && CC=${CC} CXX=${CXX} ${RAKE_BIN} nginx) .endif .if ${PORT_OPTIONS:MSYMLINK} - ${LN} -s ${GEM_LIB_DIR} ${STAGE}${PREFIX}/${GEMS_DIR}/${PORTNAME} + [ ! -d "${STAGEDIR}${PREFIX}/${GEMS_DIR}" ] && ${MKDIR} -p ${STAGEDIR}${PREFIX}/${GEMS_DIR} + ${LN} -s ${GEM_LIB_DIR} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME} .endif ${FIND} ${WRKSRC} -name '*.o' -delete