git: 4132e0f87106 - main - www/rubygem-passenger: Update to 6.0.19

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Mon, 27 Nov 2023 10:44:34 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4132e0f87106b0b217abb03a2a2df747c739c047

commit 4132e0f87106b0b217abb03a2a2df747c739c047
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-11-27 10:08:42 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-11-27 10:30:03 +0000

    www/rubygem-passenger: Update to 6.0.19
    
    - Update WWW
    - Use ECHO_CMD instead of ECHO
    - Clean up Makefile
      - Remove unnecessary USES=shebangfix
      - Remove CPE_PRODUCT
      - Remove RAKE_BIN
      - Remove no-op REINPLACE_CMD
    - Take maintainership
    
    Changes:        https://github.com/phusion/passenger/releases
---
 www/rubygem-passenger/Makefile                     | 110 +++++++++------------
 www/rubygem-passenger/distinfo                     |   6 +-
 .../patch-src-ruby_native_extension-extconf.rb     |  15 ---
 3 files changed, 51 insertions(+), 80 deletions(-)

diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index e60bd3ae64e0..aa67285ec791 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -1,22 +1,41 @@
 PORTNAME=	passenger
-PORTVERSION=	6.0.18
+PORTVERSION=	6.0.19
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Modules for running Ruby on Rails and Rack applications
-WWW=		https://www.phusionpassenger.com/
+WWW=		https://www.phusionpassenger.com/ \
+		https://github.com/phusion/passenger
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	rake:devel/rubygem-rake
-LIB_DEPENDS+=	libuv.so:devel/libuv \
+BUILD_DEPENDS=	rubygem-rack>=0:www/rubygem-rack \
+		rubygem-rake>=0.8.1:devel/rubygem-rake \
+		utf8cpp>=0:devel/utf8cpp
+LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 		libcurl.so:ftp/curl \
-		libapr-1.so:devel/apr1
+		libuv.so:devel/libuv
+RUN_DEPENDS=	rubygem-etc>=0:devel/rubygem-etc \
+		rubygem-rack>=0:www/rubygem-rack \
+		rubygem-rake>=0.8.1:devel/rubygem-rake
+
+USES=		compiler:c++11-lang cpe gem libtool python:env ssl
+
+USE_CXXSTD=	c++14
+
+PLIST_FILES=	bin/passenger \
+		bin/passenger-config \
+		bin/passenger-memory-stats \
+		bin/passenger-status
+
+SUB_FILES=	pkg-message-${FLAVOR}
+SUB_LIST=	GEM_LIB_DIR=${GEM_LIB_DIR} RUBY=${RUBY}
+
+CONFLICTS_INSTALL=	rubygem-passenger-apache rubygem-passenger-nginx
 
 CPE_VENDOR=	phusion
-CPE_PRODUCT=	passenger
 
 FLAVORS=	apache nginx
 FLAVOR?=	${FLAVORS:[1]}
@@ -24,71 +43,40 @@ FLAVOR?=	${FLAVORS:[1]}
 apache_PKGNAMESUFFIX=	-apache
 nginx_PKGNAMESUFFIX=	-nginx
 
-apache_CONFLICTS_INSTALL=	${PKGNAMEPREFIX}${PORTNAME}-nginx
-nginx_CONFLICTS_INSTALL=	${PKGNAMEPREFIX}${PORTNAME}-apache
+.if ${FLAVOR} == apache
+USES+=		apache
+.endif
 
 OPTIONS_DEFINE=	DEBUG SYMLINK
 OPTIONS_DEFAULT=SYMLINK
 OPTIONS_EXCLUDE=DOCS
 SYMLINK_DESC=	Create passenger symlink
 
-.if ${FLAVOR} == apache
-USES+=		apache
-.endif
-
-RAKE_BIN=	${LOCALBASE}/bin/rake
-USES+=		compiler:c++11-lang cpe gem libtool python:env shebangfix ssl
-USE_CXXSTD=	c++14
-SHEBANG_FILES=	src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py
-
-BUILD_DEPENDS+=	rubygem-rack>=0:www/rubygem-rack
-RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		rubygem-etc>=0:devel/rubygem-etc
-
-SUB_LIST+=	GEM_LIB_DIR=${GEM_LIB_DIR} RUBY=${RUBY}
-SUB_FILES=	pkg-message-${FLAVOR}
-
-PLIST_FILES=	bin/passenger \
-		bin/passenger-config \
-		bin/passenger-memory-stats \
-		bin/passenger-status
-
-SYMLINK_PLIST_FILES=	${GEMS_DIR}/${PORTNAME}
-SYMLINK_SUB_LIST=	PASSENGER_INSTALL_DIR="${PREFIX}/${GEMS_DIR}/${PORTNAME}"
+SYMLINK_PLIST_FILES=	${GEMS_DIR}/passenger
+SYMLINK_SUB_LIST=	PASSENGER_INSTALL_DIR="${PREFIX}/${GEMS_DIR}/passenger"
 SYMLINK_SUB_LIST_OFF=	PASSENGER_INSTALL_DIR="${PREFIX}/${GEM_LIB_DIR}"
 
-pre-patch:
-	@${REINPLACE_CMD} \
-		's!-Wall!!g; \
-		s!gcc!${CC}!g; \
-		s!g++!${CXX}!g; \
-		s!#{PlatformInfo.debugging_cflags}!${CFLAGS}!g; \
-		s!-O2!!g; \
-		s! -feliminate-unused-debug-symbols -feliminate-unused-debug-types!!g; \
-		170s!true!false!' \
-		${WRKSRC}/build/basics.rb
-	@${REINPLACE_CMD} '1s:python:python2:' \
-		${WRKSRC}/src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py
-
-pre-patch-DEBUG-off:
-	@${REINPLACE_CMD} \
-		's!-DPASSENGER_DEBUG!-DNDEBUG!g' \
-		${WRKSRC}/build/basics.rb
+post-patch:
+# Clean up bundled libraries
+	@${REINPLACE_CMD} 's|"src/cxx_supportlib/vendor-copy/[lu][^"]*".freeze, ||g' ${WRKSRC}/passenger.gemspec
+	@${RM} -r ${WRKSRC}/src/cxx_supportlib/vendor-copy/libuv/
+	@${RM} -r ${WRKSRC}/src/cxx_supportlib/vendor-copy/utf8*
+
+post-patch-DEBUG-off:
+	@${REINPLACE_CMD} 's|-DPASSENGER_DEBUG|-DNDEBUG|g' ${WRKSRC}/build/basics.rb
 
 post-build:
 .if ${FLAVOR} == apache
-	(CC=${CC} CXX=${CXX} EXTRA_CXXFLAGS="${CXXFLAGS}" ${WRKSRC}/bin/passenger-install-apache2-module --auto)
+	${SETENV} CC=${CC} CXX=${CXX} EXTRA_CXXFLAGS="${CXXFLAGS}" USE_VENDORED_LIBUV=false ${WRKSRC}/bin/passenger-install-apache2-module --auto
 .endif
-
 .if ${FLAVOR} == nginx
-	(cd ${WRKSRC} && CC=${CC} CXX=${CXX} EXTRA_CXXFLAGS="${CXXFLAGS}" ${RAKE_BIN} nginx)
+	cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} EXTRA_CXXFLAGS="${CXXFLAGS}" USE_VENDORED_LIBUV=false ${LOCALBASE}/bin/rake nginx
 .endif
-	${FIND} ${WRKSRC} -name '*.o' -o -name '*.bak' -o -name '*.orig' | ${XARGS} ${RM}
+	${FIND} ${WRKSRC} -name '*.bak' -o -name '*.o' -o -name '*.orig' -delete
 
 post-install:
-	( cd ${WRKSRC} && \
-	${COPYTREE_SHARE} buildout ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}-${PORTVERSION} )
-	${CHMOD} +x ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}-${PORTVERSION}/buildout/support-binaries/*
+	cd ${WRKSRC} && ${COPYTREE_SHARE} buildout ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/
+	${CHMOD} +x ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/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
@@ -96,14 +84,12 @@ post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/apache2/mod_passenger.so
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${LN} -sf ../../${GEM_LIB_DIR}/buildout/apache2/mod_passenger.so ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_passenger.so
-	@${ECHO} "${APACHEMODDIR}/mod_passenger.so" >> ${TMPPLIST}
+	@${ECHO_CMD} "${APACHEMODDIR}/mod_passenger.so" >> ${TMPPLIST}
 .endif
-	@${RM} ${STAGEDIR}${PREFIX}/bin/passenger-install-apache2-module \
-		${STAGEDIR}${PREFIX}/bin/passenger-install-nginx-module
-	@${RM} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/bin/passenger-install-apache2-module \
-		${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/bin/passenger-install-nginx-module
+	${RM} ${STAGEDIR}${PREFIX}/bin/passenger-install-apache2-module ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/bin/passenger-install-apache2-module
+	${RM} ${STAGEDIR}${PREFIX}/bin/passenger-install-nginx-module ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/bin/passenger-install-nginx-module
 
 post-install-SYMLINK-on:
-	${LN} -s ${GEM_NAME} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}
+	${LN} -s ${GEM_NAME} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/passenger
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-passenger/distinfo b/www/rubygem-passenger/distinfo
index 08663d0ff589..9f90e115fe76 100644
--- a/www/rubygem-passenger/distinfo
+++ b/www/rubygem-passenger/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1690299755
-SHA256 (rubygem/passenger-6.0.18.gem) = 31d308107a16cc5d6e38a8eea918166a68a89a03de048ea60307f89639518a8c
-SIZE (rubygem/passenger-6.0.18.gem) = 8290816
+TIMESTAMP = 1700760670
+SHA256 (rubygem/passenger-6.0.19.gem) = 3df03d364ff01e92d88523f432227b8a7b9fa3ba6653154e9b1601806015a6ea
+SIZE (rubygem/passenger-6.0.19.gem) = 8291328
diff --git a/www/rubygem-passenger/files/patch-src-ruby_native_extension-extconf.rb b/www/rubygem-passenger/files/patch-src-ruby_native_extension-extconf.rb
deleted file mode 100644
index 69f62791f332..000000000000
--- a/www/rubygem-passenger/files/patch-src-ruby_native_extension-extconf.rb
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/ruby_native_extension/extconf.rb.orig	2020-06-05 11:51:04.865937000 -0400
-+++ src/ruby_native_extension/extconf.rb	2020-06-05 13:22:43.694831000 -0400
-@@ -70,6 +70,12 @@
- 		File.open("Makefile", "w") do |f|
- 			f.write(makefile)
- 		end
-+	elsif RUBY_PLATFORM =~ /freebsd/
-+		makefile = File.read("Makefile")
-+		makefile.sub!(/-Wl,--compress-debug-sections=zlib/, "")
-+		File.open("Makefile", "w") do |f|
-+			f.write(makefile)
-+		end
- 	end
- end
-