Update to libXt-1.0.7. Changes:

Use make rules instead of shell for loops to generate shadow man pages
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Replace AC_DEFINE_DIR with AX_DEFINE_DIR from Autoconf Archive
Link against libICE
Fix compilation of host tools in cross-compilation case

8 files changed, 7 insertions, 235 deletions

diff --git a/x11/libXt/Makefile b/x11/libXt/Makefile
index d2f38b4552a..9bc9d1d34bc 100644
--- a/x11/libXt/Makefile
+++ b/x11/libXt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2009/09/22 19:34:05 tnn Exp $
+# $NetBSD: Makefile,v 1.13 2010/01/28 15:25:54 tnn Exp $
 #
 
-DISTNAME=		libXt-1.0.6
+DISTNAME=		libXt-1.0.7
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
@@ -39,6 +39,7 @@ CONFIGURE_ENV+=		ac_cv_path_RAWCPP="cc -E -Uunix -"
 .endif
 
 .include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/kbproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
diff --git a/x11/libXt/distinfo b/x11/libXt/distinfo
index a856b15553e..be5021e8a38 100644
--- a/x11/libXt/distinfo
+++ b/x11/libXt/distinfo
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.7 2009/07/18 10:28:47 wiz Exp $
+$NetBSD: distinfo,v 1.8 2010/01/28 15:25:54 tnn Exp $
 
-SHA1 (libXt-1.0.6.tar.bz2) = 8396f51c413006a14c1d7ecd3270a3c59736654a
-RMD160 (libXt-1.0.6.tar.bz2) = 3ad412ee271513e2ca4d8d8f7945d1d1ec0efeae
-Size (libXt-1.0.6.tar.bz2) = 538143 bytes
-SHA1 (patch-aa) = dc323bb925a638d8cefc790d0df31cf73ce826b9
-SHA1 (patch-ab) = 0fa6ad0aadf9a694f21850de58d4a1d1581e2851
-SHA1 (patch-ac) = 3abc6e5f70a9834de2ee74f9013a3dd9d2684de8
-SHA1 (patch-ad) = 89be246fc069963ff995f1d02371ce80811c2f57
-SHA1 (patch-ae) = 2571754d179fb85510c45f67d0ba0a0af4ca1bbd
-SHA1 (patch-af) = e9b2882bc62c045afc0a32a8feab6a298108aa16
+SHA1 (libXt-1.0.7.tar.bz2) = 3c285b9c04a393dec1cc3d60cf5582d798eb3272
+RMD160 (libXt-1.0.7.tar.bz2) = eb6553819486cef75d2cbb76e12953c6da5fb997
+Size (libXt-1.0.7.tar.bz2) = 559875 bytes
diff --git a/x11/libXt/patches/patch-aa b/x11/libXt/patches/patch-aa
deleted file mode 100644
index 1eb7d25b831..00000000000
--- a/x11/libXt/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2009/07/18 10:28:47 wiz Exp $
-
---- 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
- 
- CC = @CC_FOR_BUILD@
-@@ -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)
diff --git a/x11/libXt/patches/patch-ab b/x11/libXt/patches/patch-ab
deleted file mode 100644
index 211ef6ea9ae..00000000000
--- a/x11/libXt/patches/patch-ab
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2009/07/18 10:28:47 wiz Exp $
-
---- util/Makefile.in.orig	2009-07-02 17:25:58.000000000 +0000
-+++ util/Makefile.in
-@@ -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
-@@ -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)
- makestrs_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(makestrs_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
-@@ -66,8 +72,8 @@ CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- 	$(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/||"`;; \
-@@ -101,6 +107,8 @@ CWARNFLAGS = @CWARNFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@
-+CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@
- DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
- DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
- DSYMUTIL = @DSYMUTIL@
-@@ -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)
-@@ -303,6 +312,9 @@ clean-noinstPROGRAMS:
- 	  echo " rm -f $$p $$f"; \
- 	  rm -f $$p $$f ; \
- 	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) 
- 	@rm -f makestrs$(EXEEXT)
- 	$(makestrs_LINK) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)
-@@ -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@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -555,6 +568,10 @@ uninstall-am: uninstall-appmanDATA unins
- 	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.
diff --git a/x11/libXt/patches/patch-ac b/x11/libXt/patches/patch-ac
deleted file mode 100644
index 1cb0cbe1075..00000000000
--- a/x11/libXt/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2009/07/18 10:28:47 wiz Exp $
-
---- src/Makefile.am.orig	2009-07-02 17:22:11.000000000 +0000
-+++ src/Makefile.am
-@@ -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
- 	mkdir -p $(top_builddir)/src
- 	mkdir -p $(top_builddir)/include/X11
- 	cp StringDefs.h $(top_builddir)/include/X11
diff --git a/x11/libXt/patches/patch-ad b/x11/libXt/patches/patch-ad
deleted file mode 100644
index 8f5a8bf5786..00000000000
--- a/x11/libXt/patches/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2009/07/18 10:28:47 wiz Exp $
-
---- src/Makefile.in.orig	2009-07-02 17:25:58.000000000 +0000
-+++ src/Makefile.in
-@@ -103,6 +103,8 @@ CFLAGS = @CFLAGS@
- CHANGELOG_CMD = @CHANGELOG_CMD@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
-+CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@
-+CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@
- CWARNFLAGS = @CWARNFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
-@@ -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
- 
-@@ -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
diff --git a/x11/libXt/patches/patch-ae b/x11/libXt/patches/patch-ae
deleted file mode 100644
index 38977f28c2b..00000000000
--- a/x11/libXt/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2009/07/18 10:28:47 wiz Exp $
-
---- configure.ac.orig	2009-07-02 17:25:41.000000000 +0000
-+++ configure.ac
-@@ -125,6 +125,8 @@ esac
- 
- 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
diff --git a/x11/libXt/patches/patch-af b/x11/libXt/patches/patch-af
deleted file mode 100644
index 1c21262d914..00000000000
--- a/x11/libXt/patches/patch-af
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-af,v 1.3 2009/07/18 10:28:47 wiz Exp $
-
---- configure.orig	2009-07-02 17:25:57.000000000 +0000
-+++ configure
-@@ -806,6 +806,8 @@ LIB_MAN_SUFFIX
- APP_MAN_SUFFIX
- RAWCPPFLAGS
- RAWCPP
-+CROSS_COMPILING_FALSE
-+CROSS_COMPILING_TRUE
- STRINGSABIOPTIONS
- appdefaultdir
- XFILESEARCHPATHDEFAULT
-@@ -12100,6 +12102,15 @@ esac
- 
- XT_CFLAGS="$CWARNFLAGS $XT_CFLAGS $OS_CFLAGS"
- 
-+ if  test $cross_compiling = yes ; then
-+  CROSS_COMPILING_TRUE=
-+  CROSS_COMPILING_FALSE='#'
-+else
-+  CROSS_COMPILING_TRUE='#'
-+  CROSS_COMPILING_FALSE=
-+fi
-+
-+
- # Man page processing requirements
- 
- 
-@@ -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
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+$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_write_fail=0