devel/libphk: Fix build with llvm16

- Add LICENSE Beerware - Refresh patches Sponsored by: The FreeBSD Foundation
freebsd · Jul 19, 2023 · f50c098 · f50c098
1 parent 1f94719
commit f50c098
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/devel/libphk/Makefile b/devel/libphk/Makefile
@@ -9,6 +9,14 @@ MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	PHK's utilities functions
 WWW=		http://phk.freebsd.dk/phkrel/
 
+LICENSE=	Beerware
+LICENSE_NAME=	Beerware
+LICENSE_TEXT=	"THE BEER-WARE LICENSE" (Revision 42): \
+		<phk@FreeBSD.ORG> wrote this file.  As long as you retain this notice you \
+		can do whatever you want with this stuff. If we meet some day, and you think \
+		this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 USES=		uidfix tar:tgz
 
 # XXX static PIE libraries not yet supported by the base system
@@ -20,6 +28,7 @@ WRKSRC=		${WRKDIR}/Libphk
 .include <bsd.port.options.mk>
 
 .if defined(NO_PROFILE) || ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 )
+CFLAGS+=	-Wno-error=unused-but-set-variable
 PLIST_SUB+=	PROFILE="@comment "
 .else
 PLIST_SUB+=	PROFILE=""

diff --git a/devel/libphk/files/patch-phk__expr.c b/devel/libphk/files/patch-phk__expr.c
@@ -1,6 +1,6 @@
---- phk_expr.c~	2008-04-29 18:50:56.000000000 +0000
-+++ phk_expr.c	2008-09-08 09:17:19.205920000 +0000
-@@ -52,8 +52,8 @@
+--- phk_expr.c.orig	2008-04-29 18:50:56 UTC
++++ phk_expr.c
+@@ -52,8 +52,8 @@ dbg(struct e *e, const char *w)
  {
  	if (1)
  		return;
@@ -11,7 +11,7 @@
  }
 
  /*
-@@ -289,7 +289,7 @@
+@@ -289,7 +289,7 @@ phk_expr(const char *p, char **errs)
  	if (e->err != NULL) {
  		if (errs != NULL)
  			asprintf(errs, "Expression error:\n%s\n%*.*s^ %s\n",

diff --git a/devel/libphk/files/patch-test_argv_Makefile b/devel/libphk/files/patch-test_argv_Makefile
@@ -1,6 +1,6 @@
---- test/argv/Makefile.orig
+--- test/argv/Makefile.orig	2006-09-09 11:49:52 UTC
 +++ test/argv/Makefile
-@@ -4,7 +4,7 @@
+@@ -4,7 +4,7 @@ PROG	+=	test_argv
  CFLAGS	+=	-I${.CURDIR}/../..
  LDADD	+=	 -L../.. -lphk
 

diff --git a/devel/libphk/files/patch-test_expr_Makefile b/devel/libphk/files/patch-test_expr_Makefile
@@ -1,6 +1,6 @@
---- test/expr/Makefile.orig
+--- test/expr/Makefile.orig	2008-04-29 16:35:38 UTC
 +++ test/expr/Makefile
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,7 @@ CFLAGS	+=	-I${.CURDIR}/../..
  LDADD	+=	 -L../.. -lphk -lm
  DPADD	+=	../../libphk.a