[xsrc/xorg]: xsrc/external/mit/mkfontscale/dist initial import of mkfontscale...

To: source-changes-hg%NetBSD.org@localhost
Subject: [xsrc/xorg]: xsrc/external/mit/mkfontscale/dist initial import of mkfontscale...
From: mrg <mrg%NetBSD.org@localhost>
Date: Sat, 01 Jun 2019 07:35:14 +0000
details:   https://anonhg.NetBSD.org/xsrc/rev/36570685e79b
branches:  xorg
changeset: 10288:36570685e79b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Jun 01 06:40:59 2019 +0000

description:
initial import of mkfontscale-1.2.1

diffstat:

 external/mit/mkfontscale/dist/ChangeLog    |    17 +
 external/mit/mkfontscale/dist/Makefile.am  |     9 +-
 external/mit/mkfontscale/dist/Makefile.in  |    18 +-
 external/mit/mkfontscale/dist/aclocal.m4   |  2307 ++++++++++++++-------------
 external/mit/mkfontscale/dist/configure    |    95 +-
 external/mit/mkfontscale/dist/configure.ac |     3 +-
 6 files changed, 1256 insertions(+), 1193 deletions(-)

diffs (truncated from 2734 to 300 lines):

diff -r 61df5536a3b7 -r 36570685e79b external/mit/mkfontscale/dist/ChangeLog
--- a/external/mit/mkfontscale/dist/ChangeLog   Sat Jun 01 06:38:18 2019 +0000
+++ b/external/mit/mkfontscale/dist/ChangeLog   Sat Jun 01 06:40:59 2019 +0000
@@ -1,3 +1,20 @@
+commit 79f686765238ddd0e4753f9d4ee62b5a5296610e
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date:   Wed Mar 20 20:58:15 2019 -0700
+
+    mkfontscale 1.2.1
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 29cab25240cf30f546671f265167a2eeadfd4c75
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date:   Thu Mar 7 13:23:00 2019 -0800
+
+    Revert "Use autoconf instead of sed to substitute @bindir@ in mkfontdir.in"
+    
+    This reverts commit 1f9d14bec07092d62da29a5a233cefbf84d47289.
+    It caused https://gitlab.freedesktop.org/xorg/app/mkfontscale/issues/5
+
 commit 8fbafcfe7e5ef4a2030e3963f31143bba2c8786f
 Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
 Date:   Sat Mar 2 14:16:48 2019 -0800
diff -r 61df5536a3b7 -r 36570685e79b external/mit/mkfontscale/dist/Makefile.am
--- a/external/mit/mkfontscale/dist/Makefile.am Sat Jun 01 06:38:18 2019 +0000
+++ b/external/mit/mkfontscale/dist/Makefile.am Sat Jun 01 06:40:59 2019 +0000
@@ -23,6 +23,13 @@
 bin_PROGRAMS = mkfontscale
 bin_SCRIPTS = mkfontdir
 
+CLEANFILES = $(bin_SCRIPTS)
+EXTRA_DIST = $(bin_SCRIPTS:=.in)
+DIR_SUBSTS = -e 's|@bindir[@]|$(bindir)|g'
+
+mkfontdir: mkfontdir.in
+       $(AM_V_GEN)$(SED) $(DIR_SUBSTS) < $(srcdir)/mkfontdir.in > $@
+
 AM_CPPFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE
 AM_CFLAGS = $(CWARNFLAGS)
 mkfontscale_LDADD  = @MKFONTSCALE_LIBS@
@@ -59,4 +66,4 @@
        $(LINT) $(ALL_LINT_FLAGS) $(mkfontscale_SOURCES)
 endif LINT
 
-EXTRA_DIST = README.md
+EXTRA_DIST += README.md
diff -r 61df5536a3b7 -r 36570685e79b external/mit/mkfontscale/dist/Makefile.in
--- a/external/mit/mkfontscale/dist/Makefile.in Sat Jun 01 06:38:18 2019 +0000
+++ b/external/mit/mkfontscale/dist/Makefile.in Sat Jun 01 06:40:59 2019 +0000
@@ -122,7 +122,7 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = mkfontdir
+CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
@@ -231,9 +231,9 @@
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-       $(srcdir)/mkfontdir.in COPYING ChangeLog INSTALL compile \
-       config.guess config.sub depcomp install-sh missing
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in COPYING \
+       ChangeLog INSTALL compile config.guess config.sub depcomp \
+       install-sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -402,6 +402,9 @@
 top_srcdir = @top_srcdir@
 SUBDIRS = man
 bin_SCRIPTS = mkfontdir
+CLEANFILES = $(bin_SCRIPTS)
+EXTRA_DIST = $(bin_SCRIPTS:=.in) README.md
+DIR_SUBSTS = -e 's|@bindir[@]|$(bindir)|g'
 AM_CPPFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE
 AM_CFLAGS = $(CWARNFLAGS)
 mkfontscale_LDADD = @MKFONTSCALE_LIBS@
@@ -421,7 +424,6 @@
 @LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 @LINT_TRUE@            $(AM_CPPFLAGS) $(CPPFLAGS)
 
-EXTRA_DIST = README.md
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -475,8 +477,6 @@
 
 distclean-hdr:
        -rm -f config.h stamp-h1
-mkfontdir: $(top_builddir)/config.status $(srcdir)/mkfontdir.in
-       cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binPROGRAMS: $(bin_PROGRAMS)
        @$(NORMAL_INSTALL)
        @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -911,6 +911,7 @@
 mostlyclean-generic:
 
 clean-generic:
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -1015,6 +1016,9 @@
 .PRECIOUS: Makefile
 
 
+mkfontdir: mkfontdir.in
+       $(AM_V_GEN)$(SED) $(DIR_SUBSTS) < $(srcdir)/mkfontdir.in > $@
+
 .PHONY: ChangeLog INSTALL
 
 INSTALL:
diff -r 61df5536a3b7 -r 36570685e79b external/mit/mkfontscale/dist/aclocal.m4
--- a/external/mit/mkfontscale/dist/aclocal.m4  Sat Jun 01 06:38:18 2019 +0000
+++ b/external/mit/mkfontscale/dist/aclocal.m4  Sat Jun 01 06:40:59 2019 +0000
@@ -20,6 +20,1136 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.15'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.15], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.15])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is '.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
Prev by Date: [xsrc/xorg]: xsrc/external/mit/xf86-video-amdgpu/dist initial import of xf86-...
Next by Date: [xsrc/xorg]: xsrc/external/mit/pixman/dist initial import of pixman-0.38.4
Previous by Thread: [xsrc/xorg]: xsrc/external/mit/xf86-video-amdgpu/dist initial import of xf86-...
Next by Thread: [xsrc/xorg]: xsrc/external/mit/pixman/dist initial import of pixman-0.38.4
Indexes:
Home | Main Index | Thread Index | Old Index