FreeBSD Bugzilla – Attachment 193223 Details for
Bug 228054
www/rubygem-passenger is missing passenger_native_support.so
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
ruby-passenger rework
passenger.diff (text/plain), 4.66 KB, created by
Mark Felder
on 2018-05-09 20:32:48 UTC
(
hide
)
Description:
ruby-passenger rework
Filename:
MIME Type:
Creator:
Mark Felder
Created:
2018-05-09 20:32:48 UTC
Size:
4.66 KB
patch
obsolete
>Index: www/rubygem-passenger/Makefile >=================================================================== >--- www/rubygem-passenger/Makefile (revision 469460) >+++ www/rubygem-passenger/Makefile (working copy) >@@ -3,9 +3,10 @@ > > PORTNAME= passenger > PORTVERSION= 5.2.3 >-CATEGORIES= www rubygems >+PORTREVISION= 1 >+CATEGORIES= www > MASTER_SITES= RG >-PKGNAMEPREFIX= rubygem- >+PKGNAMEPREFIX= ruby- > > MAINTAINER= osa@FreeBSD.org > COMMENT= Modules for running Ruby on Rails and Rack applications >@@ -24,17 +25,16 @@ > apache_PKGNAMESUFFIX= -apache > nginx_PKGNAMESUFFIX= -nginx > >-OPTIONS_DEFINE= DEBUG SYMLINK >+OPTIONS_DEFINE= DEBUG > OPTIONS_EXCLUDE=DOCS >-SYMLINK_DESC= Create passenger symlink > > .if ${FLAVOR} == apache >-USES+= apache:2.2+ >+USES+= apache:2.2+,build,run > .endif > > USE_RUBY= yes > RAKE_BIN= ${LOCALBASE}/bin/rake >-USES+= cpe gem libtool python:env shebangfix ssl >+USES+= cpe libtool python:env shebangfix ssl > SHEBANG_FILES= \ > src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py \ > dev/vagrant/nginx_start \ >@@ -59,20 +59,11 @@ > BUILD_DEPENDS+= rubygem-rack16>=0:www/rubygem-rack16 > RUN_DEPENDS:= ${BUILD_DEPENDS} > >-SUB_LIST+= GEM_LIB_DIR=${GEM_LIB_DIR} RUBY=${RUBY} >+MAKE_ENV+= DESTDIR=${STAGEDIR} >+ >+SUB_LIST+= _RUBY_VENDORDIR=${_RUBY_VENDORDIR} RUBY=${RUBY} > SUB_FILES= pkg-message > >-PLIST_FILES= bin/passenger \ >- bin/passenger-config \ >- bin/passenger-install-apache2-module \ >- bin/passenger-memory-stats \ >- bin/passenger-status \ >- bin/passenger-install-nginx-module >- >-SYMLINK_PLIST_FILES= ${GEMS_DIR}/${PORTNAME} >-SYMLINK_SUB_LIST= PASSENGER_INSTALL_DIR="${PREFIX}/${GEMS_DIR}/${PORTNAME}" >-SYMLINK_SUB_LIST_OFF= PASSENGER_INSTALL_DIR="${PREFIX}/${GEM_LIB_DIR}" >- > pre-patch: > .if ${FLAVOR} == nginx > @${ECHO_CMD} >@@ -97,6 +88,9 @@ > 's!-DPASSENGER_DEBUG!-DNDEBUG!g' \ > ${WRKSRC}/build/basics.rb > >+do-build: >+ cd ${WRKSRC} && ${MAKE_ENV} ${RAKE_BIN} -j ${MAKE_JOBS_NUMBER} native_support >+ > post-build: > .if ${FLAVOR} == apache > (CC=${CC} CXX=${CXX} ${WRKSRC}/bin/passenger-install-apache2-module --auto) >@@ -108,21 +102,16 @@ > ${FIND} ${WRKSRC} -name '*.o' -delete > ${FIND} ${WRKSRC} -name '*.bak' -delete > >+do-install: >+ cd ${WRKSRC} && ${MAKE_ENV} ${RAKE_BIN} -j ${MAKE_JOBS_NUMBER} fakeroot >+ > post-install: >- ( cd ${WRKSRC} && \ >- ${COPYTREE_SHARE} buildout ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}-${PORTVERSION} ) >- ${CHMOD} +x ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}-${PORTVERSION}/buildout/support-binaries/* >- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/ruby/*/passenger_native_support.so >- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/support-binaries/PassengerAgent >- ${FIND} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR} -type d -empty -delete > .if ${FLAVOR} == apache >- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/apache2/mod_passenger.so > ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} >- ${INSTALL} -lrs ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/apache2/mod_passenger.so ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_passenger.so >- @${ECHO} "${APACHEMODDIR}/mod_passenger.so" >> ${TMPPLIST} >+ ${INSTALL_LIB} ${WRKSRC}/buildout/apache2/mod_passenger.so ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_passenger.so >+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_passenger.so > .endif >+ ${FIND} -s ${STAGEDIR} -not -type d | ${SORT} | \ >+ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} > >-post-install-SYMLINK-on: >- ${LN} -s ${GEM_NAME} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME} >- > .include <bsd.port.mk> >Index: www/rubygem-passenger/distinfo >=================================================================== >--- www/rubygem-passenger/distinfo (revision 469460) >+++ www/rubygem-passenger/distinfo (working copy) >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1523143545 >-SHA256 (rubygem/passenger-5.2.3.gem) = f17b52be09f9184f3ed4431b97bb68cb469ea93613a9fd4a205a16d70dae2302 >-SIZE (rubygem/passenger-5.2.3.gem) = 6857728 >+TIMESTAMP = 1525890565 >+SHA256 (passenger-5.2.3.tar.gz) = 0a06a2c75688a0e6c85717fb67b57940bebca5e56b7c76337c50b8c3d024345b >+SIZE (passenger-5.2.3.tar.gz) = 6956101 >Index: www/rubygem-passenger/files/pkg-message.in >=================================================================== >--- www/rubygem-passenger/files/pkg-message.in (revision 469460) >+++ www/rubygem-passenger/files/pkg-message.in (working copy) >@@ -2,8 +2,8 @@ > > Please edit your Apache configuration file, and add these lines: > >- LoadModule passenger_module %%PASSENGER_INSTALL_DIR%%/buildout/apache2/mod_passenger.so >- PassengerRoot %%PASSENGER_INSTALL_DIR%% >+ LoadModule passenger_module %%APACHEMODDIR%%/mod_passenger.so >+ PassengerRoot %%_RUBY_VENDORDIR%%/phusion_passenger > PassengerRuby %%RUBY%% > > After you restart Apache, you are ready to deploy any number of Ruby on Rails
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 228054
:
193223
|
193244