[pkgsrc/trunk]: pkgsrc/fonts/fontconfig Kill the platform "detection" logic a...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/12677d312990
branches:  trunk
changeset: 531523:12677d312990
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Aug 01 16:33:39 2007 +0000

description:
Kill the platform "detection" logic and just wire the host cpu as
detected by autoconf for use in the fontconfig cache file names.

Pass down CC_FOR_BUILD when doing cross-compilation.

A script for how to do the original fc-arch dance in a cross-compile
safe way was sent to the authors as well as a question why this was
done. No reply received so far.

Bump revision. Note that you might want to clean /var/cache/fontconfig
after installing this.

Supported-by: Google SoC 2007.

diffstat:

 fonts/fontconfig/Makefile         |    11 +-
 fonts/fontconfig/distinfo         |     6 +-
 fonts/fontconfig/patches/patch-aa |    13 +-
 fonts/fontconfig/patches/patch-ca |    35 +
 fonts/fontconfig/patches/patch-cb |  2664 +++++++++++++++++++++++++++++++++++++
 5 files changed, 2723 insertions(+), 6 deletions(-)

diffs (truncated from 2773 to 300 lines):

diff -r b2853393e1c0 -r 12677d312990 fonts/fontconfig/Makefile
--- a/fonts/fontconfig/Makefile Wed Aug 01 16:28:08 2007 +0000
+++ b/fonts/fontconfig/Makefile Wed Aug 01 16:33:39 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2007/01/11 11:25:57 joerg Exp $
+# $NetBSD: Makefile,v 1.63 2007/08/01 16:33:39 joerg Exp $
 
 DISTNAME=      fontconfig-2.4.2
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    fonts
 MASTER_SITES=  http://www.fontconfig.org/release/
 
@@ -68,6 +68,13 @@
 
 TEST_TARGET=   check
 
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+CONFIGURE_ENV+=        CC_FOR_BUILD=${NATIVE_CC:Q}
+.endif
+
+pre-configure:
+       echo '#define FC_ARCHITECTURE "@host_cpu@"' > ${WRKSRC}/fc-arch/fcarch.h.in
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff -r b2853393e1c0 -r 12677d312990 fonts/fontconfig/distinfo
--- a/fonts/fontconfig/distinfo Wed Aug 01 16:28:08 2007 +0000
+++ b/fonts/fontconfig/distinfo Wed Aug 01 16:33:39 2007 +0000
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.25 2007/01/30 17:03:50 tv Exp $
+$NetBSD: distinfo,v 1.26 2007/08/01 16:33:39 joerg Exp $
 
 SHA1 (fontconfig-2.4.2.tar.gz) = cd5e30625680a0435563b586275156eaf8d0d34a
 RMD160 (fontconfig-2.4.2.tar.gz) = c953020a5193500080c9eceef47b76e61c41b188
 Size (fontconfig-2.4.2.tar.gz) = 1278340 bytes
-SHA1 (patch-aa) = 7aa7831ccc818d0f501df941a1d12f3ed610d33b
+SHA1 (patch-aa) = 1f33848449251839366d85fcc2134cdddc522a28
 SHA1 (patch-ab) = 455e20719e7ad300ebe95748165eeb7e25897dd5
 SHA1 (patch-ac) = 965087ba6e457daf17c55fc3573b51fd6425be93
 SHA1 (patch-ae) = 9bd0bf5cdbdf9e1e075d248fd33a156cd4cde909
+SHA1 (patch-ca) = ff3457cb7150015d31ba7932cd5e824f7ce3b3aa
+SHA1 (patch-cb) = 5c80a81c5fc85f2423a66505db05a35122b57d72
diff -r b2853393e1c0 -r 12677d312990 fonts/fontconfig/patches/patch-aa
--- a/fonts/fontconfig/patches/patch-aa Wed Aug 01 16:28:08 2007 +0000
+++ b/fonts/fontconfig/patches/patch-aa Wed Aug 01 16:33:39 2007 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.10 2006/09/12 14:52:17 joerg Exp $
+$NetBSD: patch-aa,v 1.11 2007/08/01 16:33:39 joerg Exp $
 
---- Makefile.in.orig   2006-09-10 07:04:47.000000000 +0200
+--- Makefile.in.orig   2006-12-03 00:27:34.000000000 +0100
 +++ Makefile.in
+@@ -258,7 +258,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = fontconfig fc-case fc-lang fc-glyphname fc-arch src \
++SUBDIRS = fontconfig fc-case fc-lang fc-glyphname src \
+       fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test
+ 
+ EXTRA_DIST = fontconfig.pc.in fonts.conf.in fonts.dtd \
 @@ -274,10 +274,11 @@ MAINTAINERCLEANFILES = $(srcdir)/aclocal
        -type f -name Makefile.in -print` ChangeLog
  pkgconfigdir = $(libdir)/pkgconfig
diff -r b2853393e1c0 -r 12677d312990 fonts/fontconfig/patches/patch-ca
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/fonts/fontconfig/patches/patch-ca Wed Aug 01 16:33:39 2007 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-ca,v 1.1 2007/08/01 16:33:39 joerg Exp $
+
+--- configure.in.orig  2006-12-03 00:24:39.000000000 +0100
++++ configure.in
+@@ -137,22 +137,6 @@ AC_SUBST(EXEEXT_FOR_BUILD)
+ 
+ dnl ==========================================================================
+ 
+-AC_ARG_WITH(arch,      [  --with-arch=ARCH      Force architecture to ARCH], arch="$withval", arch=auto)
+-
+-if test $cross_compiling = yes; then
+-      case "$arch" in
+-      auto)
+-              AC_MSG_ERROR([Cannot autodetect architecture in cross compile environment]
+-                           [Use --with-arch=ARCH to specify architecture])
+-              ;;
+-      esac
+-fi
+-
+-ARCHITECTURE=$arch
+-AC_SUBST(ARCHITECTURE)
+-
+-dnl ==========================================================================
+-
+ # Checks for header files.
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+@@ -561,6 +545,7 @@ fc-lang/Makefile
+ fc-glyphname/Makefile
+ fc-case/Makefile
+ fc-arch/Makefile
++fc-arch/fcarch.h
+ src/Makefile
+ conf.d/Makefile
+ fc-cache/Makefile
diff -r b2853393e1c0 -r 12677d312990 fonts/fontconfig/patches/patch-cb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/fonts/fontconfig/patches/patch-cb Wed Aug 01 16:33:39 2007 +0000
@@ -0,0 +1,2664 @@
+$NetBSD: patch-cb,v 1.1 2007/08/01 16:33:39 joerg Exp $
+
+--- configure.orig     2006-12-03 00:27:35.000000000 +0100
++++ configure
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.60a.
++# Generated by GNU Autoconf 2.61.
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@@ -10,7 +10,8 @@
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -19,10 +20,13 @@ if test -n "${ZSH_VERSION+set}" && (emul
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
++
+ 
+ 
+ # PATH needs CR
+@@ -215,7 +219,7 @@ test \$exitcode = 0) || { (exit 1); exit
+ else
+   as_candidate_shells=
+     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+@@ -233,7 +237,6 @@ IFS=$as_save_IFS
+        # Try only shells that exist, to save several forks.
+        if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+               { ("$as_shell") 2> /dev/null <<\_ASEOF
+-# Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -242,10 +245,12 @@ if test -n "${ZSH_VERSION+set}" && (emul
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
+ 
+ :
+ _ASEOF
+@@ -253,7 +258,6 @@ _ASEOF
+   CONFIG_SHELL=$as_shell
+              as_have_required=yes
+              if { "$as_shell" 2> /dev/null <<\_ASEOF
+-# Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -262,10 +266,12 @@ if test -n "${ZSH_VERSION+set}" && (emul
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
+ 
+ :
+ (as_func_return () {
+@@ -512,19 +518,28 @@ else
+   as_mkdir_p=false
+ fi
+ 
+-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
+-# systems may use methods other than mode bits to determine executability.
+-cat >conf$$.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conf$$.file
+-if test -x conf$$.file >/dev/null 2>&1; then
+-  as_executable_p="test -x"
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
+ else
+-  as_executable_p=:
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++        test -d "$1/.";
++      else
++      case $1 in
++        -*)set "./$1";;
++      esac;
++      case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++      ???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
+ fi
+-rm -f conf$$.file
++as_executable_p=$as_test_x
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -872,7 +887,6 @@ CROSS_COMPILING_TRUE
+ CROSS_COMPILING_FALSE
+ CC_FOR_BUILD
+ EXEEXT_FOR_BUILD
+-ARCHITECTURE
+ ICONV_LIBS
+ ft_config
+ FREETYPE_LIBS
+@@ -910,6 +924,7 @@ target_alias
+ CC
+ CFLAGS
+ LDFLAGS
++LIBS
+ CPPFLAGS
+ CPP
+ CXX
+@@ -1026,10 +1041,10 @@ do
+   -disable-* | --disable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+     eval enable_$ac_feature=no ;;
+ 
+   -docdir | --docdir | --docdi | --doc | --do)
+@@ -1045,10 +1060,10 @@ do
+   -enable-* | --enable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+     eval enable_$ac_feature=\$ac_optarg ;;
+ 
+   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+@@ -1242,19 +1257,19 @@ do
+   -with-* | --with-*)
+     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+-    ac_package=`echo $ac_package| sed 's/-/_/g'`
++    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+     eval with_$ac_package=\$ac_optarg ;;
+ 
+   -without-* | --without-*)