Attachment #193244 for bug #228054





PORTNAME=	passenger
PORTVERSION=	5.2.3
PORTREVISION=	1
CATEGORIES=	www
MASTER_SITES=	RG
PKGNAMEPREFIX=	ruby-

MAINTAINER=	osa@FreeBSD.org
COMMENT=	Modules for running Ruby on Rails and Rack applications

apache_PKGNAMESUFFIX=	-apache
nginx_PKGNAMESUFFIX=	-nginx

OPTIONS_DEFINE=	DEBUG
OPTIONS_EXCLUDE=DOCS
SYMLINK_DESC=	Create passenger symlink

.if ${FLAVOR} == apache
USES+=		apache:2.2+,build,run
.endif

USE_RUBY=	yes
RAKE_BIN=	${LOCALBASE}/bin/rake
USES+=		cpe libtool python:env shebangfix ssl
SHEBANG_FILES=	\
	src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py \
	dev/vagrant/nginx_start \

BUILD_DEPENDS+=	rubygem-rack16>=0:www/rubygem-rack16
RUN_DEPENDS:=	${BUILD_DEPENDS}

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}

		'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)

	${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_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>

Lines 1-3 Link Here

(-)www/rubygem-passenger/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1523143545	1	TIMESTAMP = 1525890565
2	SHA256 (rubygem/passenger-5.2.3.gem) = f17b52be09f9184f3ed4431b97bb68cb469ea93613a9fd4a205a16d70dae2302	2	SHA256 (passenger-5.2.3.tar.gz) = 0a06a2c75688a0e6c85717fb67b57940bebca5e56b7c76337c50b8c3d024345b
3	SIZE (rubygem/passenger-5.2.3.gem) = 6857728	3	SIZE (passenger-5.2.3.tar.gz) = 6956101




--- build/packaging.rb.orig	2018-05-09 18:30:19 UTC
+++ build/packaging.rb
@@ -119,7 +119,7 @@ task :fakeroot => [:apache2, :nginx, 'ng
   require 'rbconfig'
   include RbConfig
 
-  fs_prefix  = ENV['FS_PREFIX']  || "/usr"
+  fs_prefix  = ENV['PREFIX']  || "/usr"
   fs_bindir  = ENV['FS_BINDIR']  || "#{fs_prefix}/bin"
   fs_sbindir = ENV['FS_SBINDIR'] || "#{fs_prefix}/sbin"
   fs_datadir = ENV['FS_DATADIR'] || "#{fs_prefix}/share"
@@ -146,7 +146,7 @@ task :fakeroot => [:apache2, :nginx, 'ng
   psg_ruby       = ENV['RUBY'] || "#{fs_bindir}/ruby"
   psg_free_ruby  = ENV['FREE_RUBY'] || "/usr/bin/env ruby"
 
-  fakeroot = "#{PKG_DIR}/fakeroot"
+  fakeroot = ENV['DESTDIR']
   fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}"
   fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}"
   fake_libdir     = "#{fakeroot}#{psg_libdir}"
@@ -164,7 +164,6 @@ task :fakeroot => [:apache2, :nginx, 'ng
 
   packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || ENV['PACKAGING_METHOD'] || "deb"
 
-  sh "rm -rf #{fakeroot}"
   sh "mkdir -p #{fakeroot}"
 
   # Ruby sources
@@ -262,10 +261,6 @@ task :fakeroot => [:apache2, :nginx, 'ng
     change_shebang("#{fake_sbindir}/#{exe}", shebang)
   end
 
-  # Apache 2 module
-  sh "mkdir -p #{File.dirname(fake_apache2_module_path)}"
-  sh "cp #{APACHE2_TARGET} #{fake_apache2_module_path}"
-
   # Ruby extension sources
   sh "mkdir -p #{fake_ruby_extension_source_dir}"
   sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}"

Lines 2-9 Link Here

(-)www/rubygem-passenger/files/pkg-message.in (-2 / +2 lines)
2		2
3	Please edit your Apache configuration file, and add these lines:	3	Please edit your Apache configuration file, and add these lines:
4		4
5	LoadModule passenger_module %%PASSENGER_INSTALL_DIR%%/buildout/apache2/mod_passenger.so	5	LoadModule passenger_module %%APACHEMODDIR%%/mod_passenger.so
6	PassengerRoot %%PASSENGER_INSTALL_DIR%%	6	PassengerRoot %%_RUBY_VENDORDIR%%/phusion_passenger
7	PassengerRuby %%RUBY%%	7	PassengerRuby %%RUBY%%
8		8
9	After you restart Apache, you are ready to deploy any number of Ruby on Rails	9	After you restart Apache, you are ready to deploy any number of Ruby on Rails

Return to bug 228054

Lines 3-11 Link Here

(-)www/rubygem-passenger/Makefile (-30 / +19 lines)
3		3
4	PORTNAME= passenger	4	PORTNAME= passenger
5	PORTVERSION= 5.2.3	5	PORTVERSION= 5.2.3
6	CATEGORIES= www rubygems	6	PORTREVISION= 1
		7	CATEGORIES= www
7	MASTER_SITES= RG	8	MASTER_SITES= RG
8	PKGNAMEPREFIX= rubygem-	9	PKGNAMEPREFIX= ruby-
9		10
10	MAINTAINER= osa@FreeBSD.org	11	MAINTAINER= osa@FreeBSD.org
11	COMMENT= Modules for running Ruby on Rails and Rack applications	12	COMMENT= Modules for running Ruby on Rails and Rack applications
Lines 24-40 Link Here
24	apache_PKGNAMESUFFIX= -apache	25	apache_PKGNAMESUFFIX= -apache
25	nginx_PKGNAMESUFFIX= -nginx	26	nginx_PKGNAMESUFFIX= -nginx
26		27
27	OPTIONS_DEFINE= DEBUG SYMLINK	28	OPTIONS_DEFINE= DEBUG
28	OPTIONS_EXCLUDE=DOCS	29	OPTIONS_EXCLUDE=DOCS
29	SYMLINK_DESC= Create passenger symlink
30		30
31	.if ${FLAVOR} == apache	31	.if ${FLAVOR} == apache
32	USES+= apache:2.2+	32	USES+= apache:2.2+,build,run
33	.endif	33	.endif
34		34
35	USE_RUBY= yes	35	USE_RUBY= yes
36	RAKE_BIN= ${LOCALBASE}/bin/rake	36	RAKE_BIN= ${LOCALBASE}/bin/rake
37	USES+= cpe gem libtool python:env shebangfix ssl	37	USES+= cpe libtool python:env shebangfix ssl
38	SHEBANG_FILES= \	38	SHEBANG_FILES= \
39	src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py \	39	src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py \
40	dev/vagrant/nginx_start \	40	dev/vagrant/nginx_start \
Lines 59-78 Link Here
59	BUILD_DEPENDS+= rubygem-rack16>=0:www/rubygem-rack16	59	BUILD_DEPENDS+= rubygem-rack16>=0:www/rubygem-rack16
60	RUN_DEPENDS:= ${BUILD_DEPENDS}	60	RUN_DEPENDS:= ${BUILD_DEPENDS}
61		61
62	SUB_LIST+= GEM_LIB_DIR=${GEM_LIB_DIR} RUBY=${RUBY}	62	MAKE_ENV+= DESTDIR=${STAGEDIR}
		63
		64	SUB_LIST+= _RUBY_VENDORDIR=${_RUBY_VENDORDIR} RUBY=${RUBY}
63	SUB_FILES= pkg-message	65	SUB_FILES= pkg-message
64		66
65	PLIST_FILES= bin/passenger \
66	bin/passenger-config \
67	bin/passenger-install-apache2-module \
68	bin/passenger-memory-stats \
69	bin/passenger-status \
70	bin/passenger-install-nginx-module
71
72	SYMLINK_PLIST_FILES= ${GEMS_DIR}/${PORTNAME}
73	SYMLINK_SUB_LIST= PASSENGER_INSTALL_DIR="${PREFIX}/${GEMS_DIR}/${PORTNAME}"
74	SYMLINK_SUB_LIST_OFF= PASSENGER_INSTALL_DIR="${PREFIX}/${GEM_LIB_DIR}"
75
76	pre-patch:	67	pre-patch:
77	.if ${FLAVOR} == nginx	68	.if ${FLAVOR} == nginx
78	@${ECHO_CMD}	69	@${ECHO_CMD}
Lines 97-102 Link Here
97	's!-DPASSENGER_DEBUG!-DNDEBUG!g' \	88	's!-DPASSENGER_DEBUG!-DNDEBUG!g' \
98	${WRKSRC}/build/basics.rb	89	${WRKSRC}/build/basics.rb
99		90
		91	do-build:
		92	cd ${WRKSRC} && ${MAKE_ENV} ${RAKE_BIN} -j ${MAKE_JOBS_NUMBER} native_support
		93
100	post-build:	94	post-build:
101	.if ${FLAVOR} == apache	95	.if ${FLAVOR} == apache
102	(CC=${CC} CXX=${CXX} ${WRKSRC}/bin/passenger-install-apache2-module --auto)	96	(CC=${CC} CXX=${CXX} ${WRKSRC}/bin/passenger-install-apache2-module --auto)
Lines 108-128 Link Here
108	${FIND} ${WRKSRC} -name '*.o' -delete	102	${FIND} ${WRKSRC} -name '*.o' -delete
109	${FIND} ${WRKSRC} -name '*.bak' -delete	103	${FIND} ${WRKSRC} -name '*.bak' -delete
110		104
		105	do-install:
		106	cd ${WRKSRC} && ${MAKE_ENV} ${RAKE_BIN} -j ${MAKE_JOBS_NUMBER} fakeroot
		107
111	post-install:	108	post-install:
112	( cd ${WRKSRC} && \
113	${COPYTREE_SHARE} buildout ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}-${PORTVERSION} )
114	${CHMOD} +x ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}-${PORTVERSION}/buildout/support-binaries/*
115	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/ruby/*/passenger_native_support.so
116	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/support-binaries/PassengerAgent
117	${FIND} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR} -type d -empty -delete
118	.if ${FLAVOR} == apache	109	.if ${FLAVOR} == apache
119	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/apache2/mod_passenger.so
120	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}	110	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
121	${INSTALL} -lrs ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/apache2/mod_passenger.so ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_passenger.so	111	${INSTALL_LIB} ${WRKSRC}/buildout/apache2/mod_passenger.so ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_passenger.so
122	@${ECHO} "${APACHEMODDIR}/mod_passenger.so" >> ${TMPPLIST}	112	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_passenger.so
123	.endif	113	.endif
		114	${FIND} -s ${STAGEDIR} -not -type d \| ${SORT} \| \
		115	${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
124		116
125	post-install-SYMLINK-on:
126	${LN} -s ${GEM_NAME} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}
127
128	.include <bsd.port.mk>	117	.include <bsd.port.mk>

Line 0 Link Here

(-)www/rubygem-passenger/files/patch-build_packaging.rb (+39 lines)
	1	--- build/packaging.rb.orig 2018-05-09 18:30:19 UTC
	2	+++ build/packaging.rb
	3	@@ -119,7 +119,7 @@ task :fakeroot => [:apache2, :nginx, 'ng
	4	require 'rbconfig'
	5	include RbConfig
	6
	7	- fs_prefix = ENV['FS_PREFIX'] \|\| "/usr"
	8	+ fs_prefix = ENV['PREFIX'] \|\| "/usr"
	9	fs_bindir = ENV['FS_BINDIR'] \|\| "#{fs_prefix}/bin"
	10	fs_sbindir = ENV['FS_SBINDIR'] \|\| "#{fs_prefix}/sbin"
	11	fs_datadir = ENV['FS_DATADIR'] \|\| "#{fs_prefix}/share"
	12	@@ -146,7 +146,7 @@ task :fakeroot => [:apache2, :nginx, 'ng
	13	psg_ruby = ENV['RUBY'] \|\| "#{fs_bindir}/ruby"
	14	psg_free_ruby = ENV['FREE_RUBY'] \|\| "/usr/bin/env ruby"
	15
	16	- fakeroot = "#{PKG_DIR}/fakeroot"
	17	+ fakeroot = ENV['DESTDIR']
	18	fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}"
	19	fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}"
	20	fake_libdir = "#{fakeroot}#{psg_libdir}"
	21	@@ -164,7 +164,6 @@ task :fakeroot => [:apache2, :nginx, 'ng
	22
	23	packaging_method = ENV['NATIVE_PACKAGING_METHOD'] \|\| ENV['PACKAGING_METHOD'] \|\| "deb"
	24
	25	- sh "rm -rf #{fakeroot}"
	26	sh "mkdir -p #{fakeroot}"
	27
	28	# Ruby sources
	29	@@ -262,10 +261,6 @@ task :fakeroot => [:apache2, :nginx, 'ng
	30	change_shebang("#{fake_sbindir}/#{exe}", shebang)
	31	end
	32
	33	- # Apache 2 module
	34	- sh "mkdir -p #{File.dirname(fake_apache2_module_path)}"
	35	- sh "cp #{APACHE2_TARGET} #{fake_apache2_module_path}"
	36	-
	37	# Ruby extension sources
	38	sh "mkdir -p #{fake_ruby_extension_source_dir}"
	39	sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}"