From f4ec90719127a36e6679f2fb2c094f769a338c99 Mon Sep 17 00:00:00 2001 From: fcambus Date: Fri, 29 Jul 2022 14:22:51 +0000 Subject: [PATCH] xlife: fix breakage during install, reported by ajacoutot@. Switch to using a do-install target in our Makefile like the FreeBSD port is doing, instead of attempting to appease upstream one with an endless supply of MAKE_FLAGS and FAKE_FLAGS. --- games/xlife/Makefile | 13 +++++++------ games/xlife/pkg/PLIST | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/games/xlife/Makefile b/games/xlife/Makefile index 608a5f90ed8..c79fbbd3d29 100644 --- a/games/xlife/Makefile +++ b/games/xlife/Makefile @@ -17,17 +17,18 @@ WRKDIST= ${WRKDIR}/xlife-6.7 USE_GMAKE= Yes -MAKE_FLAGS=XLIFEPATSDIR=${PREFIX}/share/xlife \ - BINDIR=${PREFIX}/bin \ - MANDIR=${PREFIX}/man/man6 -FAKE_FLAGS=XLIFEPATSDIR=${TRUEPREFIX}/share/xlife - NO_TEST= Yes post-build: cd ${WRKSRC} && ${MAKE} CFLAGS="${CFLAGS}" -post-install: +do-install: +.for f in gen-multirules table2r xlife + ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin +.endfor + cd ${PREFIX}/bin && ln -sf xlife lifeconv + ${INSTALL_DATA} ${WRKSRC}/xlife.man ${PREFIX}/man/man6/xlife.6 + cd ${PREFIX}/man/man6 && ln -sf xlife.6 lifeconv.6 ${INSTALL_DATA_DIR} ${PREFIX}/share/xlife cp -r ${WRKDIST}/patterns ${PREFIX}/share/xlife #pre-install: diff --git a/games/xlife/pkg/PLIST b/games/xlife/pkg/PLIST index 7d990eefc0c..4b54c3a9043 100644 --- a/games/xlife/pkg/PLIST +++ b/games/xlife/pkg/PLIST @@ -1,5 +1,5 @@ @bin bin/gen-multirules -@bin bin/lifeconv +bin/lifeconv bin/table2r @bin bin/xlife @man man/man6/lifeconv.6