git: ba0673b7998e - main - www/litmus: Allow build with neon >= 0.32

From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Mon, 15 Nov 2021 15:30:12 UTC
The branch main has been updated by diizzy:

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

commit ba0673b7998e26df766dfd02d2e68b389f1e225d
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2021-11-15 11:18:57 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2021-11-15 15:30:04 +0000

    www/litmus: Allow build with neon >= 0.32
    
    Additionally do some minor touch ups to Makefile while at it
    
    PR:             259595
    Approved by:    pi (maintainer), mentors (implicit)
---
 www/litmus/Makefile              | 11 +++++++++--
 www/litmus/files/patch-configure | 20 --------------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/www/litmus/Makefile b/www/litmus/Makefile
index 05dc0bfcdf85..b9c30036d902 100644
--- a/www/litmus/Makefile
+++ b/www/litmus/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	litmus
-PORTVERSION=	0.13
+DISTVERSION=	0.13
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/litmus/
@@ -7,10 +7,17 @@ MASTER_SITES=	http://www.webdav.org/neon/litmus/
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	WebDAV server protocol compliance test suite
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libneon.so:www/neon \
 		libk5crypto.so:security/krb5
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-ssl --with-neon=/usr/local
+CONFIGURE_ARGS=	--with-ssl --with-neon=${LOCALBASE}
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|25 26 27 28 29|& 30 31 32|g' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/www/litmus/files/patch-configure b/www/litmus/files/patch-configure
deleted file mode 100644
index d06d8364a461..000000000000
--- a/www/litmus/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	2011-12-09 11:37:29.000000000 +0100
-+++ configure	2015-02-11 10:24:29.000000000 +0100
-@@ -5459,7 +5459,7 @@
- $as_echo "$ne_cv_lib_neon" >&6; }
-     if test "$ne_cv_lib_neon" = "yes"; then
-        ne_cv_lib_neonver=no
--       for v in 25 26 27 28 29; do
-+       for v in 25 26 27 28 29 30 31; do
-           case $ne_libver in
-           0.$v.*) ne_cv_lib_neonver=yes ;;
-           esac
-@@ -5788,7 +5788,7 @@
- $as_echo "$ne_cv_lib_neon" >&6; }
-     if test "$ne_cv_lib_neon" = "yes"; then
-        ne_cv_lib_neonver=no
--       for v in 25 26 27 28 29; do
-+       for v in 25 26 27 28 29 30 31; do
-           case $ne_libver in
-           0.$v.*) ne_cv_lib_neonver=yes ;;
-           esac