Date: Wed, 16 Apr 2014 16:01:52 +0100 From: "Steven Hartland" <killing@multiplay.co.uk> To: "Sergey A. Osokin" <osa@FreeBSD.org> Cc: FreeBSD Ports <ports@freebsd.org>, Scot Hetzel <swhetzel@gmail.com>, David Keller <david.keller@litchis.fr> Subject: Re: FreeBSD Port: rubygem-passenger-4.0.41_2 Message-ID: <D4D70B5502E5410DB50ED558A66FC356@multiplay.co.uk> References: <CAFop7TnRM9vUmf02jiLJLJfgOOT3B80SoM0%2BLZAfA46YPHkPvA@mail.gmail.com> <2BEF3638517B4186953121B366A7AACF@multiplay.co.uk> <20140411222748.GD67075@FreeBSD.org> <25B22ADA9DF3473CB7A433EC9394D8FE@multiplay.co.uk> <CACdU%2Bf-HKC8r%2BAisMPrQJ09YRNcQ1Kw7pcUSSoC0u9GRzypfgA@mail.gmail.com> <20140413021330.GE67075@FreeBSD.org> <CAFop7TkVXHrvnf0L7x3BUMdJnkh8H8Nz2u075Od0v5rPYg%2BG5w@mail.gmail.com> <2DD63F83581C4EDF865148915D3D3546@multiplay.co.uk> <20140414230026.GC30049@FreeBSD.org> <84754692511E457B952C2F50897F7B3E@multiplay.co.uk> <20140416090333.GD30049@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
------=_NextPart_000_0614_01CF598D.2E7F28E0
Content-Type: text/plain;
format=flowed;
charset="iso-8859-1";
reply-type=original
Content-Transfer-Encoding: 7bit
Good catch on the WITH_APACHEPORT, thats old pre new options hang over,
switched to a straight else, as one or the other must be selected.
Looks like the svn diff didnt show the move, if you run the following:
svn mv files/pkg-message.in files/pkg-message-apache.in
before applying the attached patch with the WITH_APACHEPORT fix you
should be good.
Regards
Steve
----- Original Message -----
From: "Sergey A. Osokin" <osa@FreeBSD.org>
To: "Steven Hartland" <killing@multiplay.co.uk>
Cc: "FreeBSD Ports" <ports@freebsd.org>; "Scot Hetzel" <swhetzel@gmail.com>; "David Keller" <david.keller@litchis.fr>
Sent: Wednesday, April 16, 2014 10:03 AM
Subject: Re: FreeBSD Port: rubygem-passenger-4.0.41_2
> Hi Steven,
>
> unfortunately your version is different, especially this part of the code:
>
> 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
>
> Please explain what's the WITH_APACHEPORT knob, also, what's the
> pkg-message-apache file, missing from your original patch.
>
> And anyway. On the staging phase I have following error:
>
> ===> Staging for rubygem-passenger-4.0.41_3
> ===> rubygem-passenger-4.0.41_3 depends on package: rubygem-fastthread>=1.0.7 - found
> ===> rubygem-passenger-4.0.41_3 depends on package: rubygem-rack>=1.4.5 - found
> ===> rubygem-passenger-4.0.41_3 depends on package: rubygem-daemon_controller>=1.2.0 - found
> ===> rubygem-passenger-4.0.41_3 depends on file: /usr/local/bin/gem19 - found
> ===> rubygem-passenger-4.0.41_3 depends on file: /usr/local/bin/ruby19 - found
> ===> rubygem-passenger-4.0.41_3 depends on file: /usr/local/sbin/apxs - found
> ===> Generating temporary packing list
> Building native extensions. This could take a while...
> Successfully installed passenger-4.0.41
> 1 gem installed
> Installing RDoc documentation for passenger-4.0.41...
> (CC=clang CXX=clang++
> /usr/home/osa/ports/www/rubygem-passenger/work/stage/usr/local/bin/passenger-install-apache2-module --auto)
> /usr/local/lib/ruby/site_ruby/1.9/rubygems/dependency.rb:247:in `to_specs': Could not find passenger (>= 0) amongst
> [daemon_controller-1.2.0, fastthread-1.0.7, rack-1.4.5, rake-10.2.2] (Gem::LoadError)
> from /usr/local/lib/ruby/site_ruby/1.9/rubygems/dependency.rb:256:in `to_spec'
> from /usr/local/lib/ruby/site_ruby/1.9/rubygems.rb:1231:in `gem'
> from /usr/home/osa/ports/www/rubygem-passenger/work/stage/usr/local/bin/passenger-install-apache2-module:22:in `<main>'
> *** Error code 1
>
> Any idea?
>
> --
> Sergey A. Osokin
> osa@FreeBSD.org.
>
> On Tue, Apr 15, 2014 at 12:59:14AM +0100, Steven Hartland wrote:
>> Hi Sergey, could you clarify which parts you believe are features?
>>
>> I know there are a number of changes but all of them I'd class as fixes
>> and not really features.
>>
>> For reference here's a description of the changes:-
>>
>> * Added missing license
>> * Display the correct install message for both nginx and apache
>> * Fix staging build of nginx, apache and link components
>> * Ensure download_cache is included in the package which prevents warning
>> on removal due to failure to delete directory.
>> * Updated LIB_DEPENDS to latest recommended format
>>
>> Just to be sure we're both talking about the same changes I've attached
>> the latest version for reference.
>>
>> Regards
>> Steve
>> ----- Original Message ----- From: "Sergey A. Osokin" <osa@FreeBSD.org>
>> To: "Steven Hartland" <killing@multiplay.co.uk>
>> Cc: "FreeBSD Ports" <ports@freebsd.org>; "Scot Hetzel" <swhetzel@gmail.com>; "David Keller" <david.keller@litchis.fr>
>> Sent: Tuesday, April 15, 2014 12:00 AM
>> Subject: Re: FreeBSD Port: rubygem-passenger-4.0.41_2
>>
>>
>> >Hi Steven,
>> >
>> >unfortunately, your patch is wrong and this is why I can't commit your changes.
>> >
>> >What's wrong in your patch? You have mixed features and bugfixes in one patch.
>> >Please provide bugfix only patch.
>> >
>> >--
>> >ozz
>> >
>> >On Sun, Apr 13, 2014 at 12:28:41PM +0100, Steven Hartland wrote:
>> >>----- Original Message ----- From: "David Keller" <david.keller@litchis.fr>
>> >>
>> >>
>> >>>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
>> >
>> >
>> >
>> >_______________________________________________
>> >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_0614_01CF598D.2E7F28E0
Content-Type: application/octet-stream;
name="rubygem-passenger.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="rubygem-passenger.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 351202)=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=
@@ -39,9 +41,9 @@=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 +50,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=
+.else=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 +109,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=
+ ${TOUCH} =
${STAGEDIR}${PREFIX}/${GEMS_DIR}/${GEM_NAME}/download_cache/.keep_me=0A=
=0A=
.include <bsd.port.mk>=0A=
Index: files/pkg-message-apache.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-apache.in (revision 351202)=0A=
+++ files/pkg-message-apache.in (working copy)=0A=
@@ -2,8 +2,8 @@=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=
+ LoadModule passenger_module =
%%PASSENGER_INSTALL_DIR%%/buildout/apache2/mod_passenger.so=0A=
+ PassengerRoot %%PASSENGER_INSTALL_DIR%%=0A=
PassengerRuby %%RUBY%%=0A=
=0A=
After you restart Apache, you are ready to deploy any number of Ruby on =
Rails=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 %%PASSENGER_INSTALL_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: svn:mime-type=0A=
## -0,0 +1 ##=0A=
+text/plain=0A=
\ No newline at end of property=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=
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 351202)=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_0614_01CF598D.2E7F28E0--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?D4D70B5502E5410DB50ED558A66FC356>