From owner-svn-ports-all@freebsd.org Sat Jan 23 17:51:16 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D5CF4A8ED44; Sat, 23 Jan 2016 17:51:16 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 96A4417B2; Sat, 23 Jan 2016 17:51:16 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0NHpFo6098670; Sat, 23 Jan 2016 17:51:15 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0NHpFrH098669; Sat, 23 Jan 2016 17:51:15 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201601231751.u0NHpFrH098669@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Sat, 23 Jan 2016 17:51:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407046 - head/devel/rubygem-io-like X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Jan 2016 17:51:17 -0000 Author: pawel Date: Sat Jan 23 17:51:15 2016 New Revision: 407046 URL: https://svnweb.freebsd.org/changeset/ports/407046 Log: - Remove deprecated @dirrm usage - Add NO_ARCH - Convert to options helpers Approved by: portmgr blanket Modified: head/devel/rubygem-io-like/Makefile Modified: head/devel/rubygem-io-like/Makefile ============================================================================== --- head/devel/rubygem-io-like/Makefile Sat Jan 23 17:35:17 2016 (r407045) +++ head/devel/rubygem-io-like/Makefile Sat Jan 23 17:51:15 2016 (r407046) @@ -18,6 +18,7 @@ RUN_DEPENDS= ${RUBYGEMBIN}:${PORTSDIR}/d USE_RUBY= yes USE_RAKE= yes +NO_ARCH= yes GEMS_BASE_DIR= lib/ruby/gems/${RUBY_VER} GEMS_DIR= ${GEMS_BASE_DIR}/gems @@ -55,13 +56,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-ruby-1.9-t OPTIONS_DEFINE= DOCS -.include - -.if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= rubygem-allison>=0:${PORTSDIR}/devel/rubygem-allison -.else -RUBYGEM_ARGS+= --no-rdoc -.endif +DOCS_BUILD_DEPENDS= rubygem-allison>=0:${PORTSDIR}/devel/rubygem-allison +DOCS_VARS_OFF= RUBYGEM_ARGS+=--no-rdoc post-patch: .for l in 1.8.6 1.8.7 1.9.2 1.9.3 @@ -76,28 +72,18 @@ do-build: do-install: @(cd ${INSTALL_WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} pkg/${GEMFILES} -- --build-args ${CONFIGURE_ARGS}) + @${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info + @${RMDIR} ${STAGEDIR}/${PREFIX}/${GEMS_BASE_DIR}/extensions post-install: @${ECHO} ${GEM_CACHE} >> ${TMPPLIST} @${ECHO} ${GEM_SPEC} >> ${TMPPLIST} -.if ${PORT_OPTIONS:MDOCS} - @${FIND} -ds ${STAGEDIR}${PREFIX}/${GEM_DOC_DIR} -type f -print | ${SED} -E -e \ - 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} - @${FIND} -ds ${STAGEDIR}${PREFIX}/${GEM_DOC_DIR} -type d -print | ${SED} -E -e \ - 's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST} -.endif @${FIND} -ds ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR} -type f -print | ${SED} -E -e \ 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} - @${FIND} -ds ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR} -type d -print | ${SED} -E -e \ - 's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/${GEMS_DIR} 2>/dev/null || true" >> ${TMPPLIST} -.if ${PORT_OPTIONS:MDOCS} - @${ECHO_CMD} "@unexec rmdir %D/${DOC_DIR} 2>/dev/null || true" >> ${TMPPLIST} -.endif - @${ECHO_CMD} "@unexec rmdir %D/${CACHE_DIR} 2>/dev/null || true" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/${SPEC_DIR} 2>/dev/null || true" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/${GEMS_BASE_DIR} 2>/dev/null || true" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/lib/ruby/gems 2>/dev/null || true" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/lib/ruby 2>/dev/null || true" >> ${TMPPLIST} + @${ECHO} "@dir ${DOC_DIR}" >> ${TMPPLIST} + +post-install-DOCS-on: + @${FIND} -ds ${STAGEDIR}${PREFIX}/${GEM_DOC_DIR} -type f -print | ${SED} -E -e \ + 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} .include