diff options
| author | gahr <gahr@FreeBSD.org> | 2013-04-17 18:02:28 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2013-04-17 18:02:28 +0800 |
| commit | da184f7e5577439c919ad64c5c9127eddc75083e (patch) | |
| tree | 273d2f6afbef32b751a9105d864015c941356e77 /devel/mico | |
| parent | 645b5b152fc8847d617028cf685da49328ef7e05 (diff) | |
| download | freebsd-ports-gnome-da184f7e5577439c919ad64c5c9127eddc75083e.tar.gz freebsd-ports-gnome-da184f7e5577439c919ad64c5c9127eddc75083e.tar.zst freebsd-ports-gnome-da184f7e5577439c919ad64c5c9127eddc75083e.zip | |
- Use current Tcl version
Feature safe: yes
Diffstat (limited to 'devel/mico')
| -rw-r--r-- | devel/mico/Makefile | 5 | ||||
| -rw-r--r-- | devel/mico/files/patch-configure.in | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/devel/mico/Makefile b/devel/mico/Makefile index 2076c217eea5..47ed6fa97e16 100644 --- a/devel/mico/Makefile +++ b/devel/mico/Makefile @@ -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 diff --git a/devel/mico/files/patch-configure.in b/devel/mico/files/patch-configure.in index 5201e9abc8e1..4d90269d2ca8 100644 --- a/devel/mico/files/patch-configure.in +++ b/devel/mico/files/patch-configure.in @@ -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) |