[pkgsrc/trunk]: pkgsrc/x11/liblbxutil Fix cross-compilation support.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a275d9acf2c
branches:  trunk
changeset: 531781:4a275d9acf2c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Aug 06 11:49:50 2007 +0000

description:
Fix cross-compilation support.

diffstat:

 x11/liblbxutil/Makefile         |      8 +-
 x11/liblbxutil/distinfo         |      6 +-
 x11/liblbxutil/patches/patch-aa |     43 +
 x11/liblbxutil/patches/patch-ab |     13 +
 x11/liblbxutil/patches/patch-ac |  10893 ++++++++++++++++++++++++++++++++++++++
 x11/liblbxutil/patches/patch-ad |    489 +
 6 files changed, 11450 insertions(+), 2 deletions(-)

diffs (truncated from 11490 to 300 lines):

diff -r 8515cce272e8 -r 4a275d9acf2c x11/liblbxutil/Makefile
--- a/x11/liblbxutil/Makefile   Mon Aug 06 11:24:14 2007 +0000
+++ b/x11/liblbxutil/Makefile   Mon Aug 06 11:49:50 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/14 15:27:49 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2007/08/06 11:49:50 joerg Exp $
 #
 
 DISTNAME=              liblbxutil-1.0.1
@@ -17,6 +17,12 @@
 USE_TOOLS+=            pkg-config
 GNU_CONFIGURE=         yes
 
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+MAKE_ENV+=     CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include
+.endif
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
diff -r 8515cce272e8 -r 4a275d9acf2c x11/liblbxutil/distinfo
--- a/x11/liblbxutil/distinfo   Mon Aug 06 11:24:14 2007 +0000
+++ b/x11/liblbxutil/distinfo   Mon Aug 06 11:49:50 2007 +0000
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/11/14 15:27:49 joerg Exp $
+$NetBSD: distinfo,v 1.2 2007/08/06 11:49:50 joerg Exp $
 
 SHA1 (liblbxutil-1.0.1.tar.bz2) = 91b21ca5f315f844c2f12aba898c4d2c527f5fb6
 RMD160 (liblbxutil-1.0.1.tar.bz2) = c30f05119eab8ade950217e2add9af09d3996304
 Size (liblbxutil-1.0.1.tar.bz2) = 242504 bytes
+SHA1 (patch-aa) = 938c49a062da92eba5e7054cdc412752a20c4913
+SHA1 (patch-ab) = 54557385783e1331624e46ce5062288d15cf301a
+SHA1 (patch-ac) = d631e712f190e46661a83c59a687c16ea21a6121
+SHA1 (patch-ad) = 179d850176a1cf38d36d2df1dd409800df9e5ff5
diff -r 8515cce272e8 -r 4a275d9acf2c x11/liblbxutil/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/liblbxutil/patches/patch-aa   Mon Aug 06 11:49:50 2007 +0000
@@ -0,0 +1,43 @@
+$NetBSD: patch-aa,v 1.1 2007/08/06 11:49:51 joerg Exp $
+
+--- src/Makefile.am.orig       2006-04-03 23:26:31.000000000 +0200
++++ src/Makefile.am
+@@ -1,6 +1,6 @@
+ lib_LTLIBRARIES = liblbxutil.la
+ 
+-noinst_PROGRAMS = mkg3states
++noinst_PROGRAMS = mkg3states ${MKG3STATES_PROG}
+ 
+ mkg3states_SOURCES =                          \
+       $(srcdir)/image/mkg3states.c
+@@ -20,6 +20,18 @@ liblbxutil_la_SOURCES =                             \
+       $(srcdir)/image/lbxbwcodes.h            \
+       $(srcdir)/delta/lbxdelta.c
+ 
++if CROSS_COMPILING
++MKG3STATES_PROG=      xmkg3states$(EXEEXT)
++MKG3STATES=           ./xmkg3states
++
++xmkg3states$(EXEEXT): $(srcdir)/image/mkg3states.c
++      $(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
++          $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(srcdir)/image/mkg3states.c
++else
++MKG3STATES=   ./mkg3states
++endif
++
++
+ nodist_liblbxutil_la_SOURCES = g3states.h
+ 
+ liblbxutil_la_LIBADD = @LBXUTIL_LIBS@
+@@ -28,9 +40,9 @@ INCLUDES = @LBXUTIL_CFLAGS@ 
+ 
+ $(srcdir)/image/dfaxg42d.c: g3states.h
+ 
+-g3states.h: mkg3states
++g3states.h: ${MKG3STATES_PROG} mkg3states$(EXEEXT)
+       -rm -f g3states.h
+-      ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
++      ${MKG3STATES} -c > g3states.h_ && mv g3states.h_ g3states.h
+ 
+ liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+ 
diff -r 8515cce272e8 -r 4a275d9acf2c x11/liblbxutil/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/liblbxutil/patches/patch-ab   Mon Aug 06 11:49:50 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/08/06 11:49:51 joerg Exp $
+
+--- configure.ac.orig  2007-08-06 10:45:16.000000000 +0200
++++ configure.ac
+@@ -43,6 +43,8 @@ AC_CHECK_LIB(z,deflate,[LBXUTIL_LIBS="${
+ 
+ AC_SUBST(LBXUTIL_CFLAGS)
+ AC_SUBST(LBXUTIL_LIBS)
++
++AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ])
+                 
+ # Check fixesext configuration, strip extra digits from package version to
+ # find the required protocol version
diff -r 8515cce272e8 -r 4a275d9acf2c x11/liblbxutil/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/liblbxutil/patches/patch-ac   Mon Aug 06 11:49:50 2007 +0000
@@ -0,0 +1,10893 @@
+$NetBSD: patch-ac,v 1.1 2007/08/06 11:49:51 joerg Exp $
+
+--- configure.orig     2006-05-15 22:24:51.000000000 +0200
++++ configure
+@@ -1,27 +1,56 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59 for lbxutil 1.0.1.
++# Generated by GNU Autoconf 2.61 for lbxutil 1.0.1.
+ #
+ # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
+ #
+-# Copyright (C) 2003 Free Software Foundation, Inc.
++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+ ## 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=:
+   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
++fi
++
++
++
++
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++    PATH_SEPARATOR=';'
++  else
++    PATH_SEPARATOR=:
++  fi
++  rm -f conf$$.sh
+ fi
+-DUALCASE=1; export DUALCASE # for MKS sh
+ 
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+@@ -31,8 +60,43 @@ else
+ fi
+ 
+ 
++# IFS
++# We need space, tab and new line, in precisely that order.  Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++as_nl='
++'
++IFS=" ""      $as_nl"
++
++# Find who we are.  Look in the path if we contain no directory separator.
++case $0 in
++  *[\\/]* ) as_myself=$0 ;;
++  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++IFS=$as_save_IFS
++
++     ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++  as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  { (exit 1); exit 1; }
++fi
++
+ # Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+@@ -46,18 +110,19 @@ do
+   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+     eval $as_var=C; export $as_var
+   else
+-    $as_unset $as_var
++    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+   fi
+ done
+ 
+ # Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+   as_basename=basename
+ else
+   as_basename=false
+@@ -65,157 +130,388 @@ fi
+ 
+ 
+ # Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+        X"$0" : 'X\(//\)$' \| \
+-       X"$0" : 'X\(/\)$' \| \
+-       .     : '\(.\)' 2>/dev/null ||
++       X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-        /^X\/\(\/\/\)$/{ s//\1/; q; }
+-        /^X\/\(\/\).*/{ s//\1/; q; }
+-        s/.*/./; q'`
++    sed '/^.*\/\([^/][^/]*\)\/*$/{
++          s//\1/
++          q
++        }
++        /^X\/\(\/\/\)$/{
++          s//\1/
++          q
++        }
++        /^X\/\(\/\).*/{
++          s//\1/
++          q
++        }
++        s/.*/./; q'`
+ 
++# CDPATH.
++$as_unset CDPATH
+ 
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conf$$.sh
++if test "x$CONFIG_SHELL" = x; then
++  if (eval ":") 2>/dev/null; then
++  as_have_required=yes
++else
++  as_have_required=no
+ fi
+ 
++  if test $as_have_required = yes &&   (eval ":
++(as_func_return () {