diff --git a/audio/playgsf/Makefile b/audio/playgsf/Makefile
index 016671441b2a..714bbf57a2e1 100644
--- a/audio/playgsf/Makefile
+++ b/audio/playgsf/Makefile
@@ -1,48 +1,49 @@
 # Created by: Emanuel Haupt <ehaupt@critical.ch>
 # $FreeBSD$
 
 PORTNAME=	playgsf
 PORTVERSION=	0.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://projects.raphnet.net/playgsf/ \
 		LOCAL/ehaupt
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Command-line player for gsf audio files
 
+LICENSE=	GPLv2+ LGPL21 NONE
+LICENSE_COMB=	multi
+LICENSE_FILE_LGPL21=	${WRKSRC}/libresample-0.1.3/LICENSE.txt
+
 LIB_DEPENDS=	libao.so:audio/libao
 
-USES=		gmake dos2unix
+USES=		dos2unix gmake localbase:ldflags
 GNU_CONFIGURE=	yes
-
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-CONFIGURE_ARGS+=	--enable-ccore --disable-optimisations
+CONFIGURE_ARGS=	--enable-ccore \
+		--disable-optimisations
 
 PLIST_FILES=	bin/playgsf
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 PORTSCOUT=	skipv:0.7.2
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|\([[:space:]]*\).*configure.*|\1@true|' \
 			${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} \
 		-e '/^CFLAGS="-DLINUX/s|"$$| ${CFLAGS}"|' \
 		-e '/^LDFLAGS="-lz/s|"$$| ${LDFLAGS}"|' \
 		${WRKSRC}/configure
 
 post-configure:
 	@(cd ${WRKSRC}/libresample-0.1.3 && ${SETENV} \
 		CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
 		CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		${CONFIGURE_ENV} ./configure)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/audio/playgsf/files/patch-VBA_Util.cpp b/audio/playgsf/files/patch-VBA_Util.cpp
index b89973153125..4fa610d1a453 100644
--- a/audio/playgsf/files/patch-VBA_Util.cpp
+++ b/audio/playgsf/files/patch-VBA_Util.cpp
@@ -1,12 +1,30 @@
---- VBA/Util.cpp.orig	2016-07-26 15:40:39 UTC
+--- VBA/Util.cpp.orig	2016-11-24 13:15:44 UTC
 +++ VBA/Util.cpp
+@@ -917,7 +917,7 @@ bool utilIsGSF(const char * file)
+   
+ 
+   if(strlen(file) > 4) {
+-    char *p = strrchr(file,'.');
++    const char *p = strrchr(file,'.');
+ 
+ 	if(p != NULL) {
+ 	  if(_stricmp(p, ".gsf") == 0)
+@@ -934,7 +934,7 @@ bool utilIsGBAImage(const char * file)
+ {
+   cpuIsMultiBoot = false;
+   if(strlen(file) > 4) {
+-    char * p = strrchr(file,'.');
++    const char * p = strrchr(file,'.');
+ 
+     if(p != NULL) {
+       //if(_stricmp(p, ".gba") == 0)
 @@ -1484,7 +1484,8 @@ void utilWriteData(gzFile gzFile, variab
  
  gzFile utilGzOpen(const char *file, const char *mode)
  {
 -  utilGzWriteFunc = (int (ZEXPORT *)(void *,void * const, unsigned int))gzwrite;
 +  // utilGzWriteFunc = (int (ZEXPORT *)(void *,void * const, unsigned int))gzwrite; 
 +  utilGzWriteFunc = (int (ZEXPORT *)(gzFile_s*, void * const, unsigned int))gzwrite;
    utilGzReadFunc = gzread;
    utilGzCloseFunc = gzclose;