Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 Aug 2015 15:14:03 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r395036 - head/deskutils/ical/files
Message-ID:  <201508221514.t7MFE3Us057134@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sat Aug 22 15:14:02 2015
New Revision: 395036
URL: https://svnweb.freebsd.org/changeset/ports/395036

Log:
  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.

Modified:
  head/deskutils/ical/files/patch-configure

Modified: head/deskutils/ical/files/patch-configure
==============================================================================
--- head/deskutils/ical/files/patch-configure	Sat Aug 22 14:45:18 2015	(r395035)
+++ head/deskutils/ical/files/patch-configure	Sat Aug 22 15:14:02 2015	(r395036)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508221514.t7MFE3Us057134>