From nobody Mon Nov 27 10:44:34 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sf2Jz1vlwz523qq; Mon, 27 Nov 2023 10:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sf2Jz0530z4vjy; Mon, 27 Nov 2023 10:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701081875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ooc904dqY455X+S3Ni1xxtqyNn1qBPnjj1Svv+E/Npg=; b=b8kKtWHubazJkInSGyX9OlU6MAOc7pIUfnRyGuCxAd3y4ygcCZbkvlG57uIqoQ9DlxaZDf RIi5h0ewwewlkGx14MHzMsFGR9I9F2g2x+6VjHycHZjP1YWsaLKrgZdzr18KJ1FPCv9d/4 VAa7Ec1i0uR8ZKs1oLBI++YqYfudXUiW3R7y9rlONodIgNDyNJtMjAzMVdwACkR/gq9IaT SAIRPXEAIBStER7bVXG5gUN7V3WeFQ33+hhVGpyPYLZl5/NrkTht993Zq2wjaEMQI2K/oL 0VxItk/uOiAwjbcM55xwcxrXVE+PZu7XbeE9L+NxtpGKC2BIJCZICtOiSeNBNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701081875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ooc904dqY455X+S3Ni1xxtqyNn1qBPnjj1Svv+E/Npg=; b=LdaUMM1Hv898jWz2ElgFbSdXSFrW3dDdGArTL5n1JpUooAK1z6YUUYXM8lMeJ5L8OpWIYq f9M4hzXSbyigomBXGVOrCs8HBmzFOszQBVUsdo2L5UOgY3Qbv1VFAY0NWSS+XMyy/KTckX P4D/DaZJp2yqb4mABExEXIM0+nvNinnIhYb5AW9l65oDbNOgqfVJlF5kceI1UnEDNuU4r7 v74IVSb1qk7neHUGnTtOLlR8LFzhPGIVAlhDAU72i3joy26cvqcwL1ceAbD1uqwjRkyl0+ PvMMRFolpYBt7CV5TZuZkrIcF8X0nFwmT03+d7S4z13ElnJcSntuV8L9xcPfdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701081875; a=rsa-sha256; cv=none; b=P3UQFfiAmerIcarK2ZXmlN9T22qUA6NTjPHGpj9JJuzMgjE+jaLocTbNcCHUoC4A//Ztul naOIFX/RP/0VINc5JDzVxExFSrn86UpteeoGBT3RECW3O2jELXyx2H+E9fAVBwakdGzMKY iqZSx/VZ4ddKIYjGbrUZ9r5ZA0Kj8iRxKdk1xgCPjQQydHHKiG6pAs7l2/dh0fcbpgf0pS DEC4g6Zb7WY8oAI9tNDEn9IM/DaibsjaTpJa32393qJTjG1Yj+gdAkGdVt0Qiw9umTfiIS /EL8wX/yvaB50ToZcwuJOfEJ4ymduztZ4tVpD74DT4mp/CgDzxIE1UATuV2VfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sf2Jy6HK8zbS8; Mon, 27 Nov 2023 10:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ARAiYUa024618; Mon, 27 Nov 2023 10:44:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARAiYhO024615; Mon, 27 Nov 2023 10:44:34 GMT (envelope-from git) Date: Mon, 27 Nov 2023 10:44:34 GMT Message-Id: <202311271044.3ARAiYhO024615@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 4132e0f87106 - main - www/rubygem-passenger: Update to 6.0.19 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4132e0f87106b0b217abb03a2a2df747c739c047 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4132e0f87106b0b217abb03a2a2df747c739c047 commit 4132e0f87106b0b217abb03a2a2df747c739c047 Author: Po-Chuan Hsieh AuthorDate: 2023-11-27 10:08:42 +0000 Commit: Po-Chuan Hsieh 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 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 -