Date: Wed, 31 Mar 2021 02:46:06 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r569607 - in head/devel/bitkeeper: . files Message-ID: <202103310246.12V2k6Nc075656@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Wed Mar 31 02:46:05 2021 New Revision: 569607 URL: https://svnweb.freebsd.org/changeset/ports/569607 Log: devel/bitkeeper: fix poudriere build r569286 fixed manual port stage however it broke poudriere builds. This resulted in either a nested directory tree of $STAGEDIR/$PREFIX/bitkeeper/$PREFIX/bitkeeper under poudriere or simply $STAGEDIR when building by hand, making any conventional fix mutulally exclusive. To resolve we rename DESTDIR within the port to some arbitrary name, PDESTDIR, and set the port's BINDIR to /bitkeeper, from /usr/local/bitkeeper, to avoid the other source of nesting. Added: head/devel/bitkeeper/files/patch-src_Makefile (contents, props changed) Modified: head/devel/bitkeeper/Makefile (contents, props changed) Modified: head/devel/bitkeeper/Makefile ============================================================================== --- head/devel/bitkeeper/Makefile Wed Mar 31 00:22:42 2021 (r569606) +++ head/devel/bitkeeper/Makefile Wed Mar 31 02:46:05 2021 (r569607) @@ -37,12 +37,16 @@ MANDIRS= ${PREFIX}/bitkeeper/man WRKSRC= ${WRKDIR}/bk-${PORTVERSION}/src ALL_TARGET= p +post-patch: + @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ + 's/DESTDIR/PDESTDIR/g' + do-build: @(cd ${WRKSRC}; ${MAKE_CMD} ${ALL_TARGET}) do-install: @(cd ${WRKSRC}; \ - ${MAKE_CMD} DESTDIR=${STAGEDIR}${PREFIX}/bitkeeper ${INSTALL_TARGET}); \ + ${MAKE_CMD} PDESTDIR=${STAGEDIR}${PREFIX} ${INSTALL_TARGET}) ${INSTALL_SCRIPT} ${WRKDIR}/bk ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKDIR}/bk-man.conf \ ${STAGEDIR}${PREFIX}/etc/man.d/bk.conf Added: head/devel/bitkeeper/files/patch-src_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/bitkeeper/files/patch-src_Makefile Wed Mar 31 02:46:05 2021 (r569607) @@ -0,0 +1,15 @@ +--- Makefile.orig 2018-12-29 05:21:08.000000000 -0800 ++++ Makefile 2021-03-30 17:02:38.009421000 -0700 +@@ -70,11 +70,7 @@ + EXE= + # You can set this to anywhere you like and do a + # build production" and you'll have an installed BitKeeper. +- ifeq (,$(INSTALLED_BK)) +- BINDIR := /usr/local/bitkeeper +- else +- BINDIR := $(shell "$(INSTALLED_BK)" bin) +- endif ++ BINDIR := /bitkeeper + INSTALL=install + RESOURCE= + endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103310246.12V2k6Nc075656>