Update to tclcl 1.20

ok sthen@ sebastia@
This commit is contained in:
stu 2012-04-28 18:07:12 +00:00
parent 35bfbd45a0
commit dbf00e87df
4 changed files with 28 additions and 78 deletions

View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.25 2011/01/05 19:00:54 sebastia Exp $
# $OpenBSD: Makefile,v 1.26 2012/04/28 18:07:12 stu Exp $
# $FreeBSD: ports/devel/tclcl/Makefile,v 1.4 1999/11/28 18:31:57 steve Exp $
COMMENT= Tcl/C++ interface used by ns and nam
V= 1.19
REVISION = 0
V= 1.20
DISTNAME= tclcl-src-$V
PKGNAME= tclcl-$V
CATEGORIES= devel
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
HOMEPAGE= http://www.isi.edu/nsnam/tclcl/index.html
HOMEPAGE= http://otcl-tclcl.sourceforge.net/tclcl/
# BSD
PERMIT_PACKAGE_CDROM= Yes
@ -18,7 +18,6 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MODULES += x11/tk
MODTK_VERSION = 8.4
WANTLIB= c m stdc++ otcl>=1
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=otcl-tclcl/}
@ -29,11 +28,11 @@ LIB_DEPENDS= lang/otcl
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-tcl-ver=${MODTCL_VERSION} \
--with-tk-ver=${MODTK_VERSION} \
--with-tcl=${MODTCL_LIBDIR} \
--with-tk=${MODTK_LIBDIR}
--with-tcl=${LOCALBASE} \
--with-tk=${LOCALBASE}
pre-configure:
${SUBST_CMD} ${WRKSRC}/otcldoc
@${MODTCL_TCLSH_ADJ} ${WRKSRC}/otcldoc
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/tcl2c++ ${PREFIX}/bin

View File

@ -1,5 +1,5 @@
MD5 (tclcl-src-1.19.tar.gz) = AjrvvS5tma2W6yy+is2/Sg==
RMD160 (tclcl-src-1.19.tar.gz) = p7wAiOIP2R/Wo/8fj/TZlknbcEc=
SHA1 (tclcl-src-1.19.tar.gz) = TstLRfQ5+b8QU5k2oTjXDdMqptQ=
SHA256 (tclcl-src-1.19.tar.gz) = Rg+60fm8pC7EFYHfAIwrRQFV9lXPx99GqS+AF579mzY=
SIZE (tclcl-src-1.19.tar.gz) = 174080
MD5 (tclcl-src-1.20.tar.gz) = kdSNZpSuBs0pxiffa3hTSg==
RMD160 (tclcl-src-1.20.tar.gz) = 7qFOoZNmnWDI5/qyO/IJbZ/qroo=
SHA1 (tclcl-src-1.20.tar.gz) = RdOKHeou2b/VKXdrFvWnjVhPdUk=
SHA256 (tclcl-src-1.20.tar.gz) = ZP0exLHRwTIp5Yp+EL+EItgExdPwAiERfq/Cr/MG3Hg=
SIZE (tclcl-src-1.20.tar.gz) = 171728

View File

@ -1,56 +1,19 @@
$OpenBSD: patch-configure,v 1.2 2011/01/05 19:00:54 sebastia Exp $
--- configure.orig Sun Feb 18 23:20:32 2007
+++ configure Thu Dec 23 11:59:42 2010
@@ -5304,6 +5304,7 @@ TCL_H_PLACES=" \
/usr/local/lib/tcl$TCL_HI_VERS \
/usr/local/lib/tcl$TCL_ALT_VERS \
/usr/local/include/tcl$TCL_VERS \
+ /usr/local/include/tcl$TCL_HI_VERS/generic \
/usr/local/include/tcl$TCL_HI_VERS \
/usr/local/include/tcl$TCL_ALT_VERS \
/usr/local/include \
@@ -5398,7 +5399,7 @@ else
echo "$as_me: error: $d is not a directory" >&2;}
{ (exit 1); exit 1; }; }
fi
- places="$TCL_H_PLACES_D"
+ places="$TCL_H_PLACES_D $TCL_H_PLACES"
fi
$OpenBSD: patch-configure,v 1.3 2012/04/28 18:07:12 stu Exp $
--- configure.orig Sun Sep 5 00:33:14 2010
+++ configure Mon Apr 23 11:38:38 2012
@@ -5937,6 +5937,7 @@ TCL_OLD_ALT_VERS=`echo $TCL_OLD_VERS | sed 's/\.//'`
V_INCLUDE_TCL=""
@@ -5452,7 +5453,7 @@ else
echo "$as_me: error: $d is not a directory" >&2;}
{ (exit 1); exit 1; }; }
fi
- places="$TCL_H_PLACES_D"
+ places="$TCL_H_PLACES_D $TCL_H_PLACES"
fi
TCL_TCL_PLACES_D="$d \
V_INCLUDE_TCL=""
@@ -5506,7 +5507,7 @@ else
echo "$as_me: error: $d is not a directory" >&2;}
{ (exit 1); exit 1; }; }
fi
- places="$TCL_LIB_PLACES_D"
+ places="$TCL_LIB_PLACES_D $TCL_LIB_PLACES"
fi
+ $d/lib/tcl/tcl$TCL_VERS \
$d/lib64/tcl$TCL_HI_VERS \
$d/lib64/tcl$TCL_VERS \
$d/lib64/tcl$TCL_ALT_VERS \
@@ -6552,6 +6553,7 @@ TK_OLD_VERS=8.4
TK_OLD_ALT_VERS=`echo $TK_OLD_VERS | sed 's/\.//'`
V_LIB_TCL=""
@@ -5965,7 +5966,7 @@ else
echo "$as_me: error: $d is not a directory" >&2;}
{ (exit 1); exit 1; }; }
fi
- places="$TK_H_PLACES_D"
+ places="$TK_H_PLACES_D $TK_H_PLACES"
fi
V_INCLUDE_TK=""
@@ -6019,7 +6020,7 @@ else
echo "$as_me: error: $d is not a directory" >&2;}
{ (exit 1); exit 1; }; }
fi
- places="$TK_LIB_PLACES_D"
+ places="$TK_LIB_PLACES_D $TK_LIB_PLACES"
fi
V_LIB_TK=""
TK_TCL_PLACES_D="$d \
+ $d/lib/tcl/tk$TK_VERS \
$d/lib64/tk$TK_VERS \
$d/lib64/tk$TK_ALT_VERS \
$d/lib64/tk$TK_HI_VERS \

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-otcldoc,v 1.3 2011/01/05 19:00:54 sebastia Exp $
--- otcldoc.orig 2003-08-20 02:38:33.000000000 -0400
+++ otcldoc 2003-08-20 02:40:23.000000000 -0400
@@ -1,7 +1,7 @@
#!/bin/sh
# the exec restarts using tclsh which in turn ignores
# the command because of this backslash: \
-exec tclsh "$0" "$@"
+exec tclsh${MODTCL_VERSION} "$0" "$@"
#
# otcldoc - a simple script for translating otcl classes into