Date: Fri, 11 Apr 2014 11:13:08 +0100 From: "Steven Hartland" <killing@multiplay.co.uk> To: "David Keller" <david.keller@litchis.fr>, <osa@FreeBSD.org> Cc: ports@FreeBSD.org Subject: Re: FreeBSD Port: rubygem-passenger-4.0.41_2 Message-ID: <2BEF3638517B4186953121B366A7AACF@multiplay.co.uk> References: <CAFop7TnRM9vUmf02jiLJLJfgOOT3B80SoM0%2BLZAfA46YPHkPvA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
------=_NextPart_000_07BC_01CF5577.04D6D110
Content-Type: text/plain;
format=flowed;
charset="iso-8859-1";
reply-type=original
Content-Transfer-Encoding: 7bit
I've been playing with this and other issues with that port, try the attached patch.
Regards
Steve
----- Original Message -----
From: "David Keller" <david.keller@litchis.fr>
To: <osa@FreeBSD.org>
Cc: <ports@FreeBSD.org>
Sent: Friday, April 11, 2014 10:29 AM
Subject: FreeBSD Port: rubygem-passenger-4.0.41_2
> Hello,
>
> Since
>
> rev *350664* (Wed Apr 9 02:36:08 2014 UTC)
>
>
> After *#make install *from */usr/ports/www/rubygem-passenger*
>
> /usr/local/lib/ruby/gems/1.9/gems/passenger-4.0.41/*buildout*
>
>
> is no longer populated with passenger binaries, hence nginx complains that
> passenger is not installed.
>
> Mannualy copying *buildout* directory from
> */usr/ports/www/rubygem-passenger/work/**passenger-4.0.41/* resolves the
> issue.
>
> Regards.
> _______________________________________________
> freebsd-ports@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-ports
> To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org"
>
------=_NextPart_000_07BC_01CF5577.04D6D110
Content-Type: application/octet-stream;
name="rubygem-passenger-stage-fix.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="rubygem-passenger-stage-fix.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 350763)=0A=
+++ Makefile (working copy)=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=
@@ -37,11 +39,10 @@=0A=
.else=0A=
BUILD_DEPENDS+=3D nginx:${PORTSDIR}/www/nginx-devel=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 +49,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=
@@ -81,7 +88,7 @@=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=
+.if ${PORT_OPTIONS:MDEBUG}=0A=
@${REINPLACE_CMD} \=0A=
's!-DPASSENGER_DEBUG!-DNDEBUG!g' \=0A=
${WRKSRC}/build/basics.rb=0A=
@@ -101,19 +108,23 @@=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=
+ (CC=3D${CC} CXX=3D${CXX} =
${STAGEDIR}${PREFIX}/bin/passenger-install-apache2-module --auto)=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=
.if ${PORT_OPTIONS:MSYMLINK}=0A=
- ${LN} -s ${GEM_LIB_DIR} ${STAGE}${PREFIX}/${GEMS_DIR}/${PORTNAME}=0A=
+ ${LN} -s ${GEM_LIB_DIR} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${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=
=0A=
.include <bsd.port.mk>=0A=
Index: files/pkg-message-nginx.in=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=
--- files/pkg-message-nginx.in (revision 0)=0A=
+++ files/pkg-message-nginx.in (working copy)=0A=
@@ -0,0 +1,12 @@=0A=
+#####################################################################=0A=
+=0A=
+Please edit your nginx configuration file, and add these lines:=0A=
+=0A=
+ passenger_root %%PREFIX%%/%%GEM_LIB_DIR%%=0A=
+ passenger_ruby %%RUBY%%=0A=
+=0A=
+After you restart nginx, you are ready to deploy any number of Ruby on =
Rails=0A=
+applications on nginx, without any further Ruby on Rails-specific=0A=
+configuration!=0A=
+=0A=
+#####################################################################=0A=
=0A=
Property changes on: files/pkg-message-nginx.in=0A=
___________________________________________________________________=0A=
Added: fbsd:nokeywords=0A=
## -0,0 +1 ##=0A=
+yes=0A=
\ No newline at end of property=0A=
Added: svn:eol-style=0A=
## -0,0 +1 ##=0A=
+native=0A=
\ No newline at end of property=0A=
Added: svn:mime-type=0A=
## -0,0 +1 ##=0A=
+text/plain=0A=
\ No newline at end of property=0A=
Index: files/pkg-message.in=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=
--- files/pkg-message.in (revision 350763)=0A=
+++ files/pkg-message.in (working copy)=0A=
@@ -1,13 +0,0 @@=0A=
-#####################################################################=0A=
-=0A=
-Please edit your Apache configuration file, and add these lines:=0A=
-=0A=
- LoadModule passenger_module =
%%PREFIX%%/%%GEM_LIB_DIR%%/buildout/apache2/mod_passenger.so=0A=
- PassengerRoot %%PREFIX%%/%%GEM_LIB_DIR%%=0A=
- PassengerRuby %%RUBY%%=0A=
-=0A=
-After you restart Apache, you are ready to deploy any number of Ruby on =
Rails=0A=
-applications on Apache, without any further Ruby on Rails-specific=0A=
-configuration!=0A=
-=0A=
-#####################################################################=0A=
------=_NextPart_000_07BC_01CF5577.04D6D110--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2BEF3638517B4186953121B366A7AACF>