 @@ -1,87 +1,87 @@
-$NetBSD: patch-ab,v 1.4 2007/09/20 08:30:14 rillig Exp $
+$NetBSD: patch-ab,v 1.5 2009/07/18 10:28:47 wiz Exp $
---- util/Makefile.in.orig	2007-01-28 07:31:13.000000000 +0100
+--- util/Makefile.in.orig	2009-07-02 17:25:58.000000000 +0000
-+++ util/Makefile.in	2007-09-20 10:23:58.000000000 +0200
++++ util/Makefile.in
-@@ -38,7 +38,9 @@ POST_UNINSTALL = :
+@@ -34,7 +34,9 @@ POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
  @INSTALL_MAKESTRS_TRUE@bin_PROGRAMS = makestrs$(EXEEXT)
 -@INSTALL_MAKESTRS_FALSE@noinst_PROGRAMS = makestrs$(EXEEXT)
 +@INSTALL_MAKESTRS_FALSE@noinst_PROGRAMS = makestrs$(EXEEXT) \
 +@INSTALL_MAKESTRS_FALSE@	$(am__EXEEXT_1)
 +@INSTALL_MAKESTRS_TRUE@noinst_PROGRAMS = $(am__EXEEXT_1)
  subdir = util
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -51,10 +53,14 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -47,10 +49,14 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 +@CROSS_COMPILING_TRUE@am__EXEEXT_1 = xmakestrs$(EXEEXT)
  PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
  am_makestrs_OBJECTS = makestrs-makestrs.$(OBJEXT)
  makestrs_OBJECTS = $(am_makestrs_OBJECTS)
  makestrs_LDADD = $(LDADD)
 +xmakestrs_SOURCES = xmakestrs.c
 +xmakestrs_OBJECTS = xmakestrs.$(OBJEXT)
 +xmakestrs_LDADD = $(LDADD)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ makestrs_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- depcomp = $(SHELL) $(top_srcdir)/depcomp
+ 	--mode=link $(CCLD) $(makestrs_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- am__depfiles_maybe = depfiles
+ 	$(LDFLAGS) -o $@
-@@ -66,8 +72,8 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
+@@ -66,8 +72,8 @@ CCLD = $(CC)
- CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ 	$(LDFLAGS) -o $@
 -SOURCES = $(makestrs_SOURCES)
 -DIST_SOURCES = $(makestrs_SOURCES)
 +SOURCES = $(makestrs_SOURCES) xmakestrs.c
 +DIST_SOURCES = $(makestrs_SOURCES) xmakestrs.c
  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
  am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -97,6 +103,8 @@ CCDEPMODE = @CCDEPMODE@
+@@ -101,6 +107,8 @@ CWARNFLAGS = @CWARNFLAGS@
- CFLAGS = @CFLAGS@
+ CYGPATH_W = @CYGPATH_W@
- CPP = @CPP@
+ DEFS = @DEFS@
- CPPFLAGS = @CPPFLAGS@
+ DEPDIR = @DEPDIR@
 +CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@
 +CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@
- CXX = @CXX@
+ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
- CXXCPP = @CXXCPP@
+ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
- CXXDEPMODE = @CXXDEPMODE@
+ DSYMUTIL = @DSYMUTIL@
-@@ -211,6 +219,7 @@ target_alias = @target_alias@
+@@ -220,6 +228,7 @@ top_srcdir = @top_srcdir@
  EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE)
  makestrs_CFLAGS = $(XT_CFLAGS)
  makestrs_SOURCES = makestrs.c
 +@CROSS_COMPILING_TRUE@MAKESTRS_PROG = xmakestrs$(EXEEXT)
  # Man page
  appmandir = $(APP_MAN_DIR)
-@@ -298,6 +307,9 @@ clean-noinstPROGRAMS:
+@@ -303,6 +312,9 @@ clean-noinstPROGRAMS:
- makestrs$(EXEEXT): $(makestrs_OBJECTS) $(makestrs_DEPENDENCIES)
+ 	  echo " rm -f $$p $$f"; \
- 	@rm -f makestrs$(EXEEXT)
+ 	  rm -f $$p $$f ; \
- 	$(LINK) $(makestrs_LDFLAGS) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)
+ 	done
 +@CROSS_COMPILING_FALSE@xmakestrs$(EXEEXT): $(xmakestrs_OBJECTS) $(xmakestrs_DEPENDENCIES)
 +@CROSS_COMPILING_FALSE@	@rm -f xmakestrs$(EXEEXT)
 +@CROSS_COMPILING_FALSE@	$(LINK) $(xmakestrs_LDFLAGS) $(xmakestrs_OBJECTS) $(xmakestrs_LDADD) $(LIBS)
  makestrs$(EXEEXT): $(makestrs_OBJECTS) $(makestrs_DEPENDENCIES)
- mostlyclean-compile:
+ 	@rm -f makestrs$(EXEEXT)
- 	-rm -f *.$(OBJEXT)
+ 	$(makestrs_LINK) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)
-@@ -306,6 +318,7 @@ distclean-compile:
+@@ -314,6 +326,7 @@ distclean-compile:
  	-rm -f *.tab.c
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makestrs-makestrs.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmakestrs.Po@am__quote@
  .c.o:
- @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -542,6 +555,10 @@ uninstall-am: uninstall-appmanDATA unins
+@@ -555,6 +568,10 @@ uninstall-am: uninstall-appmanDATA unins
- 	uninstall-appmanDATA uninstall-binPROGRAMS uninstall-info-am
+ 	uninstall-appmanDATA uninstall-binPROGRAMS
 +@CROSS_COMPILING_TRUE@xmakestrs$(EXEEXT): makestrs.c
 +@CROSS_COMPILING_TRUE@	$(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
 +@CROSS_COMPILING_TRUE@	    $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c
++
  .man.$(APP_MAN_SUFFIX):
  	sed $(MAN_SUBSTS) < $< > $@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.

 @@ -1,31 +1,31 @@
-$NetBSD: patch-ad,v 1.2 2007/09/20 08:30:15 rillig Exp $
+$NetBSD: patch-ad,v 1.3 2009/07/18 10:28:47 wiz Exp $
---- src/Makefile.in.orig	2007-01-28 07:31:13.000000000 +0100
+--- src/Makefile.in.orig	2009-07-02 17:25:58.000000000 +0000
-+++ src/Makefile.in	2007-09-20 10:23:58.000000000 +0200
++++ src/Makefile.in
-@@ -103,6 +103,8 @@ CCDEPMODE = @CCDEPMODE@
+@@ -103,6 +103,8 @@ CFLAGS = @CFLAGS@
- CFLAGS = @CFLAGS@
+ CHANGELOG_CMD = @CHANGELOG_CMD@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
 +CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@
 +CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@
- CXX = @CXX@
+ CWARNFLAGS = @CWARNFLAGS@
- CXXCPP = @CXXCPP@
+ CYGPATH_W = @CYGPATH_W@
- CXXDEPMODE = @CXXDEPMODE@
+ DEFS = @DEFS@
-@@ -299,6 +301,8 @@ BUILT_SOURCE = StringDefs.c
+@@ -308,6 +310,8 @@ BUILT_SOURCE = StringDefs.c
  BUILT_HEADER = $(top_builddir)/include/X11/StringDefs.h $(top_builddir)/include/X11/Shell.h
  BUILT_FILES = $(BUILT_SOURCE) $(BUILT_HEADER)
  STRING_LIST = $(top_srcdir)/util/string.list
 +@CROSS_COMPILING_FALSE@MAKESTRS = $(top_builddir)/util/makestrs
 +@CROSS_COMPILING_TRUE@MAKESTRS = $(top_builddir)/util/xmakestrs
  all: $(BUILT_SOURCES)
  	$(MAKE) $(AM_MAKEFLAGS) all-am
-@@ -637,7 +641,7 @@ all-local: $(BUILT_FILES)
+@@ -651,7 +655,7 @@ all-local: $(BUILT_FILES)
  $(BUILT_HEADER): $(BUILT_SOURCE)
  $(BUILT_SOURCE):
 -	$(top_builddir)/util/makestrs -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
 +	$(MAKESTRS) -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
  	mkdir -p $(top_builddir)/src
  	mkdir -p $(top_builddir)/include/X11
  	cp StringDefs.h $(top_builddir)/include/X11

 @@ -1,230 +1,43 @@
-$NetBSD: patch-af,v 1.2 2007/09/20 08:30:15 rillig Exp $
+$NetBSD: patch-af,v 1.3 2009/07/18 10:28:47 wiz Exp $
---- configure.orig	2007-01-28 07:31:11.000000000 +0100
+--- configure.orig	2009-07-02 17:25:57.000000000 +0000
-+++ configure	2007-09-20 10:25:10.000000000 +0200
++++ configure
-@@ -864,6 +864,8 @@ INSTALL_MAKESTRS_FALSE
+@@ -806,6 +806,8 @@ LIB_MAN_SUFFIX
  XFILESEARCHPATHDEFAULT
  appdefaultdir
  STRINGSABIOPTIONS
 +CROSS_COMPILING_TRUE
 +CROSS_COMPILING_FALSE
  RAWCPP
  RAWCPPFLAGS
  APP_MAN_SUFFIX
-@@ -4420,7 +4422,7 @@ ia64-*-hpux*)
+ RAWCPPFLAGS
-   ;;
+ RAWCPP
- *-*-irix6*)
++CROSS_COMPILING_FALSE
-   # Find out which ABI we are using.
++CROSS_COMPILING_TRUE
--  echo '#line 4423 "configure"' > conftest.$ac_ext
+ STRINGSABIOPTIONS
-+  echo '#line 4425 "configure"' > conftest.$ac_ext
+ appdefaultdir
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ XFILESEARCHPATHDEFAULT
-   (eval $ac_compile) 2>&5
+@@ -12100,6 +12102,15 @@ esac
    ac_status=$?
@@ -7384,11 +7386,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:7387: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:7389: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:7391: \$? = $ac_status" >&5
 +   echo "$as_me:7393: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
@@ -7652,11 +7654,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:7655: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:7657: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:7659: \$? = $ac_status" >&5
 +   echo "$as_me:7661: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
@@ -7756,11 +7758,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:7759: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:7761: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:7763: \$? = $ac_status" >&5
 +   echo "$as_me:7765: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
@@ -10208,7 +10210,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 10211 "configure"
 +#line 10213 "configure"
  #include "confdefs.h"
  #if HAVE_DLFCN_H
@@ -10308,7 +10310,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 10311 "configure"
 +#line 10313 "configure"
  #include "confdefs.h"
  #if HAVE_DLFCN_H
@@ -12676,11 +12678,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:12679: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:12681: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:12683: \$? = $ac_status" >&5
 +   echo "$as_me:12685: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
@@ -12780,11 +12782,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:12783: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:12785: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:12787: \$? = $ac_status" >&5
 +   echo "$as_me:12789: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
@@ -14350,11 +14352,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14353: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:14355: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:14357: \$? = $ac_status" >&5
 +   echo "$as_me:14359: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
@@ -14454,11 +14456,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14457: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:14459: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:14461: \$? = $ac_status" >&5
 +   echo "$as_me:14463: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
@@ -16684,11 +16686,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16687: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:16689: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:16691: \$? = $ac_status" >&5
 +   echo "$as_me:16693: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
@@ -16952,11 +16954,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16955: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:16957: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:16959: \$? = $ac_status" >&5
 +   echo "$as_me:16961: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
@@ -17056,11 +17058,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:17059: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:17061: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:17063: \$? = $ac_status" >&5
 +   echo "$as_me:17065: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
@@ -20421,6 +20423,17 @@ case $host_os in
  esac
  XT_CFLAGS="$CWARNFLAGS $XT_CFLAGS $OS_CFLAGS"
 + if  test $cross_compiling = yes ; then
 +if  test $cross_compiling = yes ; then
 +  CROSS_COMPILING_TRUE=
 +  CROSS_COMPILING_FALSE='#'
 +else
 +  CROSS_COMPILING_TRUE='#'
 +  CROSS_COMPILING_FALSE=
 +fi
++
++
  # Man page processing requirements
-@@ -20850,6 +20863,13 @@ echo "$as_me: error: conditional \"INSTA
+@@ -12541,6 +12552,13 @@ $as_echo "$as_me: error: conditional \"I
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
 +if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined.
++  { { $as_echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined.
 +Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined.
++$as_echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined.
 +Usually this means the macro was only invoked conditionally." >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
  : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
+ ac_write_fail=0
@@ -21525,6 +21545,8 @@ INSTALL_MAKESTRS_FALSE!$INSTALL_MAKESTRS
  XFILESEARCHPATHDEFAULT!$XFILESEARCHPATHDEFAULT$ac_delim
  appdefaultdir!$appdefaultdir$ac_delim
  STRINGSABIOPTIONS!$STRINGSABIOPTIONS$ac_delim
 +CROSS_COMPILING_TRUE!$CROSS_COMPILING_TRUE$ac_delim
 +CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim
  RAWCPP!$RAWCPP$ac_delim
  RAWCPPFLAGS!$RAWCPPFLAGS$ac_delim
  APP_MAN_SUFFIX!$APP_MAN_SUFFIX$ac_delim
@@ -21546,7 +21568,7 @@ LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 33; then
 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

 @@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2008/05/24 21:45:15 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/18 10:28:47 wiz Exp $
+#
-DISTNAME=		libXt-1.0.5
+DISTNAME=		libXt-1.0.6
 PKGREVISION=		1
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		joerg@NetBSD.org
 HOMEPAGE=		http://xorg.freedesktop.org/
 COMMENT=		X Toolkit Intrinsics library
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes

 @@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.6 2008/01/29 03:37:02 bjs Exp $
+$NetBSD: distinfo,v 1.7 2009/07/18 10:28:47 wiz Exp $
-SHA1 (libXt-1.0.5.tar.bz2) = 5f33921e373ce162a39eabef2ce05d946935eb5b
+SHA1 (libXt-1.0.6.tar.bz2) = 8396f51c413006a14c1d7ecd3270a3c59736654a
-RMD160 (libXt-1.0.5.tar.bz2) = 7e5ef9e03dc860bf5b64b85a897dd1d2ae1ed0bf
+RMD160 (libXt-1.0.6.tar.bz2) = 3ad412ee271513e2ca4d8d8f7945d1d1ec0efeae
-Size (libXt-1.0.5.tar.bz2) = 500502 bytes
+Size (libXt-1.0.6.tar.bz2) = 538143 bytes
-SHA1 (patch-aa) = bc1b32ac62f012cea92de65f73ecaf521ede16e5
+SHA1 (patch-aa) = dc323bb925a638d8cefc790d0df31cf73ce826b9
-SHA1 (patch-ab) = 9a03be1b08aa72375c80a21dfe10bd79fbd37a83
+SHA1 (patch-ab) = 0fa6ad0aadf9a694f21850de58d4a1d1581e2851
-SHA1 (patch-ac) = d053f56de09d13fc60b5a8dd281837020a0aee95
+SHA1 (patch-ac) = 3abc6e5f70a9834de2ee74f9013a3dd9d2684de8
-SHA1 (patch-ad) = 5fa9b62316dc04eaf80cec20fc900cdd120751af
+SHA1 (patch-ad) = 89be246fc069963ff995f1d02371ce80811c2f57
-SHA1 (patch-ae) = feff93927edcb31c1c9320212df0754b4cab0676
+SHA1 (patch-ae) = 2571754d179fb85510c45f67d0ba0a0af4ca1bbd
-SHA1 (patch-af) = 8cc0692ff61345149830682703533e65870d1693
+SHA1 (patch-af) = e9b2882bc62c045afc0a32a8feab6a298108aa16
 SHA1 (patch-ag) = da1e7688a5923542d81e87d204ce8e95b920e221

 @@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.2 2007/09/20 08:30:15 rillig Exp $
+$NetBSD: patch-ae,v 1.3 2009/07/18 10:28:47 wiz Exp $
---- configure.ac	2007-01-28 07:27:22.000000000 +0100
+--- configure.ac.orig	2009-07-02 17:25:41.000000000 +0000
-+++ configure.ac	2007-07-27 20:08:44.000000000 +0200
++++ configure.ac
-@@ -95,6 +95,8 @@
+@@ -125,6 +125,8 @@ esac
  esac
- AC_SUBST(STRINGSABIOPTIONS)
+ XT_CFLAGS="$CWARNFLAGS $XT_CFLAGS $OS_CFLAGS"
 +AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ])
++
  # Man page processing requirements
  XORG_PROG_RAWCPP
  XORG_MANPAGE_SECTIONS

 @@ -1,28 +1,28 @@
-$NetBSD: patch-aa,v 1.3 2007/08/01 16:52:48 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2009/07/18 10:28:47 wiz Exp $
---- util/Makefile.am.orig	2006-07-11 20:05:55.000000000 +0200
+--- util/Makefile.am.orig	2009-07-02 17:22:11.000000000 +0000
 +++ util/Makefile.am
 @@ -1,7 +1,8 @@
  if INSTALL_MAKESTRS
  bin_PROGRAMS = makestrs
 +noinst_PROGRAMS = $(MAKESTRS_PROG)
  else
 -noinst_PROGRAMS = makestrs
 +noinst_PROGRAMS = makestrs $(MAKESTRS_PROG)
  endif
- EXTRA_DIST = \
+ CC = @CC_FOR_BUILD@
-@@ -13,6 +14,13 @@ EXTRA_DIST = \
+@@ -15,6 +16,13 @@ EXTRA_DIST = \
  makestrs_CFLAGS = $(XT_CFLAGS)
  makestrs_SOURCES = makestrs.c
 +if CROSS_COMPILING
 +MAKESTRS_PROG=		xmakestrs$(EXEEXT)
++
 +xmakestrs$(EXEEXT): makestrs.c
 +	$(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
 +	    $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c
 +endif
  # Man page
  appmandir = $(APP_MAN_DIR)

 @@ -1,18 +1,18 @@
-$NetBSD: patch-ac,v 1.2 2007/09/20 08:30:15 rillig Exp $
+$NetBSD: patch-ac,v 1.3 2009/07/18 10:28:47 wiz Exp $
---- src/Makefile.am	2006-12-19 04:40:53.000000000 +0100
+--- src/Makefile.am.orig	2009-07-02 17:22:11.000000000 +0000
-+++ src/Makefile.am	2007-07-27 21:30:16.000000000 +0200
++++ src/Makefile.am
-@@ -96,8 +96,15 @@
+@@ -96,8 +96,15 @@ all-local: $(BUILT_FILES)
  $(BUILT_HEADER): $(BUILT_SOURCE)
 +if CROSS_COMPILING
 +MAKESTRS=	$(top_builddir)/util/xmakestrs
 +else
 +MAKESTRS=	$(top_builddir)/util/makestrs
 +endif
++
++
  $(BUILT_SOURCE):
 -	$(top_builddir)/util/makestrs -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
 +	$(MAKESTRS) -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c