Date: Mon, 17 May 2021 17:42:30 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0c2fa02921dd - main - sysutils/bareos17-server: fix build Message-ID: <202105171742.14HHgUAm075836@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=0c2fa02921dd8b7e82f5021fdf5229cb9552a821 commit 0c2fa02921dd8b7e82f5021fdf5229cb9552a821 Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2021-05-17 16:00:03 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2021-05-17 17:40:05 +0000 sysutils/bareos17-server: fix build Escape special regular expression characters to prevent ${REINPLACE_CMD}s from manging the Makefiles. Approved by: portmgr blanket --- sysutils/bareos17-server/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysutils/bareos17-server/Makefile b/sysutils/bareos17-server/Makefile index 6817b7f1e51a..412e279342f9 100644 --- a/sysutils/bareos17-server/Makefile +++ b/sysutils/bareos17-server/Makefile @@ -197,9 +197,9 @@ post-patch: # In server port don't install filed @${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \ -e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|../lib/|$$(LOCALBASE)/lib/|g' -e 's|../findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \ + @${REINPLACE_CMD} -e 's|\.\./lib/|$$(LOCALBASE)/lib/|g' -e 's|\.\./findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \ ${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in ${WRKSRC}/src/tests/Makefile.in - @${REINPLACE_CMD} -e 's|../../lib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/plugins/dird/Makefile.in ${WRKSRC}/src/plugins/stored/Makefile.in + @${REINPLACE_CMD} -e 's|\.\./\.\./lib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/plugins/dird/Makefile.in ${WRKSRC}/src/plugins/stored/Makefile.in @${REINPLACE_CMD} -e 's|fd_plugins.h|filed/fd_plugins.h|g' -e 's|dir_plugins.h|dird/dir_plugins.h|g' -e 's|stored.h|stored/stored.h|g' \ ${WRKSRC}/src/tools/bpluginfo.c @${REINPLACE_CMD} -e 's|perl|$(LOCALBASE)/bin/perl|g' ${WRKSRC}/scripts/mtx-changer.in
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105171742.14HHgUAm075836>