Change summary and patch inline,
README.OpenBSD attached
(goes in lang/tcl/8.5/files).
- Added ${LOCALBASE}/share/doc/tcltk8.5/README.OpenBSD containing
info about the differences between the 'stock' Tcl/Tk installs
and the OpenBSD port as well as info/patch to set up /etc/man.conf
for Tcl/Tk. There is only one README.OpenBSD for both Tcl and Tk,
installed when Tcl is installed. The information pertaining to
both is nearly identical and Tk cannot be installed without Tcl
... is the reasoning behind this decision. It's not great but
it's a start at least, and fairly complete.
- Removed message about new install locations from patches to
Tcl/Tk's Makefiles; this information is now in README.OpenBSD.
- Used more vars in port Makefile; easier to update but not pretty.
Tcl and Tk port Makefiles now nearly identical.
- Removed from patches the major changes pertaining to building
on m88k/vax. Building on non-shared archs was removed from Tcl
due in part to some things not working so well or at all and that
few people these days run non-shared archs. The patches now
are cleaner and are very close to the ones I've already sent
upstream. I've started testing building under simh/vax but it's
slow going and I'd like to get this out now with hopefully a
vax/m88k update coming soon. There are some changes ...
the _pic.a files are now in PFRAG.shared and only built on
shared archs. The .a libs will now not be built twice on
non-shared archs.
- Do not install file ldAix since we're not aix. Hijack
TCL_BUILD_EXP Makefile target to build static lib on shared
archs (ironically, it's only used on aix).
- Use symlinks for man pages with multiple names. Saves some
space and adds information.
- Don't use -rpath.
- Remove monkeying with install-sh in source dir.
- Tk demos are now in ${LOCALBASE}/share/examples/tk8.5.
- Removed Tcl/Tk resource info from DESC, expanded and
added to README.OpenBSD.
The usual test failures:
fCmd-9.4: I've been told that this is OpenBSD's problem
and that it is being worked on.
stack-3.1: This fails due to OpenBSD having a low ulimit
for the stack size and this test needing a larger one.
Essentially a disagreement between Tcl and OpenBSD about
how large one's stack should be, it shouldn't be a problem
under normal circumstances; the test really pushes things.
If it is, then up your ulimit.
Should the port be creating both _pic.a files?
I'm not sure what to do exactly.
As usual, comments, complaints and gifts of tastefully
decorated cheese platters are welcome.
Index: lang/tcl/8.5/Makefile
===================================================================
RCS file: /cvs/ports/lang/tcl/8.5/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- lang/tcl/8.5/Makefile 27 Apr 2008 13:47:15 -0000 1.3
+++ lang/tcl/8.5/Makefile 14 Sep 2008 00:37:39 -0000
@@ -1,63 +1,82 @@
# $OpenBSD: Makefile,v 1.3 2008/04/27 13:47:15 sthen Exp $
-COMMENT= Tool Command Language
+COMMENT = Tool Command Language
-VERSION= 8.5.2
+NAME = tcl
+VERSION = 8.5
+PATCHLEVEL = 4
+NODOT_VERSION = ${VERSION:S/.//}
+FULL_VERSION = ${VERSION}.${PATCHLEVEL}
+SHLIB_VERSION = 0.1
+
+DISTNAME = ${NAME}${FULL_VERSION}
+PKGNAME = ${NAME}-${FULL_VERSION}
+SHARED_LIBS = ${NAME}${NODOT_VERSION} ${SHLIB_VERSION}
+CATEGORIES = lang lang/${NAME}
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcl/}
+DISTFILES = ${NAME}${FULL_VERSION}-src.tar.gz
+WANTLIB = c m
-DISTNAME= tcl${VERSION}
-PKGNAME= tcl-${VERSION}p1
-SHARED_LIBS= tcl85 0.0
-CATEGORIES= lang lang/tcl
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
-DISTFILES= tcl${VERSION}-src.tar.gz
-WANTLIB= c m
-
-MAINTAINER= Stuart Cassoff <[EMAIL PROTECTED]>
-HOMEPAGE= http://www.tcl.tk/
+MAINTAINER = Stuart Cassoff <[EMAIL PROTECTED]>
+HOMEPAGE = http://www.tcl.tk/
# BSD
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
-
-FLAVORS= threaded
-FLAVOR?=
-
-WRKSRC= ${WRKDIST}/unix
-
-SEPARATE_BUILD= concurrent
-AUTOCONF_VERSION= 2.59
-CONFIGURE_STYLE= autoconf no-autoheader old
-CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
- --includedir="${LOCALBASE}/include/tcl8.5" \
- --mandir="${LOCALBASE}/lib/tcl8.5/man" \
- --sysconfdir="${SYSCONFDIR}"
-
-CONFIGURE_ENV= LIBtcl85_VERSION=${LIBtcl85_VERSION}
-CONFIGURE_ENV+= CFLAGS=""
-
-FAKE_FLAGS= INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"\
- INSTALL_LIBRARY="${INSTALL_DATA}" \
- INSTALL_DATA="${INSTALL_DATA}"
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
+
+FLAVORS = threaded
+FLAVOR ?=
+
+WRKSRC = ${WRKDIST}/unix
+
+SEPARATE_BUILD = concurrent
+AUTOCONF_VERSION = 2.59
+CONFIGURE_STYLE = autoconf no-autoheader old
+CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
+ --includedir="${LOCALBASE}/include/${NAME}${VERSION}" \
+ --mandir="${LOCALBASE}/lib/${NAME}${VERSION}/man" \
+ --sysconfdir="${SYSCONFDIR}" \
+ --enable-man-symlinks \
+ --disable-rpath
+
+CONFIGURE_ENV += SHLIB_VERSION="${SHLIB_VERSION}" \
+ CFLAGS=""
+
+.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
+MAKE_FLAGS += TCL_BUILD_EXP_FILE="lib${NAME}${NODOT_VERSION}.a" \
+ TCL_EXP_FILE="lib${NAME}${NODOT_VERSION}.a"
+.endif
-FAKE_FLAGS+=INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+FAKE_FLAGS = INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" \
+ INSTALL_LIBRARY="${INSTALL_DATA}" \
+ INSTALL_DATA="${INSTALL_DATA}" \
+ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+
CONFIG_INSTALL_DIR="${WRKINST}${LOCALBASE}/lib/${NAME}${VERSION}"
.if ${FLAVOR:L:Mthreaded}
-CONFIGURE_ARGS+=--enable-threads
-WANTLIB+=pthread
+CONFIGURE_ARGS += --enable-threads
+WANTLIB += pthread
.endif
# Needs a full network connection to run?
#REGRESS_IS_INTERACTIVE=Yes
-REGRESS_TARGET= test
-REGRESS_FLAGS= HOME=${TESTHOME}
-TESTHOME=${WRKDIR}/testhome
+REGRESS_TARGET = test
+REGRESS_FLAGS = HOME=${TESTHOME}
+TESTHOME = ${WRKDIR}/testhome
+
+DOCDIR = ${PREFIX}/share/doc/tcltk${VERSION}
pre-regress:
@mkdir -p ${TESTHOME}
post-install:
- ln -s libtclstub85.a ${PREFIX}/lib/libtclstub85_pic.a
+ ${INSTALL_DATA_DIR} ${DOCDIR}
+ ${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${DOCDIR}
+.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
+ ln -s lib${NAME}${NODOT_VERSION}.a
${PREFIX}/lib/lib${NAME}${NODOT_VERSION}_pic.a
+ ln -s lib${NAME}stub${NODOT_VERSION}.a
${PREFIX}/lib/lib${NAME}stub${NODOT_VERSION}_pic.a
+.endif
.include <bsd.port.mk>
Index: lang/tcl/8.5/distinfo
===================================================================
RCS file: /cvs/ports/lang/tcl/8.5/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- lang/tcl/8.5/distinfo 25 Apr 2008 14:10:46 -0000 1.1.1.1
+++ lang/tcl/8.5/distinfo 14 Sep 2008 00:37:39 -0000
@@ -1,5 +1,5 @@
-MD5 (tcl8.5.2-src.tar.gz) = Lu/3phhEs+beUgLaEnXP8Q==
-RMD160 (tcl8.5.2-src.tar.gz) = kbVf2kDzOLhUO6izsBw0Fkqa4yM=
-SHA1 (tcl8.5.2-src.tar.gz) = 6FpPkkrV9Lh5Pjc7lmc0V9XL6Xg=
-SHA256 (tcl8.5.2-src.tar.gz) = 32X43GNPfu8Fl1OohZYp2lEZ8+hkcTa51s5kebALdcs=
-SIZE (tcl8.5.2-src.tar.gz) = 4372573
+MD5 (tcl8.5.4-src.tar.gz) = FQMqakPzv76SI7lRhoSUcg==
+RMD160 (tcl8.5.4-src.tar.gz) = A1XpxiCiIsd0c4ANk5F8K0Rha6c=
+SHA1 (tcl8.5.4-src.tar.gz) = qf8InfYz1V5vj+9+VsVQ7yWQnGQ=
+SHA256 (tcl8.5.4-src.tar.gz) = AVdigZX/2ZTCAvFtN5XE8TAoHZYC8O8PYdm9pFSVKwg=
+SIZE (tcl8.5.4-src.tar.gz) = 4402113
Index: lang/tcl/8.5/patches/patch-unix_Makefile_in
===================================================================
RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-unix_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-unix_Makefile_in
--- lang/tcl/8.5/patches/patch-unix_Makefile_in 25 Apr 2008 14:10:47 -0000
1.1.1.1
+++ lang/tcl/8.5/patches/patch-unix_Makefile_in 14 Sep 2008 00:37:39 -0000
@@ -1,50 +1,33 @@
$OpenBSD: patch-unix_Makefile_in,v 1.1.1.1 2008/04/25 14:10:47 deanna Exp $
---- unix/Makefile.in.orig Fri Mar 28 14:41:53 2008
-+++ unix/Makefile.in Thu Apr 17 10:46:51 2008
-@@ -196,6 +196,8 @@ TCL_LIB_FILE = @TCL_LIB_FILE@
- # Generic lib name used in rules that apply to tcl and tk
- LIB_FILE = ${TCL_LIB_FILE}
+--- 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)
-+STATIC_LIB_FILE = libtcl${MAJOR_VERSION}${MINOR_VERSION}.a
++# Directory in which to install the configuration file tclConfig.sh:
++CONFIG_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
+
- TCL_LIB_FLAG = @TCL_LIB_FLAG@
- #TCL_LIB_FLAG = -ltcl
+ # Package search path.
+ TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
-@@ -538,7 +540,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(
-
- all: binaries libraries doc
-
--binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
-+binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE)
${STATIC_LIB_FILE} tclsh
-
- libraries:
-
-@@ -554,6 +556,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+@@ -554,6 +557,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@MAKE_STUB_LIB@
-+${STATIC_LIB_FILE}: ${OBJS}
++${TCL_BUILD_EXP_FILE}: ${OBJS}
+ rm -f $@
+ ${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@
+
# 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
-@@ -697,7 +703,7 @@ gentommath_h:
- dltest.marker: ${STUB_LIB_FILE}
- cd dltest ; $(MAKE)
-
--INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@
-+INSTALL_TARGETS = install-binaries install-libraries install-doc
@EXTRA_INSTALL@ print-msg-install
-
- install: $(INSTALL_TARGETS)
-
-@@ -711,12 +717,11 @@ install-strip:
+@@ -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)"
"$(SCRIPT_INSTALL_DIR)"; \
++ @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)"
"$(CONFIG_INSTALL_DIR)"; \
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
@@ -54,29 +37,28 @@
else true; \
fi; \
done;
-@@ -725,7 +730,9 @@ install-binaries: binaries
- fi
+- @if test ! -x $(SRC_DIR)/../unix/install-sh; then \
+- chmod +x $(SRC_DIR)/../unix/install-sh; \
+- fi
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
@@INSTALL_LIB@
- @chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
-+ @echo "Installing $(STATIC_LIB_FILE) to $(LIB_INSTALL_DIR)/"
-+ @$(INSTALL_DATA) $(STATIC_LIB_FILE)
"$(LIB_INSTALL_DIR)"/$(STATIC_LIB_FILE); \
-+ (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(STATIC_LIB_FILE))
@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
-@@ -733,8 +740,8 @@ install-binaries: binaries
+ "$(LIB_INSTALL_DIR)"/$(TCL_EXP_FILE); \
++ (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(TCL_EXP_FILE)); \
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 $(SCRIPT_INSTALL_DIR)/"
-+ @$(INSTALL_DATA) tclConfig.sh "$(SCRIPT_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 +749,12 @@ install-binaries: binaries
+@@ -742,12 +745,12 @@ install-binaries: binaries
@EXTRA_INSTALL_BINARIES@
install-libraries: libraries $(INSTALL_TZDATA) install-msgs
@@ -92,7 +74,7 @@
else true; \
fi; \
done;
-@@ -755,8 +762,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install
+@@ -755,14 +758,10 @@ install-libraries: libraries $(INSTALL_TZDATA) install
do \
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -102,7 +84,13 @@
else true; \
fi; \
done;
-@@ -770,7 +776,18 @@ install-libraries: libraries $(INSTALL_TZDATA) install
+- @if test ! -x $(SRC_DIR)/../unix/install-sh; then \
+- chmod +x $(SRC_DIR)/../unix/install-sh; \
+- fi
+ @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
$(GENERIC_DIR)/tclTomMathDecls.h ; \
do \
$(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
@@ -120,8 +108,12 @@
+ 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@; \
-@@ -831,8 +848,7 @@ install-doc: doc
+- $(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
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
@@ -131,21 +123,3 @@
else true; \
fi; \
done;
-@@ -875,6 +891,17 @@ install-private-headers: libraries
- @if test -f tclConfig.h; then\
- $(INSTALL_DATA) tclConfig.h "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \
- fi;
-+
-+print-msg-install:
-+ @echo "**********"
-+ @echo "IMPORTANT:"
-+ @echo "**********"
-+ @echo "tclConfig.sh in $(TCL_LIBRARY)/tclConfig.sh"
-+ @echo "tcl.h in $(includedir)/tcl.h"
-+ @echo "tclDecls.h in $(includedir)/tclDecls.h"
-+ @echo "tclPlatDecls.h in $(includedir)/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."
-
- Makefile: $(UNIX_DIR)/Makefile.in $(DLTEST_DIR)/Makefile.in
- $(SHELL) config.status
Index: lang/tcl/8.5/patches/patch-unix_tcl_m4
===================================================================
RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-unix_tcl_m4,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-unix_tcl_m4
--- lang/tcl/8.5/patches/patch-unix_tcl_m4 25 Apr 2008 14:10:47 -0000
1.1.1.1
+++ lang/tcl/8.5/patches/patch-unix_tcl_m4 14 Sep 2008 00:37:39 -0000
@@ -1,64 +1,72 @@
$OpenBSD: patch-unix_tcl_m4,v 1.1.1.1 2008/04/25 14:10:47 deanna Exp $
---- unix/tcl.m4.orig Tue Feb 5 12:00:35 2008
-+++ unix/tcl.m4 Mon Mar 24 00:57:23 2008
-@@ -1534,26 +1534,43 @@ dnl AC_CHECK_TOOL(AR, ar)
+--- 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-*)
-- SHLIB_CFLAGS="-fPIC"
-- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
-- SHLIB_LD_LIBS='${LIBS}'
-- SHLIB_SUFFIX=".so"
-- DL_OBJS="tclLoadDl.o"
-- DL_LIBS=""
-- AS_IF([test $doRpath = yes], [
-- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
-- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
++ 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'
-- AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
-- AC_EGREP_CPP(yes, [
-+ case `arch -s` in
-+ m88k|vax)
-+ SHLIB_CFLAGS=""
-+ SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-+ SHLIB_LD_LIBS='${LIBS}'
-+ SHLIB_SUFFIX=".a"
-+ DL_OBJS="tclLoadAout.o"
-+ DL_LIBS=""
-+ LDFLAGS=""
-+ CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+ ;;
-+ *)
-+ SHLIB_CFLAGS="-fPIC"
-+ SHLIB_LD="${CC} -shared ${SHLIB_CFLAGS}"
-+ SHLIB_LD_LIBS='${LIBS}'
-+ SHLIB_SUFFIX=".so"
-+ DL_OBJS="tclLoadDl.o"
-+ DL_LIBS=""
-+ 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.${LIBtcl85_VERSION}'
-+ AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
-+ AC_EGREP_CPP(yes, [
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+ AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
+ AC_EGREP_CPP(yes, [
#ifdef __ELF__
- yes
- #endif
-- ], tcl_cv_ld_elf=yes, tcl_cv_ld_elf=no)])
-- AS_IF([test $tcl_cv_ld_elf = yes], [
-- LDFLAGS=-Wl,-export-dynamic
-- ], [LDFLAGS=""])
--
-+ ], tcl_cv_ld_elf=yes, tcl_cv_ld_elf=no)])
-+ AS_IF([test $tcl_cv_ld_elf = yes], [
-+ LDFLAGS=-Wl,-export-dynamic
-+ ], [LDFLAGS=""])
-+ ;;
-+ esac
-+ CFLAGS_WARNING="-Wall"
-+ CFLAGS_OPTIMIZE="-O2"
- # OpenBSD doesn't do version numbers with dots.
+@@ -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)
Index: lang/tcl/8.5/pkg/DESCR
===================================================================
RCS file: /cvs/ports/lang/tcl/8.5/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 DESCR
--- lang/tcl/8.5/pkg/DESCR 25 Apr 2008 14:10:47 -0000 1.1.1.1
+++ lang/tcl/8.5/pkg/DESCR 14 Sep 2008 00:37:39 -0000
@@ -5,10 +5,4 @@
evolving language that is truly cross platform, easily deployed and
highly extensible.
-Tcl/Tk resources:
- Newsgroup: comp.lang.tcl
- Wiki: http://wiki.tcl.tk
- Book: Practical Programming in Tcl and Tk, 4th Edition
- ISBN: 0-13-038560-3
-
Flavor: threaded - build with thread support
Index: lang/tcl/8.5/pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/lang/tcl/8.5/pkg/PFRAG.shared,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PFRAG.shared
--- lang/tcl/8.5/pkg/PFRAG.shared 25 Apr 2008 14:10:47 -0000 1.1.1.1
+++ lang/tcl/8.5/pkg/PFRAG.shared 14 Sep 2008 00:37:39 -0000
@@ -1,2 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2008/04/25 14:10:47 deanna Exp $
@lib lib/libtcl85.so.${LIBtcl85_VERSION}
+lib/libtcl85_pic.a
+lib/libtclstub85_pic.a
Index: lang/tcl/8.5/pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/tcl/8.5/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- lang/tcl/8.5/pkg/PLIST 25 Apr 2008 14:10:47 -0000 1.1.1.1
+++ lang/tcl/8.5/pkg/PLIST 14 Sep 2008 00:37:40 -0000
@@ -2,7 +2,7 @@
@option no-default-conflict
@conflict tcl->=8.5,<8.6
%%SHARED%%
-bin/tclsh8.5
[EMAIL PROTECTED] bin/tclsh8.5
include/tcl8.5/
include/tcl8.5/generic/
include/tcl8.5/generic/tcl.h
@@ -23,7 +23,6 @@
include/tcl8.5/unix/tclUnixPort.h
lib/libtcl85.a
lib/libtclstub85.a
-lib/libtclstub85_pic.a
lib/tcl8/
lib/tcl8.5/
lib/tcl8.5/auto.tcl
@@ -112,7 +111,6 @@
lib/tcl8.5/http1.0/http.tcl
lib/tcl8.5/http1.0/pkgIndex.tcl
lib/tcl8.5/init.tcl
-lib/tcl8.5/ldAix
@mandir lib/tcl8.5/man/
lib/tcl8.5/man/man1/
@man lib/tcl8.5/man/man1/tclsh.1
@@ -380,7 +378,7 @@
@man lib/tcl8.5/man/man3/Tcl_GetEnsembleSubcommandList.3
@man lib/tcl8.5/man/man3/Tcl_GetEnsembleUnknownHandler.3
@man lib/tcl8.5/man/man3/Tcl_GetErrno.3
[EMAIL PROTECTED] lib/tcl8.5/man/man3/Tcl_GetGloblaNamespace.3
[EMAIL PROTECTED] lib/tcl8.5/man/man3/Tcl_GetGlobalNamespace.3
@man lib/tcl8.5/man/man3/Tcl_GetHashKey.3
@man lib/tcl8.5/man/man3/Tcl_GetHashValue.3
@man lib/tcl8.5/man/man3/Tcl_GetHostName.3
@@ -952,10 +950,12 @@
lib/tcl8.5/word.tcl
lib/tcl8/8.3/
lib/tcl8/8.4/
-lib/tcl8/8.4/http-2.7.tm
+lib/tcl8/8.4/http-2.7.1.tm
lib/tcl8/8.4/platform/
lib/tcl8/8.4/platform-1.0.3.tm
lib/tcl8/8.4/platform/shell-1.1.3.tm
lib/tcl8/8.5/
lib/tcl8/8.5/msgcat-1.4.2.tm
lib/tcl8/8.5/tcltest-2.3.0.tm
+share/doc/tcltk8.5/
+share/doc/tcltk8.5/README.OpenBSD
Index: x11/tk/8.5/Makefile
===================================================================
RCS file: /cvs/ports/x11/tk/8.5/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- x11/tk/8.5/Makefile 2 May 2008 13:17:16 -0000 1.4
+++ x11/tk/8.5/Makefile 14 Sep 2008 00:37:40 -0000
@@ -1,63 +1,77 @@
# $OpenBSD: Makefile,v 1.4 2008/05/02 13:17:16 sthen Exp $
-COMMENT= graphical toolkit for Tcl
+COMMENT = graphical toolkit for Tcl
-VERSION= 8.5.2
-
-DISTNAME= tk${VERSION}
-PKGNAME= tk-${VERSION}p2
-SHARED_LIBS= tk85 0.0
-CATEGORIES= x11 x11/tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
-DISTFILES= tk${VERSION}-src.tar.gz
-WANTLIB= X11 Xau Xdmcp Xext Xft Xrender Xss c expat fontconfig freetype
m z
-
-MAINTAINER= Stuart Cassoff <[EMAIL PROTECTED]>
-HOMEPAGE= http://www.tcl.tk/
-
-# BSD
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
-
-LIB_DEPENDS= tcl85:tcl-8.5.*:lang/tcl/8.5
-
-FLAVORS= threaded
-FLAVOR?=
-
-WRKSRC= ${WRKDIST}/unix
-
-USE_X11= Yes
-SEPARATE_BUILD= concurrent
-AUTOCONF_VERSION= 2.59
-CONFIGURE_STYLE= autoconf no-autoheader old
-CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
- --with-tcl="${LOCALBASE}/lib/tcl8.5" \
- --includedir="${LOCALBASE}/include/tk8.5" \
- --mandir="${LOCALBASE}/lib/tk8.5/man" \
- --sysconfdir="${SYSCONFDIR}"
-
-CONFIGURE_ENV+= LIBtk85_VERSION="${LIBtk85_VERSION}"
-CONFIGURE_ENV+= CFLAGS=""
-
-FAKE_FLAGS= INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" \
- INSTALL_LIBRARY="${INSTALL_DATA}" \
- INSTALL_DATA="${INSTALL_DATA}"
+NAME = tk
+VERSION = 8.5
+PATCHLEVEL = 4
+NODOT_VERSION = ${VERSION:S/.//}
+FULL_VERSION = ${VERSION}.${PATCHLEVEL}
+SHLIB_VERSION = 0.1
+
+DISTNAME = ${NAME}${FULL_VERSION}
+PKGNAME = ${NAME}-${FULL_VERSION}
+SHARED_LIBS = ${NAME}${NODOT_VERSION} ${SHLIB_VERSION}
+CATEGORIES = x11 x11/${NAME}
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcl/}
+DISTFILES = ${NAME}${FULL_VERSION}-src.tar.gz
+WANTLIB = X11 Xau Xdmcp Xext Xft Xrender Xss c expat fontconfig
freetype m z
+
+MAINTAINER = Stuart Cassoff <[EMAIL PROTECTED]>
+HOMEPAGE = http://www.tcl.tk/
+
+# BSD
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
+
+LIB_DEPENDS = tcl85:tcl-8.5.4:lang/tcl/8.5
+
+FLAVORS = threaded
+FLAVOR ?=
+
+WRKSRC = ${WRKDIST}/unix
+
+USE_X11 = Yes
+
+SEPARATE_BUILD = concurrent
+AUTOCONF_VERSION = 2.59
+CONFIGURE_STYLE = autoconf no-autoheader old
+CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
+ --with-tcl="${LOCALBASE}/lib/tcl${VERSION}" \
+ --includedir="${LOCALBASE}/include/${NAME}${VERSION}" \
+ --mandir="${LOCALBASE}/lib/${NAME}${VERSION}/man" \
+ --sysconfdir="${SYSCONFDIR}" \
+ --enable-man-symlinks \
+ --disable-rpath
+
+CONFIGURE_ENV += SHLIB_VERSION="${SHLIB_VERSION}" \
+ CFLAGS=""
+
+.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
+MAKE_FLAGS += TK_BUILD_EXP_FILE="lib${NAME}${NODOT_VERSION}.a" \
+ TK_EXP_FILE="lib${NAME}${NODOT_VERSION}.a"
+.endif
-FAKE_FLAGS+=INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+FAKE_FLAGS = INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" \
+ INSTALL_LIBRARY="${INSTALL_DATA}" \
+ INSTALL_DATA="${INSTALL_DATA}" \
+ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+
CONFIG_INSTALL_DIR="${WRKINST}${LOCALBASE}/lib/${NAME}${VERSION}" \
+
DEMO_INSTALL_DIR="${WRKINST}${PREFIX}/share/examples/${NAME}${VERSION}"
.if ${FLAVOR:L:Mthreaded}
-CONFIGURE_ARGS+=--enable-threads
-WANTLIB+=pthread
+CONFIGURE_ARGS += --enable-threads
+WANTLIB += pthread
.endif
# This regression test wants an X11 display
-REGRESS_IS_INTERACTIVE= Yes
-REGRESS_TARGET= test
-REGRESS_FLAGS= HOME=${TESTHOME}
-REGRESS_FLAGS+= DISPLAY=${DISPLAY} XAUTHORITY=${XAUTHORITY}
-TESTHOME=${WRKDIR}/testhome
+REGRESS_IS_INTERACTIVE =Yes
+REGRESS_TARGET = test
+REGRESS_FLAGS = HOME=${TESTHOME}
+REGRESS_FLAGS += DISPLAY=${DISPLAY} XAUTHORITY=${XAUTHORITY}
+TESTHOME = ${WRKDIR}/testhome
pre-regress:
.for t in DISPLAY XAUTHORITY
@@ -68,6 +82,9 @@
@mkdir -p ${TESTHOME}
post-install:
- ln -s libtkstub85.a ${PREFIX}/lib/libtkstub85_pic.a
+.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
+ ln -s lib${NAME}${NODOT_VERSION}.a
${PREFIX}/lib/lib${NAME}${NODOT_VERSION}_pic.a
+ ln -s lib${NAME}stub${NODOT_VERSION}.a
${PREFIX}/lib/lib${NAME}stub${NODOT_VERSION}_pic.a
+.endif
.include <bsd.port.mk>
Index: x11/tk/8.5/distinfo
===================================================================
RCS file: /cvs/ports/x11/tk/8.5/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- x11/tk/8.5/distinfo 25 Apr 2008 14:17:25 -0000 1.1.1.1
+++ x11/tk/8.5/distinfo 14 Sep 2008 00:37:40 -0000
@@ -1,5 +1,5 @@
-MD5 (tk8.5.2-src.tar.gz) = vQFL0+GoGOBq03W5UkFFLQ==
-RMD160 (tk8.5.2-src.tar.gz) = OcZ/i4AGOaYuWG2zSapZxnXgAhI=
-SHA1 (tk8.5.2-src.tar.gz) = 3vv1MY3XLNURu4FETFRFgx2szQ8=
-SHA256 (tk8.5.2-src.tar.gz) = oqKLtlHdG6Z/q8W+XesSDA11QY74TcWe5sAAXULkblo=
-SIZE (tk8.5.2-src.tar.gz) = 3763820
+MD5 (tk8.5.4-src.tar.gz) = pq7nZTVm7At8Sw9MJKlvIA==
+RMD160 (tk8.5.4-src.tar.gz) = pGPfybWT+8XR5A66tNgxHaqcd4Q=
+SHA1 (tk8.5.4-src.tar.gz) = oJBzWGUb9cfEZd4cv3vkaVE/ze0=
+SHA256 (tk8.5.4-src.tar.gz) = HBcyR34O9WWy+RqjF5oRW55IQfEXX2dTXMeilG3yIzk=
+SIZE (tk8.5.4-src.tar.gz) = 3771766
Index: x11/tk/8.5/patches/patch-unix_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/tk/8.5/patches/patch-unix_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-unix_Makefile_in
--- x11/tk/8.5/patches/patch-unix_Makefile_in 25 Apr 2008 14:17:25 -0000
1.1.1.1
+++ x11/tk/8.5/patches/patch-unix_Makefile_in 14 Sep 2008 00:37:40 -0000
@@ -1,16 +1,17 @@
$OpenBSD: patch-unix_Makefile_in,v 1.1.1.1 2008/04/25 14:17:25 deanna Exp $
---- unix/Makefile.in.orig Fri Mar 28 14:46:36 2008
-+++ unix/Makefile.in Thu Apr 17 11:07:46 2008
-@@ -241,6 +241,8 @@ TK_LIB_FILE = @TK_LIB_FILE@
- # Generic lib name used in rules that apply to tcl and tk
- LIB_FILE = ${TK_LIB_FILE}
+--- unix/Makefile.in.orig Thu Aug 14 13:31:55 2008
++++ unix/Makefile.in Thu Sep 11 22:16:09 2008
+@@ -92,6 +92,9 @@ HTML_DIR = @HTML_DIR@
+ # Directory in which to install html documentation:
+ HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR)
-+STATIC_LIB_FILE = libtk${MAJOR_VERSION}${MINOR_VERSION}.a
++# Directory in which to install the configuration file tkConfig.sh:
++CONFIG_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
+
- TK_LIB_FLAG = @TK_LIB_FLAG@
- #TK_LIB_FLAG = -ltk
-
-@@ -547,8 +549,7 @@ PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDec
+ # 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):
+@@ -547,8 +550,7 @@ 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 \
@@ -20,27 +21,27 @@
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
-@@ -560,7 +561,7 @@ SHELL_ENV = \
+@@ -560,7 +562,7 @@ SHELL_ENV = \
all: binaries libraries doc
-binaries: ${LIB_FILE} ${STUB_LIB_FILE} wish
-+binaries: ${LIB_FILE} ${STUB_LIB_FILE} ${STATIC_LIB_FILE} wish
++binaries: ${LIB_FILE} ${STUB_LIB_FILE} ${TK_BUILD_EXP_FILE} wish
libraries:
-@@ -580,6 +581,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+@@ -580,6 +582,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@MAKE_STUB_LIB@
-+${STATIC_LIB_FILE}: ${OBJS}
++${TK_BUILD_EXP_FILE}: ${OBJS}
+ rm -f $@
+ ${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@
+
# Build Aqua resource files
${TK_RSRC_FILE}: $(AQUA_RESOURCES)
rm -f $@
-@@ -635,7 +640,6 @@ xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
+@@ -635,7 +641,6 @@ xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
# % make test TESTFLAGS="-verbose bps -file fileName.test"
test: test-classic test-ttk
@@ -48,21 +49,12 @@
test-classic: tktest
$(SHELL_ENV) ./tktest $(TEST_DIR)/all.tcl -geometry +0+0 $(TESTFLAGS)
-@@ -674,7 +678,7 @@ gdb: wish
- gdb ./wish --command=gdb.run
- rm gdb.run
-
--INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @EXTRA_INSTALL@
-+INSTALL_TARGETS = install-binaries install-libraries install-demos
install-doc @EXTRA_INSTALL@ print-msg-install
-
- install: $(INSTALL_TARGETS)
-
-@@ -688,12 +692,11 @@ install-strip:
+@@ -688,18 +693,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)"
"$(SCRIPT_INSTALL_DIR)"; \
++ @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" "$(PKG_INSTALL_DIR)"
"$(CONFIG_INSTALL_DIR)"; \
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
@@ -72,7 +64,13 @@
else true; \
fi; \
done;
-@@ -710,10 +713,13 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $
+- @if test ! -x $(SRC_DIR)/install-sh; then \
+- chmod +x $(SRC_DIR)/install-sh; \
+- fi
+ @if test "x$(TK_SHARED_BUILD)" = "x1"; then \
+ echo "Creating package index $(PKG_INDEX)"; \
+ rm -f "$(PKG_INDEX)"; \
+@@ -710,19 +711,20 @@ 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)"; \
@@ -81,24 +79,22 @@
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
@@INSTALL_LIB@
- @chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
-+ @echo "Installing $(STATIC_LIB_FILE) to $(LIB_INSTALL_DIR)/"
-+ @$(INSTALL_DATA) $(STATIC_LIB_FILE)
"$(LIB_INSTALL_DIR)"/$(STATIC_LIB_FILE); \
-+ (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(STATIC_LIB_FILE))
@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
-@@ -721,8 +727,8 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $
+ "$(LIB_INSTALL_DIR)"/$(TK_EXP_FILE); \
++ (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(TK_EXP_FILE)); \
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 $(SCRIPT_INSTALL_DIR)/"
-+ @$(INSTALL_DATA) tkConfig.sh "$(SCRIPT_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@ ; \
-@@ -733,13 +739,14 @@ install-libraries: libraries
+@@ -733,24 +735,35 @@ install-libraries: libraries
@if test "$(@[EMAIL PROTECTED])" != ""; then \
XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \
@@ -115,7 +111,10 @@
else true; \
fi; \
done;
-@@ -750,7 +757,20 @@ install-libraries: libraries
+- @if test ! -x $(SRC_DIR)/install-sh; then \
+- chmod +x $(SRC_DIR)/install-sh; \
+- fi
+ @echo "Installing header files";
@for i in $(PUBLIC_HDRS); \
do \
$(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
@@ -136,7 +135,15 @@
@list='$(@[EMAIL PROTECTED])'; for i in $$list ; \
do \
$(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/X11; \
-@@ -790,8 +810,7 @@ install-demos:
+@@ -784,34 +797,33 @@ 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 ; \
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
@@ -146,21 +153,32 @@
else true; \
fi; \
done;
-@@ -801,11 +820,12 @@ install-demos:
+- @echo "Installing demos to $(SCRIPT_INSTALL_DIR)/demos/";
++ @echo "Installing demos to $(DEMO_INSTALL_DIR)/";
+ @for i in $(TOP_DIR)/library/demos/*; \
+ do \
if [ -f $$i ] ; then \
sed -e '3 s|exec wish|exec wish$(VERSION)|' \
- $$i > "$(SCRIPT_INSTALL_DIR)"/demos/`basename $$i`; \
-+ chmod 444 "$(SCRIPT_INSTALL_DIR)"/demos/`basename $$i`; \
+- $$i > "$(SCRIPT_INSTALL_DIR)"/demos/`basename $$i`; \
++ $$i > "$(DEMO_INSTALL_DIR)"/`basename $$i`; \
++ chmod 444 "$(DEMO_INSTALL_DIR)"/`basename $$i`; \
fi; \
done;
@for i in $(DEMOPROGS); \
do \
- chmod 755 "$(SCRIPT_INSTALL_DIR)"/demos/$$i; \
-+ chmod 555 "$(SCRIPT_INSTALL_DIR)"/demos/$$i; \
++ chmod 555 "$(DEMO_INSTALL_DIR)"/$$i; \
done;
@echo "Installing demo images";
@for i in $(TOP_DIR)/library/demos/images/*; \
-@@ -823,8 +843,7 @@ install-doc:
+ do \
+ if [ -f $$i ] ; then \
+- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/demos/images; \
++ $(INSTALL_DATA) $$i "$(DEMO_INSTALL_DIR)"/images; \
+ fi; \
+ done;
+
+@@ -823,8 +835,7 @@ install-doc:
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
@@ -170,21 +188,3 @@
else true; \
fi; \
done;
-@@ -865,6 +884,17 @@ install-private-headers: libraries
- @if test -f tkConfig.h; then\
- $(INSTALL_DATA) tkConfig.h "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \
- fi;
-+
-+print-msg-install:
-+ @echo "**********"
-+ @echo "IMPORTANT:"
-+ @echo "**********"
-+ @echo "tkConfig.sh in $(TK_LIBRARY)/tkConfig.sh"
-+ @echo "tk.h in $(includedir)/tk.h"
-+ @echo "tkDecls.h in $(includedir)/tkDecls.h"
-+ @echo "tkPlatDecls.h in $(includedir)/tkPlatDecls.h"
-+ @echo "These are NOT in the default place, but in a good place to avoid"
-+ @echo "conflicting with another version of Tcl/Tk."
-
- Makefile: $(UNIX_DIR)/Makefile.in
- $(SHELL) config.status
Index: x11/tk/8.5/patches/patch-unix_tcl_m4
===================================================================
RCS file: /cvs/ports/x11/tk/8.5/patches/patch-unix_tcl_m4,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-unix_tcl_m4
--- x11/tk/8.5/patches/patch-unix_tcl_m4 25 Apr 2008 14:17:25 -0000
1.1.1.1
+++ x11/tk/8.5/patches/patch-unix_tcl_m4 14 Sep 2008 00:37:40 -0000
@@ -1,64 +1,72 @@
$OpenBSD: patch-unix_tcl_m4,v 1.1.1.1 2008/04/25 14:17:25 deanna Exp $
---- unix/tcl.m4.orig Fri Mar 28 14:46:36 2008
-+++ unix/tcl.m4 Thu Apr 17 07:35:48 2008
-@@ -1530,26 +1530,43 @@ dnl AC_CHECK_TOOL(AR, ar)
+--- 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-*)
-- SHLIB_CFLAGS="-fPIC"
-- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
-- SHLIB_LD_LIBS='${LIBS}'
-- SHLIB_SUFFIX=".so"
-- DL_OBJS="tclLoadDl.o"
-- DL_LIBS=""
-- AS_IF([test $doRpath = yes], [
-- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
-- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
++ 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'
-- AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
-- AC_EGREP_CPP(yes, [
-+ case `arch -s` in
-+ m88k|vax)
-+ SHLIB_CFLAGS=""
-+ SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-+ SHLIB_LD_LIBS=''
-+ SHLIB_SUFFIX=".a"
-+ DL_OBJS="tclLoadAout.o"
-+ DL_LIBS=""
-+ LDFLAGS=""
-+ CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+ ;;
-+ *)
-+ SHLIB_CFLAGS="-fPIC"
-+ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
-+ SHLIB_LD_LIBS='${LIBS}'
-+ SHLIB_SUFFIX=".so"
-+ DL_OBJS="tclLoadDl.o"
-+ DL_LIBS=""
-+ 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.${LIBtk85_VERSION}'
-+ AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
-+ AC_EGREP_CPP(yes, [
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+ AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
+ AC_EGREP_CPP(yes, [
#ifdef __ELF__
- yes
- #endif
-- ], tcl_cv_ld_elf=yes, tcl_cv_ld_elf=no)])
-- AS_IF([test $tcl_cv_ld_elf = yes], [
-- LDFLAGS=-Wl,-export-dynamic
-- ], [LDFLAGS=""])
--
-+ ], tcl_cv_ld_elf=yes, tcl_cv_ld_elf=no)])
-+ AS_IF([test $tcl_cv_ld_elf = yes], [
-+ LDFLAGS=-Wl,-export-dynamic
-+ ], [LDFLAGS=""])
-+ ;;
-+ esac
-+ CFLAGS_WARNING="-Wall"
-+ CFLAGS_OPTIMIZE="-O2"
- # OpenBSD doesn't do version numbers with dots.
+@@ -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)
Index: x11/tk/8.5/pkg/DESCR
===================================================================
RCS file: /cvs/ports/x11/tk/8.5/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 DESCR
--- x11/tk/8.5/pkg/DESCR 25 Apr 2008 14:17:25 -0000 1.1.1.1
+++ x11/tk/8.5/pkg/DESCR 14 Sep 2008 00:37:40 -0000
@@ -4,10 +4,4 @@
can produce rich, native applications that run unchanged across most
platforms.
-Tcl/Tk resources:
- Newsgroup: comp.lang.tcl
- Wiki: http://wiki.tcl.tk
- Book: Practical Programming in Tcl and Tk, 4th Edition
- ISBN: 0-13-038560-3
-
Flavor: threaded - build with threads support
Index: x11/tk/8.5/pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/x11/tk/8.5/pkg/PFRAG.shared,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PFRAG.shared
--- x11/tk/8.5/pkg/PFRAG.shared 25 Apr 2008 14:17:25 -0000 1.1.1.1
+++ x11/tk/8.5/pkg/PFRAG.shared 14 Sep 2008 00:37:40 -0000
@@ -1,2 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2008/04/25 14:17:25 deanna Exp $
@lib lib/libtk85.so.${LIBtk85_VERSION}
+lib/libtk85_pic.a
+lib/libtkstub85_pic.a
Index: x11/tk/8.5/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/tk/8.5/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- x11/tk/8.5/pkg/PLIST 25 Apr 2008 14:17:25 -0000 1.1.1.1
+++ x11/tk/8.5/pkg/PLIST 14 Sep 2008 00:37:40 -0000
@@ -2,7 +2,7 @@
@option no-default-conflict
@conflict tk->=8.5,<8.6
%%SHARED%%
-bin/wish8.5
[EMAIL PROTECTED] bin/wish8.5
include/tk8.5/
include/tk8.5/generic/
include/tk8.5/generic/tk.h
@@ -23,7 +23,6 @@
include/tk8.5/unix/tkUnixPort.h
lib/libtk85.a
lib/libtkstub85.a
-lib/libtkstub85_pic.a
lib/tk8.5/
lib/tk8.5/bgerror.tcl
lib/tk8.5/button.tcl
@@ -31,90 +30,6 @@
lib/tk8.5/clrpick.tcl
lib/tk8.5/comdlg.tcl
lib/tk8.5/console.tcl
-lib/tk8.5/demos/
-lib/tk8.5/demos/README
-lib/tk8.5/demos/anilabel.tcl
-lib/tk8.5/demos/aniwave.tcl
-lib/tk8.5/demos/arrow.tcl
-lib/tk8.5/demos/bind.tcl
-lib/tk8.5/demos/bitmap.tcl
-lib/tk8.5/demos/browse
-lib/tk8.5/demos/button.tcl
-lib/tk8.5/demos/check.tcl
-lib/tk8.5/demos/clrpick.tcl
-lib/tk8.5/demos/colors.tcl
-lib/tk8.5/demos/combo.tcl
-lib/tk8.5/demos/cscroll.tcl
-lib/tk8.5/demos/ctext.tcl
-lib/tk8.5/demos/dialog1.tcl
-lib/tk8.5/demos/dialog2.tcl
-lib/tk8.5/demos/en.msg
-lib/tk8.5/demos/entry1.tcl
-lib/tk8.5/demos/entry2.tcl
-lib/tk8.5/demos/entry3.tcl
-lib/tk8.5/demos/filebox.tcl
-lib/tk8.5/demos/floor.tcl
-lib/tk8.5/demos/form.tcl
-lib/tk8.5/demos/goldberg.tcl
-lib/tk8.5/demos/hello
-lib/tk8.5/demos/hscale.tcl
-lib/tk8.5/demos/icon.tcl
-lib/tk8.5/demos/image1.tcl
-lib/tk8.5/demos/image2.tcl
-lib/tk8.5/demos/images/
-lib/tk8.5/demos/images/earth.gif
-lib/tk8.5/demos/images/earthris.gif
-lib/tk8.5/demos/images/face.xbm
-lib/tk8.5/demos/images/flagdown.xbm
-lib/tk8.5/demos/images/flagup.xbm
-lib/tk8.5/demos/images/gray25.xbm
-lib/tk8.5/demos/images/letters.xbm
-lib/tk8.5/demos/images/noletter.xbm
-lib/tk8.5/demos/images/pattern.xbm
-lib/tk8.5/demos/images/tcllogo.gif
-lib/tk8.5/demos/images/teapot.ppm
-lib/tk8.5/demos/items.tcl
-lib/tk8.5/demos/ixset
-lib/tk8.5/demos/knightstour.tcl
-lib/tk8.5/demos/label.tcl
-lib/tk8.5/demos/labelframe.tcl
-lib/tk8.5/demos/license.terms
-lib/tk8.5/demos/mclist.tcl
-lib/tk8.5/demos/menu.tcl
-lib/tk8.5/demos/menubu.tcl
-lib/tk8.5/demos/msgbox.tcl
-lib/tk8.5/demos/nl.msg
-lib/tk8.5/demos/paned1.tcl
-lib/tk8.5/demos/paned2.tcl
-lib/tk8.5/demos/pendulum.tcl
-lib/tk8.5/demos/plot.tcl
-lib/tk8.5/demos/puzzle.tcl
-lib/tk8.5/demos/radio.tcl
-lib/tk8.5/demos/rmt
-lib/tk8.5/demos/rolodex
-lib/tk8.5/demos/ruler.tcl
-lib/tk8.5/demos/sayings.tcl
-lib/tk8.5/demos/search.tcl
-lib/tk8.5/demos/spin.tcl
-lib/tk8.5/demos/square
-lib/tk8.5/demos/states.tcl
-lib/tk8.5/demos/style.tcl
-lib/tk8.5/demos/tclIndex
-lib/tk8.5/demos/tcolor
-lib/tk8.5/demos/text.tcl
-lib/tk8.5/demos/textpeer.tcl
-lib/tk8.5/demos/timer
-lib/tk8.5/demos/toolbar.tcl
-lib/tk8.5/demos/tree.tcl
-lib/tk8.5/demos/ttkbut.tcl
-lib/tk8.5/demos/ttkmenu.tcl
-lib/tk8.5/demos/ttknote.tcl
-lib/tk8.5/demos/ttkpane.tcl
-lib/tk8.5/demos/ttkprogress.tcl
-lib/tk8.5/demos/twind.tcl
-lib/tk8.5/demos/unicodeout.tcl
-lib/tk8.5/demos/vscale.tcl
-lib/tk8.5/demos/widget
lib/tk8.5/dialog.tcl
lib/tk8.5/entry.tcl
lib/tk8.5/focus.tcl
@@ -569,3 +484,87 @@
lib/tk8.5/ttk/xpTheme.tcl
lib/tk8.5/unsupported.tcl
lib/tk8.5/xmfbox.tcl
+share/examples/tk8.5/
+share/examples/tk8.5/README
+share/examples/tk8.5/anilabel.tcl
+share/examples/tk8.5/aniwave.tcl
+share/examples/tk8.5/arrow.tcl
+share/examples/tk8.5/bind.tcl
+share/examples/tk8.5/bitmap.tcl
+share/examples/tk8.5/browse
+share/examples/tk8.5/button.tcl
+share/examples/tk8.5/check.tcl
+share/examples/tk8.5/clrpick.tcl
+share/examples/tk8.5/colors.tcl
+share/examples/tk8.5/combo.tcl
+share/examples/tk8.5/cscroll.tcl
+share/examples/tk8.5/ctext.tcl
+share/examples/tk8.5/dialog1.tcl
+share/examples/tk8.5/dialog2.tcl
+share/examples/tk8.5/en.msg
+share/examples/tk8.5/entry1.tcl
+share/examples/tk8.5/entry2.tcl
+share/examples/tk8.5/entry3.tcl
+share/examples/tk8.5/filebox.tcl
+share/examples/tk8.5/floor.tcl
+share/examples/tk8.5/form.tcl
+share/examples/tk8.5/goldberg.tcl
+share/examples/tk8.5/hello
+share/examples/tk8.5/hscale.tcl
+share/examples/tk8.5/icon.tcl
+share/examples/tk8.5/image1.tcl
+share/examples/tk8.5/image2.tcl
+share/examples/tk8.5/images/
+share/examples/tk8.5/images/earth.gif
+share/examples/tk8.5/images/earthris.gif
+share/examples/tk8.5/images/face.xbm
+share/examples/tk8.5/images/flagdown.xbm
+share/examples/tk8.5/images/flagup.xbm
+share/examples/tk8.5/images/gray25.xbm
+share/examples/tk8.5/images/letters.xbm
+share/examples/tk8.5/images/noletter.xbm
+share/examples/tk8.5/images/pattern.xbm
+share/examples/tk8.5/images/tcllogo.gif
+share/examples/tk8.5/images/teapot.ppm
+share/examples/tk8.5/items.tcl
+share/examples/tk8.5/ixset
+share/examples/tk8.5/knightstour.tcl
+share/examples/tk8.5/label.tcl
+share/examples/tk8.5/labelframe.tcl
+share/examples/tk8.5/license.terms
+share/examples/tk8.5/mclist.tcl
+share/examples/tk8.5/menu.tcl
+share/examples/tk8.5/menubu.tcl
+share/examples/tk8.5/msgbox.tcl
+share/examples/tk8.5/nl.msg
+share/examples/tk8.5/paned1.tcl
+share/examples/tk8.5/paned2.tcl
+share/examples/tk8.5/pendulum.tcl
+share/examples/tk8.5/plot.tcl
+share/examples/tk8.5/puzzle.tcl
+share/examples/tk8.5/radio.tcl
+share/examples/tk8.5/rmt
+share/examples/tk8.5/rolodex
+share/examples/tk8.5/ruler.tcl
+share/examples/tk8.5/sayings.tcl
+share/examples/tk8.5/search.tcl
+share/examples/tk8.5/spin.tcl
+share/examples/tk8.5/square
+share/examples/tk8.5/states.tcl
+share/examples/tk8.5/style.tcl
+share/examples/tk8.5/tclIndex
+share/examples/tk8.5/tcolor
+share/examples/tk8.5/text.tcl
+share/examples/tk8.5/textpeer.tcl
+share/examples/tk8.5/timer
+share/examples/tk8.5/toolbar.tcl
+share/examples/tk8.5/tree.tcl
+share/examples/tk8.5/ttkbut.tcl
+share/examples/tk8.5/ttkmenu.tcl
+share/examples/tk8.5/ttknote.tcl
+share/examples/tk8.5/ttkpane.tcl
+share/examples/tk8.5/ttkprogress.tcl
+share/examples/tk8.5/twind.tcl
+share/examples/tk8.5/unicodeout.tcl
+share/examples/tk8.5/vscale.tcl
+share/examples/tk8.5/widget
# $ OpenBSD$
cat << "EOTEXT" > /dev/null
The OpenBSD port of the Tcl dynamic language was designed to balance
deriving the maximum value from the original software while keeping any
modifications to a minimum. This document describes the differences and
includes a handy guide and patch for adding Tcl and Tk to /etc/man.conf.
The principal change is to the installation. In order to be able to
install multiple versions of Tcl on OpenBSD without conflict, some
deviation from the original installation is required.
Tclsh / Wish
Tclsh and wish are installed as tclsh8.5 and wish8.5, respectively.
Many Tcl programs expect to find tclsh or wish.
They will have to be modified to launch the correct shell or links
tclsh and wish may be created which point to tclsh8.5 and wish8.5,
respectively. These links may have already been created by the
system administrator. It is of course also possible to create one's
own links.
Files / Directories
Configuration files
tclConfig.sh, tkConfig.sh
normally in
${LOCALBASE}/lib
now in
${LOCALBASE}/lib/tcl8.5, ${LOCALBASE}/lib/tk8.5
Include files ('public' - see below)
*.h
normally in
${LOCALBASE}/include
now in
${LOCALBASE}/include/tcl8.5, ${LOCALBASE}/include/tk8.5
Manual pages
*.1, *.3, *.n
normally in
${LOCALBASE}/man
now in
${LOCALBASE}/lib/tcl8.5/man, ${LOCALBASE}/lib/tk8.5/man
Demos
*.tcl, *
normally in
${LOCALBASE}/lib/tk8.5/demos
now in
${LOCALBASE}/share/examples/tk8.5
Additional Header Files
Additional (what Tcl/Tk calls 'private') include (.h) files are installed
under ${LOCALBASE}/include/tcl8.5 and ${LOCALBASE}/include/tk8.5 in a
directory structure which mimics the Tcl and Tk source code directory
layouts. Some software that compiles and links against Tcl or Tk
requires these 'private' headers and therefore assumes that the Tcl or Tk
source (containing the 'private' headers) is available. This setup
enables using such 'poorly-behaved' software without requiring the
presence of the entire Tcl and Tk source trees.
Libraries
On architectures that support shared libraries, additional static
libraries (libtcl85.a, libtk85.a) are built from the -fPIC compiled
object (.o) files. A soft link from any lib.a is created to lib_pic.a
in order to satisfy l*btool (apparently).
Manual Page Configuration
Changes to /etc/man.conf are required so that OpenBSD's man(1) and
related commands can find the Tcl and Tk manual pages.
Additional _whatdb entries are needed which point to the Tcl and Tk
whatis.db files. The Tcl and Tk manual page directories need to be added
to the _default and n sections. Additional sections tcl and tk point to
the Tcl and Tk manual page directories.
Following this text is a patch (with instructions) that will perform
the aforementioned changes on an unmodified /etc/man.conf. If not
used directly it can serve as a guide.
Tcl/Tk resources:
Newsgroup: nntp://comp.lang.tcl
Wiki: http://wiki.tcl.tk
Tutorial: http://www.tcl.tk/man/tcl8.5/tutorial/tcltutorial.html
Wikibook: http://en.wikibooks.org/wiki/Programming:Tcl
Book: Practical Programming in Tcl and Tk, 4th Edition
ISBN: 0-13-038560-3
EOTEXT
#
# Patch to add Tcl and Tk to /etc/man.conf
#
# Run:
# "$ sh README.OpenBSD > man.conf.new"
# Examine and install in /etc
# if it appeases you
#
cat << "EOPATCH" | patch -p0 -s -o - /etc/man.conf
--- man.conf.orig Wed Aug 27 13:13:13 2008
+++ man.conf Wed Aug 27 15:08:27 2008
@@ -7,6 +7,8 @@
_whatdb /usr/share/man/whatis.db
_whatdb /usr/local/man/whatis.db
_whatdb /usr/X11R6/man/whatis.db
+_whatdb /usr/local/lib/tcl8.5/man/whatis.db
+_whatdb /usr/local/lib/tk8.5/man/whatis.db
# Subdirectories for paths ending in '/', IN SEARCH ORDER.
_subdir cat1 man1 cat8 man8 cat6 man6 cat2 man2 cat3 man3 cat5
man5 cat7 man7 cat4 man4 cat9 man9 cat3p man3p cat3f man3f catn mann
@@ -33,12 +35,14 @@
# directory with all of the subdirectories listed for the keyword _subdir.
# default
-_default /usr/{share,X11R6,local}/man/
+_default /usr/{share,X11R6,local,local/lib/{tcl,tk}8.5}/man/
# Other sections that represent complete man subdirectories.
X11 /usr/X11R6/man/
X11R6 /usr/X11R6/man/
local /usr/local/man/
+tcl /usr/local/lib/tcl8.5/man/
+tk /usr/local/lib/tk8.5/man/
# Specific section/directory combinations.
1 /usr/{share,X11R6,local}/man/{cat,man}1
@@ -54,4 +58,4 @@
7 /usr/{share,X11R6,local}/man/{cat,man}7
8 /usr/{share,X11R6,local}/man/{cat,man}8
9 /usr/share/man/{cat,man}9
-n /usr/local/man/{cat,man}n
+n /usr/{local,local/lib/{tcl,tk}8.5}/man/{cat,man}n
EOPATCH
# EOF
