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" <[email protected]>
To: "Steven Hartland" <[email protected]> Cc: "FreeBSD Ports" <[email protected]>; "Scot Hetzel" <[email protected]>; "David Keller" <[email protected]> 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 [email protected]. 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" <[email protected]> To: "Steven Hartland" <[email protected]> Cc: "FreeBSD Ports" <[email protected]>; "Scot Hetzel" <[email protected]>; "David Keller" <[email protected]> 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" <[email protected]> >> >> >>>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 > > > >_______________________________________________ >[email protected] mailing list >http://lists.freebsd.org/mailman/listinfo/freebsd-ports >To unsubscribe, send any mail to "[email protected]" >
rubygem-passenger.patch
Description: Binary data
_______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "[email protected]"
