svn commit: r315956 - in head/devel/mico: . files

[Pietro Cerutti]

Author: gahr
Date: Wed Apr 17 10:02:28 2013
New Revision: 315956
URL: http://svnweb.freebsd.org/changeset/ports/315956

Log:
  - Use current Tcl version
  
  Feature safe:	yes

Modified:
  head/devel/mico/Makefile
  head/devel/mico/files/patch-configure.in   (contents, props changed)

Modified: head/devel/mico/Makefile
==============================================================================
--- head/devel/mico/Makefile	Wed Apr 17 09:34:05 2013	(r315955)
+++ head/devel/mico/Makefile	Wed Apr 17 10:02:28 2013	(r315956)
@@ -71,9 +71,10 @@ CONFIGURE_ARGS+=	--with-gtk=${LOCALBASE}
 MICO_GTK=		"@comment "
 .endif
 .if ${PORT_OPTIONS:MTCL}
-LIB_DEPENDS=		tcl83:${PORTSDIR}/lang/tcl83
+USE_TCL=		yes
 CONFIGURE_ARGS+=	--with-tcl
-CPPFLAGS+=		-I${LOCALBASE}/include/tcl8.3
+CPPFLAGS+=		-I${TCL_INCLUDEDIR}
+LDFLAGS+=		-L${LOCALBASE}/lib
 .else
 MICO_TCL=		"@comment "
 .endif

Modified: head/devel/mico/files/patch-configure.in
==============================================================================
--- head/devel/mico/files/patch-configure.in	Wed Apr 17 09:34:05 2013	(r315955)
+++ head/devel/mico/files/patch-configure.in	Wed Apr 17 10:02:28 2013	(r315956)
@@ -1,5 +1,5 @@
---- configure.in.orig	Sat Jul 22 15:43:10 2006
-+++ configure.in	Sat Jul 22 15:43:37 2006
+--- configure.in.orig	2006-01-21 16:12:08.000000000 +0100
++++ configure.in	2013-04-17 11:45:36.000000000 +0200
 @@ -605,7 +605,7 @@
  # System dependencies.
  #
@@ -18,3 +18,12 @@
    fi
  
    CONF_SHARED_CC="$CXX -shared"
+@@ -1082,7 +1082,7 @@
+   AC_GET_DEFINE(TCL_VERSION, TCL_VERSION, tcl.h)
+   if test X"$TCL_VERSION" != X; then
+     dnl # remove quotes if any
+-    TCL_VERSION=`echo $TCL_VERSION | tr -d \"`
++    TCL_VERSION=`echo $TCL_VERSION | tr -d \" | tr -d \.`
+     TCL_LIBS=-ltcl$TCL_VERSION
+     HAVE_TCL=yes
+     AC_MSG_RESULT($TCL_VERSION)