Date: Wed, 30 Sep 2020 12:43:57 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r550694 - in head: www/py-urlgrabber www/sahi www/vertx x11/gnome-pie Message-ID: <202009301243.08UChv1e087336@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Sep 30 12:43:56 2020 New Revision: 550694 URL: https://svnweb.freebsd.org/changeset/ports/550694 Log: REINPLACE_ARGS can only contain the -i argument. Reported by: kevans Modified: head/www/py-urlgrabber/Makefile (contents, props changed) head/www/sahi/Makefile (contents, props changed) head/www/vertx/Makefile (contents, props changed) head/x11/gnome-pie/Makefile (contents, props changed) Modified: head/www/py-urlgrabber/Makefile ============================================================================== --- head/www/py-urlgrabber/Makefile Wed Sep 30 12:24:26 2020 (r550693) +++ head/www/py-urlgrabber/Makefile Wed Sep 30 12:43:56 2020 (r550694) @@ -25,13 +25,11 @@ DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${ OPTIONS_DEFINE= DOCS -REINPLACE_ARGS= -i.bak -e 's,%%DOCSDIR%%,${DOCSDIR},' - SHEBANG_FILES= scripts/urlgrabber-ext-down USE_PYTHON= autoplist distutils post-patch: - @${REINPLACE_CMD} ${REINPLACE_ARGS} ${WRKSRC}/${PYSETUP} + @${REINPLACE_CMD} -e 's,%%DOCSDIR%%,${DOCSDIR},' ${WRKSRC}/${PYSETUP} .include <bsd.port.mk> Modified: head/www/sahi/Makefile ============================================================================== --- head/www/sahi/Makefile Wed Sep 30 12:24:26 2020 (r550693) +++ head/www/sahi/Makefile Wed Sep 30 12:43:56 2020 (r550694) @@ -44,16 +44,7 @@ USE_JAVA= yes WRKSRC= ${WRKDIR}/sahi -REINPLACE_ARGS= -i '' -E \ - -e 's,%%CHROME%%,${LOCALBASE}/bin/chrome,g' \ - -e 's,%%DATADIR%%,${DATADIR},g' \ - -e 's,%%FIREFOX%%,${LOCALBASE}/bin/firefox,g' \ - -e 's,%%JAVA%%,${JAVA},g' \ - -e 's,%%JAVA_KEYTOOL%%,${JAVA_KEYTOOL},g' \ - -e 's,%%OPERA%%,${LOCALBASE}/bin/opera,g' \ - -e 's,(SAHI_HOME=).*$$,\1${DATADIR},g' \ - -e 's,(export (SAHI_)?USERDATA_DIR=).*$$,if [ -z "$${SAHI_USERDATA_DIR}" ]; then \1\$${HOME}/.sahi; fi,g' \ - -e 's,^(\#!/bin/)ba(sh)$$,\1\2,g' +REINPLACE_ARGS= -i '' SUB_FILES= ${PORTNAME}.sh SUB_LIST= BROWSER=${BROWSER} JAVA_HOME=${JAVA_HOME} @@ -62,7 +53,16 @@ post-patch: @${FIND} ${WRKSRC} -type f \( -name "*.orig" -or -name "*.bat" \) -delete @${FIND} ${WRKSRC} -type f \( -name "*.sh" -or -name "linux.xml" \ -or -name "sahi.properties" \) -print0 \ - | ${XARGS} -0 ${REINPLACE_CMD} + | ${XARGS} -0 ${REINPLACE_CMD} -E \ + -e 's,%%CHROME%%,${LOCALBASE}/bin/chrome,g' \ + -e 's,%%DATADIR%%,${DATADIR},g' \ + -e 's,%%FIREFOX%%,${LOCALBASE}/bin/firefox,g' \ + -e 's,%%JAVA%%,${JAVA},g' \ + -e 's,%%JAVA_KEYTOOL%%,${JAVA_KEYTOOL},g' \ + -e 's,%%OPERA%%,${LOCALBASE}/bin/opera,g' \ + -e 's,(SAHI_HOME=).*$$,\1${DATADIR},g' \ + -e 's,(export (SAHI_)?USERDATA_DIR=).*$$,if [ -z "$${SAHI_USERDATA_DIR}" ]; then \1\$${HOME}/.sahi; fi,g' \ + -e 's,^(\#!/bin/)ba(sh)$$,\1\2,g' do-install: @${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME} Modified: head/www/vertx/Makefile ============================================================================== --- head/www/vertx/Makefile Wed Sep 30 12:24:26 2020 (r550693) +++ head/www/vertx/Makefile Wed Sep 30 12:43:56 2020 (r550694) @@ -22,8 +22,7 @@ JAVA_RUN= yes PLIST_SUB= VERTXVER=${PORTVERSION} -REINPLACE_ARGS= -E -e '/APP_BASE_NAME=/a \${SED_APPEND_ARGS}' \ - -e 's,(pattern=)%t,\1%h,1' -i '' +REINPLACE_ARGS= -i '' SED_APPEND_ARGS= ${nl}JAVA_HOME=${JAVA_HOME} SHEBANG_FILES= bin/vertx @@ -65,7 +64,6 @@ VERTX_MODULES+= groovy .if ${PORT_OPTIONS:MJYTHON} SED_APPEND_ARGS+= \${nl}JYTHON_HOME=${LOCALBASE}/lib/jython -REINPLACE_ARGS+= -e 's,-Djruby.home=,-Dpython.cachedir=$${HOME}/.jython-cachedir &,1' VERTX_MODULES+= jython .endif @@ -109,7 +107,10 @@ do-build: post-patch: @${FIND} ${WRKSRC} -type f \( -name "*.bat" -o -name "*.orig" \) -delete - @${REINPLACE_CMD} ${WRKSRC}/bin/${PORTNAME} ${WRKSRC}/conf/logging.properties + @${REINPLACE_CMD} -E -e '/APP_BASE_NAME=/a \${SED_APPEND_ARGS}' \ + -e 's,(pattern=)%t,\1%h,1' \ + -e 's,-Djruby.home=,-Dpython.cachedir=$${HOME}/.jython-cachedir &,1' \ + ${WRKSRC}/bin/${PORTNAME} ${WRKSRC}/conf/logging.properties do-install: @${MKDIR} ${STAGEDIR}${DATADIR} Modified: head/x11/gnome-pie/Makefile ============================================================================== --- head/x11/gnome-pie/Makefile Wed Sep 30 12:24:26 2020 (r550693) +++ head/x11/gnome-pie/Makefile Wed Sep 30 12:43:56 2020 (r550694) @@ -42,13 +42,13 @@ OPTIONS_SUB= yes PLIST_SUB= DESKTOPDIR=${DESKTOPDIR} -REINPLACE_ARGS= -e 's,%%DATADIR%%,${DATADIR},1' \ - -e 's,%%DESKTOPDIR%%,${DESKTOPDIR},1' \ - -e 's,%%PREFIX%%,${PREFIX},1' -i.bak \ - -e '/has_resize_grip/d' -i '' +REINPLACE_ARGS= -i '' post-patch: - ${REINPLACE_CMD} ${WRKSRC}/src/actions/actionRegistry.vala \ + ${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},1' \ + -e 's,%%DESKTOPDIR%%,${DESKTOPDIR},1' \ + -e 's,%%PREFIX%%,${PREFIX},1' \ + -e '/has_resize_grip/d' ${WRKSRC}/src/actions/actionRegistry.vala \ ${WRKSRC}/src/gui/indicator.vala \ ${WRKSRC}/src/utilities/paths.vala \ ${WRKSRC}/resources/ui/*.ui
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009301243.08UChv1e087336>