Changes 20160404:

This fixes a number of bugs and crashes and adds a few small features. Most importantly, this release comes with a working Macintosh package.

4 files changed, 27 insertions, 33 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index f601852fbf0..c2cf36d5786 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,17 +1,20 @@
-# $NetBSD: Makefile,v 1.96 2016/04/04 17:33:10 joerg Exp $
+# $NetBSD: Makefile,v 1.97 2016/04/07 10:09:02 adam Exp $
 
-DISTNAME=	fontforge-20150824
+DISTNAME=	fontforge-dist-20160404
+PKGNAME=	${DISTNAME:S/-dist-/-/}
 CATEGORIES=	fonts editors
-PKGREVISION=	1
 MASTER_SITES=	${MASTER_SITE_GITHUB:=fontforge/}
 GITHUB_PROJECT=	fontforge
-GITHUB_RELEASE=	20150824
+GITHUB_RELEASE=	${PKGVERSION_NOREV}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://fontforge.github.io/
 COMMENT=	Postscript font editor
 LICENSE=	modified-bsd
 
+EXTRACT_USING=	bsdtar
+WRKSRC=		${WRKDIR}/fontforge-2.0.20140101
+
 USE_LANGUAGES=		c
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 2c831baad44..e6ee1328e39 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.62 2016/03/14 15:37:47 tnn Exp $
+$NetBSD: distinfo,v 1.63 2016/04/07 10:09:02 adam Exp $
 
-SHA1 (fontforge-20150824.tar.gz) = 2dd442baee9cd16efb5928bf51cc3d6b9c73d9af
-RMD160 (fontforge-20150824.tar.gz) = e26fca6affc11d1ea6c927751a63dae0bfeab47b
-SHA512 (fontforge-20150824.tar.gz) = 82a33b41667b5637706aa11ca56695cf0d7a485c66cb37b8c3346087ca3b738967b77141f9aaaaddd90c8a4c2cec7e4924609de0ff18133a91e5862b1ad1ae2d
-Size (fontforge-20150824.tar.gz) = 20796482 bytes
+SHA1 (fontforge-dist-20160404.tar.gz) = e7c235f3d0ef59196df30707e18ad1198ff7baae
+RMD160 (fontforge-dist-20160404.tar.gz) = e72662db3a00a9da6a2639d36f8f0b9890cda936
+SHA512 (fontforge-dist-20160404.tar.gz) = be94f04881b12ed3b1a34d0d7cc9149321db17d51458f135b2683ea600401e4fa55647ced4b4e014555ba1c900a684b9d5d6f2e2812ce03c432d23ca72f5c363
+Size (fontforge-dist-20160404.tar.gz) = 20906256 bytes
 SHA1 (patch-Makefile.in) = 5a7cad2f9516540048008a13a257d6c9720a22c9
-SHA1 (patch-configure) = 47cd1d1ff60d40114aa08308d4e73b7c2da4716e
-SHA1 (patch-fontforge_python.c) = 1c1cb83feada6e8588754a728863ee92d7f9368f
+SHA1 (patch-configure) = d85d82bed7ee84c5b8282afd1310872eca39a3dd
 SHA1 (patch-fontforge_splinefont.h) = b518e61e3ba88c7fb86ebe53fb62109447791121
 SHA1 (patch-po_Makefile.in) = 75990b7371e5ce525deba693c651dbd5222e558b
diff --git a/fonts/fontforge/patches/patch-configure b/fonts/fontforge/patches/patch-configure
index 608aca7f6e7..29fd675b9b6 100644
--- a/fonts/fontforge/patches/patch-configure
+++ b/fonts/fontforge/patches/patch-configure
@@ -1,10 +1,11 @@
-$NetBSD: patch-configure,v 1.1 2016/02/07 14:09:08 adam Exp $
+$NetBSD: patch-configure,v 1.2 2016/04/07 10:09:02 adam Exp $
 
 Fix building on OS X.
+Portability fix.
 
---- configure.orig	2016-02-07 11:36:39.000000000 +0000
+--- configure.orig	2016-04-05 01:57:34.000000000 +0000
 +++ configure
-@@ -15139,7 +15139,6 @@ $as_echo "#define __Mac 1" >>confdefs.h
+@@ -15228,7 +15228,6 @@ $as_echo "#define __Mac 1" >>confdefs.h
         MACAPP=""
        fi
  
@@ -12,7 +13,16 @@ Fix building on OS X.
  
  
  
-@@ -32762,7 +32761,7 @@ fi
+@@ -19653,7 +19652,7 @@ fi
+ 
+ fi
+ 
+-   if test x"${have_zlib}" == xyes; then
++   if test x"${have_zlib}" = xyes; then
+       ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+ if test "x$ac_cv_header_zlib_h" = xyes; then :
+ 
+@@ -35279,7 +35278,7 @@ fi
  #--------------------------------------------------------------------------
  
  # Check whether --enable-breakpad was given.
diff --git a/fonts/fontforge/patches/patch-fontforge_python.c b/fonts/fontforge/patches/patch-fontforge_python.c
deleted file mode 100644
index c7710fa11b7..00000000000
--- a/fonts/fontforge/patches/patch-fontforge_python.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-fontforge_python.c,v 1.1 2016/02/07 14:09:08 adam Exp $
-
-Fix for Python 3.5+.
-
---- fontforge/python.c.orig	2016-02-07 11:15:18.000000000 +0000
-+++ fontforge/python.c
-@@ -18174,7 +18174,11 @@ static PyObject* CreatePyModule( module_
-     mdef->runtime.pymod_def.m_doc = mdef->docstring;
-     mdef->runtime.pymod_def.m_methods = mdef->methods;
-     mdef->runtime.pymod_def.m_size = -1;
-+#if PY_MINOR_VERSION >= 5
-+    mdef->runtime.pymod_def.m_slots = NULL;
-+#else
-     mdef->runtime.pymod_def.m_reload = NULL;
-+#endif
-     mdef->runtime.pymod_def.m_traverse = NULL;
-     mdef->runtime.pymod_def.m_clear = NULL;
-     mdef->runtime.pymod_def.m_free = NULL;