Update to otcl 2.0
ok sthen@ sebastia@
This commit is contained in:
stu
parent
29a66ec5cd
commit
35bfbd45a0
@ -1,14 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.31 2011/01/05 20:29:56 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.32 2012/04/28 18:06:29 stu Exp $
|
||||
# $FreeBSD: ports/lang/otcl/Makefile,v 1.6 1999/11/28 18:31:28 steve Exp $
|
||||
|
||||
COMMENT= MIT Object Tcl
|
||||
|
||||
V= 1.13
|
||||
V= 1.14
|
||||
DISTNAME= otcl-src-$V
|
||||
PKGNAME= otcl-$V
|
||||
REVISION= 2
|
||||
SHARED_LIBS= otcl 1.0
|
||||
SHARED_LIBS= otcl 2.0
|
||||
CATEGORIES= lang
|
||||
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
|
||||
|
||||
HOMEPAGE= http://otcl-tclcl.sourceforge.net/otcl/
|
||||
|
||||
@ -19,7 +19,6 @@ PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MODULES += x11/tk
|
||||
MODTK_VERSION = 8.4
|
||||
WANTLIB= X11 Xext c m ${MODTK_WANTLIB}
|
||||
LIB_DEPENDS = ${MODTK_LIB_DEPENDS}
|
||||
|
||||
@ -28,8 +27,8 @@ WRKDIST= ${WRKDIR}/otcl-$V
|
||||
|
||||
CONFIGURE_STYLE= gnu dest
|
||||
CONFIGURE_ARGS+= --x-includes=${X11BASE}/include \
|
||||
--with-tcl=${MODTCL_LIBDIR} \
|
||||
--with-tk=${MODTK_LIBDIR} \
|
||||
--with-tcl=${LOCALBASE} \
|
||||
--with-tk=${LOCALBASE} \
|
||||
--with-tcl-ver=${MODTCL_VERSION} \
|
||||
--with-tk-ver=${MODTCL_VERSION} \
|
||||
--x-libraries=${X11BASE}/lib
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (otcl-src-1.13.tar.gz) = 8+SGREVClQY5e3IMcjLkxg==
|
||||
RMD160 (otcl-src-1.13.tar.gz) = fA3vd5k+xuSOQIXWqVO1XC/ivFk=
|
||||
SHA1 (otcl-src-1.13.tar.gz) = 4zEARGKPClkherql/4rII0cA3YM=
|
||||
SHA256 (otcl-src-1.13.tar.gz) = I7O3qI/Vp7/p+R/Qr9CshZgcHC/wyuZxSu5U9/OKsl0=
|
||||
SIZE (otcl-src-1.13.tar.gz) = 317440
|
||||
MD5 (otcl-src-1.14.tar.gz) = M27B4ASdJUb7I2IAXDuwvg==
|
||||
RMD160 (otcl-src-1.14.tar.gz) = KJXE2BQkb6pGjRhU+ct8ij96xpY=
|
||||
SHA1 (otcl-src-1.14.tar.gz) = 47KwkLjyBPYP94Bm2F/YAN5T23w=
|
||||
SHA256 (otcl-src-1.14.tar.gz) = xkSu1HzNfggq1HOI3IokEqDs6svoHYV05WCnl7eCuWk=
|
||||
SIZE (otcl-src-1.14.tar.gz) = 325964
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.1 2003/10/29 22:12:43 sturm Exp $
|
||||
--- Makefile.in.orig 2003-08-20 00:40:36.000000000 -0400
|
||||
+++ Makefile.in 2003-08-20 00:43:00.000000000 -0400
|
||||
@@ -28,7 +28,7 @@ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
|
||||
INST_OTCLSH= @prefix@/bin
|
||||
INST_OWISH= @prefix@/bin
|
||||
INST_OLIB= @prefix@/lib
|
||||
-INST_OLIBSH= @INST_OLIBSH@
|
||||
+INST_OLIBSH= @prefix@/lib
|
||||
INST_OINC= @prefix@/include
|
||||
|
||||
|
||||
@ -1,77 +1,41 @@
|
||||
$OpenBSD: patch-configure,v 1.6 2011/01/05 18:49:20 sebastia Exp $
|
||||
--- configure.orig Sun Feb 18 23:19:10 2007
|
||||
+++ configure Thu Dec 23 11:24:03 2010
|
||||
@@ -4163,6 +4163,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 \
|
||||
@@ -4257,7 +4258,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.7 2012/04/28 18:06:29 stu Exp $
|
||||
--- configure.orig Sun Sep 5 00:33:59 2010
|
||||
+++ configure Mon Apr 23 11:16:49 2012
|
||||
@@ -4814,6 +4814,7 @@ TCL_OLD_ALT_VERS=`echo $TCL_OLD_VERS | sed 's/\.//'`
|
||||
|
||||
V_INCLUDE_TCL=""
|
||||
@@ -4311,7 +4312,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=""
|
||||
@@ -4365,7 +4366,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 \
|
||||
@@ -5429,6 +5430,7 @@ TK_OLD_VERS=8.4
|
||||
TK_OLD_ALT_VERS=`echo $TK_OLD_VERS | sed 's/\.//'`
|
||||
|
||||
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 \
|
||||
@@ -6866,9 +6868,9 @@ fi
|
||||
if test "x$ac_cv_header_dlfcn_h" = x""yes; then
|
||||
|
||||
SHLIB_CFLAGS="-fpic"
|
||||
- SHLIB_LD="ld -Bshareable -x"
|
||||
+ SHLIB_LD="cc -shared"
|
||||
SHLIB_LD_LIBS=""
|
||||
- SHLIB_SUFFIX=".so"
|
||||
+ SHLIB_SUFFIX=".so.${LIBotcl_VERSION}"
|
||||
DL_LIBS=""
|
||||
DL_LD_FLAGS=""
|
||||
DL_LD_SEARCH_FLAGS=""
|
||||
@@ -7122,9 +7124,6 @@ fi
|
||||
#
|
||||
|
||||
INST_OLIBSH="${prefix}/lib"
|
||||
-if test -d ${prefix}/shlib ; then
|
||||
- INST_OLIBSH="${prefix}/shlib"
|
||||
-fi
|
||||
|
||||
V_LIB_TCL=""
|
||||
@@ -4824,7 +4825,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=""
|
||||
@@ -4878,7 +4879,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=""
|
||||
@@ -5532,16 +5533,16 @@ case $system in
|
||||
DL_LIBS="-ldl"
|
||||
SHLD_FLAGS="-Wl,-Bexport"
|
||||
;;
|
||||
- NetBSD-*|FreeBSD-*)
|
||||
+ NetBSD-*|FreeBSD-*|OpenBSD-*)
|
||||
# Not available on all versions: check for include file.
|
||||
if test -e /usr/include/dlfcn.h; then
|
||||
SHLIB_CFLAGS="-fpic"
|
||||
- SHLIB_LD="ld -Bshareable"
|
||||
- SHLIB_SUFFIX=".so"
|
||||
+ SHLIB_LD="cc -shared"
|
||||
+ SHLIB_SUFFIX=".so.${LIBotcl_VERSION}"
|
||||
DL_LIBS=""
|
||||
SHLD_FLAGS=""
|
||||
else
|
||||
- echo "NetBSD/FreeBSD with no support for dynamic loading"
|
||||
+ echo "NetBSD/FreeBSD/OpenBSD with no support for dynamic loading"
|
||||
echo " or shared libraries on this system."
|
||||
SHLIB_CFLAGS=""
|
||||
SHLIB_LD=": Skipping shared libaries"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2003/10/29 22:12:43 sturm Exp $
|
||||
bin/otclsh
|
||||
bin/owish
|
||||
@comment $OpenBSD: PLIST,v 1.4 2012/04/28 18:06:29 stu Exp $
|
||||
@bin bin/otclsh
|
||||
@bin bin/owish
|
||||
include/otcl.h
|
||||
lib/libotcl.a
|
||||
%%SHARED%%
|
||||
|
||||
Loading…
Reference in New Issue
Block a user