Date: Fri, 14 Aug 2020 17:03:30 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544890 - head/comms/wsjtx Message-ID: <202008141703.07EH3UiY028854@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Fri Aug 14 17:03:30 2020 New Revision: 544890 URL: https://svnweb.freebsd.org/changeset/ports/544890 Log: comms/wsjtx: prepare for cmake-3.18.x - this belongs into the "let's forget this ever happened category". - with cmake-3.18 the target to patch the thirdparty sources gets ran twice. Onde during build and once during the install phase. - we silently remove the patches again after the build is done, so that during the install phase, the patching is a no-op. PR: 248003 Modified: head/comms/wsjtx/Makefile Modified: head/comms/wsjtx/Makefile ============================================================================== --- head/comms/wsjtx/Makefile Fri Aug 14 16:52:24 2020 (r544889) +++ head/comms/wsjtx/Makefile Fri Aug 14 17:03:30 2020 (r544890) @@ -32,9 +32,22 @@ CMAKE_ARGS+= -DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/l -DLOCALBASE::STRING="${LOCALBASE}" PLIST_SUB+= PORTVERSION="${PORTVERSION}" +_PATCHES= wsjtx.patch hamlib.patch + post-patch: - ${CP} ${FILESDIR}/wsjtx.patch ${WRKSRC} - ${CP} ${FILESDIR}/hamlib.patch ${WRKSRC} +. for _patch in ${_PATCHES} + # Keep a copy of the blank patch for the post-build target below + ${MV} ${WRKSRC}/${_patch} ${WRKSRC}/${_patch}.orig + # Copy the patch provided by the ports system + ${CP} ${FILESDIR}/${_patch} ${WRKSRC} +. endfor + +post-build: + # With cmake 3.18, the patching stage in the internal build + # is ran again, trick it by removing the patch again. +. for _patch in ${_PATCHES} + ${MV} ${WRKSRC}/${_patch}.orig ${WRKSRC}/${_patch} +. endfor do-install: (cd ${CONFIGURE_WRKSRC};${MAKE} -f Makefile DESTDIR=${STAGEDIR} install)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008141703.07EH3UiY028854>