fontforge: python3.8 needs you to use the python3.8-embed pkg-config file.

3 files changed, 97 insertions, 5 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index b97c5f812ed..2a70dd938ce 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2020/03/10 22:09:49 wiz Exp $
+# $NetBSD: Makefile,v 1.112 2020/05/24 12:00:51 markd Exp $
 
 DISTNAME=	fontforge-20190801
 PKGREVISION=	2
@@ -47,6 +47,18 @@ CHECK_INTERPRETER_SKIP+=	share/fontforge/python/simple/*
 _TOOLS_USE_PKGSRC.date=	yes
 .endif
 
+.include "../../lang/python/application.mk"
+# Python38 needs use of pkgconfig python-3.8-embed
+.if ${PYPKGPREFIX} == "py38"
+EMBED=-embed
+.else
+EMBED=
+.endif
+SUBST_CLASSES+=		pkgconf
+SUBST_STAGE.pkgconf=	pre-configure
+SUBST_FILES.pkgconf=	configure
+SUBST_VARS.pkgconf=	EMBED
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -63,7 +75,6 @@ _TOOLS_USE_PKGSRC.date=	yes
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/potrace/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libuninameslist/buildlink3.mk"
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 531b89531f9..cdddebce2df 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.70 2019/09/02 14:45:37 nia Exp $
+$NetBSD: distinfo,v 1.71 2020/05/24 12:00:51 markd Exp $
 
 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-configure) = aef6f9b16cbde58d3ae691c79c0cb5011f8bb8af
 SHA1 (patch-fontforge_splinefont.h) = be7739b6145b3c622913efa9f2d679860c35cccb
 SHA1 (patch-po_Makefile.in) = 75990b7371e5ce525deba693c651dbd5222e558b
diff --git a/fonts/fontforge/patches/patch-configure b/fonts/fontforge/patches/patch-configure
index 0f69c47565a..9f7b607e552 100644
--- a/fonts/fontforge/patches/patch-configure
+++ b/fonts/fontforge/patches/patch-configure
@@ -1,9 +1,90 @@
-$NetBSD: patch-configure,v 1.4 2019/09/02 14:45:37 nia Exp $
+$NetBSD: patch-configure,v 1.5 2020/05/24 12:00:51 markd Exp $
 
 Remove unsupported date argument.
+Python 3.8 requires different pkg_config call.
 
 --- configure.orig	2019-08-01 09:12:22.865001000 +0000
 +++ configure
+@@ -21315,11 +21315,11 @@ if test -n "$PYTHON_CFLAGS"; then
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-\"\${PYTHON_VERSION}\"\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "python-"${PYTHON_VERSION}"") 2>&5
++  ($PKG_CONFIG --exists --print-errors "python-"${PYTHON_VERSION}"@EMBED@") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_PYTHON_CFLAGS=`$PKG_CONFIG --cflags "python-"${PYTHON_VERSION}"" 2>/dev/null`
++  pkg_cv_PYTHON_CFLAGS=`$PKG_CONFIG --cflags "python-"${PYTHON_VERSION}"@EMBED@" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -21332,11 +21332,11 @@ if test -n "$PYTHON_LIBS"; then
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-\"\${PYTHON_VERSION}\"\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "python-"${PYTHON_VERSION}"") 2>&5
++  ($PKG_CONFIG --exists --print-errors "python-"${PYTHON_VERSION}"@EMBED@") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_PYTHON_LIBS=`$PKG_CONFIG --libs "python-"${PYTHON_VERSION}"" 2>/dev/null`
++  pkg_cv_PYTHON_LIBS=`$PKG_CONFIG --libs "python-"${PYTHON_VERSION}"@EMBED@" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -21357,9 +21357,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        PYTHON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python-"${PYTHON_VERSION}"" 2>&1`
++	        PYTHON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python-"${PYTHON_VERSION}"@EMBED@" 2>&1`
+         else
+-	        PYTHON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python-"${PYTHON_VERSION}"" 2>&1`
++	        PYTHON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python-"${PYTHON_VERSION}"@EMBED@" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$PYTHON_PKG_ERRORS" >&5
+@@ -21384,11 +21384,11 @@ if test -n "$PYTHONDEV_CFLAGS"; then
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-\"\${PYTHON_VERSION}\"\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "python-"${PYTHON_VERSION}"") 2>&5
++  ($PKG_CONFIG --exists --print-errors "python-"${PYTHON_VERSION}"@EMBED@") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_PYTHONDEV_CFLAGS=`$PKG_CONFIG --cflags "python-"${PYTHON_VERSION}"" 2>/dev/null`
++  pkg_cv_PYTHONDEV_CFLAGS=`$PKG_CONFIG --cflags "python-"${PYTHON_VERSION}"@EMBED@" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -21401,11 +21401,11 @@ if test -n "$PYTHONDEV_LIBS"; then
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-\"\${PYTHON_VERSION}\"\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "python-"${PYTHON_VERSION}"") 2>&5
++  ($PKG_CONFIG --exists --print-errors "python-"${PYTHON_VERSION}"@EMBED@") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_PYTHONDEV_LIBS=`$PKG_CONFIG --libs "python-"${PYTHON_VERSION}"" 2>/dev/null`
++  pkg_cv_PYTHONDEV_LIBS=`$PKG_CONFIG --libs "python-"${PYTHON_VERSION}"@EMBED@" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -21426,9 +21426,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python-"${PYTHON_VERSION}"" 2>&1`
++	        PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python-"${PYTHON_VERSION}"@EMBED@" 2>&1`
+         else
+-	        PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python-"${PYTHON_VERSION}"" 2>&1`
++	        PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python-"${PYTHON_VERSION}"@EMBED@" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$PYTHONDEV_PKG_ERRORS" >&5
 @@ -26865,7 +26865,7 @@ FONTFORGE_DATE_NOW=${SOURCE_DATE_EPOCH:-
  FONTFORGE_DATE_OPTS="--date=@${FONTFORGE_DATE_NOW}"
  if ! date --version 2>/dev/null ; then