Index: Makefile
===================================================================
--- Makefile	(revision 395212)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fontforge
-DISTVERSION=	20150612
-PORTREVISION=	2
+DISTVERSION=	20150824
 CATEGORIES=	print
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -29,7 +28,7 @@
 		jpeg libtool pkgconfig python shared-mime-info shebangfix
 SHEBANG_FILES=	pycontrib/gdraw/__init__.py \
 		pycontrib/gdraw/gdraw.py
-USE_XORG=	x11 xi ice xkbui
+USE_XORG=	ice x11 xi xkbui
 USE_GNOME=	glib20 gtk20 libxml2 pango
 
 CONFIGURE_ARGS=	--enable-tile-path --enable-gtk2-use
@@ -56,7 +55,7 @@
 
 .if ${PORT_OPTIONS:MFREETYPE}
 MASTER_SITES+=	http://savannah.nongnu.org/download/freetype/:freetype \
-		SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/:freetype \
+		SF/freetype/freetype2/${FREETYPE_VERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/:freetype \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/:freetype \
 		http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/:freetype \
 		http://ftp.sunet.se/pub/text-processing/freetype/freetype2/:freetype \
Index: distinfo
===================================================================
--- distinfo	(revision 395212)
+++ distinfo	(working copy)
@@ -1,4 +1,4 @@
-SHA256 (fontforge-fontforge-20150612_GH0.tar.gz) = af4997a07c96f7057f08cb5c7d71b19a0e8ac6336e0c48476471b471c0574247
-SIZE (fontforge-fontforge-20150612_GH0.tar.gz) = 24784438
+SHA256 (fontforge-fontforge-20150824_GH0.tar.gz) = 28ab2471cb010c1fa75b8ab8191a1dded81fe1e9490aa5ff6ab4706a4c78ff27
+SIZE (fontforge-fontforge-20150824_GH0.tar.gz) = 25030387
 SHA256 (freetype-2.6.tar.bz2) = 8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e
 SIZE (freetype-2.6.tar.bz2) = 1726219
Index: files/patch-fontforge_splinefont.h
===================================================================
--- files/patch-fontforge_splinefont.h	(revision 395212)
+++ files/patch-fontforge_splinefont.h	(working copy)
@@ -1,15 +1,15 @@
---- fontforge/splinefont.h.orig	2015-06-12 20:48:13 UTC
+--- fontforge/splinefont.h.orig	2015-08-20 03:39:10 UTC
 +++ fontforge/splinefont.h
 @@ -3548,7 +3548,11 @@ char * delimit_null(const char * input, 
  
  #include "ustring.h"
  
--#ifdef __MINGW32__
+-#ifdef _WIN32
 +#ifdef __FreeBSD__
 +#include <osreldate.h>
 +#endif
 +
-+#if defined(__MINGW32__) || (defined(__FreeBSD__) && __FreeBSD_version < 900506)
++#if defined(_WIN32) || (defined(__FreeBSD__) && __FreeBSD_version < 900506)
  #define BAD_LOCALE_HACK
  typedef char* locale_t;
  #define LC_GLOBAL_LOCALE ((locale_t)-1)
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 395212)
+++ pkg-plist	(working copy)
@@ -476,6 +476,7 @@
 share/locale/fr/LC_MESSAGES/FontForge.mo
 share/locale/it/LC_MESSAGES/FontForge.mo
 share/locale/ja/LC_MESSAGES/FontForge.mo
+share/locale/ko/LC_MESSAGES/FontForge.mo
 share/locale/ml/LC_MESSAGES/FontForge.mo
 share/locale/pl/LC_MESSAGES/FontForge.mo
 share/locale/pt/LC_MESSAGES/FontForge.mo