Commit 26e3dffc authored by cy's avatar cy
Browse files

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.
parent 1f406ed1
......@@ -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
......
--- 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment