Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 29 Apr 2023 17:33:02 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 0a28a51398d1 - main - devel/leatherman: Unbreak on HEAD
Message-ID:  <202304291733.33THX2ib052156@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0a28a51398d1be4dd07249535c030cc0a60ab719

commit 0a28a51398d1be4dd07249535c030cc0a60ab719
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-04-29 16:54:10 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-04-29 17:32:35 +0000

    devel/leatherman: Unbreak on HEAD
    
    - Pet portclippy while I am here
    
    Approved by:    portmgr (blanket)
---
 devel/leatherman/Makefile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/devel/leatherman/Makefile b/devel/leatherman/Makefile
index 9a7b70559f38..ff5b8d2222e4 100644
--- a/devel/leatherman/Makefile
+++ b/devel/leatherman/Makefile
@@ -15,16 +15,22 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 USES=		compiler:c++11-lang cmake gettext ruby
 USE_GITHUB=	yes
 GH_ACCOUNT=	puppetlabs
+USE_LDCONFIG=	yes
 
 CMAKE_ON=	LEATHERMAN_SHARED
 CMAKE_OFF=	ENABLE_CXX_WERROR
-USE_LDCONFIG=	yes
+
 TEST_TARGET=	test
 
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
+.include <bsd.port.pre.mk>
+
 post-configure:
 	# This file is vendored in vendor/Catch-1.10.0.zip and extracted at configure step
 	${SED} -i '' -e '1s|\(.*\)|#include <sys/signal.h>\n\1|' ${CONFIGURE_WRKSRC}/src/Catch-1.10.0/single_include/catch.hpp
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+	${REINPLACE_CMD} -e 's|ptrdiff_t|size_t|' ${CONFIGURE_WRKSRC}/src/Catch-1.10.0/single_include/catch.hpp
+.endif
 
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304291733.33THX2ib052156>