diff --git a/devel/libphk/Makefile b/devel/libphk/Makefile
index dc623e7c3753..baad9d4a7016 100644
--- a/devel/libphk/Makefile
+++ b/devel/libphk/Makefile
@@ -1,31 +1,40 @@
 PORTNAME=	libphk
 PORTVERSION=	0.3.20080902
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://phk.freebsd.dk/phkrel/
 DISTNAME=	Libphk.${PORTVERSION:C/0.3.//}
 
 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
 MAKE_FLAGS+=	WITHOUT_PIE=true
 MAKE_JOBS_UNSAFE=	yes
 
 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=""
 .endif
 
 post-patch:
 	@${SED} -i -e 's!/usr/local!$${PREFIX}!g' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/devel/libphk/files/patch-phk__expr.c b/devel/libphk/files/patch-phk__expr.c
index 1552f4182969..1ee09bae095b 100644
--- a/devel/libphk/files/patch-phk__expr.c
+++ b/devel/libphk/files/patch-phk__expr.c
@@ -1,22 +1,22 @@
---- 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;
 -	fprintf(stderr, "<%*.*s|", e->p - e->b, e->p - e->b, e->b);
 -	fprintf(stderr, "%*.*s> %s\n", e->e - e->p, e->e - e->p, e->p, w);
 +	fprintf(stderr, "<%*.*s|", (int)(e->p - e->b), (int)(e->p - e->b), e->b);
 +	fprintf(stderr, "%*.*s> %s\n", (int)(e->e - e->p), (int)(e->e - e->p), e->p, w);
  }
  
  /*
-@@ -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",
 -			    e->b, e->p - e->b, e->p - e->b, "", e->err);
 +			    e->b, (int)(e->p - e->b), (int)(e->p - e->b), "", e->err);
  		return (NAN);
  	}
  	return (v);
diff --git a/devel/libphk/files/patch-test_argv_Makefile b/devel/libphk/files/patch-test_argv_Makefile
index dc3d577904ea..81e89aab7d36 100644
--- a/devel/libphk/files/patch-test_argv_Makefile
+++ b/devel/libphk/files/patch-test_argv_Makefile
@@ -1,11 +1,11 @@
---- 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
  
 -NO_MAN	=	sorry
 +MAN	=
  
  .include <bsd.prog.mk>
  
diff --git a/devel/libphk/files/patch-test_expr_Makefile b/devel/libphk/files/patch-test_expr_Makefile
index ebe69d23d6b4..e3ce274722d3 100644
--- a/devel/libphk/files/patch-test_expr_Makefile
+++ b/devel/libphk/files/patch-test_expr_Makefile
@@ -1,11 +1,11 @@
---- 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
  
 -NO_MAN	=	sorry
 +MAN	=
  
  .include <bsd.prog.mk>