Date: Tue, 11 Apr 2023 07:14:09 GMT From: Kristof Provost <kp@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4bebb4a0bc1d - main - net/libpfctl: support FreeBSD 12 and 13 Message-ID: <202304110714.33B7E92Y007087@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/ports/commit/?id=4bebb4a0bc1d0355d022257abd6a944bc6f3245e commit 4bebb4a0bc1d0355d022257abd6a944bc6f3245e Author: Kristof Provost <kp@FreeBSD.org> AuthorDate: 2023-03-31 02:50:01 +0000 Commit: Kristof Provost <kp@FreeBSD.org> CommitDate: 2023-04-11 07:13:59 +0000 net/libpfctl: support FreeBSD 12 and 13 Extend the port to also build for FreeBSD 12.4 and FreeBSD 13.1. While here also update the 14.0 hash to a more recent code snapshot. Reviewed by: garga Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39360 --- net/libpfctl/Makefile | 40 +++++++++++++++++++++++++++------------ net/libpfctl/distinfo | 10 +++++++--- net/libpfctl/files/patch-Makefile | 3 ++- 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/net/libpfctl/Makefile b/net/libpfctl/Makefile index c2ad523c431b..470956b04d13 100644 --- a/net/libpfctl/Makefile +++ b/net/libpfctl/Makefile @@ -1,8 +1,9 @@ +.include <bsd.port.pre.mk> + PORTNAME= libpfctl -PORTVERSION= 0.1 +PORTVERSION= 0.2 CATEGORIES= net MASTER_SITES= LOCAL/kp/ -DISTFILES= libpfctl-${_LIBPFCTL_HASH}.tar.gz MAINTAINER= kp@FreeBSD.org COMMENT= Library for interaction with pf(4) @@ -10,32 +11,47 @@ WWW= https://cgit.freebsd.org/src/tree/lib/libpfctl LICENSE= BSD2CLAUSE -BROKEN_FreeBSD_12= Will not work until nvlist-ified ioctls are available -BROKEN_FreeBSD_13= Will not work until nvlist-ified ioctls are available - USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/libpfctl -_LIBPFCTL_HASH= 4ae3a97e127c +_LIBPFCTL_HASH= 134ced89c4ca -PLIST_FILES= lib/libpfctl.so.0 \ +PLIST_FILES= \ + lib/libpfctl.so \ + lib/libpfctl.so.0 \ include/libpfctl.h +.include <bsd.port.pre.mk> + +.if ${OSREL} == "14.0" +DISTFILES= libpfctl-${_LIBPFCTL_HASH}.tar.gz +.else +DISTFILES= libpfctl-${OSREL}.tar.gz +.endif + do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib @${MKDIR} ${STAGEDIR}${PREFIX}/include ${INSTALL_LIB} ${WRKSRC}/libpfctl.so.0 ${STAGEDIR}${PREFIX}/lib + ${LN} -s libpfctl.so.0 ${STAGEDIR}${PREFIX}/lib/libpfctl.so ${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include .if defined(MAINTAINER_MODE) upload: + for version in 12.3 12.4 13.1; \ + do \ + cd /usr/src/lib && \ + git archive --format=tar.gz \ + --output=libpfctl-$${version}.tar.gz \ + origin/releng/$${version} libpfctl ; \ + done cd /usr/src/lib && \ - HASH=$$(git rev-parse --short origin/main) && \ git archive --format=tar.gz \ - --output=libpfctl-$${HASH}.tar.gz \ - origin/main libpfctl && \ - scp libpfctl-$${HASH}.tar.gz kp@freefall.freebsd.org:public_distfiles/ + --output=libpfctl-${_LIBPFCTL_HASH}.tar.gz \ + ${_LIBPFCTL_HASH} libpfctl ; \ + scp libpfctl-*.tar.gz \ + kp@freefall.freebsd.org:public_distfiles/ .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net/libpfctl/distinfo b/net/libpfctl/distinfo index c85746451541..fc3bf9dd8046 100644 --- a/net/libpfctl/distinfo +++ b/net/libpfctl/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1618833133 -SHA256 (libpfctl-4ae3a97e127c.tar.gz) = dcafd22c84f129e301ffe3b0f7f8cb53b841d420bc357af8afa2a5f186b958b3 -SIZE (libpfctl-4ae3a97e127c.tar.gz) = 5260 +TIMESTAMP = 1680240816 +SHA256 (libpfctl-134ced89c4ca.tar.gz) = 320ce04fc4cc4e07bdb7146437b46d258d6b2625958ab071a6a62f8146e375ea +SIZE (libpfctl-134ced89c4ca.tar.gz) = 11323 +SHA256 (libpfctl-12.4.tar.gz) = 1797dd44939bcb1b4eb5725049f83470f50d075a62482fd1242503f5940729d4 +SIZE (libpfctl-12.4.tar.gz) = 9871 +SHA256 (libpfctl-13.1.tar.gz) = 0897d7ee37fcc980f048c50e12c820a2ae4a61389f6017a080c8b61b1e820d61 +SIZE (libpfctl-13.1.tar.gz) = 8319 diff --git a/net/libpfctl/files/patch-Makefile b/net/libpfctl/files/patch-Makefile index becc613d8e6b..605352fe030e 100644 --- a/net/libpfctl/files/patch-Makefile +++ b/net/libpfctl/files/patch-Makefile @@ -1,11 +1,12 @@ --- Makefile.orig 2021-04-19 10:09:35 UTC +++ Makefile -@@ -2,7 +2,7 @@ +@@ -2,7 +2,8 @@ PACKAGE= lib${LIB} LIB= pfctl -INTERNALLIB= true +SHLIB_MAJOR= 0 ++LIBADD+= nv SRCS= libpfctl.c INCS= libpfctl.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304110714.33B7E92Y007087>