update to Tcl/Tk 8.5.7, from maintainer Stuart Cassoff
This commit is contained in:
sthen
parent
2801d797d0
commit
c061372b7f
@ -1,17 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.6 2008/12/26 23:36:03 steven Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 2009/04/24 21:13:13 sthen Exp $
|
||||
|
||||
COMMENT = Tool Command Language
|
||||
|
||||
V = 8.5.6
|
||||
V = 8.5.7
|
||||
DISTNAME = tcl${V}
|
||||
PKGNAME = tcl-${V}
|
||||
|
||||
SHARED_LIBS = tcl85 0.3
|
||||
|
||||
SHARED_LIBS = tcl85 0.4
|
||||
CATEGORIES = lang lang/tcl
|
||||
|
||||
HOMEPAGE = http://www.tcl.tk/
|
||||
|
||||
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
|
||||
|
||||
# BSD
|
||||
@ -37,11 +33,8 @@ FAKE_FLAGS = INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" \
|
||||
CONFIG_INSTALL_DIR="${WRKINST}${TRUEPREFIX}/lib/tcl8.5"
|
||||
|
||||
REGRESS_FLAGS = HOME=${TESTHOME}
|
||||
|
||||
SEPARATE_BUILD = concurrent
|
||||
|
||||
AUTOCONF_VERSION = 2.59
|
||||
CONFIGURE_STYLE = autoconf no-autoheader old
|
||||
CONFIGURE_STYLE = gnu old
|
||||
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
|
||||
--includedir="${PREFIX}/include/tcl8.5" \
|
||||
--mandir="${PREFIX}/lib/tcl8.5/man" \
|
||||
@ -49,8 +42,7 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
|
||||
--enable-man-symlinks \
|
||||
--disable-rpath
|
||||
|
||||
CONFIGURE_ENV += SHLIB_VERSION="${LIBtcl85_VERSION}" \
|
||||
CFLAGS=""
|
||||
CONFIGURE_ENV += SHLIB_VERSION="${LIBtcl85_VERSION}"
|
||||
|
||||
# Needs a full network connection to run?
|
||||
#REGRESS_IS_INTERACTIVE=Yes
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (tcl8.5.6-src.tar.gz) = 0LCz/3YA/2MTXHELV1JlzQ==
|
||||
RMD160 (tcl8.5.6-src.tar.gz) = HzyTel537C+/eSQNOFR07tJPjqU=
|
||||
SHA1 (tcl8.5.6-src.tar.gz) = AsV+6jUZHwJ0YMbfKJF50D8ulYQ=
|
||||
SHA256 (tcl8.5.6-src.tar.gz) = JG0J2hFTB8YPHJH8/O+FGJUuFm3gWLau9/vP+nbKFQ4=
|
||||
SIZE (tcl8.5.6-src.tar.gz) = 4409651
|
||||
MD5 (tcl8.5.7-src.tar.gz) = 9wrY94teSp95L+EB8isSXw==
|
||||
RMD160 (tcl8.5.7-src.tar.gz) = G7hDVIwFMy6zQEuZtIAGE/Janb8=
|
||||
SHA1 (tcl8.5.7-src.tar.gz) = pgPSe/C4VHOcmfDWWL/D8cSF9Xg=
|
||||
SHA256 (tcl8.5.7-src.tar.gz) = Z9KNUajQTDcRQDAnZQO8iFmkspG8MxM1VqstETA+ZvI=
|
||||
SIZE (tcl8.5.7-src.tar.gz) = 4421720
|
||||
|
||||
@ -1,17 +1,7 @@
|
||||
$OpenBSD: patch-unix_Makefile_in,v 1.2 2008/10/01 19:47:40 steven Exp $
|
||||
--- unix/Makefile.in.orig Thu Aug 14 13:31:38 2008
|
||||
+++ unix/Makefile.in Wed Aug 27 02:25:06 2008
|
||||
@@ -80,6 +80,9 @@ HTML_DIR = @HTML_DIR@
|
||||
# Directory in which to install html documentation:
|
||||
HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR)
|
||||
|
||||
+# Directory in which to install the configuration file tclConfig.sh:
|
||||
+CONFIG_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
|
||||
+
|
||||
# Package search path.
|
||||
TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
|
||||
|
||||
@@ -554,6 +557,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
|
||||
$OpenBSD: patch-unix_Makefile_in,v 1.3 2009/04/24 21:13:13 sthen Exp $
|
||||
--- unix/Makefile.in.orig Wed Apr 15 15:30:05 2009
|
||||
+++ unix/Makefile.in Fri Apr 17 11:09:50 2009
|
||||
@@ -557,6 +557,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
|
||||
rm -f $@
|
||||
@MAKE_STUB_LIB@
|
||||
|
||||
@ -22,12 +12,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.2 2008/10/01 19:47:40 steven Exp $
|
||||
# Make target which outputs the list of the .o contained in the Tcl lib useful
|
||||
# to build a single big shared library containing Tcl and other extensions.
|
||||
# Used for the Tcl Plugin. -- dl
|
||||
@@ -711,30 +718,26 @@ install-strip:
|
||||
# (e.g. if installing as root).
|
||||
|
||||
install-binaries: binaries
|
||||
- @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" ; \
|
||||
+ @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)"; \
|
||||
@@ -719,21 +723,17 @@ install-binaries: binaries
|
||||
do \
|
||||
if [ ! -d "$$i" ] ; then \
|
||||
echo "Making directory $$i"; \
|
||||
@ -51,14 +36,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.2 2008/10/01 19:47:40 steven Exp $
|
||||
fi
|
||||
@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)/"
|
||||
- @$(INSTALL_DATA) tclConfig.sh "$(LIB_INSTALL_DIR)"/tclConfig.sh
|
||||
+ @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
|
||||
+ @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)"/tclConfig.sh
|
||||
@if test "$(STUB_LIB_FILE)" != "" ; then \
|
||||
echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
|
||||
@INSTALL_STUB_LIB@ ; \
|
||||
@@ -742,12 +745,12 @@ install-binaries: binaries
|
||||
@@ -746,12 +746,12 @@ install-binaries: binaries
|
||||
@EXTRA_INSTALL_BINARIES@
|
||||
|
||||
install-libraries: libraries $(INSTALL_TZDATA) install-msgs
|
||||
@ -74,7 +52,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.2 2008/10/01 19:47:40 steven Exp $
|
||||
else true; \
|
||||
fi; \
|
||||
done;
|
||||
@@ -755,14 +758,10 @@ install-libraries: libraries $(INSTALL_TZDATA) install
|
||||
@@ -759,14 +759,10 @@ install-libraries: libraries $(INSTALL_TZDATA) install
|
||||
do \
|
||||
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
|
||||
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
|
||||
@ -90,15 +68,15 @@ $OpenBSD: patch-unix_Makefile_in,v 1.2 2008/10/01 19:47:40 steven Exp $
|
||||
@echo "Installing header files";
|
||||
@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
|
||||
$(GENERIC_DIR)/tclPlatDecls.h \
|
||||
@@ -770,10 +769,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install
|
||||
@@ -774,7 +770,18 @@ install-libraries: libraries $(INSTALL_TZDATA) install
|
||||
$(GENERIC_DIR)/tclTomMathDecls.h ; \
|
||||
do \
|
||||
$(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
|
||||
+ cd "$(INCLUDE_INSTALL_DIR)"/generic && ln -sf ../`basename $$i` ./`basename $$i`; \
|
||||
done;
|
||||
+ @for i in $(GENERIC_DIR)/tclInt.h $(GENERIC_DIR)/tclIntDecls.h \
|
||||
+ $(GENERIC_DIR)/tclIntPlatDecls.h \
|
||||
+ $(GENERIC_DIR)/tclPort.h ; \
|
||||
+ $(GENERIC_DIR)/tclIntPlatDecls.h $(GENERIC_DIR)/tclPort.h \
|
||||
+ $(GENERIC_DIR)/tclRegexp.h $(GENERIC_DIR)/regex.h ; \
|
||||
+ do \
|
||||
+ $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/generic; \
|
||||
+ done;
|
||||
@ -108,12 +86,15 @@ $OpenBSD: patch-unix_Makefile_in,v 1.2 2008/10/01 19:47:40 steven Exp $
|
||||
+ done;
|
||||
@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 @DTRACE_SRC@; \
|
||||
+ $(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \
|
||||
do \
|
||||
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
|
||||
done;
|
||||
@@ -831,8 +841,7 @@ install-doc: doc
|
||||
$(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \
|
||||
@@ -828,31 +835,27 @@ install-msgs: tclsh
|
||||
$(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs
|
||||
|
||||
install-doc: doc
|
||||
- @if test ! -x $(UNIX_DIR)/installManPage; then \
|
||||
- chmod +x $(UNIX_DIR)/installManPage; \
|
||||
- fi
|
||||
@for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3_INSTALL_DIR)" "$(MANN_INSTALL_DIR)" ; \
|
||||
do \
|
||||
if [ ! -d "$$i" ] ; then \
|
||||
echo "Making directory $$i"; \
|
||||
@ -123,3 +104,22 @@ $OpenBSD: patch-unix_Makefile_in,v 1.2 2008/10/01 19:47:40 steven Exp $
|
||||
else true; \
|
||||
fi; \
|
||||
done;
|
||||
@echo "Installing and cross-linking top-level (.1) docs";
|
||||
@for i in $(TOP_DIR)/doc/*.1; do \
|
||||
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
|
||||
+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
|
||||
done
|
||||
|
||||
@echo "Installing and cross-linking C API (.3) docs";
|
||||
@for i in $(TOP_DIR)/doc/*.3; do \
|
||||
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
|
||||
+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
|
||||
done
|
||||
|
||||
@echo "Installing and cross-linking command (.n) docs";
|
||||
@for i in $(TOP_DIR)/doc/*.n; do \
|
||||
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
|
||||
+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
|
||||
done
|
||||
|
||||
# Optional target to install private headers
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
$OpenBSD: patch-unix_tcl_m4,v 1.2 2008/10/01 19:47:40 steven Exp $
|
||||
--- unix/tcl.m4.orig Thu Aug 14 13:31:38 2008
|
||||
+++ unix/tcl.m4 Wed Sep 10 09:49:17 2008
|
||||
@@ -1140,7 +1140,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
|
||||
CFLAGS_DEBUG=-g
|
||||
CFLAGS_OPTIMIZE=-O
|
||||
AS_IF([test "$GCC" = yes], [
|
||||
- CFLAGS_WARNING="-Wall -Wno-implicit-int"
|
||||
+ CFLAGS_WARNING="-Wall"
|
||||
], [CFLAGS_WARNING=""])
|
||||
TCL_NEEDS_EXP_FILE=0
|
||||
TCL_BUILD_EXP_FILE=""
|
||||
@@ -1155,6 +1155,8 @@ dnl AC_CHECK_TOOL(AR, ar)
|
||||
LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH"
|
||||
PLAT_OBJS=""
|
||||
PLAT_SRCS=""
|
||||
+ LDAIX_SRC=""
|
||||
+ AS_IF([test x"${SHLIB_VERSION}" = x],[SHLIB_VERSION="1.0"])
|
||||
case $system in
|
||||
AIX-*)
|
||||
AS_IF([test "${TCL_THREADS}" = "1" -a "$GCC" != "yes"], [
|
||||
@@ -1214,6 +1216,7 @@ dnl AC_CHECK_TOOL(AR, ar)
|
||||
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
|
||||
TCL_NEEDS_EXP_FILE=1
|
||||
TCL_EXPORT_FILE_SUFFIX='${VERSION}.exp'
|
||||
+ LDAIX_SRC='$(UNIX_DIR)/ldAix'
|
||||
])
|
||||
|
||||
# AIX v<=4.1 has some different flags than 4.2+
|
||||
@@ -1521,7 +1524,7 @@ dnl AC_CHECK_TOOL(AR, ar)
|
||||
AS_IF([test $tcl_cv_ld_elf = yes], [
|
||||
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
|
||||
], [
|
||||
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
|
||||
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
|
||||
])
|
||||
|
||||
# Ancient FreeBSD doesn't handle version numbers with dots.
|
||||
@@ -1530,6 +1533,7 @@ dnl AC_CHECK_TOOL(AR, ar)
|
||||
TCL_LIB_VERSIONS_OK=nodots
|
||||
;;
|
||||
OpenBSD-*)
|
||||
+ CFLAGS_OPTIMIZE="-O2"
|
||||
SHLIB_CFLAGS="-fPIC"
|
||||
SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
|
||||
SHLIB_LD_LIBS='${LIBS}'
|
||||
@@ -1539,7 +1543,7 @@ dnl AC_CHECK_TOOL(AR, ar)
|
||||
AS_IF([test $doRpath = yes], [
|
||||
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
|
||||
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
|
||||
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
|
||||
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
|
||||
AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
|
||||
AC_EGREP_CPP(yes, [
|
||||
#ifdef __ELF__
|
||||
@@ -1848,7 +1852,7 @@ dnl AC_CHECK_TOOL(AR, ar)
|
||||
# requires an extra version number at the end of .so file names.
|
||||
# So, the library has to have a name like libtcl75.so.1.0
|
||||
|
||||
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
|
||||
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
|
||||
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
|
||||
TCL_LIB_VERSIONS_OK=nodots
|
||||
;;
|
||||
@@ -2112,6 +2116,7 @@ dnl # preprocessing tests use only CPPFLAGS.
|
||||
AC_SUBST(DL_OBJS)
|
||||
AC_SUBST(PLAT_OBJS)
|
||||
AC_SUBST(PLAT_SRCS)
|
||||
+ AC_SUBST(LDAIX_SRC)
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(CFLAGS_DEBUG)
|
||||
AC_SUBST(CFLAGS_OPTIMIZE)
|
||||
@ -1,10 +1,11 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2008/12/26 23:36:03 steven Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.4 2009/04/24 21:13:13 sthen Exp $
|
||||
@option no-default-conflict
|
||||
@conflict tcl->=8.5,<8.6
|
||||
%%SHARED%%
|
||||
@bin bin/tclsh8.5
|
||||
include/tcl8.5/
|
||||
include/tcl8.5/generic/
|
||||
include/tcl8.5/generic/regex.h
|
||||
include/tcl8.5/generic/tcl.h
|
||||
include/tcl8.5/generic/tclDecls.h
|
||||
include/tcl8.5/generic/tclInt.h
|
||||
@ -12,6 +13,7 @@ include/tcl8.5/generic/tclIntDecls.h
|
||||
include/tcl8.5/generic/tclIntPlatDecls.h
|
||||
include/tcl8.5/generic/tclPlatDecls.h
|
||||
include/tcl8.5/generic/tclPort.h
|
||||
include/tcl8.5/generic/tclRegexp.h
|
||||
include/tcl8.5/generic/tclTomMath.h
|
||||
include/tcl8.5/generic/tclTomMathDecls.h
|
||||
include/tcl8.5/tcl.h
|
||||
@ -950,12 +952,12 @@ lib/tcl8.5/tm.tcl
|
||||
lib/tcl8.5/word.tcl
|
||||
lib/tcl8/8.3/
|
||||
lib/tcl8/8.4/
|
||||
lib/tcl8/8.4/http-2.7.2.tm
|
||||
lib/tcl8/8.4/http-2.7.3.tm
|
||||
lib/tcl8/8.4/platform/
|
||||
lib/tcl8/8.4/platform-1.0.3.tm
|
||||
lib/tcl8/8.4/platform-1.0.4.tm
|
||||
lib/tcl8/8.4/platform/shell-1.1.4.tm
|
||||
lib/tcl8/8.5/
|
||||
lib/tcl8/8.5/msgcat-1.4.2.tm
|
||||
lib/tcl8/8.5/tcltest-2.3.0.tm
|
||||
lib/tcl8/8.5/tcltest-2.3.1.tm
|
||||
share/doc/tcltk8.5/
|
||||
share/doc/tcltk8.5/README.OpenBSD
|
||||
|
||||
@ -1,17 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.8 2009/03/17 00:24:28 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.9 2009/04/24 21:13:13 sthen Exp $
|
||||
|
||||
COMMENT = graphical toolkit for Tcl
|
||||
|
||||
V = 8.5.6
|
||||
V = 8.5.7
|
||||
DISTNAME = tk${V}
|
||||
PKGNAME = tk-${V}p0
|
||||
|
||||
SHARED_LIBS = tk85 0.3
|
||||
|
||||
PKGNAME = tk-${V}
|
||||
SHARED_LIBS = tk85 0.4
|
||||
CATEGORIES = x11 x11/tk
|
||||
|
||||
HOMEPAGE = http://www.tcl.tk/
|
||||
|
||||
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
|
||||
|
||||
# BSD
|
||||
@ -43,9 +39,7 @@ REGRESS_FLAGS = HOME=${TESTHOME} \
|
||||
|
||||
SEPARATE_BUILD = concurrent
|
||||
USE_X11 = Yes
|
||||
|
||||
AUTOCONF_VERSION = 2.59
|
||||
CONFIGURE_STYLE = autoconf no-autoheader old
|
||||
CONFIGURE_STYLE = gnu old
|
||||
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
|
||||
--includedir="${PREFIX}/include/tk8.5" \
|
||||
--mandir="${PREFIX}/lib/tk8.5/man" \
|
||||
@ -54,8 +48,7 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
|
||||
--disable-rpath \
|
||||
--with-tcl="${LOCALBASE}/lib/tcl8.5"
|
||||
|
||||
CONFIGURE_ENV += SHLIB_VERSION="${LIBtk85_VERSION}" \
|
||||
CFLAGS=""
|
||||
CONFIGURE_ENV += SHLIB_VERSION="${LIBtk85_VERSION}"
|
||||
|
||||
# This regression test wants an X11 display
|
||||
REGRESS_IS_INTERACTIVE =Yes
|
||||
@ -66,9 +59,9 @@ FLAVOR ?=
|
||||
.if ${FLAVOR:L:Mthreaded}
|
||||
CONFIGURE_ARGS += --enable-threads
|
||||
WANTLIB += pthread
|
||||
LIB_DEPENDS = tcl85:tcl->=$V,<8.5.7-${FLAVOR}:lang/tcl/8.5
|
||||
LIB_DEPENDS = tcl85:tcl->=$V,<8.5.8-${FLAVOR}:lang/tcl/8.5
|
||||
.else
|
||||
LIB_DEPENDS = tcl85:tcl->=$V,<8.5.7:lang/tcl/8.5
|
||||
LIB_DEPENDS = tcl85:tcl->=$V,<8.5.8:lang/tcl/8.5
|
||||
.endif
|
||||
|
||||
WRKSRC = ${WRKDIST}/unix
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (tk8.5.6-src.tar.gz) = faLgCt3cfu1ggN+QRXnZTg==
|
||||
RMD160 (tk8.5.6-src.tar.gz) = Gz2RZsyNDC88EcqYv4Cn9TRHNDs=
|
||||
SHA1 (tk8.5.6-src.tar.gz) = OxRT0e+0elxgD6a0gl/tavo6Mq0=
|
||||
SHA256 (tk8.5.6-src.tar.gz) = 3JGLiQOdIcq0wJ7dr2CrzEHlf3v/QhaoESN8HeNQWQc=
|
||||
SIZE (tk8.5.6-src.tar.gz) = 3778532
|
||||
MD5 (tk8.5.7-src.tar.gz) = B2T2OuIQa0d0xOyw7zkWEA==
|
||||
RMD160 (tk8.5.7-src.tar.gz) = j/QS+E/7drmw2loy90BMN6UzcAM=
|
||||
SHA1 (tk8.5.7-src.tar.gz) = td72hx5Tx4NUrAGyer1SO7QpUVg=
|
||||
SHA256 (tk8.5.7-src.tar.gz) = 2TZu05fEvellUOydMKj89nh4zyaTfK6T5YByaofXrzA=
|
||||
SIZE (tk8.5.7-src.tar.gz) = 3779867
|
||||
|
||||
@ -1,17 +1,26 @@
|
||||
$OpenBSD: patch-unix_Makefile_in,v 1.4 2009/03/17 00:24:28 sthen Exp $
|
||||
--- unix/Makefile.in.orig Mon Dec 22 13:52:02 2008
|
||||
+++ unix/Makefile.in Wed Mar 11 13:18:07 2009
|
||||
@@ -92,6 +92,9 @@ HTML_DIR = @HTML_DIR@
|
||||
# Directory in which to install html documentation:
|
||||
HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR)
|
||||
$OpenBSD: patch-unix_Makefile_in,v 1.5 2009/04/24 21:13:13 sthen Exp $
|
||||
--- unix/Makefile.in.orig Wed Apr 15 10:11:42 2009
|
||||
+++ unix/Makefile.in Wed Apr 15 23:16:23 2009
|
||||
@@ -95,6 +95,9 @@ HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR)
|
||||
# Directory in which to install the configuration file tkConfig.sh:
|
||||
CONFIG_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
|
||||
|
||||
+# Directory in which to install the configuration file tkConfig.sh:
|
||||
+CONFIG_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
|
||||
+# Directory in which to install the demo files:
|
||||
+DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY)/demos
|
||||
+
|
||||
# The directory containing the Tcl sources and headers appropriate
|
||||
# for this version of Tk ("srcdir" will be replaced or has already
|
||||
# been replaced by the configure script):
|
||||
@@ -537,7 +540,8 @@ AQUA_XLIB_HDRS = $(XLIB_DIR)/X11/*.h $(XLIB_DIR)/xbyte
|
||||
@@ -190,7 +193,7 @@ NO_DEPRECATED_FLAGS = -DTCL_NO_DEPRECATED
|
||||
|
||||
# Some versions of make, like SGI's, use the following variable to
|
||||
# determine which shell to use for executing commands:
|
||||
-SHELL = /bin/sh
|
||||
+SHELL = @SHELL@
|
||||
|
||||
# BUILD_TCLSH is the fully qualified path name of the tclsh shell
|
||||
# in the Tcl build directory. Test that need to be run in the
|
||||
@@ -540,7 +543,8 @@ AQUA_XLIB_HDRS = $(XLIB_DIR)/X11/*.h $(XLIB_DIR)/xbyte
|
||||
|
||||
AQUA_PRIVATE_HDRS = $(MAC_OSX_DIR)/tkMacOSXPort.h $(MAC_OSX_DIR)/tkMacOSXInt.h
|
||||
|
||||
@ -21,25 +30,19 @@ $OpenBSD: patch-unix_Makefile_in,v 1.4 2009/03/17 00:24:28 sthen Exp $
|
||||
|
||||
# Currently private, eventually public
|
||||
TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_DIR)/ttkDecls.h
|
||||
@@ -548,7 +552,7 @@ PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDec
|
||||
@@ -551,9 +555,9 @@ PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDec
|
||||
# The private headers we want installed for install-private-headers
|
||||
PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \
|
||||
$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
|
||||
- $(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS)
|
||||
+ $(GENERIC_DIR)/default.h
|
||||
|
||||
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
|
||||
-DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
|
||||
+DEMOPROGS = browse hello ixset rmt rolodex tcolor timer widget
|
||||
|
||||
@@ -560,7 +564,7 @@ SHELL_ENV = \
|
||||
|
||||
all: binaries libraries doc
|
||||
|
||||
-binaries: ${LIB_FILE} ${STUB_LIB_FILE} wish
|
||||
+binaries: ${LIB_FILE} ${STUB_LIB_FILE} ${TK_BUILD_EXP_FILE} wish
|
||||
|
||||
libraries:
|
||||
|
||||
@@ -580,6 +584,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
|
||||
SHELL_ENV = \
|
||||
@LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \
|
||||
@@ -583,6 +587,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
|
||||
rm -f $@
|
||||
@MAKE_STUB_LIB@
|
||||
|
||||
@ -50,7 +53,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.4 2009/03/17 00:24:28 sthen Exp $
|
||||
# Build Aqua resource files
|
||||
${TK_RSRC_FILE}: $(AQUA_RESOURCES)
|
||||
rm -f $@
|
||||
@@ -635,7 +643,6 @@ xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
|
||||
@@ -638,7 +646,6 @@ xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
|
||||
# % make test TESTFLAGS="-verbose bps -file fileName.test"
|
||||
|
||||
test: test-classic test-ttk
|
||||
@ -58,18 +61,13 @@ $OpenBSD: patch-unix_Makefile_in,v 1.4 2009/03/17 00:24:28 sthen Exp $
|
||||
|
||||
test-classic: tktest
|
||||
$(SHELL_ENV) ./tktest $(TEST_DIR)/all.tcl -geometry +0+0 $(TESTFLAGS)
|
||||
@@ -688,18 +695,14 @@ install-strip:
|
||||
# possible (e.g. if installing as root).
|
||||
|
||||
install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
|
||||
- @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" "$(PKG_INSTALL_DIR)"; \
|
||||
+ @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)"; \
|
||||
@@ -696,14 +703,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $
|
||||
do \
|
||||
if [ ! -d "$$i" ] ; then \
|
||||
echo "Making directory $$i"; \
|
||||
- mkdir -p "$$i"; \
|
||||
- chmod 755 "$$i"; \
|
||||
+ $(INSTALL_DATA_DIR) $$i; \
|
||||
+ $(INSTALL_DATA_DIR) "$$i"; \
|
||||
else true; \
|
||||
fi; \
|
||||
done;
|
||||
@ -79,7 +77,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.4 2009/03/17 00:24:28 sthen Exp $
|
||||
@if test "x$(TK_SHARED_BUILD)" = "x1"; then \
|
||||
echo "Creating package index $(PKG_INDEX)"; \
|
||||
rm -f "$(PKG_INDEX)"; \
|
||||
@@ -709,19 +712,20 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $
|
||||
@@ -713,14 +716,15 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $
|
||||
echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\
|
||||
[list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
|
||||
) > "$(PKG_INDEX)"; \
|
||||
@ -96,14 +94,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.4 2009/03/17 00:24:28 sthen Exp $
|
||||
fi
|
||||
@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
|
||||
@$(INSTALL_PROGRAM) wish "$(BIN_INSTALL_DIR)"/wish$(VERSION)
|
||||
- @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
|
||||
- @$(INSTALL_DATA) tkConfig.sh "$(LIB_INSTALL_DIR)"/tkConfig.sh
|
||||
+ @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
|
||||
+ @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)"/tkConfig.sh
|
||||
@if test "$(STUB_LIB_FILE)" != "" ; then \
|
||||
echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
|
||||
@INSTALL_STUB_LIB@ ; \
|
||||
@@ -732,24 +736,35 @@ install-libraries: libraries
|
||||
@@ -736,24 +740,35 @@ install-libraries: libraries
|
||||
@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
|
||||
XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
|
||||
for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \
|
||||
@ -116,7 +107,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.4 2009/03/17 00:24:28 sthen Exp $
|
||||
echo "Making directory $$i"; \
|
||||
- mkdir -p "$$i"; \
|
||||
- chmod 755 "$$i"; \
|
||||
+ $(INSTALL_DATA_DIR) $$i; \
|
||||
+ $(INSTALL_DATA_DIR) "$$i"; \
|
||||
else true; \
|
||||
fi; \
|
||||
done;
|
||||
@ -144,21 +135,20 @@ $OpenBSD: patch-unix_Makefile_in,v 1.4 2009/03/17 00:24:28 sthen Exp $
|
||||
@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
|
||||
do \
|
||||
$(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/X11; \
|
||||
@@ -783,34 +798,33 @@ install-libraries: libraries
|
||||
@@ -787,63 +802,57 @@ install-libraries: libraries
|
||||
done;
|
||||
|
||||
install-demos:
|
||||
- @for i in "$(SCRIPT_INSTALL_DIR)" \
|
||||
- "$(SCRIPT_INSTALL_DIR)"/demos \
|
||||
- "$(SCRIPT_INSTALL_DIR)"/demos/images ; \
|
||||
+ @for i in "$(DEMO_INSTALL_DIR)" \
|
||||
+ "$(DEMO_INSTALL_DIR)"/images ; \
|
||||
+ @for i in "$(DEMO_INSTALL_DIR)" "$(DEMO_INSTALL_DIR)"/images ; \
|
||||
do \
|
||||
if [ ! -d "$$i" ] ; then \
|
||||
echo "Making directory $$i"; \
|
||||
- mkdir -p "$$i"; \
|
||||
- chmod 755 "$$i"; \
|
||||
+ $(INSTALL_DATA_DIR) $$i; \
|
||||
+ $(INSTALL_DATA_DIR) "$$i"; \
|
||||
else true; \
|
||||
fi; \
|
||||
done;
|
||||
@ -187,13 +177,36 @@ $OpenBSD: patch-unix_Makefile_in,v 1.4 2009/03/17 00:24:28 sthen Exp $
|
||||
fi; \
|
||||
done;
|
||||
|
||||
@@ -822,8 +836,7 @@ install-doc:
|
||||
install-doc:
|
||||
- @if test ! -x $(UNIX_DIR)/installManPage; then \
|
||||
- chmod +x $(UNIX_DIR)/installManPage; \
|
||||
- fi
|
||||
@for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3_INSTALL_DIR)" "$(MANN_INSTALL_DIR)" ; \
|
||||
do \
|
||||
if [ ! -d "$$i" ] ; then \
|
||||
echo "Making directory $$i"; \
|
||||
- mkdir -p "$$i"; \
|
||||
- chmod 755 "$$i"; \
|
||||
+ $(INSTALL_DATA_DIR) $$i; \
|
||||
+ $(INSTALL_DATA_DIR) "$$i"; \
|
||||
else true; \
|
||||
fi; \
|
||||
done;
|
||||
@echo "Installing and cross-linking top-level (.1) docs";
|
||||
@for i in $(TOP_DIR)/doc/*.1; do \
|
||||
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
|
||||
+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
|
||||
done
|
||||
|
||||
@echo "Installing and cross-linking C API (.3) docs";
|
||||
@for i in $(TOP_DIR)/doc/*.3; do \
|
||||
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
|
||||
+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
|
||||
done
|
||||
|
||||
@echo "Installing and cross-linking command (.n) docs";
|
||||
@for i in $(TOP_DIR)/doc/*.n; do \
|
||||
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
|
||||
+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
|
||||
done
|
||||
|
||||
# Optional target to install private headers
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
$OpenBSD: patch-unix_tcl_m4,v 1.2 2008/10/01 19:48:46 steven Exp $
|
||||
--- unix/tcl.m4.orig Thu Aug 14 13:31:55 2008
|
||||
+++ unix/tcl.m4 Thu Sep 11 10:08:29 2008
|
||||
@@ -1140,7 +1140,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
|
||||
CFLAGS_DEBUG=-g
|
||||
CFLAGS_OPTIMIZE=-O
|
||||
AS_IF([test "$GCC" = yes], [
|
||||
- CFLAGS_WARNING="-Wall -Wno-implicit-int"
|
||||
+ CFLAGS_WARNING="-Wall"
|
||||
], [CFLAGS_WARNING=""])
|
||||
TCL_NEEDS_EXP_FILE=0
|
||||
TCL_BUILD_EXP_FILE=""
|
||||
@@ -1155,6 +1155,8 @@ dnl AC_CHECK_TOOL(AR, ar)
|
||||
LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH"
|
||||
PLAT_OBJS=""
|
||||
PLAT_SRCS=""
|
||||
+ LDAIX_SRC=""
|
||||
+ AS_IF([test x"${SHLIB_VERSION}" = x],[SHLIB_VERSION="1.0"])
|
||||
case $system in
|
||||
AIX-*)
|
||||
AS_IF([test "${TCL_THREADS}" = "1" -a "$GCC" != "yes"], [
|
||||
@@ -1214,6 +1216,7 @@ dnl AC_CHECK_TOOL(AR, ar)
|
||||
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
|
||||
TCL_NEEDS_EXP_FILE=1
|
||||
TCL_EXPORT_FILE_SUFFIX='${VERSION}.exp'
|
||||
+ LDAIX_SRC='$(UNIX_DIR)/ldAix'
|
||||
])
|
||||
|
||||
# AIX v<=4.1 has some different flags than 4.2+
|
||||
@@ -1521,7 +1524,7 @@ dnl AC_CHECK_TOOL(AR, ar)
|
||||
AS_IF([test $tcl_cv_ld_elf = yes], [
|
||||
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
|
||||
], [
|
||||
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
|
||||
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
|
||||
])
|
||||
|
||||
# Ancient FreeBSD doesn't handle version numbers with dots.
|
||||
@@ -1530,6 +1533,7 @@ dnl AC_CHECK_TOOL(AR, ar)
|
||||
TCL_LIB_VERSIONS_OK=nodots
|
||||
;;
|
||||
OpenBSD-*)
|
||||
+ CFLAGS_OPTIMIZE="-O2"
|
||||
SHLIB_CFLAGS="-fPIC"
|
||||
SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
|
||||
SHLIB_LD_LIBS='${LIBS}'
|
||||
@@ -1539,7 +1543,7 @@ dnl AC_CHECK_TOOL(AR, ar)
|
||||
AS_IF([test $doRpath = yes], [
|
||||
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
|
||||
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
|
||||
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
|
||||
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
|
||||
AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
|
||||
AC_EGREP_CPP(yes, [
|
||||
#ifdef __ELF__
|
||||
@@ -1848,7 +1852,7 @@ dnl AC_CHECK_TOOL(AR, ar)
|
||||
# requires an extra version number at the end of .so file names.
|
||||
# So, the library has to have a name like libtcl75.so.1.0
|
||||
|
||||
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
|
||||
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
|
||||
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
|
||||
TCL_LIB_VERSIONS_OK=nodots
|
||||
;;
|
||||
@@ -2112,6 +2116,7 @@ dnl # preprocessing tests use only CPPFLAGS.
|
||||
AC_SUBST(DL_OBJS)
|
||||
AC_SUBST(PLAT_OBJS)
|
||||
AC_SUBST(PLAT_SRCS)
|
||||
+ AC_SUBST(LDAIX_SRC)
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(CFLAGS_DEBUG)
|
||||
AC_SUBST(CFLAGS_OPTIMIZE)
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2009/03/17 00:24:28 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.4 2009/04/24 21:13:13 sthen Exp $
|
||||
@option no-default-conflict
|
||||
@conflict tk->=8.5,<8.6
|
||||
%%SHARED%%
|
||||
@ -449,7 +449,6 @@ lib/tk8.5/optMenu.tcl
|
||||
lib/tk8.5/palette.tcl
|
||||
lib/tk8.5/panedwindow.tcl
|
||||
lib/tk8.5/pkgIndex.tcl
|
||||
lib/tk8.5/prolog.ps
|
||||
lib/tk8.5/safetk.tcl
|
||||
lib/tk8.5/scale.tcl
|
||||
lib/tk8.5/scrlbar.tcl
|
||||
|
||||
Loading…
Reference in New Issue
Block a user