20170731:

This incorporates a large number of adjustments and fixes and adds packages for newer Ubuntu releases.

5 files changed, 49 insertions, 38 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index 65754f0890e..893ac27d4f2 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.100 2017/05/04 19:23:18 adam Exp $
+# $NetBSD: Makefile,v 1.101 2017/08/25 09:20:38 adam Exp $
 
-DISTNAME=	fontforge-dist-20161004
+DISTNAME=	fontforge-dist-20170731
 PKGNAME=	${DISTNAME:S/-dist-/-/}
 CATEGORIES=	fonts editors
 MASTER_SITES=	${MASTER_SITE_GITHUB:=fontforge/}
-GITHUB_PROJECT=	fontforge
-GITHUB_RELEASE=	20161005
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://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}
 
diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST
index c174dd40554..abc57d8e40c 100644
--- a/fonts/fontforge/PLIST
+++ b/fonts/fontforge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2017/05/04 19:23:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.35 2017/08/25 09:20:38 adam Exp $
 bin/fontforge
 bin/fontimage
 bin/fontlint
@@ -48,6 +48,7 @@ include/fontforge/gwwiconv.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
@@ -860,7 +861,9 @@ share/fontforge/pixmaps/OFL.txt
 share/fontforge/pixmaps/changeweight.png
 share/fontforge/pixmaps/charviewicon.xbm
 share/fontforge/pixmaps/check_off.png
+share/fontforge/pixmaps/check_off_disabled.png
 share/fontforge/pixmaps/check_on.png
+share/fontforge/pixmaps/check_on_disabled.png
 share/fontforge/pixmaps/chooseraudio.png
 share/fontforge/pixmaps/chooserback.png
 share/fontforge/pixmaps/chooserbookmark.png
@@ -1119,7 +1122,9 @@ share/fontforge/pixmaps/ptinfohvcurve.png
 share/fontforge/pixmaps/ptinfotangent.png
 share/fontforge/pixmaps/python.png
 share/fontforge/pixmaps/radio_off.png
+share/fontforge/pixmaps/radio_off_disabled.png
 share/fontforge/pixmaps/radio_on.png
+share/fontforge/pixmaps/radio_on_disabled.png
 share/fontforge/pixmaps/resources
 share/fontforge/pixmaps/rmoverlap.png
 share/fontforge/pixmaps/rotate180.png
@@ -1213,12 +1218,14 @@ 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/locale/ca/LC_MESSAGES/FontForge.mo
 share/locale/de/LC_MESSAGES/FontForge.mo
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 03752c5189e..16951e12273 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.66 2017/08/24 10:45:00 jperkin Exp $
+$NetBSD: distinfo,v 1.67 2017/08/25 09:20:38 adam Exp $
 
-SHA1 (fontforge-dist-20161004.tar.gz) = bafb76ccbfcb37f94cf71f32c79cc120d8102683
-RMD160 (fontforge-dist-20161004.tar.gz) = fc3e3823bb06835b280109bd7928a3e092aec70d
-SHA512 (fontforge-dist-20161004.tar.gz) = 274ab26859b3691bd9c9c3b639157753bd5cd5d909e90309b6f4c8b68aedfd49b3e7c88fe45bc0f8090d3a3e946a409d131d3d191299f14a153f3c95b36c35c2
-Size (fontforge-dist-20161004.tar.gz) = 20987883 bytes
+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) = d85d82bed7ee84c5b8282afd1310872eca39a3dd
+SHA1 (patch-configure) = 23c953855960f65c539d9ccd15df14fb6a9a2428
 SHA1 (patch-fontforge_splinefont.h) = eda077c87d3bba57a6b6fe0f62d83956e6e13bc1
-SHA1 (patch-fontforgeexe_Makefile.in) = de7b58d1c84508f9aa843ea06d23a87b0502b344
+SHA1 (patch-fontforgeexe_Makefile.in) = cfacd2b76e98593e8d0867eddd9f84ee1bd24f26
 SHA1 (patch-po_Makefile.in) = 75990b7371e5ce525deba693c651dbd5222e558b
diff --git a/fonts/fontforge/patches/patch-configure b/fonts/fontforge/patches/patch-configure
index 29fd675b9b6..4991c5ec633 100644
--- a/fonts/fontforge/patches/patch-configure
+++ b/fonts/fontforge/patches/patch-configure
@@ -1,19 +1,11 @@
-$NetBSD: patch-configure,v 1.2 2016/04/07 10:09:02 adam Exp $
+$NetBSD: patch-configure,v 1.3 2017/08/25 09:20:38 adam Exp $
 
-Fix building on OS X.
-Portability fix.
+Portability fixes.
+Disable IPython modules.
 
---- configure.orig	2016-04-05 01:57:34.000000000 +0000
+--- configure.orig	2017-07-31 08:30:42.386015000 +0000
 +++ configure
-@@ -15228,7 +15228,6 @@ $as_echo "#define __Mac 1" >>confdefs.h
-        MACAPP=""
-       fi
- 
--      RAW_COMPILE_PLATFORM_CFLAGS=" $CFLAGS -arch x86_64 -arch i386 "
- 
- 
- 
-@@ -19653,7 +19652,7 @@ fi
+@@ -20382,7 +20382,7 @@ fi
  
  fi
  
@@ -22,7 +14,18 @@ Portability fix.
        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
+@@ -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.
@@ -31,3 +34,12 @@ Portability fix.
    enableval=$enable_breakpad; have_breakpad=yes
  fi
  
+@@ -37307,7 +37306,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}"
+ fi
+ FONTFORGE_MODTIME="$(date -u $FONTFORGE_DATE_OPTS +'%s')L"
+ FONTFORGE_MODTIME_STR="$(date -u $FONTFORGE_DATE_OPTS +'%H:%M %Z %e-%b-%Y')"
diff --git a/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in b/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in
index a86aaf2134d..c864d79ba25 100644
--- a/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in
+++ b/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-fontforgeexe_Makefile.in,v 1.2 2017/08/24 10:45:00 jperkin Exp $
+$NetBSD: patch-fontforgeexe_Makefile.in,v 1.3 2017/08/25 09:20:38 adam Exp $
 
 Fix linking Objective-C code.
 
---- fontforgeexe/Makefile.in.orig	2016-10-04 12:30:31.000000000 +0000
+--- fontforgeexe/Makefile.in.orig	2017-07-31 08:30:47.000000000 +0000
 +++ fontforgeexe/Makefile.in
-@@ -380,7 +380,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -391,7 +391,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
  am__v_lt_0 = --silent
  am__v_lt_1 = 
  libfontforgeexe_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
@@ -13,12 +13,3 @@ Fix linking Objective-C code.
  	$(libfontforgeexe_la_OBJCFLAGS) $(OBJCFLAGS) \
  	$(libfontforgeexe_la_LDFLAGS) $(LDFLAGS) -o $@
  PROGRAMS = $(bin_PROGRAMS)
-@@ -2039,7 +2039,7 @@ fontforge-main.obj: main.c
- 	$(AM_V_OBJC)$(LTOBJCCOMPILE) -c -o $@ $<
- 
- libfontforgeexe_la-macobjective.lo: macobjective.m
--	$(AM_V_OBJC)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfontforgeexe_la_CPPFLAGS) $(CPPFLAGS) $(libfontforgeexe_la_OBJCFLAGS) $(OBJCFLAGS) -c -o libfontforgeexe_la-macobjective.lo `test -f 'macobjective.m' || echo '$(srcdir)/'`macobjective.m
-+	$(AM_V_OBJC)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=CC --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfontforgeexe_la_CPPFLAGS) $(CPPFLAGS) $(libfontforgeexe_la_OBJCFLAGS) $(OBJCFLAGS) -c -o libfontforgeexe_la-macobjective.lo `test -f 'macobjective.m' || echo '$(srcdir)/'`macobjective.m
- 
- mostlyclean-libtool:
- 	-rm -f *.lo