Date: Sun, 29 Jun 2014 17:02:53 +0200 From: David Keller <david.keller@litchis.fr> To: Steven Hartland <killing@multiplay.co.uk> Cc: FreeBSD Ports <ports@freebsd.org>, Scot Hetzel <swhetzel@gmail.com>, "Sergey A. Osokin" <osa@freebsd.org> Subject: Re: FreeBSD Port: rubygem-passenger-4.0.41_2 Message-ID: <CAFop7Tn3h-Ntv_GRJovq3Lj_g68ANFZt=jmB4-jGktFbkTpGXA@mail.gmail.com> In-Reply-To: <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> <D4D70B5502E5410DB50ED558A66FC356@multiplay.co.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
--047d7b339d113d80b304fcfad696 Content-Type: text/plain; charset=ISO-8859-1 Hi, This should correct the symlink creation error. Regards, David On Wed, Apr 16, 2014 at 5:01 PM, Steven Hartland <killing@multiplay.co.uk> wrote: > 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" >>> > >> >> >> >> > --047d7b339d113d80b304fcfad696 Content-Type: application/octet-stream; name="rubygem-passenger.patch" Content-Disposition: attachment; filename="rubygem-passenger.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hx0hkxeu1 LS0tIE1ha2VmaWxlCTIwMTQtMDYtMjkgMTY6NTI6MzUuMDAwMDAwMDAwICswMjAwCisrKyBNYWtl ZmlsZQkyMDE0LTA2LTI5IDE2OjUwOjQyLjAwMDAwMDAwMCArMDIwMApAQCAtMTA4LDEwICsxMDgs NiBAQAogLmlmICR7UE9SVF9PUFRJT05TOk1OR0lOWH0KIAkoY2QgJHtXUktTUkN9ICYmIENDPSR7 Q0N9IENYWD0ke0NYWH0gJHtSQUtFX0JJTn0gbmdpbngpCiAuZW5kaWYKLS5pZiAke1BPUlRfT1BU SU9OUzpNU1lNTElOS30KLQkke0xOfSAtcyAke0dFTV9MSUJfRElSfSAke1NUQUdFfSR7UFJFRklY fS8ke0dFTVNfRElSfS8ke1BPUlROQU1FfQotLmVuZGlmCi0KIAkke0ZJTkR9ICR7V1JLU1JDfSAt bmFtZSAnKi5vJyAtZGVsZXRlCiAJJHtGSU5EfSAke1dSS1NSQ30gLW5hbWUgJyouYmFrJyAtZGVs ZXRlCiAKQEAgLTEyMCw0ICsxMTYsOCBAQAogCSR7Q09QWVRSRUVfU0hBUkV9IGJ1aWxkb3V0ICR7 U1RBR0VESVJ9JHtQUkVGSVh9LyR7R0VNU19ESVJ9LyR7UE9SVE5BTUV9LSR7UE9SVFZFUlNJT059 ICkKIAkke0NITU9EfSAreCAke1NUQUdFRElSfSR7UFJFRklYfS8ke0dFTVNfRElSfS8ke1BPUlRO QU1FfS0ke1BPUlRWRVJTSU9OfS9idWlsZG91dC9hZ2VudHMvKgogCisuaWYgJHtQT1JUX09QVElP TlM6TVNZTUxJTkt9CisJJHtMTn0gLXMgJHtHRU1fTkFNRX0gJHtTVEFHRURJUn0ke1BSRUZJWH0v JHtHRU1TX0RJUn0vJHtQT1JUTkFNRX0KKy5lbmRpZgorCiAuaW5jbHVkZSA8YnNkLnBvcnQubWs+ Cg== --047d7b339d113d80b304fcfad696--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFop7Tn3h-Ntv_GRJovq3Lj_g68ANFZt=jmB4-jGktFbkTpGXA>