upgrade to 8.3.5
This commit is contained in:
kevlo
parent
b55e354dd1
commit
faf08cceec
@ -1,12 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.16 2002/05/13 23:31:25 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.17 2002/11/29 09:45:48 kevlo Exp $
|
||||
# Uses pthreads (can but does not at the moment)
|
||||
|
||||
COMMENT= "Tool Command Language"
|
||||
|
||||
DISTNAME= tcl8.3.4
|
||||
PKGNAME= tcl-8.3.4
|
||||
VERSION= 8.3.5
|
||||
|
||||
DISTNAME= tcl${VERSION}-src
|
||||
PKGNAME= tcl-${VERSION}
|
||||
CATEGORIES= lang lang/tcl
|
||||
NEED_VERSION= 1.482
|
||||
MASTER_SITES= ${MASTER_SITE_TCLTK:=tcl8_3/}
|
||||
|
||||
HOMEPAGE= http://dev.scriptics.com/software/tcltk/
|
||||
@ -32,7 +33,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
CONFIGURE_ARGS+= --enable-static
|
||||
CONFIGURE_ENV= PORTSDIR="${PORTSDIR}"
|
||||
|
||||
WRKDIST= ${WRKDIR}/${DISTNAME}/unix
|
||||
WRKDIST= ${WRKDIR}/tcl${VERSION}/unix
|
||||
|
||||
INSTALL_TARGET= install-strip
|
||||
REGRESS_TARGET= test
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (tcl8.3.4.tar.gz) = 8777250e03d6be9be7551bfc6e99d252
|
||||
RMD160 (tcl8.3.4.tar.gz) = 1840927939f9bbc4c48a53f256212f26c164e517
|
||||
SHA1 (tcl8.3.4.tar.gz) = b179f1f51b322b7045cf152b73df4f3d01da82ec
|
||||
MD5 (tcl8.3.5-src.tar.gz) = 5cb79f8b90cf1322cb1286b9fe67f7a2
|
||||
RMD160 (tcl8.3.5-src.tar.gz) = fde6dbc853812c504c6ad069d23bbb61979359fd
|
||||
SHA1 (tcl8.3.5-src.tar.gz) = d95903e644e1b6ff37c419b7ef716648ec5558f8
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
--- Makefile.in.orig Fri Oct 26 13:12:04 2001
|
||||
+++ Makefile.in Fri Oct 26 13:51:55 2001
|
||||
@@ -37,6 +37,9 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.1 2002/11/29 09:45:51 kevlo Exp $
|
||||
--- Makefile.in.orig Fri Oct 18 20:44:46 2002
|
||||
+++ Makefile.in Fri Nov 29 16:28:19 2002
|
||||
@@ -37,6 +37,9 @@ mandir = @mandir@
|
||||
# when installing files.
|
||||
INSTALL_ROOT =
|
||||
|
||||
@ -10,7 +11,7 @@
|
||||
# Path for the platform independent Tcl scripting libraries:
|
||||
TCL_LIBRARY = $(prefix)/lib/tcl$(VERSION)
|
||||
|
||||
@@ -407,7 +410,7 @@
|
||||
@@ -407,7 +410,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(ST
|
||||
|
||||
all: binaries libraries doc
|
||||
|
||||
@ -19,13 +20,11 @@
|
||||
|
||||
libraries:
|
||||
|
||||
@@ -418,14 +421,15 @@
|
||||
@@ -418,12 +421,15 @@ doc:
|
||||
${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
|
||||
rm -f ${TCL_LIB_FILE}
|
||||
@MAKE_LIB@
|
||||
- if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
|
||||
- $(RANLIB) ${TCL_LIB_FILE}; \
|
||||
- fi
|
||||
- $(RANLIB) ${TCL_LIB_FILE}
|
||||
|
||||
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
|
||||
rm -f ${STUB_LIB_FILE}
|
||||
@ -39,13 +38,11 @@
|
||||
|
||||
# Make target which outputs the list of the .o contained in the Tcl lib
|
||||
# usefull to build a single big shared library containing Tcl and other
|
||||
@@ -539,10 +543,10 @@
|
||||
@@ -559,8 +565,10 @@ install-binaries: binaries
|
||||
fi
|
||||
@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
|
||||
@$(INSTALL_LIBRARY) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
|
||||
- @if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
|
||||
- (cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)); \
|
||||
- fi
|
||||
- @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
|
||||
@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
|
||||
+ @echo "Installing libtcl83.a"
|
||||
+ @$(INSTALL_DATA) libtcl83.a $(LIB_INSTALL_DIR)/libtcl83.a
|
||||
@ -53,7 +50,7 @@
|
||||
@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
|
||||
echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
|
||||
$(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
|
||||
@@ -551,7 +555,8 @@
|
||||
@@ -569,7 +577,8 @@ install-binaries: binaries
|
||||
@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
|
||||
@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
|
||||
@echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/"
|
||||
@ -63,7 +60,7 @@
|
||||
@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
|
||||
echo "Installing $(TCL_STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
|
||||
$(INSTALL_LIBRARY) $(STUB_LIB_FILE) \
|
||||
@@ -559,7 +564,8 @@
|
||||
@@ -577,7 +586,8 @@ install-binaries: binaries
|
||||
fi
|
||||
|
||||
install-libraries: libraries
|
||||
@ -73,7 +70,7 @@
|
||||
do \
|
||||
if [ ! -d $$i ] ; then \
|
||||
echo "Making directory $$i"; \
|
||||
@@ -581,11 +587,19 @@
|
||||
@@ -599,11 +609,19 @@ install-libraries: libraries
|
||||
chmod +x $(SRC_DIR)/install-sh; \
|
||||
fi
|
||||
@echo "Installing header files";
|
||||
@ -96,16 +93,16 @@
|
||||
@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
|
||||
@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
|
||||
do \
|
||||
@@ -664,6 +678,15 @@
|
||||
@@ -682,6 +700,15 @@ install-doc: doc
|
||||
done;
|
||||
@echo "Cross-linking command (.n) docs";
|
||||
@$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
|
||||
+ @echo "**********"
|
||||
+ @echo "IMPORTANT:"
|
||||
+ @echo "**********"
|
||||
+ @echo "tclConfig.sh in $(TCL_LIBRARY)/tclConfig.sh"
|
||||
+ @echo "tcl.h in $(TCL_INCLUDE_GENERIC)/tcl.h"
|
||||
+ @echo "tclDecls.h in $(TCL_INCLUDE_GENERIC)/tclDecls.h"
|
||||
+ @echo "tclConfig.sh in $(TCL_LIBRARY)/tclConfig.sh"
|
||||
+ @echo "tcl.h in $(TCL_INCLUDE_GENERIC)/tcl.h"
|
||||
+ @echo "tclDecls.h in $(TCL_INCLUDE_GENERIC)/tclDecls.h"
|
||||
+ @echo "tclPlatDecls.h in $(TCL_INCLUDE_GENERIC)/tclPlatDecls.h"
|
||||
+ @echo "These are NOT in the default place, but in a good place to avoid"
|
||||
+ @echo "conflicting with another version of Tcl/Tk."
|
||||
@ -1,24 +1,25 @@
|
||||
--- configure.orig Fri Oct 19 18:24:15 2001
|
||||
+++ configure Mon Nov 19 23:25:15 2001
|
||||
@@ -5328,9 +5328,14 @@ fi
|
||||
$OpenBSD: patch-configure,v 1.9 2002/11/29 09:45:51 kevlo Exp $
|
||||
--- configure.orig Fri Oct 18 20:44:46 2002
|
||||
+++ configure Fri Nov 29 16:28:19 2002
|
||||
@@ -5441,9 +5441,14 @@ fi
|
||||
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
|
||||
- # NetBSD/SPARC needs -fPIC, -fpic will not do.
|
||||
- SHLIB_CFLAGS="-fPIC"
|
||||
- SHLIB_LD="ld -Bshareable -x"
|
||||
+ # OpenBSD/SPARC needs -fPIC, -fpic will not do.
|
||||
+ # OpenBSD/SPARC[64] needs -fPIC, -fpic will not do.
|
||||
+ case `machine` in
|
||||
+ sparc*)
|
||||
+ sparc|sparc64)
|
||||
+ SHLIB_CFLAGS="-fPIC";;
|
||||
+ *)
|
||||
+ SHLIB_CFLAGS="-fpic";;
|
||||
+ SHLIB_CFLAGS="-fpic";;
|
||||
+ esac
|
||||
+ SHLIB_LD="${CC} -shared ${SHLIB_CFLAGS}"
|
||||
SHLIB_LD_LIBS=""
|
||||
SHLIB_SUFFIX=".so"
|
||||
DL_OBJS="tclLoadDl.o"
|
||||
@@ -5352,11 +5357,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
|
||||
@@ -5465,11 +5470,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
|
||||
egrep "yes" >/dev/null 2>&1; then
|
||||
rm -rf conftest*
|
||||
echo "$ac_t""yes" 1>&6
|
||||
@ -32,16 +33,16 @@
|
||||
|
||||
fi
|
||||
rm -f conftest*
|
||||
@@ -6101,7 +6106,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SH
|
||||
TCL_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
|
||||
eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"
|
||||
if test "x$DL_OBJS" = "xtclLoadAout.o"; then
|
||||
- MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}"
|
||||
+ MAKE_LIB="\${STLIB_LD} \${TCL_LIB_FILE} \${OBJS}; \${RANLIB} \${TCL_LIB_FILE}"
|
||||
else
|
||||
MAKE_LIB="\${SHLIB_LD} ${TCL_SHLIB_LD_EXTRAS} -o \$@ \${OBJS} ${SHLIB_LD_LIBS}"
|
||||
fi
|
||||
@@ -6186,7 +6191,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
|
||||
@@ -6292,7 +6297,7 @@ else
|
||||
esac
|
||||
TCL_SHLIB_CFLAGS=""
|
||||
eval "TCL_LIB_FILE=libtcl${TCL_UNSHARED_LIB_SUFFIX}"
|
||||
- MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}"
|
||||
+ MAKE_LIB="\${STLIB_LD} \${TCL_LIB_FILE} \${OBJS}; \${RANLIB} \${TCL_LIB_FILE}"
|
||||
fi
|
||||
|
||||
# tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
|
||||
@@ -6359,7 +6364,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
|
||||
# Replace DBGX with TCL_DBGX
|
||||
eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.9 2001/10/26 06:48:30 kevlo Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.10 2002/11/29 09:45:55 kevlo Exp $
|
||||
@option no-default-conflict
|
||||
@pkgcfl tcl-8.3.*
|
||||
bin/tclsh8.3
|
||||
@ -269,6 +269,7 @@ lib/tcl8.3/man/man3/Tcl_DStringLength.3
|
||||
lib/tcl8.3/man/man3/Tcl_DStringResult.3
|
||||
lib/tcl8.3/man/man3/Tcl_DStringSetLength.3
|
||||
lib/tcl8.3/man/man3/Tcl_DStringStartSublist.3
|
||||
lib/tcl8.3/man/man3/Tcl_DStringTrunc.3
|
||||
lib/tcl8.3/man/man3/Tcl_DStringValue.3
|
||||
lib/tcl8.3/man/man3/Tcl_DecrRefCount.3
|
||||
lib/tcl8.3/man/man3/Tcl_DeleteAssocData.3
|
||||
@ -496,6 +497,7 @@ lib/tcl8.3/man/man3/Tcl_SetHashValue.3
|
||||
lib/tcl8.3/man/man3/Tcl_SetIntObj.3
|
||||
lib/tcl8.3/man/man3/Tcl_SetListObj.3
|
||||
lib/tcl8.3/man/man3/Tcl_SetLongObj.3
|
||||
lib/tcl8.3/man/man3/Tcl_SetMainLoop.3
|
||||
lib/tcl8.3/man/man3/Tcl_SetMaxBlockTime.3
|
||||
lib/tcl8.3/man/man3/Tcl_SetObjErrorCode.3
|
||||
lib/tcl8.3/man/man3/Tcl_SetObjLength.3
|
||||
@ -695,7 +697,7 @@ lib/tcl8.3/man/mann/variable.n
|
||||
lib/tcl8.3/man/mann/vwait.n
|
||||
lib/tcl8.3/man/mann/while.n
|
||||
lib/tcl8.3/msgcat1.1/msgcat.tcl
|
||||
lib/tcl8.3/msgcat1.1/pkgIndex.tcl
|
||||
lib/tcl8.3/msgcat1.1/pkgIndex.tcl
|
||||
lib/tcl8.3/opt0.4/optparse.tcl
|
||||
lib/tcl8.3/opt0.4/pkgIndex.tcl
|
||||
lib/tcl8.3/package.tcl
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.15 2002/05/15 18:05:19 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.16 2002/11/29 09:48:52 kevlo Exp $
|
||||
|
||||
COMMENT= "graphical toolkit for Tcl"
|
||||
|
||||
DISTNAME= tk8.3.4
|
||||
PKGNAME= tk-8.3.4
|
||||
VERSION= 8.3.5
|
||||
|
||||
DISTNAME= tk${VERSION}-src
|
||||
PKGNAME= tk-${VERSION}
|
||||
CATEGORIES= x11 x11/tk
|
||||
NEED_VERSION= 1.482
|
||||
MASTER_SITES= ${MASTER_SITE_TCLTK:=tcl8_3/}
|
||||
|
||||
HOMEPAGE= http://dev.scriptics.com/software/tcltk/
|
||||
@ -34,7 +35,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
CONFIGURE_ARGS+= --enable-static --with-tcl="${LOCALBASE}/lib/tcl8.3"
|
||||
CONFIGURE_ENV= PORTSDIR="${PORTSDIR}"
|
||||
|
||||
WRKDIST= ${WRKDIR}/${DISTNAME}/unix
|
||||
WRKDIST= ${WRKDIR}/tk${VERSION}/unix
|
||||
|
||||
REGRESS_TARGET=test
|
||||
REGRESS_DEPENDS=::lang/tcl/8.3:regress
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (tk8.3.4.tar.gz) = 02311d8f90734c4f5eaa62e9b36fe535
|
||||
RMD160 (tk8.3.4.tar.gz) = f154fd9b2eedcff732b9cdabee48bd9af1b3dd26
|
||||
SHA1 (tk8.3.4.tar.gz) = d52bf5cedb73e9b817ba8d6a2b00701f4f82fad2
|
||||
MD5 (tk8.3.5-src.tar.gz) = 363a55d31d94e05159e9212074c68004
|
||||
RMD160 (tk8.3.5-src.tar.gz) = 15d3a0b3206d380eac7e318015ad9fc711751dd2
|
||||
SHA1 (tk8.3.5-src.tar.gz) = f0974644569ce8cde41f301377bc7119810b44a0
|
||||
|
||||
@ -1,15 +1,7 @@
|
||||
--- Makefile.in.orig Fri Oct 26 14:14:42 2001
|
||||
+++ Makefile.in Fri Oct 26 14:21:47 2001
|
||||
@@ -202,7 +202,7 @@
|
||||
# Libraries to use when linking. This definition is determined by the
|
||||
# configure script.
|
||||
LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
|
||||
-WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
|
||||
+WISH_LIBS = -L${PREFIX}/lib -ltcl83 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
|
||||
|
||||
# The symbol below provides support for dynamic loading and shared
|
||||
# libraries. See configure.in for a description of what it means.
|
||||
@@ -357,7 +357,7 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.1 2002/11/29 09:48:55 kevlo Exp $
|
||||
--- Makefile.in.orig Wed Oct 23 17:45:50 2002
|
||||
+++ Makefile.in Fri Nov 29 17:38:11 2002
|
||||
@@ -356,7 +356,7 @@ DEMOPROGS = browse hello ixset rmt rolod
|
||||
|
||||
all: binaries libraries doc
|
||||
|
||||
@ -18,7 +10,7 @@
|
||||
|
||||
libraries:
|
||||
|
||||
@@ -372,12 +372,15 @@
|
||||
@@ -371,12 +371,15 @@ doc: $(SRC_DIR)/doc/man.macros
|
||||
${TK_LIB_FILE}: ${OBJS}
|
||||
rm -f ${TK_LIB_FILE}
|
||||
@MAKE_LIB@
|
||||
@ -36,7 +28,7 @@
|
||||
|
||||
# Make target which outputs the list of the .o contained in the Tk lib
|
||||
# usefull to build a single big shared library containing Tcl/Tk and other
|
||||
@@ -463,12 +466,15 @@
|
||||
@@ -478,12 +481,15 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
|
||||
fi
|
||||
@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
|
||||
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
|
||||
@ -54,7 +46,7 @@
|
||||
@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
|
||||
echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
|
||||
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
|
||||
@@ -482,6 +488,7 @@
|
||||
@@ -497,6 +503,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
|
||||
|
||||
install-libraries:
|
||||
@for i in $(INCLUDE_INSTALL_DIR) \
|
||||
@ -62,17 +54,17 @@
|
||||
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
|
||||
do \
|
||||
if [ ! -d $$i ] ; then \
|
||||
@@ -495,11 +502,19 @@
|
||||
@@ -510,11 +517,19 @@ install-libraries:
|
||||
chmod +x $(UNIX_DIR)/install-sh; \
|
||||
fi
|
||||
@echo "Installing header files";
|
||||
- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkPlatDecls.h \
|
||||
- $(GENERIC_DIR)/tkDecls.h $(GENERIC_DIR)/tkIntXlibDecls.h ; \
|
||||
- $(GENERIC_DIR)/tkDecls.h ; \
|
||||
+ @for i in $(GENERIC_DIR)/*.h ; \
|
||||
+ do \
|
||||
+ echo "Installing $$i"; \
|
||||
+ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR); \
|
||||
+ done;
|
||||
+ done
|
||||
+ @for i in $(UNIX_DIR)/*.h ; \
|
||||
do \
|
||||
- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
|
||||
@ -1,6 +1,7 @@
|
||||
--- configure.orig Fri Oct 19 18:24:40 2001
|
||||
+++ configure Mon Nov 19 23:30:03 2001
|
||||
@@ -2298,9 +2298,14 @@ fi
|
||||
$OpenBSD: patch-configure,v 1.8 2002/11/29 09:48:55 kevlo Exp $
|
||||
--- configure.orig Wed Oct 23 17:45:50 2002
|
||||
+++ configure Fri Nov 29 17:38:11 2002
|
||||
@@ -2438,9 +2438,14 @@ fi
|
||||
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
|
||||
@ -18,7 +19,7 @@
|
||||
SHLIB_LD_LIBS=""
|
||||
SHLIB_SUFFIX=".so"
|
||||
DL_OBJS="tclLoadDl.o"
|
||||
@@ -2322,11 +2327,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
|
||||
@@ -2462,11 +2467,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
|
||||
egrep "yes" >/dev/null 2>&1; then
|
||||
rm -rf conftest*
|
||||
echo "$ac_t""yes" 1>&6
|
||||
@ -32,22 +33,22 @@
|
||||
|
||||
fi
|
||||
rm -f conftest*
|
||||
@@ -2882,6 +2887,7 @@ fi
|
||||
echo "$ac_t""no" 1>&6
|
||||
@@ -3075,6 +3080,8 @@ EOF
|
||||
fi
|
||||
|
||||
+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
|
||||
|
||||
+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
|
||||
+
|
||||
LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
|
||||
|
||||
@@ -4589,14 +4595,13 @@ if test "${SHARED_BUILD}" = "1" -a "${SH
|
||||
TK_DBGX=${DBGX}
|
||||
@@ -4778,13 +4785,12 @@ if test "${SHARED_BUILD}" = "1" -a "${SH
|
||||
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
|
||||
TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX}
|
||||
MAKE_LIB="\${SHLIB_LD} -o \$@ \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}"
|
||||
MAKE_LIB="\${SHLIB_LD} -o \$@ \${OBJS} \$(TK_LD_SEARCH_FLAGS) \${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}"
|
||||
- RANLIB=":"
|
||||
|
||||
# TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
|
||||
TCL_STUB_FLAGS=""
|
||||
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
|
||||
else
|
||||
TK_SHLIB_CFLAGS=""
|
||||
TK_LIB_FILE=libtk${TK_UNSHARED_LIB_SUFFIX}
|
||||
@ -56,12 +57,3 @@
|
||||
|
||||
TCL_STUB_FLAGS=""
|
||||
fi
|
||||
@@ -4640,7 +4645,7 @@ TK_SHARED_BUILD=${SHARED_BUILD}
|
||||
eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
|
||||
|
||||
# FIXME: Should we add MAKE_STUB_LIB to tclConfig.sh ?
|
||||
-MAKE_STUB_LIB="\${STLIB_LD} \$@ \${STUB_LIB_OBJS}"
|
||||
+MAKE_STUB_LIB="\${STLIB_LD} \${TK_STUB_LIB_FILE} \${STUB_LIB_OBJS}; \${RANLIB} \${TK_STUB_LIB_FILE}"
|
||||
|
||||
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
|
||||
eval TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}\${TK_DBGX}"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.8 2001/10/26 06:53:02 kevlo Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.9 2002/11/29 09:48:57 kevlo Exp $
|
||||
@option no-default-conflict
|
||||
@pkgcfl tk-8.3.*
|
||||
bin/wish8.3
|
||||
@ -27,8 +27,8 @@ include/tk8.3/generic/tkSelect.h
|
||||
include/tk8.3/generic/tkText.h
|
||||
include/tk8.3/tk.h
|
||||
include/tk8.3/tkDecls.h
|
||||
include/tk8.3/tkPlatDecls.h
|
||||
include/tk8.3/tkIntXlibDecls.h
|
||||
include/tk8.3/tkPlatDecls.h
|
||||
include/tk8.3/unix/tkUnixDefault.h
|
||||
include/tk8.3/unix/tkUnixInt.h
|
||||
include/tk8.3/unix/tkUnixPort.h
|
||||
|
||||
Loading…
Reference in New Issue
Block a user