Date: Tue, 10 Sep 2019 17:38:00 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511765 - in head: Mk/Uses security/rubygem-scrypt textproc/rubygem-cld3 textproc/rubygem-ox textproc/rubygem-ox/files textproc/rubygem-sassc Message-ID: <201909101738.x8AHc04E054546@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Tue Sep 10 17:38:00 2019 New Revision: 511765 URL: https://svnweb.freebsd.org/changeset/ports/511765 Log: Keep .so files in ext directory - Remove NO_ARCH for dependent ports - Bump PORTREVISION for dependency and package change PR: 240425 Exp-run by: antoine Deleted: head/textproc/rubygem-ox/files/ Modified: head/Mk/Uses/gem.mk head/security/rubygem-scrypt/Makefile head/textproc/rubygem-cld3/Makefile head/textproc/rubygem-ox/Makefile head/textproc/rubygem-sassc/Makefile Modified: head/Mk/Uses/gem.mk ============================================================================== --- head/Mk/Uses/gem.mk Tue Sep 10 17:36:51 2019 (r511764) +++ head/Mk/Uses/gem.mk Tue Sep 10 17:38:00 2019 (r511765) @@ -108,8 +108,9 @@ do-install: ${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info/ ${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f -name '*.so' -exec ${STRIP_CMD} {} + ${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f \( -name mkmf.log -or -name gem_make.out \) -delete - ${RM} -r ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext \ - ${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null || ${TRUE} + ${FIND} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext -type f -not -name '*.so' -delete 2> /dev/null || ${TRUE} + ${FIND} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext -type d -empty -delete 2> /dev/null || ${TRUE} + ${RM} -r ${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null || ${TRUE} ${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null || ${TRUE} .if !${PORT_OPTIONS:MDOCS} -@${RMDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR} Modified: head/security/rubygem-scrypt/Makefile ============================================================================== --- head/security/rubygem-scrypt/Makefile Tue Sep 10 17:36:51 2019 (r511764) +++ head/security/rubygem-scrypt/Makefile Tue Sep 10 17:38:00 2019 (r511765) @@ -3,6 +3,7 @@ PORTNAME= scrypt PORTVERSION= 3.0.6 +PORTREVISION= 1 CATEGORIES= security rubygems MASTER_SITES= RG @@ -16,7 +17,5 @@ RUN_DEPENDS= rubygem-ffi-compiler>=1.0:devel/rubygem-f USES= gem USE_RUBY= yes - -NO_ARCH= yes .include <bsd.port.mk> Modified: head/textproc/rubygem-cld3/Makefile ============================================================================== --- head/textproc/rubygem-cld3/Makefile Tue Sep 10 17:36:51 2019 (r511764) +++ head/textproc/rubygem-cld3/Makefile Tue Sep 10 17:38:00 2019 (r511765) @@ -2,6 +2,7 @@ PORTNAME= cld3 DISTVERSION= 3.2.4 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -12,22 +13,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= protobuf>0:devel/protobuf \ - rubygem-ffi110>1.1.0<1.11.0:devel/rubygem-ffi110 + rubygem-ffi110>=1.1.0<1.11.0:devel/rubygem-ffi110 USES= gem pkgconfig USE_RUBY= yes - -## do-install here to prevent removal of ext -do-install: - (cd ${BUILD_WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install \ - ${RUBYGEM_ARGS} ${GEMFILES} -- ${CONFIGURE_ARGS}) - ${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info/ - ${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f -name '*.so' \ - -exec ${STRIP_CMD} {} + - ${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f \ - \( -name mkmf.log -or -name gem_make.out \) -delete - ${RM} -r ${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null || ${TRUE} - ${RMDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR} 2> /dev/null || ${TRUE} - ${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null || ${TRUE} .include <bsd.port.mk> Modified: head/textproc/rubygem-ox/Makefile ============================================================================== --- head/textproc/rubygem-ox/Makefile Tue Sep 10 17:36:51 2019 (r511764) +++ head/textproc/rubygem-ox/Makefile Tue Sep 10 17:38:00 2019 (r511765) @@ -2,6 +2,7 @@ PORTNAME= ox PORTVERSION= 2.10.0 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -12,14 +13,5 @@ LICENSE= MIT USES= gem USE_RUBY= yes - -# The original gem depends on ext/ox/ox.so, -# but the ext directory is eliminated by FreeBSD's Uses/gem.mk framework. -# The workaround below is to create symlink lib/ox/ox.so pointing to lib/ox.so. - -PLIST_FILES= ${GEM_LIB_DIR}/lib/ox/ox.so - -post-install: - ${LN} -s ../ox.so ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/lib/ox .include <bsd.port.mk> Modified: head/textproc/rubygem-sassc/Makefile ============================================================================== --- head/textproc/rubygem-sassc/Makefile Tue Sep 10 17:36:51 2019 (r511764) +++ head/textproc/rubygem-sassc/Makefile Tue Sep 10 17:38:00 2019 (r511765) @@ -3,6 +3,7 @@ PORTNAME= sassc PORTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -12,13 +13,9 @@ COMMENT= Use libsass with Ruby LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LIB_DEPENDS= libsass.so:textproc/libsass RUN_DEPENDS= rubygem-ffi>=1.9<2:devel/rubygem-ffi USES= gem gmake USE_RUBY= yes - -post-patch: - @${REINPLACE_CMD} -e '/ffi_lib/ s|__dir__|"${LOCALBASE}/lib"|' ${WRKSRC}/lib/sassc/native.rb .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909101738.x8AHc04E054546>