From owner-svn-ports-all@freebsd.org Wed Mar 31 02:46:06 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A41C25B8817; Wed, 31 Mar 2021 02:46:06 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F99g24Gfkz4SFW; Wed, 31 Mar 2021 02:46:06 +0000 (UTC) (envelope-from cy@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 80C0711F44; Wed, 31 Mar 2021 02:46:06 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12V2k6MN075658; Wed, 31 Mar 2021 02:46:06 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12V2k6Nc075656; Wed, 31 Mar 2021 02:46:06 GMT (envelope-from cy@FreeBSD.org) Message-Id: <202103310246.12V2k6Nc075656@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 31 Mar 2021 02:46:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r569607 - in head/devel/bitkeeper: . files X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in head/devel/bitkeeper: . files X-SVN-Commit-Revision: 569607 X-SVN-Commit-Repository: ports 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.34 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: Wed, 31 Mar 2021 02:46:06 -0000 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