summaryrefslogtreecommitdiff
path: root/x11/libXt/patches/patch-af
diff options
context:
space:
mode:
Diffstat (limited to 'x11/libXt/patches/patch-af')
-rw-r--r--x11/libXt/patches/patch-af223
1 files changed, 18 insertions, 205 deletions
diff --git a/x11/libXt/patches/patch-af b/x11/libXt/patches/patch-af
index 9af43a9d0df..1c21262d914 100644
--- a/x11/libXt/patches/patch-af
+++ b/x11/libXt/patches/patch-af
@@ -1,190 +1,21 @@
-$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 2007-09-20 10:25:10.000000000 +0200
-@@ -864,6 +864,8 @@ INSTALL_MAKESTRS_FALSE
- XFILESEARCHPATHDEFAULT
- appdefaultdir
- STRINGSABIOPTIONS
-+CROSS_COMPILING_TRUE
-+CROSS_COMPILING_FALSE
- RAWCPP
- RAWCPPFLAGS
+--- configure.orig 2009-07-02 17:25:57.000000000 +0000
++++ configure
+@@ -806,6 +806,8 @@ LIB_MAN_SUFFIX
APP_MAN_SUFFIX
-@@ -4420,7 +4422,7 @@ ia64-*-hpux*)
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 4423 "configure"' > conftest.$ac_ext
-+ echo '#line 4425 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- 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
+ 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
++ if test $cross_compiling = yes ; then
+ CROSS_COMPILING_TRUE=
+ CROSS_COMPILING_FALSE='#'
+else
@@ -196,35 +27,17 @@ $NetBSD: patch-af,v 1.2 2007/09/20 08:30:15 rillig Exp $
# 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
-@@ -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
+ ac_write_fail=0
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-08 21:46:54 +0000