CVS commit: pkgsrc/fonts/fontforge

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Sep  2 14:45:37 UTC 2019

Modified Files:
        pkgsrc/fonts/fontforge: Makefile PLIST distinfo
        pkgsrc/fonts/fontforge/patches: patch-configure
            patch-fontforge_splinefont.h
Removed Files:
        pkgsrc/fonts/fontforge: options.mk
        pkgsrc/fonts/fontforge/patches: patch-Makefile.in
            patch-fontforgeexe_Makefile.in patch-fontforgeexe_startui.c

Log Message:
fontforge: Update to 20190801

Along with the usual bugfixes, there have been a couple of new features worth calling out:

    Added Croatian translation
    Added user decompositions
    New graphic for the splash/about screen
    Images embedded in SFDs are now serialised as PNGs
        This is enabled by default, but may be turned off with the 'WritePNGInSFD' option.
        A new tag is used to identify this mode; 'Image2', instead of 'Image'
        This requires FontForge to be compiled with libpng support. If not compiled with libpng, FontForge will revert to the old method of serialising RLE encoded raw images.

As part of an ongoing effort to clean up the code base, there have additionally been multiple build system changes:

    Python 2 support is deprecated. It is strongly recommended to build with Python 3 support. Python 2 support will be removed in a future release.
    Both the Windows and Mac builds are now built with Python 3 instead of Python 2.
    The minimum supported version for the Mac build is now MacOS Sierra (10.12)
    FontForge no longer uses gnulib
    collab support has been removed
    The build system now expects libuninameslist to be present, and will fail if it is not found. Building without libuninameslist must be explcititly specified using --without-libuninameslist


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 pkgsrc/fonts/fontforge/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/fonts/fontforge/PLIST
cvs rdiff -u -r1.69 -r1.70 pkgsrc/fonts/fontforge/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/fonts/fontforge/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/fonts/fontforge/patches/patch-Makefile.in \
    pkgsrc/fonts/fontforge/patches/patch-fontforgeexe_startui.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/fontforge/patches/patch-configure
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/fonts/fontforge/patches/patch-fontforge_splinefont.h
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/fonts/fontforge/Makefile
diff -u pkgsrc/fonts/fontforge/Makefile:1.108 pkgsrc/fonts/fontforge/Makefile:1.109
--- pkgsrc/fonts/fontforge/Makefile:1.108       Thu Apr 25 07:32:54 2019
+++ pkgsrc/fonts/fontforge/Makefile     Mon Sep  2 14:45:37 2019
@@ -1,38 +1,43 @@
-# $NetBSD: Makefile,v 1.108 2019/04/25 07:32:54 maya Exp $
+# $NetBSD: Makefile,v 1.109 2019/09/02 14:45:37 nia Exp $
 
-DISTNAME=      fontforge-dist-20170731
-PKGNAME=       ${DISTNAME:S/-dist-/-/}
-PKGREVISION=   5
+DISTNAME=      fontforge-20190801
 CATEGORIES=    fonts editors
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fontforge/}
-EXTRACT_SUFX=  .tar.xz
+GITHUB_PROJECT=        fontforge
+GITHUB_RELEASE=        ${PKGVERSION_NOREV}
 
 MAINTAINER=    adam%NetBSD.org@localhost
-HOMEPAGE=      http://fontforge.github.io/
+HOMEPAGE=      https://fontforge.github.io/
 COMMENT=       Postscript font editor
 LICENSE=       modified-bsd
 
-GITHUB_PROJECT=        fontforge
-GITHUB_RELEASE=        ${PKGVERSION_NOREV}
 EXTRACT_USING= bsdtar
-WRKSRC=                ${WRKDIR}/fontforge-2.0.${PKGVERSION_NOREV}
 
-USE_LANGUAGES=         c
-USE_LIBTOOL=           yes
+USE_TOOLS+=    gmake msgfmt pkg-config xgettext
+USE_LANGUAGES= c c++11
+USE_LIBTOOL=   yes
+GNU_CONFIGURE= yes
+
+# C++11
+GCC_REQD+=     4.8
+
+# Make the build reproducable.
+CONFIGURE_ENV+=                SOURCE_DATE_EPOCH=${PKGVERSION_NOREV}0000
+
+CONFIGURE_ARGS+=       --enable-gdk
+CONFIGURE_ARGS+=       --enable-woff2
+
 USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake msgfmt pkg-config
-GNU_CONFIGURE=         yes
+PY_PATCHPLIST=         yes
 
 PKGCONFIG_OVERRIDE_STAGE=      post-configure
 PKGCONFIG_OVERRIDE+=           libfontforge.pc
 PKGCONFIG_OVERRIDE+=           libfontforgeexe.pc
 
-CHECK_PORTABILITY_SKIP+=osx/FontForge.app/Contents/MacOS/*
-CHECK_INTERPRETER_SKIP+=share/fontforge/python/collab/*
-CHECK_INTERPRETER_SKIP+=share/fontforge/python/gdraw/*
-CHECK_INTERPRETER_SKIP+=share/fontforge/python/simple/*
-
-PY_PATCHPLIST=         yes
+CHECK_PORTABILITY_SKIP+=       osx/FontForge.app/Contents/MacOS/*
+CHECK_INTERPRETER_SKIP+=       share/fontforge/python/collab/*
+CHECK_INTERPRETER_SKIP+=       share/fontforge/python/gdraw/*
+CHECK_INTERPRETER_SKIP+=       share/fontforge/python/simple/*
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -41,13 +46,14 @@ PY_PATCHPLIST=              yes
 _TOOLS_USE_PKGSRC.date=        yes
 .endif
 
-.include "options.mk"
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/woff2/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
@@ -59,6 +65,8 @@ _TOOLS_USE_PKGSRC.date=       yes
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/libuninameslist/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/fontforge/PLIST
diff -u pkgsrc/fonts/fontforge/PLIST:1.35 pkgsrc/fonts/fontforge/PLIST:1.36
--- pkgsrc/fonts/fontforge/PLIST:1.35   Fri Aug 25 09:20:38 2017
+++ pkgsrc/fonts/fontforge/PLIST        Mon Sep  2 14:45:37 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2017/08/25 09:20:38 adam Exp $
+@comment $NetBSD: PLIST,v 1.36 2019/09/02 14:45:37 nia Exp $
 bin/fontforge
 bin/fontimage
 bin/fontlint
@@ -13,19 +13,18 @@ include/fontforge/bitmapcontrol.h
 include/fontforge/carbon.h
 include/fontforge/chardata.h
 include/fontforge/charset.h
-include/fontforge/configure-fontforge.h
-include/fontforge/cvruler.h
 include/fontforge/delta.h
 include/fontforge/dlist.h
-include/fontforge/dynamic.h
 include/fontforge/edgelist.h
 include/fontforge/edgelist2.h
 include/fontforge/encoding.h
 include/fontforge/fffreetype.h
+include/fontforge/ffgdk.h
 include/fontforge/ffglib.h
 include/fontforge/ffpython.h
-include/fontforge/fileutil.h
+include/fontforge/flaglist.h
 include/fontforge/fontforge-config.h
+include/fontforge/fontforge-version-extras.h
 include/fontforge/fontforge.h
 include/fontforge/fontforgevw.h
 include/fontforge/fvmetrics.h
@@ -37,7 +36,7 @@ include/fontforge/gimage.h
 include/fontforge/gio.h
 include/fontforge/gkeysym.h
 include/fontforge/glif_name_hash.h
-include/fontforge/gnetwork.h
+include/fontforge/glyphcomp.h
 include/fontforge/gprogress.h
 include/fontforge/gresedit.h
 include/fontforge/gresource.h
@@ -45,15 +44,15 @@ include/fontforge/groups.h
 include/fontforge/gutils.h
 include/fontforge/gwidget.h
 include/fontforge/gwwiconv.h
+include/fontforge/hotkeys.h
 include/fontforge/intl.h
-include/fontforge/libffstamp.h
 include/fontforge/lookups.h
 include/fontforge/mem.h
 include/fontforge/mm.h
 include/fontforge/namehash.h
 include/fontforge/nonlineartrans.h
 include/fontforge/ofl.h
-include/fontforge/plugins.h
+include/fontforge/prefs.h
 include/fontforge/print.h
 include/fontforge/psfont.h
 include/fontforge/savefont.h
@@ -68,14 +67,14 @@ include/fontforge/stemdb.h
 include/fontforge/ttf.h
 include/fontforge/ttfinstrs.h
 include/fontforge/uiinterface.h
+include/fontforge/unicodelibinfo.h
 include/fontforge/unicoderange.h
-include/fontforge/usermenu.h
 include/fontforge/ustring.h
 include/fontforge/utype.h
+include/fontforge/views.h
 lib/libfontforge.la
 lib/libfontforgeexe.la
-${PLIST.x11}lib/libgdraw.la
-lib/libgioftp.la
+lib/libgdraw.la
 lib/libgunicode.la
 lib/libgutils.la
 lib/pkgconfig/libfontforge.pc
@@ -86,7 +85,8 @@ man/man1/fontforge.1
 man/man1/fontimage.1
 man/man1/fontlint.1
 man/man1/sfddiff.1
-share/applications/fontforge.desktop
+share/appdata/org.fontforge.FontForge.appdata.xml
+share/applications/org.fontforge.FontForge.desktop
 share/doc/fontforge/.htaccess
 share/doc/fontforge/AA-Comparison.html
 share/doc/fontforge/AddLookup-Liga.png
@@ -156,6 +156,7 @@ share/doc/fontforge/Efore.png
 share/doc/fontforge/EforeTtf.png
 share/doc/fontforge/Ehinted.png
 share/doc/fontforge/EhintedTtf.png
+share/doc/fontforge/Encodings.ps.gz
 share/doc/fontforge/Eperspective.png
 share/doc/fontforge/FF32.png
 share/doc/fontforge/FFmacotfIcon.png
@@ -456,6 +457,7 @@ share/doc/fontforge/faqFrame.html
 share/doc/fontforge/featsetdlg.png
 share/doc/fontforge/featurefile.html
 share/doc/fontforge/ff-history.html
+share/doc/fontforge/ff-screenshot.png
 share/doc/fontforge/ffanvil16.png
 share/doc/fontforge/ffanvil300.png
 share/doc/fontforge/ffanvil32.png
@@ -691,7 +693,6 @@ share/doc/fontforge/phi-hints-filled.png
 share/doc/fontforge/phi-hints-outline.png
 share/doc/fontforge/phi-nohints-filled.png
 share/doc/fontforge/phi-nohints-outline.png
-share/doc/fontforge/plugins.html
 share/doc/fontforge/pnts.gif
 share/doc/fontforge/pointinfo-interp.png
 share/doc/fontforge/pointinfo.png
@@ -828,29 +829,7 @@ share/doc/fontforge/x-height.png
 share/doc/fontforge/xItalic.png
 share/doc/fontforge/xim.html
 share/doc/fontforge/xres.html
-share/fontforge/Adobe-CNS1-6.cidmap
-share/fontforge/Adobe-GB1-5.cidmap
-share/fontforge/Adobe-Identity-0.cidmap
-share/fontforge/Adobe-Japan1-5.cidmap
-share/fontforge/Adobe-Japan1-6.cidmap
-share/fontforge/Adobe-Japan2-0.cidmap
-share/fontforge/Adobe-Korea1-2.cidmap
 share/fontforge/hotkeys/default
-share/fontforge/nodejs/collabwebview/client.html
-share/fontforge/nodejs/collabwebview/css/print.css
-share/fontforge/nodejs/collabwebview/css/styles.css
-share/fontforge/nodejs/collabwebview/index.html
-share/fontforge/nodejs/collabwebview/js/constants.js
-share/fontforge/nodejs/collabwebview/js/contentEditable/component.json
-share/fontforge/nodejs/collabwebview/js/contentEditable/contenteditable.jquery.json
-share/fontforge/nodejs/collabwebview/js/contentEditable/example.html
-share/fontforge/nodejs/collabwebview/js/contentEditable/jquery.contenteditable.js
-share/fontforge/nodejs/collabwebview/js/fontdrag.js
-share/fontforge/nodejs/collabwebview/js/jquery-1.9.1.min.js
-share/fontforge/nodejs/collabwebview/js/jquery.masonry.min.js
-share/fontforge/nodejs/collabwebview/js/otfeatures.js
-share/fontforge/nodejs/collabwebview/package.json
-share/fontforge/nodejs/collabwebview/server.js
 share/fontforge/pixmaps/Cantarell-Bold.ttf
 share/fontforge/pixmaps/Cantarell-BoldOblique.ttf
 share/fontforge/pixmaps/Cantarell-Oblique.ttf
@@ -1204,35 +1183,27 @@ share/fontforge/pixmaps/viewzoomin.png
 share/fontforge/pixmaps/viewzoomout.png
 share/fontforge/pixmaps/wireframe.png
 share/fontforge/prefs
-share/fontforge/python/collab/sessionjoin-and-change-c.py
-share/fontforge/python/collab/sessionjoin-and-save-to-out.sfd.py
-share/fontforge/python/collab/sessionstart.py
-share/fontforge/python/collab/web-test-collab.py
 share/fontforge/python/excepthook.py
-share/fontforge/python/gdraw/README
-share/fontforge/python/gdraw/__init__.py
-share/fontforge/python/gdraw/_gdraw.py
-share/fontforge/python/gdraw/gdraw.html
-share/fontforge/python/gdraw/gdraw.py
 share/fontforge/python/simple/expand-a.py
 share/fontforge/python/simple/load-font-and-show-name.py
 share/fontforge/python/test.sfd
-share/fontforge/python/webcollab.py
-share/icons/hicolor/128x128/apps/fontforge.png
-share/icons/hicolor/16x16/apps/fontforge.png
-share/icons/hicolor/22x22/apps/fontforge.png
-share/icons/hicolor/24x24/apps/fontforge.png
-share/icons/hicolor/256x256/apps/fontforge.png
-share/icons/hicolor/32x32/apps/fontforge.png
-share/icons/hicolor/48x48/apps/fontforge.png
-share/icons/hicolor/64x64/apps/fontforge.png
-share/icons/hicolor/scalable/apps/fontforge.svg
+share/icons/hicolor/128x128/apps/org.fontforge.FontForge.png
+share/icons/hicolor/16x16/apps/org.fontforge.FontForge.png
+share/icons/hicolor/22x22/apps/org.fontforge.FontForge.png
+share/icons/hicolor/24x24/apps/org.fontforge.FontForge.png
+share/icons/hicolor/256x256/apps/org.fontforge.FontForge.png
+share/icons/hicolor/32x32/apps/org.fontforge.FontForge.png
+share/icons/hicolor/48x48/apps/org.fontforge.FontForge.png
+share/icons/hicolor/512x512/apps/org.fontforge.FontForge.png
+share/icons/hicolor/64x64/apps/org.fontforge.FontForge.png
+share/icons/hicolor/scalable/apps/org.fontforge.FontForge.svg
 share/locale/ca/LC_MESSAGES/FontForge.mo
 share/locale/de/LC_MESSAGES/FontForge.mo
 share/locale/el/LC_MESSAGES/FontForge.mo
 share/locale/en_GB/LC_MESSAGES/FontForge.mo
 share/locale/es/LC_MESSAGES/FontForge.mo
 share/locale/fr/LC_MESSAGES/FontForge.mo
+share/locale/hr/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
@@ -1244,4 +1215,8 @@ share/locale/uk/LC_MESSAGES/FontForge.mo
 share/locale/vi/LC_MESSAGES/FontForge.mo
 share/locale/zh_CN/LC_MESSAGES/FontForge.mo
 share/locale/zh_TW/LC_MESSAGES/FontForge.mo
+share/metainfo/org.fontforge.FontForge.appdata.xml
+share/metainfo/org.fontforge.FontForge.metainfo.xml
 share/mime/packages/fontforge.xml
+share/pixmaps/org.fontforge.FontForge.png
+share/pixmaps/org.fontforge.FontForge.xpm

Index: pkgsrc/fonts/fontforge/distinfo
diff -u pkgsrc/fonts/fontforge/distinfo:1.69 pkgsrc/fonts/fontforge/distinfo:1.70
--- pkgsrc/fonts/fontforge/distinfo:1.69        Wed Nov 15 10:18:06 2017
+++ pkgsrc/fonts/fontforge/distinfo     Mon Sep  2 14:45:37 2019
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.69 2017/11/15 10:18:06 adam Exp $
+$NetBSD: distinfo,v 1.70 2019/09/02 14:45:37 nia Exp $
 
-SHA1 (fontforge-dist-20170731.tar.xz) = 89ab434e523dbea8fd9f81907dda33f023055b05
-RMD160 (fontforge-dist-20170731.tar.xz) = af473f403999937dd95715bdfd98f582d05c94cd
-SHA512 (fontforge-dist-20170731.tar.xz) = 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11
-Size (fontforge-dist-20170731.tar.xz) = 13985256 bytes
-SHA1 (patch-Makefile.in) = 5a7cad2f9516540048008a13a257d6c9720a22c9
-SHA1 (patch-configure) = 23c953855960f65c539d9ccd15df14fb6a9a2428
-SHA1 (patch-fontforge_splinefont.h) = eda077c87d3bba57a6b6fe0f62d83956e6e13bc1
-SHA1 (patch-fontforgeexe_Makefile.in) = 725a0a033132bf859917e8f28c5d0cbbad3eea0e
-SHA1 (patch-fontforgeexe_startui.c) = e390742321931ded9f5143fbe3dc2f81e5abbbdc
+SHA1 (fontforge-20190801.tar.gz) = b0a248b8c7709550347a8d8cf6d2dbbb2e28d252
+RMD160 (fontforge-20190801.tar.gz) = 1b8e8ba52dc35034e250c0b2cd9c4acef01794f2
+SHA512 (fontforge-20190801.tar.gz) = 78f3e1e94e38e26dcf52c6a0e038753033dc47052b7492f0ac0aaf1b8962e4e4bbf07c2550ef6014ea7290a6429bf669acb0691735efe0aee368480b4b7e6236
+Size (fontforge-20190801.tar.gz) = 20766334 bytes
+SHA1 (patch-configure) = 3943ced86608110a18fc75252be2be6a92c6bf76
+SHA1 (patch-fontforge_splinefont.h) = be7739b6145b3c622913efa9f2d679860c35cccb
 SHA1 (patch-po_Makefile.in) = 75990b7371e5ce525deba693c651dbd5222e558b

Index: pkgsrc/fonts/fontforge/patches/patch-configure
diff -u pkgsrc/fonts/fontforge/patches/patch-configure:1.3 pkgsrc/fonts/fontforge/patches/patch-configure:1.4
--- pkgsrc/fonts/fontforge/patches/patch-configure:1.3  Fri Aug 25 09:20:38 2017
+++ pkgsrc/fonts/fontforge/patches/patch-configure      Mon Sep  2 14:45:37 2019
@@ -1,45 +1,15 @@
-$NetBSD: patch-configure,v 1.3 2017/08/25 09:20:38 adam Exp $
+$NetBSD: patch-configure,v 1.4 2019/09/02 14:45:37 nia Exp $
 
-Portability fixes.
-Disable IPython modules.
+Remove unsupported date argument.
 
---- configure.orig     2017-07-31 08:30:42.386015000 +0000
+--- configure.orig     2019-08-01 09:12:22.865001000 +0000
 +++ configure
-@@ -20382,7 +20382,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 :
- 
-@@ -37045,9 +37045,8 @@ if test x"${i_do_have_python_scripting}"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPython" >&5
- $as_echo_n "checking for IPython... " >&6; }
-    if $( $PYTHON -c 'import IPython' 2>&5 ); then
--        have_ipython=yes;
-+        have_ipython=no;
- 
--$as_echo "#define HAVE_IPYTHON 1" >>confdefs.h
- 
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-@@ -37090,7 +37089,7 @@ fi
- #--------------------------------------------------------------------------
- 
- # Check whether --enable-breakpad was given.
--if test "${enable_breakpad+set}" = set; then :
-+if test "${enable_breakpad+set}" = set; then
-   enableval=$enable_breakpad; have_breakpad=yes
- fi
- 
-@@ -37307,7 +37306,7 @@ FONTFORGE_DATE_NOW=${SOURCE_DATE_EPOCH:-
+@@ -26865,7 +26865,7 @@ FONTFORGE_DATE_NOW=${SOURCE_DATE_EPOCH:-
  FONTFORGE_DATE_OPTS="--date=@${FONTFORGE_DATE_NOW}"
  if ! date --version 2>/dev/null ; then
    # Use POSIX date instead of GNU date on BSD systems
 -  FONTFORGE_DATE_OPTS="-j -f %s ${FONTFORGE_DATE_NOW}"
-+  FONTFORGE_DATE_OPTS="-j -r ${FONTFORGE_DATE_NOW}"
++  FONTFORGE_DATE_OPTS="-j ${FONTFORGE_DATE_NOW}"
  fi
  FONTFORGE_MODTIME="$(date -u $FONTFORGE_DATE_OPTS +'%s')L"
  FONTFORGE_MODTIME_STR="$(date -u $FONTFORGE_DATE_OPTS +'%H:%M %Z %e-%b-%Y')"

Index: pkgsrc/fonts/fontforge/patches/patch-fontforge_splinefont.h
diff -u pkgsrc/fonts/fontforge/patches/patch-fontforge_splinefont.h:1.2 pkgsrc/fonts/fontforge/patches/patch-fontforge_splinefont.h:1.3
--- pkgsrc/fonts/fontforge/patches/patch-fontforge_splinefont.h:1.2     Tue Sep 27 10:24:57 2016
+++ pkgsrc/fonts/fontforge/patches/patch-fontforge_splinefont.h Mon Sep  2 14:45:37 2019
@@ -1,28 +1,41 @@
-$NetBSD: patch-fontforge_splinefont.h,v 1.2 2016/09/27 10:24:57 taca Exp $
+$NetBSD: patch-fontforge_splinefont.h,v 1.3 2019/09/02 14:45:37 nia Exp $
 
-* NetBSD does not implement uselocale().
-* NetBSD prior to 7.0 dose not have locale_t.
+NetBSD does not implement uselocale().
 
---- fontforge/splinefont.h.orig        2016-04-05 01:29:03.000000000 +0000
+--- fontforge/splinefont.h.orig        2019-07-22 10:10:01.551001000 +0000
 +++ fontforge/splinefont.h
-@@ -3549,6 +3549,20 @@ char * delimit_null(const char * input, 
+@@ -2625,17 +2625,33 @@ extern bool isSplinePointPartOfGuide( Sp
  
- #include "ustring.h"
+ extern void debug_printHint( StemInfo *h, char* msg );
  
-+#ifdef __NetBSD__
-+#define BAD_LOCALE_HACK
-+#ifndef __LOCALE_T_DECLARED
-+typedef char* locale_t;
-+#define LC_GLOBAL_LOCALE ((locale_t)-1)
-+#define LC_ALL_MASK LC_ALL
-+#define LC_COLLATE_MASK LC_COLLATE
-+#define LC_CTYPE_MASK LC_CTYPE
-+#define LC_MONETARY_MASK LC_MONETARY
-+#define LC_NUMERIC_MASK LC_NUMERIC
-+#define LC_TIME_MASK LC_TIME
-+#endif
-+#endif
-+
- #ifdef _WIN32
+-#if defined(_WIN32) || defined(__HAIKU__)
++#if defined(_WIN32) || defined(__HAIKU__) || defined(__NetBSD__)
  #define BAD_LOCALE_HACK
++#ifndef __NetBSD__
  typedef char* locale_t;
++#endif
++#ifndef LC_GLOBAL_LOCALE
+ #define LC_GLOBAL_LOCALE ((locale_t)-1)
++#endif
++#ifndef LC_ALL_MASK
+ #define LC_ALL_MASK LC_ALL
++#endif
++#ifndef LC_COLLATE_MASK
+ #define LC_COLLATE_MASK LC_COLLATE
++#endif
++#ifndef LC_CTYPE_MASK
+ #define LC_CTYPE_MASK LC_CTYPE
++#endif
++#ifndef LC_MONETARY_MASK
+ #define LC_MONETARY_MASK LC_MONETARY
++#endif
++#ifndef LC_NUMERIC_MASK
+ #define LC_NUMERIC_MASK LC_NUMERIC
++#endif
++#ifndef LC_TIME_MASK
+ #define LC_TIME_MASK LC_TIME
+ #endif
++#endif
+ 
+ static inline void switch_to_c_locale(locale_t * tmplocale_p, locale_t * oldlocale_p) {
+ #ifndef BAD_LOCALE_HACK