Index: head/java/jxgrabkey/Makefile
===================================================================
--- head/java/jxgrabkey/Makefile	(revision 417954)
+++ head/java/jxgrabkey/Makefile	(revision 417955)
@@ -1,42 +1,42 @@
 # Created by: Mikhail T. <mi@aldan.algebra.com>
 # $FreeBSD$
 
 PORTNAME=	jxgrabkey
 PORTVERSION=	0.3.2
 CATEGORIES=	java devel
 MASTER_SITES=	SF
 DISTFILES=	${PORTNAME}-${PORTVERSION}_src${EXTRACT_SUFX}
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	JNI library for easy use of global X11 hotkeys from Java
 
 LICENSE=	LGPL3
 
 USES=		tar:bz2
 USE_JAVA=	yes
 USE_ANT=	yes
 OPTIONS_DEFINE=	TEST
 TEST_BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:java/junit	\
 			${JAVALIBDIR}/hamcrest.jar:java/hamcrest
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} OPSYS=${OPSYS}
 PLIST_FILES=	%%JAVAJARDIR%%/JXGrabKey.jar lib/libJXGrabKey.so
 USE_LDCONFIG=	yes
 
 do-build:
 	${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC}/JXGrabKey/C++	\
-		-f ${FILESDIR}/Makefile.JXGrabKey
+		-f ${FILESDIR}/Makefile.JXGrabKey libJXGrabKey.so
 	cd ${WRKSRC}/JXGrabKey/Java && ${ANT} -verbose jar
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/JXGrabKey/C++/libJXGrabKey.so ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_DATA} ${WRKSRC}/JXGrabKey/Java/dist/JXGrabKey.jar ${STAGEDIR}${JAVAJARDIR}/
 
 do-test-TEST-on: build
 	${ECHO_MSG} Tests require a valid DISPLAY
 	cd ${WRKSRC}/JXGrabKey/Java &&	\
 		${SETENV} CLASSPATH=${JAVALIBDIR}/junit.jar:${JAVALIBDIR}/hamcrest.jar	\
 		    LD_LIBRARY_PATH=${WRKSRC}/JXGrabKey/C++	\
 			${ANT} -Djavac.classpath=${JAVALIBDIR}/junit.jar \
 			    test
 
 .include <bsd.port.mk>
Index: head/java/jxgrabkey/files/patch-warnings
===================================================================
--- head/java/jxgrabkey/files/patch-warnings	(revision 417954)
+++ head/java/jxgrabkey/files/patch-warnings	(revision 417955)
@@ -1,24 +1,25 @@
 --- JXGrabKey/C++/src/JXGrabKey.cpp	2010-02-28 10:11:49.000000000 -0500
 +++ JXGrabKey/C++/src/JXGrabKey.cpp	2016-06-30 03:15:41.718599000 -0400
-@@ -24,4 +24,5 @@
+@@ -24,4 +24,6 @@
  #include <X11/Xlib.h>
  #include <X11/keysym.h>
 +#include <X11/XKBlib.h>
  
++#include <unistd.h>
  #include <pthread.h>
 @@ -319,5 +320,5 @@
  
  	XSetErrorHandler((XErrorHandler) xErrorHandler);
 -	pthread_spin_init(&x_lock, NULL); // init here bcoz of the returns
 +	pthread_spin_init(&x_lock, PTHREAD_PROCESS_SHARED); // init here bcoz of the returns
  
  	doListen = true;
 @@ -347,6 +348,6 @@
  									<< keys.at(i).id
  									<< "; type = KeyPress; x11Keycode = '"
 -									<< XKeysymToString(XKeycodeToKeysym(dpy,
 -											ev.xkey.keycode, 0)) << "' (0x"
 +									<< XKeysymToString(XkbKeycodeToKeysym(dpy,
 +										ev.xkey.keycode, 0, 0)) << "' (0x"
  									<< std::hex << ev.xkey.keycode
  									<< "); x11Mask = 0x" << std::hex