Index: Makefile
===================================================================
--- Makefile	(revision 351057)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	passenger
 PORTVERSION=	4.0.41
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMEPREFIX=	rubygem-
@@ -11,6 +11,8 @@
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	Modules for running Ruby on Rails and Rack applications
 
+LICENSE=	MIT
+
 OPTIONS_DEFINE=	DEBUG SYMLINK
 OPTIONS_SINGLE=	SERVER
 OPTIONS_SINGLE_SERVER=	APACHE22 NGINX
@@ -31,17 +33,12 @@
 .endif
 
 .if ${PORT_OPTIONS:MNGINX}
-NGINXVERSION!=	${PKG_INFO} -qO www/nginx-devel 2>/dev/null; ${ECHO_CMD}
-.if empty(NGINXVERSION)
-BUILD_DEPENDS+=	nginx:${PORTSDIR}/www/nginx
-.else
-BUILD_DEPENDS+=	nginx:${PORTSDIR}/www/nginx-devel
+BUILD_DEPENDS+=	nginx:${PORTSDIR}/www/nginx-passenger
 .endif
-.endif
 
-LIB_DEPENDS+=	eio:${PORTSDIR}/devel/libeio \
-		ev:${PORTSDIR}/devel/libev \
-		curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libeio.so:${PORTSDIR}/devel/libeio \
+		libev.so:${PORTSDIR}/devel/libev \
+		libcurl.so:${PORTSDIR}/ftp/curl
 BUILD_DEPENDS+=	rubygem-fastthread>=1.0.1:${PORTSDIR}/devel/rubygem-fastthread \
 		rubygem-rack>=0:${PORTSDIR}/www/rubygem-rack \
 		rubygem-daemon_controller>=1.2.0:${PORTSDIR}/devel/rubygem-daemon_controller
@@ -48,7 +45,13 @@
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 SUB_LIST+=	GEM_LIB_DIR=${GEM_LIB_DIR} RUBY=${RUBY}
-SUB_FILES=	pkg-message
+.if ${PORT_OPTIONS:MNGINX}
+SUB_FILES+=	pkg-message-nginx
+PKGMESSAGE=	pkg-message-nginx
+.elif defined(WITH_APACHEPORT)
+SUB_FILES+=	pkg-message-apache
+PKGMESSAGE=	pkg-message-apache
+.endif
 
 PLIST_FILES=	bin/passenger \
 		bin/passenger-config \
@@ -101,19 +104,25 @@
 		's!-lpthread!${PTHREAD_LIBS}!g' \
 		${WRKSRC}/lib/phusion_passenger/platform_info/cxx_portability.rb
 
-post-build:
+post-install:
 .if ${PORT_OPTIONS:MAPACHE22}
-	(CC=${CC} CXX=${CXX} ${WRKSRC}/bin/passenger-install-apache2-module --auto)
+	(cd ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME} && CC=${CC} CXX=${CXX} ${RAKE_BIN} apache2)
 .endif
 
 .if ${PORT_OPTIONS:MNGINX}
-	(cd ${WRKSRC} && CC=${CC} CXX=${CXX} ${RAKE_BIN} nginx)
+	(cd ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME} && CC=${CC} CXX=${CXX} ${RAKE_BIN} nginx)
 .endif
+
 .if ${PORT_OPTIONS:MSYMLINK}
-	${LN} -s ${GEM_LIB_DIR} ${STAGE}${PREFIX}/${GEMS_DIR}/${PORTNAME}
+	(cd ${STAGEDIR}${PREFIX}/${GEMS_DIR} && ${LN} -s ${GEM_NAME} ${PORTNAME})
 .endif
 
-	${FIND} ${WRKSRC} -name '*.o' -delete
-	${FIND} ${WRKSRC} -name '*.bak' -delete
+	${FIND} ${STAGEDIR} -name '*.o' -delete
+	${FIND} ${STAGEDIR} -name '*.bak' -delete
+	${FIND} ${STAGEDIR} -name '*.log' -delete
+	${RM} -rf ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME}/buildout/common
+	${RM} -rf ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME}/buildout/cache
+	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME}/buildout/ruby/ -name Makefile -delete
+	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME}/download_cache
 
 .include <bsd.port.mk>