diff options
author | marino <marino@FreeBSD.org> | 2015-08-22 23:14:02 +0800 |
---|---|---|
committer | marino <marino@FreeBSD.org> | 2015-08-22 23:14:02 +0800 |
commit | 24653c6abd532877982957154679b8d0d664f4d6 (patch) | |
tree | 780fb83fa041603ad8cbbfb9eb816d26497439d8 /deskutils | |
parent | b8976a3ec1831ef3006a4aa92267514bc47cc337 (diff) | |
download | freebsd-ports-gnome-24653c6abd532877982957154679b8d0d664f4d6.tar.gz freebsd-ports-gnome-24653c6abd532877982957154679b8d0d664f4d6.tar.zst freebsd-ports-gnome-24653c6abd532877982957154679b8d0d664f4d6.zip |
deskutils/ical: Skip faulty configure test (that will always pass anyway)
The configure test for a valid tk version assumes the compiler will
search in /usr/local/include by default. While this is often true, it
cannot be guaranteed and the test will fail when the compiler doesn't
search there.
The ports framework guarantees the correct version of tk will always be
present, so this modification to the unmaintained port just skips the
tests to allow the configure phase to succeed on the previously mentioned
compilers.
Diffstat (limited to 'deskutils')
-rw-r--r-- | deskutils/ical/files/patch-configure | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/deskutils/ical/files/patch-configure b/deskutils/ical/files/patch-configure index 95ea2cad7484..d8350a9b153b 100644 --- a/deskutils/ical/files/patch-configure +++ b/deskutils/ical/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Fri Nov 15 17:59:05 2002 -+++ configure Fri Nov 15 17:59:20 2002 +--- configure.orig 1999-08-06 23:07:54 UTC ++++ configure @@ -1204,8 +1204,8 @@ fi echo "checking Tcl/Tk installation" 1>&6 @@ -11,7 +11,7 @@ #### Find tclsh # Check whether --with-tclsh or --without-tclsh was given. -@@ -1327,6 +1327,8 @@ +@@ -1327,6 +1327,8 @@ echo "$ac_t""$tkconfig/tkConfig.sh" 1>&6 #### Load the Tcl/Tk configuration files . $tclconfig/tclConfig.sh . $tkconfig/tkConfig.sh @@ -20,3 +20,13 @@ if test -z "$TCL_EXEC_PREFIX"; then TCL_EXEC_PREFIX="$TCL_PREFIX"; fi if test -z "$TK_EXEC_PREFIX"; then TK_EXEC_PREFIX="$TK_PREFIX"; fi +@@ -1517,8 +1519,7 @@ cat > conftest.$ac_ext <<EOF + good_tk_version + #endif + EOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "good_tk_version" >/dev/null 2>&1; then ++if true; then + rm -rf conftest* + is_good_tk_version=yes + else |