From de8de1ce0e498b8cc9ae39e5a7d156100bcda99b Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Wed, 20 Feb 2019 12:48:36 +0100
Subject: [PATCH] Minor (whitespace, spelling, doc update).

---
 builds/freetype.mk        | 37 +++++++++++++++++++------------------
 builds/unix/configure.raw |  8 ++++----
 docs/CHANGES              |  5 +++++
 src/psaux/cffdecode.c     |  2 +-
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/builds/freetype.mk b/builds/freetype.mk
index fcb5d7eca..a9dce0dd3 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -298,21 +298,22 @@ PIP    ?= pip
 
 refdoc:
 	@echo Running docwriter...
-	$(PYTHON) -m docwriter                      \
-			--prefix=ft2                        \
-			--title=FreeType-$(version)         \
-			--output=$(DOC_DIR)                 \
-			$(PUBLIC_DIR)/*.h                   \
-			$(PUBLIC_DIR)/config/*.h            \
-			$(PUBLIC_DIR)/cache/*.h
+	$(PYTHON) -m docwriter \
+                  --prefix=ft2 \
+                  --title=FreeType-$(version) \
+                  --output=$(DOC_DIR) \
+                  $(PUBLIC_DIR)/*.h \
+                  $(PUBLIC_DIR)/config/*.h \
+                  $(PUBLIC_DIR)/cache/*.h
 	@echo Building static site...
 	cd $(DOC_DIR) && mkdocs build
 	@echo Done.
 
-# Variables for running refdoc with Python's `virtualenv'. The env is
-# created in `DOC_DIR/env' and is gitignored.
-# We still need to cd into `DOC_DIR' to build mkdocs because paths in
-# mkdocs.yml are relative to cwd.
+# Variables for running `refdoc' with Python's `virtualenv'.  The
+# environment is created in `DOC_DIR/env' and is gitignored.
+#
+# We still need to cd into `DOC_DIR' to build `mkdocs' because paths in
+# `mkdocs.yml' are relative to the current working directory.
 #
 VENV_NAME  := env
 VENV_DIR   := $(DOC_DIR)$(SEP)$(VENV_NAME)
@@ -325,13 +326,13 @@ refdoc-venv:
 	@echo Installing docwriter...
 	$(ENV_PIP) install docwriter
 	@echo Running docwriter...
-	$(ENV_PYTHON) -m docwriter              \
-			--prefix=ft2                    \
-			--title=FreeType-$(version)     \
-			--output=$(DOC_DIR)             \
-			$(PUBLIC_DIR)/*.h               \
-			$(PUBLIC_DIR)/config/*.h        \
-			$(PUBLIC_DIR)/cache/*.h
+	$(ENV_PYTHON) -m docwriter \
+                      --prefix=ft2 \
+                      --title=FreeType-$(version) \
+                      --output=$(DOC_DIR) \
+                      $(PUBLIC_DIR)/*.h \
+                      $(PUBLIC_DIR)/config/*.h \
+                      $(PUBLIC_DIR)/cache/*.h
 	@echo Building static site...
 	cd $(DOC_DIR) && $(VENV_NAME)$(SEP)$(BIN)$(SEP)python -m mkdocs build
 	@echo Done.
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index e50aad638..ce788d708 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -37,7 +37,7 @@ AC_SUBST(EXEEXT)
 PKG_PROG_PKG_CONFIG([0.24])
 
 LT_INIT(win32-dll)
-AC_CHECK_HEADER([windows.h],[LT_PROG_RC])
+AC_CHECK_HEADER([windows.h], [LT_PROG_RC])
 
 
 # checks for native programs to generate building tool
@@ -196,7 +196,7 @@ AC_SYS_LARGEFILE
 AC_ARG_ENABLE([mmap],
   AS_HELP_STRING([--disable-mmap],
                  [do not check mmap() and do not use]),
-  [enable_mmap="no"],[enable_mmap="yes"])
+  [enable_mmap="no"], [enable_mmap="yes"])
 if test "x${enable_mmap}" != "xno"; then
   AC_FUNC_MMAP
 fi
@@ -315,7 +315,7 @@ found_visibility_flag=no
 AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
 orig_CFLAGS="${CFLAGS}"
 CFLAGS="${CFLAGS} -fvisibility=hidden"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
                [found_visibility_flag=yes
                 AC_MSG_RESULT(yes)],
                [CFLAGS="${orig_CFLAGS}"
@@ -325,7 +325,7 @@ if test "${found_visibility_flag}" = "no"; then
   AC_MSG_CHECKING([for -xldscope=hidden compiler flag])
   orig_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} -xldscope=hidden"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
                  [found_visibility_flag=yes
                   AC_MSG_RESULT(yes)],
                  [CFLAGS="${orig_CFLAGS}"
diff --git a/docs/CHANGES b/docs/CHANGES
index 0938a67f2..dfb9789d5 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -79,6 +79,11 @@ CHANGES BETWEEN 2.9.1 and 2.10
       functions limited to Adobe MultiMaster fonts to directly set and
       get the weight vector.
 
+    - Support for Position Independent Code as needed by  systems that
+      prohibit  automatic  address  fixups,  such  as BREW,  has  been
+      removed.  [Compilation with modern compilers that use flags like
+      `-fPIC' or `-fPIE' is not affected.]
+
 
 ======================================================================
 
diff --git a/src/psaux/cffdecode.c b/src/psaux/cffdecode.c
index 655e53e5a..6cc1d3249 100644
--- a/src/psaux/cffdecode.c
+++ b/src/psaux/cffdecode.c
@@ -860,7 +860,7 @@
           case cff_op_flex1:
           case cff_op_callsubr:
           case cff_op_callgsubr:
-            /* depracated opcodes */
+            /* deprecated opcodes */
           case cff_op_dotsection:
             /* invalid Type 1 opcodes */
           case cff_op_hsbw: