From owner-freebsd-ports@FreeBSD.ORG Sun Apr 13 11:28:55 2014 Return-Path: Delivered-To: ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 737E3D37; Sun, 13 Apr 2014 11:28:55 +0000 (UTC) Received: from smtp1.multiplay.co.uk (smtp1.multiplay.co.uk [85.236.96.35]) by mx1.freebsd.org (Postfix) with ESMTP id 071DB1445; Sun, 13 Apr 2014 11:28:54 +0000 (UTC) Received: by smtp1.multiplay.co.uk (Postfix, from userid 65534) id C23C120E7088C; Sun, 13 Apr 2014 11:28:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.multiplay.co.uk X-Spam-Level: *** X-Spam-Status: No, score=3.0 required=8.0 tests=AWL,BAYES_20,DOS_OE_TO_MX, FSL_HELO_NON_FQDN_1,HELO_NO_DOMAIN,RDNS_DYNAMIC autolearn=no version=3.3.1 Received: from r2d2 (82-69-141-170.dsl.in-addr.zen.co.uk [82.69.141.170]) by smtp1.multiplay.co.uk (Postfix) with ESMTPS id 4086920E70886; Sun, 13 Apr 2014 11:28:47 +0000 (UTC) Message-ID: <2DD63F83581C4EDF865148915D3D3546@multiplay.co.uk> From: "Steven Hartland" To: "David Keller" , "Sergey A. Osokin" References: <2BEF3638517B4186953121B366A7AACF@multiplay.co.uk> <20140411222748.GD67075@FreeBSD.org> <25B22ADA9DF3473CB7A433EC9394D8FE@multiplay.co.uk> <20140413021330.GE67075@FreeBSD.org> Subject: Re: FreeBSD Port: rubygem-passenger-4.0.41_2 Date: Sun, 13 Apr 2014 12:28:41 +0100 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_0E31_01CF5713.E741D480" X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2900.5931 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157 Cc: FreeBSD Ports , Scot Hetzel X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2014 11:28:55 -0000 This is a multi-part message in MIME format. ------=_NextPart_000_0E31_01CF5713.E741D480 Content-Type: text/plain; format=flowed; charset="iso-8859-1"; reply-type=original Content-Transfer-Encoding: 7bit ----- Original Message ----- From: "David Keller" > Hi Sergey, > > It's not related to gem dependency error but the symlink creation > might be incorrect: > ${LN} -s ${GEM_LIB_DIR} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME} > > Will create the following symlink: > /usr/local/lib/ruby/gems/1.9/gems/passenger -> > lib/ruby/gems/1.9/gems/passenger-4.0.41 > > Rather than: > /usr/local/lib/ruby/gems/1.9/gems/passenger -> > /usr/local/lib/ruby/gems/1.9/gems/passenger-4.0.41 > > Or: > /usr/local/lib/ruby/gems/1.9/gems/passenger -> passenger-4.0.41 > > > You might prefer using: > ${LN} -s ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME} > ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME} > > Or even: > ${LN} -s ${GEM_NAME} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME} My current version has: (cd ${STAGEDIR}${PREFIX}/${GEMS_DIR} && ${LN} -s ${GEM_NAME} ${PORTNAME}) Which I will create: /usr/local/lib/ruby/gems/1.9/gems/passenger -> passenger-4.0.41 @Sergey: For your apache module problem try the attached patch / full version which fixes that for me. I'd previously only ever built the nginx version and looks like the apache2 module build was broken when stage support was added. I've confirmed it builds but I don't have an apache2 install to test fully with here so if you could let me know if it works and I'll get all the changes checked in. Regards Steve ------=_NextPart_000_0E31_01CF5713.E741D480 Content-Type: application/octet-stream; name="Makefile" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="Makefile" # Created by: Jacob Atzen =0A= # $FreeBSD: head/www/rubygem-passenger/Makefile 350745 2014-04-09 = 23:16:05Z osa $=0A= =0A= PORTNAME=3D passenger=0A= PORTVERSION=3D 4.0.41=0A= PORTREVISION=3D 3=0A= CATEGORIES=3D www rubygems=0A= MASTER_SITES=3D RG=0A= PKGNAMEPREFIX=3D rubygem-=0A= =0A= MAINTAINER=3D osa@FreeBSD.org=0A= COMMENT=3D Modules for running Ruby on Rails and Rack applications=0A= =0A= LICENSE=3D MIT=0A= =0A= OPTIONS_DEFINE=3D DEBUG SYMLINK=0A= OPTIONS_SINGLE=3D SERVER=0A= OPTIONS_SINGLE_SERVER=3D APACHE22 NGINX=0A= APACHE22_DESC=3D Build with apache22 support=0A= NGINX_DESC=3D Build with nginx support=0A= SYMLINK_DESC=3D Create passenger symlink=0A= OPTIONS_DEFAULT=3D APACHE22=0A= =0A= USE_RUBY=3D yes=0A= USE_RAKE=3D yes=0A= USE_RUBYGEMS=3D yes=0A= RUBYGEM_AUTOPLIST=3D yes=0A= =0A= .include =0A= =0A= .if ${PORT_OPTIONS:MAPACHE22}=0A= USE_APACHE=3D 22+=0A= .endif=0A= =0A= .if ${PORT_OPTIONS:MNGINX}=0A= BUILD_DEPENDS+=3D nginx:${PORTSDIR}/www/nginx-passenger=0A= .endif=0A= =0A= LIB_DEPENDS+=3D libeio.so:${PORTSDIR}/devel/libeio \=0A= libev.so:${PORTSDIR}/devel/libev \=0A= libcurl.so:${PORTSDIR}/ftp/curl=0A= BUILD_DEPENDS+=3D = rubygem-fastthread>=3D1.0.1:${PORTSDIR}/devel/rubygem-fastthread \=0A= rubygem-rack>=3D0:${PORTSDIR}/www/rubygem-rack \=0A= = rubygem-daemon_controller>=3D1.2.0:${PORTSDIR}/devel/rubygem-daemon_contr= oller=0A= RUN_DEPENDS:=3D ${BUILD_DEPENDS}=0A= =0A= SUB_LIST+=3D GEM_LIB_DIR=3D${GEM_LIB_DIR} RUBY=3D${RUBY}=0A= .if ${PORT_OPTIONS:MNGINX}=0A= SUB_FILES+=3D pkg-message-nginx=0A= PKGMESSAGE=3D pkg-message-nginx=0A= .elif defined(WITH_APACHEPORT)=0A= SUB_FILES+=3D pkg-message-apache=0A= PKGMESSAGE=3D pkg-message-apache=0A= .endif=0A= =0A= PLIST_FILES=3D bin/passenger \=0A= bin/passenger-config \=0A= bin/passenger-install-apache2-module \=0A= bin/passenger-memory-stats \=0A= bin/passenger-status \=0A= bin/passenger-install-nginx-module=0A= =0A= .if ${PORT_OPTIONS:MSYMLINK}=0A= PLIST_FILES+=3D ${GEMS_DIR}/${PORTNAME}=0A= SUB_LIST+=3D PASSENGER_INSTALL_DIR=3D"${PREFIX}/${GEMS_DIR}/${PORTNAME}"=0A= .else=0A= SUB_LIST+=3D PASSENGER_INSTALL_DIR=3D"${PREFIX}/${GEM_LIB_DIR}"=0A= .endif=0A= =0A= pre-patch:=0A= .if ${PORT_OPTIONS:MNGINX}=0A= @${ECHO_CMD}=0A= @${ECHO_CMD} "Do not forget compile www/nginx"=0A= @${ECHO_CMD} "with PASSENGER_MODULE support"=0A= @${ECHO_CMD}=0A= .endif=0A= =0A= @${REINPLACE_CMD} \=0A= 's!-Wall!!g; \=0A= s!gcc!${CC}!g; \=0A= s!g++!${CXX}!g; \=0A= s!#{PlatformInfo.debugging_cflags}!${CFLAGS}!g; \=0A= s!-O2!!g; \=0A= s! -feliminate-unused-debug-symbols -feliminate-unused-debug-types!!g; = \=0A= 201,203s!true!false!' \=0A= ${WRKSRC}/build/basics.rb=0A= .if ${PORT_OPTIONS:NDEBUG}=0A= @${REINPLACE_CMD} \=0A= 's!-DPASSENGER_DEBUG!-DNDEBUG!g' \=0A= ${WRKSRC}/build/basics.rb=0A= .endif=0A= @${REINPLACE_CMD} \=0A= 's!#{LIBEV_LIBS}!-L${LOCALBASE}/lib -lev!g' \=0A= ${WRKSRC}/build/agents.rb=0A= @${REINPLACE_CMD} \=0A= 's!-Iext/libev!!; \=0A= s!/usr/include/libev!${LOCALBASE}/include!; \=0A= s!-lev!-L${LOCALBASE}/lib -lev!; \=0A= s!-Iext/libeio!!; \=0A= s!/usr/include/libeio!${LOCALBASE}/include!; \=0A= s!-leio!-L${LOCALBASE}/lib -leio!' \=0A= ${WRKSRC}/build/common_library.rb=0A= @${REINPLACE_CMD} \=0A= 's!-lpthread!${PTHREAD_LIBS}!g' \=0A= ${WRKSRC}/lib/phusion_passenger/platform_info/cxx_portability.rb=0A= =0A= post-install:=0A= .if ${PORT_OPTIONS:MAPACHE22}=0A= (cd ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME} && CC=3D${CC} = CXX=3D${CXX} ${RAKE_BIN} apache2)=0A= .endif=0A= =0A= .if ${PORT_OPTIONS:MNGINX}=0A= (cd ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME} && CC=3D${CC} = CXX=3D${CXX} ${RAKE_BIN} nginx)=0A= .endif=0A= =0A= .if ${PORT_OPTIONS:MSYMLINK}=0A= (cd ${STAGEDIR}${PREFIX}/${GEMS_DIR} && ${LN} -s ${GEM_NAME} = ${PORTNAME})=0A= .endif=0A= =0A= ${FIND} ${STAGEDIR} -name '*.o' -delete=0A= ${FIND} ${STAGEDIR} -name '*.bak' -delete=0A= ${FIND} ${STAGEDIR} -name '*.log' -delete=0A= ${RM} -rf ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME}/buildout/common=0A= ${RM} -rf ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME}/buildout/cache=0A= ${FIND} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME}/buildout/ruby/ = -name Makefile -delete=0A= ${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME}/download_cache=0A= =0A= .include =0A= ------=_NextPart_000_0E31_01CF5713.E741D480 Content-Type: application/octet-stream; name="Makefile.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="Makefile.patch" Index: Makefile=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= --- Makefile (revision 351057)=0A= +++ Makefile (working copy)=0A= @@ -3,7 +3,7 @@=0A= =0A= PORTNAME=3D passenger=0A= PORTVERSION=3D 4.0.41=0A= -PORTREVISION=3D 2=0A= +PORTREVISION=3D 3=0A= CATEGORIES=3D www rubygems=0A= MASTER_SITES=3D RG=0A= PKGNAMEPREFIX=3D rubygem-=0A= @@ -11,6 +11,8 @@=0A= MAINTAINER=3D osa@FreeBSD.org=0A= COMMENT=3D Modules for running Ruby on Rails and Rack applications=0A= =0A= +LICENSE=3D MIT=0A= +=0A= OPTIONS_DEFINE=3D DEBUG SYMLINK=0A= OPTIONS_SINGLE=3D SERVER=0A= OPTIONS_SINGLE_SERVER=3D APACHE22 NGINX=0A= @@ -31,17 +33,12 @@=0A= .endif=0A= =0A= .if ${PORT_OPTIONS:MNGINX}=0A= -NGINXVERSION!=3D ${PKG_INFO} -qO www/nginx-devel 2>/dev/null; = ${ECHO_CMD}=0A= -.if empty(NGINXVERSION)=0A= -BUILD_DEPENDS+=3D nginx:${PORTSDIR}/www/nginx=0A= -.else=0A= -BUILD_DEPENDS+=3D nginx:${PORTSDIR}/www/nginx-devel=0A= +BUILD_DEPENDS+=3D nginx:${PORTSDIR}/www/nginx-passenger=0A= .endif=0A= -.endif=0A= =0A= -LIB_DEPENDS+=3D eio:${PORTSDIR}/devel/libeio \=0A= - ev:${PORTSDIR}/devel/libev \=0A= - curl:${PORTSDIR}/ftp/curl=0A= +LIB_DEPENDS+=3D libeio.so:${PORTSDIR}/devel/libeio \=0A= + libev.so:${PORTSDIR}/devel/libev \=0A= + libcurl.so:${PORTSDIR}/ftp/curl=0A= BUILD_DEPENDS+=3D = rubygem-fastthread>=3D1.0.1:${PORTSDIR}/devel/rubygem-fastthread \=0A= rubygem-rack>=3D0:${PORTSDIR}/www/rubygem-rack \=0A= = rubygem-daemon_controller>=3D1.2.0:${PORTSDIR}/devel/rubygem-daemon_contr= oller=0A= @@ -48,7 +45,13 @@=0A= RUN_DEPENDS:=3D ${BUILD_DEPENDS}=0A= =0A= SUB_LIST+=3D GEM_LIB_DIR=3D${GEM_LIB_DIR} RUBY=3D${RUBY}=0A= -SUB_FILES=3D pkg-message=0A= +.if ${PORT_OPTIONS:MNGINX}=0A= +SUB_FILES+=3D pkg-message-nginx=0A= +PKGMESSAGE=3D pkg-message-nginx=0A= +.elif defined(WITH_APACHEPORT)=0A= +SUB_FILES+=3D pkg-message-apache=0A= +PKGMESSAGE=3D pkg-message-apache=0A= +.endif=0A= =0A= PLIST_FILES=3D bin/passenger \=0A= bin/passenger-config \=0A= @@ -101,19 +104,25 @@=0A= 's!-lpthread!${PTHREAD_LIBS}!g' \=0A= ${WRKSRC}/lib/phusion_passenger/platform_info/cxx_portability.rb=0A= =0A= -post-build:=0A= +post-install:=0A= .if ${PORT_OPTIONS:MAPACHE22}=0A= - (CC=3D${CC} CXX=3D${CXX} = ${WRKSRC}/bin/passenger-install-apache2-module --auto)=0A= + (cd ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME} && CC=3D${CC} = CXX=3D${CXX} ${RAKE_BIN} apache2)=0A= .endif=0A= =0A= .if ${PORT_OPTIONS:MNGINX}=0A= - (cd ${WRKSRC} && CC=3D${CC} CXX=3D${CXX} ${RAKE_BIN} nginx)=0A= + (cd ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME} && CC=3D${CC} = CXX=3D${CXX} ${RAKE_BIN} nginx)=0A= .endif=0A= +=0A= .if ${PORT_OPTIONS:MSYMLINK}=0A= - ${LN} -s ${GEM_LIB_DIR} ${STAGE}${PREFIX}/${GEMS_DIR}/${PORTNAME}=0A= + (cd ${STAGEDIR}${PREFIX}/${GEMS_DIR} && ${LN} -s ${GEM_NAME} = ${PORTNAME})=0A= .endif=0A= =0A= - ${FIND} ${WRKSRC} -name '*.o' -delete=0A= - ${FIND} ${WRKSRC} -name '*.bak' -delete=0A= + ${FIND} ${STAGEDIR} -name '*.o' -delete=0A= + ${FIND} ${STAGEDIR} -name '*.bak' -delete=0A= + ${FIND} ${STAGEDIR} -name '*.log' -delete=0A= + ${RM} -rf ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME}/buildout/common=0A= + ${RM} -rf ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME}/buildout/cache=0A= + ${FIND} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME}/buildout/ruby/ = -name Makefile -delete=0A= + ${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME}/download_cache=0A= =0A= .include =0A= ------=_NextPart_000_0E31_01CF5713.E741D480--