Index: head/print/fontforge/Makefile
===================================================================
--- head/print/fontforge/Makefile	(revision 390552)
+++ head/print/fontforge/Makefile	(revision 390553)
@@ -1,78 +1,78 @@
 # Created by: KANOU Hiroki <kanou@khdd.net>
 # $FreeBSD$
 
 PORTNAME=	fontforge
-DISTVERSION=	20150430
+DISTVERSION=	20150612
 CATEGORIES=	print
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Type 1/TrueType/OpenType/bitmap font editor
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:${PORTSDIR}/devel/uthash \
 		${LOCALBASE}/bin/gnulib-tool:${PORTSDIR}/devel/gnulib
 LIB_DEPENDS=	libuninameslist.so:${PORTSDIR}/textproc/libuninameslist \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libgif.so:${PORTSDIR}/graphics/giflib \
 		libspiro.so:${PORTSDIR}/graphics/libspiro \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libltdl.so:${PORTSDIR}/devel/libltdl
 
 USE_GITHUB=	yes
 
 USES=		autoreconf:build desktop-file-utils execinfo gettext gmake iconv \
 		jpeg libtool pkgconfig python shared-mime-info
 USE_XORG=	x11 xi ice xkbui
 USE_GNOME=	glib20 gtk20 libxml2 pango
 
 CONFIGURE_ARGS=	--enable-tile-path --enable-gtk2-use
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 INSTALLS_ICONS=	yes
 
 PORTDOCS=	* .htaccess
 
 OPTIONS_DEFINE=	DOCS FREETYPE CAIRO PYTHON
 OPTIONS_SUB=	yes
 FREETYPE_DESC=	Include freetype's internal debugger
 
 PYTHON_CONFIGURE_ENABLE=	python-scripting python-extension
 
 CAIRO_USE=	GNOME=cairo
 CAIRO_CONFIGURE_WITH=	cairo
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFREETYPE}
 MASTER_SITES+=	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 \
 		ftp://ftp.freetype.org/freetype/freetype2/:freetype
 FREETYPE_VERSION=	2.5.5
 FREETYPE_SRC=	freetype-${FREETYPE_VERSION}.tar.bz2
 DISTFILES+=	${FREETYPE_SRC:C/$/:freetype/}
 CONFIGURE_ARGS+=	--enable-freetype-debugger=${WRKDIR}/freetype-${FREETYPE_VERSION}
 .else
 CONFIGURE_ARGS+=	--disable-freetype-debugger
 .endif
 
 # This is to get around calling fontforge's bootstrap script, as that script fails
 # if git isn't installed on a system DESPITE there being a --skip-git argument that
 # can be passed into it. autoreconf is called here because I want to run it without
 # libtoolize being run along with it.
 pre-configure:
 	(cd ${WRKSRC} && \
 		${SH} -c '. ./bootstrap.conf ; \
 		${LOCALBASE}/bin/libtoolize -i -c -q ; \
 		${LOCALBASE}/bin/gnulib-tool --aux-dir=config --m4-base=m4 --libtool --symlink --import $${gnulib_modules}' ; \
 		export LIBTOOLIZE=true ; ${LOCALBASE}/bin/autoreconf -s -i)
 
 .include <bsd.port.mk>
Index: head/print/fontforge/distinfo
===================================================================
--- head/print/fontforge/distinfo	(revision 390552)
+++ head/print/fontforge/distinfo	(revision 390553)
@@ -1,4 +1,4 @@
-SHA256 (fontforge-fontforge-20150430_GH0.tar.gz) = 430c6d02611c7ca948df743e9241994efe37eda25f81a94aeadd9b6dd286ff37
-SIZE (fontforge-fontforge-20150430_GH0.tar.gz) = 24531572
+SHA256 (fontforge-fontforge-20150612_GH0.tar.gz) = af4997a07c96f7057f08cb5c7d71b19a0e8ac6336e0c48476471b471c0574247
+SIZE (fontforge-fontforge-20150612_GH0.tar.gz) = 24784438
 SHA256 (freetype-2.5.5.tar.bz2) = 387bcc4b780b12484aa2ec9f7db1a55d8286eb5639f45fbc0fbba7a4e5a1afb9
 SIZE (freetype-2.5.5.tar.bz2) = 1714529
Index: head/print/fontforge/files/patch-fontforge_splinefont.h
===================================================================
--- head/print/fontforge/files/patch-fontforge_splinefont.h	(revision 390552)
+++ head/print/fontforge/files/patch-fontforge_splinefont.h	(revision 390553)
@@ -1,15 +1,15 @@
---- fontforge/splinefont.h~
+--- fontforge/splinefont.h.orig	2015-06-12 20:48:13 UTC
 +++ fontforge/splinefont.h
-@@ -3547,7 +3547,11 @@ char * delimit_null(const char * input, 
+@@ -3548,7 +3548,11 @@ char * delimit_null(const char * input, 
  
  #include "ustring.h"
  
 -#ifdef __MINGW32__
 +#ifdef __FreeBSD__
 +#include <osreldate.h>
 +#endif
 +
 +#if defined(__MINGW32__) || (defined(__FreeBSD__) && __FreeBSD_version < 900506)
  #define BAD_LOCALE_HACK
  typedef char* locale_t;
  #define LC_GLOBAL_LOCALE ((locale_t)-1)