Now very much like the 8.5 port but with less frills.
- No threaded FLAVOR
- No README.OpenBSD
- Tk demos are still in ${LOCALBASE}/lib/tk8.4 - too much of pain to
move them.
- Blurb about 8.4.19 being the end of the line for 8.4 added to Tcl's DESCR.
- I took maintainership.
The non-shared arch build stuff was taken out in 8.5 so it might
actually work here,
if not it should at least serve as a guide to making it work.
Regress failures:
clock-10.8, clock-10.14, clock-10.15, clock-10.21, clock-10.22, clock-10.37.
All very similar to this:
==== clock-10.15 ISO week-based calendar 2003-W01-2 FAILED
==== Contents of test case:
clock format 1041292800 -format {%a %A %g %G %u %V %w} -gmt true; #
2002-12-31
---- Result was:
Tue Tuesday 03 2003 2 53 2
---- Result should have been (exact matching):
Tue Tuesday 03 2003 2 01 2
==== clock-10.15 FAILED
These are due to bug in obsd's strftime(3).
I'll be submitting a bug report anon.
Please try to encourage using 8.5 over 8.4.
Index: lang/tcl/8.4/Makefile
===================================================================
RCS file: /cvs/ports/lang/tcl/8.4/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- lang/tcl/8.4/Makefile 4 Jan 2008 17:48:36 -0000 1.21
+++ lang/tcl/8.4/Makefile 30 Sep 2008 08:39:05 -0000
@@ -1,55 +1,70 @@
# $OpenBSD: Makefile,v 1.21 2008/01/04 17:48:36 espie Exp $
-# Uses pthreads (can but does not at the moment)
-COMMENT= Tool Command Language
+COMMENT = Tool Command Language
-VERSION= 8.4.7
+V = 8.4.19
+DISTNAME = tcl${V}
+PKGNAME = tcl-${V}
-DISTNAME= tcl${VERSION}-src
-PKGNAME= tcl-${VERSION}p6
-SHARED_LIBS= tcl84 1.0
-CATEGORIES= lang lang/tcl
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
-WANTLIB= c m
+SHARED_LIBS = tcl84 1.1
-HOMEPAGE= http://www.tcl.tk/
+CATEGORIES = lang lang/tcl
+
+HOMEPAGE = http://www.tcl.tk/
+
+MAINTAINER = Stuart Cassoff <[EMAIL PROTECTED]>
# BSD
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
-
-MAKE_FLAGS= CFLAGS="${CFLAGS}"
-FAKE_FLAGS= INSTALL="install -c" INSTALL_ROOT=${WRKINST} \
- BASE_INCLUDE_DIR='$$(prefix)/include/tcl$$(VERSION)' \
- INCLUDE_INSTALL_DIR='$$(INSTALL_ROOT)$$(BASE_INCLUDE_DIR)' \
- GENERIC_INCLUDE_INSTALL_DIR='$$(BASE_INCLUDE_DIR)/generic' \
- UNIX_INCLUDE_INSTALL_DIR='$$(BASE_INCLUDE_DIR)/unix' \
- MAN_INSTALL_DIR='$${INSTALL_ROOT}$$(TCL_LIBRARY)/man'
-
-SEPARATE_BUILD= concurrent
-AUTOCONF_VERSION=2.13
-CONFIGURE_STYLE= autoconf no-autoheader
-CONFIGURE_ENV= PORTSDIR="${PORTSDIR}" \
- LIBtcl84_VERSION=${LIBtcl84_VERSION}
-CONFIGURE_ARGS= --includedir="${LOCALBASE}/include/tcl8.4"
-
-WRKDIST= ${WRKDIR}/tcl${VERSION}/unix
-
-INSTALL_TARGET= install-strip
-REGRESS_TARGET= test
-# Needs a full network connection to run
-REGRESS_IS_INTERACTIVE=Yes
-TESTHOME=${WRKDIR}/testhome
-REGRESS_FLAGS= HOME=${TESTHOME}
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
+
+WANTLIB = c m
+
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcl/}
+DISTFILES = ${DISTNAME}-src.tar.gz
+
+.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
+MAKE_FLAGS += TCL_BUILD_EXP_FILE="libtcl84.a" \
+ TCL_EXP_FILE="libtcl84.a"
+.endif
+
+FAKE_FLAGS = INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" \
+ INSTALL_LIBRARY="${INSTALL_DATA}" \
+ INSTALL_DATA="${INSTALL_DATA}" \
+ INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+
+REGRESS_FLAGS = HOME=${TESTHOME}
+
+SEPARATE_BUILD = concurrent
+
+AUTOCONF_VERSION = 2.13
+CONFIGURE_STYLE = autoconf no-autoheader old
+CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
+ --includedir="${LOCALBASE}/include/tcl8.4" \
+ --mandir="${LOCALBASE}/lib/tcl8.4/man" \
+ --sysconfdir="${SYSCONFDIR}" \
+ --enable-man-symlinks
+
+CONFIGURE_ENV += SHLIB_VERSION="${LIBtcl84_VERSION}" \
+ CFLAGS=""
+
+# Needs a full network connection to run?
+#REGRESS_IS_INTERACTIVE=Yes
+
+WRKSRC = ${WRKDIST}/unix
+REGRESS_TARGET = test
+
+TESTHOME = ${WRKDIR}/testhome
+
pre-regress:
@mkdir -p ${TESTHOME}
post-install:
- ${INSTALL_SCRIPT_DIR} ${PREFIX}/share/aclocal
- ${INSTALL_DATA} ${WRKSRC}/tcl.m4 ${PREFIX}/share/aclocal
- ranlib ${PREFIX}/lib/libtcl84.a
+.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
+ ln -s libtcl84.a ${PREFIX}/lib/libtcl84_pic.a
ln -s libtclstub84.a ${PREFIX}/lib/libtclstub84_pic.a
+.endif
.include <bsd.port.mk>
Index: lang/tcl/8.4/distinfo
===================================================================
RCS file: /cvs/ports/lang/tcl/8.4/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- lang/tcl/8.4/distinfo 5 Apr 2007 16:20:01 -0000 1.6
+++ lang/tcl/8.4/distinfo 30 Sep 2008 08:39:05 -0000
@@ -1,5 +1,5 @@
-MD5 (tcl8.4.7-src.tar.gz) = B+JW4hvQ0FiHdwMYtUDDbw==
-RMD160 (tcl8.4.7-src.tar.gz) = 5oT8xmM4bTV5v2dms1RxCaqmQww=
-SHA1 (tcl8.4.7-src.tar.gz) = FSnYRzveW6NDCpMEfVRml/5t7ns=
-SHA256 (tcl8.4.7-src.tar.gz) = 6wtvSR1l9LNO5KFjffJCsR8Cm1OVZZD7gvGbh3P7sJw=
-SIZE (tcl8.4.7-src.tar.gz) = 3472974
+MD5 (tcl8.4.19-src.tar.gz) = reLAM6e1Re4Qjz/f62Kfzw==
+RMD160 (tcl8.4.19-src.tar.gz) = bj0pkejkSi4y8NqP33qweqm4IC8=
+SHA1 (tcl8.4.19-src.tar.gz) = 7SXFoga81gPC1eWHkDVLm+F48zE=
+SHA256 (tcl8.4.19-src.tar.gz) = HCRHIvtAnod0xdRdagsh7cPkVB/QFqQK/fU8lKaaPbk=
+SIZE (tcl8.4.19-src.tar.gz) = 3658647
Index: lang/tcl/8.4/patches/patch-unix_Makefile_in
===================================================================
RCS file: lang/tcl/8.4/patches/patch-unix_Makefile_in
diff -N lang/tcl/8.4/patches/patch-unix_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/tcl/8.4/patches/patch-unix_Makefile_in 30 Sep 2008 08:39:05 -0000
@@ -0,0 +1,113 @@
+$OpenBSD$
+--- unix/Makefile.in.orig Thu Apr 17 16:29:49 2008
++++ unix/Makefile.in Sun Sep 28 01:04:05 2008
+@@ -485,6 +485,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+ rm -f $@
+ @MAKE_STUB_LIB@
+
++${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
+ # usefull to build a single big shared library containing Tcl and other
+ # extensions. used for the Tcl Plugin. -- dl
+@@ -620,30 +624,26 @@ install-strip:
+ # possible (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) ;
\
+ do \
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+- mkdir -p $$i; \
+- chmod 755 $$i; \
++ ${INSTALL_DATA_DIR} $$i; \
+ else true; \
+ fi; \
+ done;
+- @if test ! -x $(SRC_DIR)/install-sh; then \
+- chmod +x $(SRC_DIR)/install-sh; \
+- fi
+ @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
+ @@INSTALL_LIB@
+- @chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE)
+ @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
+ echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
+ $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
+ $(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
+ @if test "$(STUB_LIB_FILE)" != "" ; then \
+ echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
+ @INSTALL_STUB_LIB@ ; \
+@@ -651,12 +651,12 @@ install-binaries: binaries
+ @EXTRA_INSTALL_BINARIES@
+
+ install-libraries: libraries
+- @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
++ @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR) \
++ $(INCLUDE_INSTALL_DIR)/generic $(INCLUDE_INSTALL_DIR)/unix; \
+ do \
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+- mkdir -p $$i; \
+- chmod 755 $$i; \
++ ${INSTALL_DATA_DIR} $$i; \
+ else true; \
+ fi; \
+ done;
+@@ -664,23 +664,30 @@ install-libraries: libraries
+ do \
+ if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
+ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
+- mkdir -p $(SCRIPT_INSTALL_DIR)/$$i; \
+- chmod 755 $(SCRIPT_INSTALL_DIR)/$$i; \
++ ${INSTALL_DATA_DIR} $(SCRIPT_INSTALL_DIR)/$$i; \
+ else true; \
+ fi; \
+ done;
+- @if test ! -x $(SRC_DIR)/install-sh; then \
+- chmod +x $(SRC_DIR)/install-sh; \
+- fi
+ @echo "Installing header files";
+ @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
+ $(GENERIC_DIR)/tclPlatDecls.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)/tclMath.h \
++ $(GENERIC_DIR)/tclPort.h ; \
++ do \
++ $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/generic; \
++ done;
++ @for i in $(UNIX_DIR)/tclUnixPort.h; \
++ do \
++ $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/unix; \
++ 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 @DTRACE_SRC@; \
+ do \
+ $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
+ done;
+@@ -722,8 +729,7 @@ install-doc: doc
+ do \
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+- mkdir -p $$i; \
+- chmod 755 $$i; \
++ ${INSTALL_DATA_DIR} $$i; \
+ else true; \
+ fi; \
+ done;
Index: lang/tcl/8.4/patches/patch-unix_tclConfig_sh_in
===================================================================
RCS file: lang/tcl/8.4/patches/patch-unix_tclConfig_sh_in
diff -N lang/tcl/8.4/patches/patch-unix_tclConfig_sh_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/tcl/8.4/patches/patch-unix_tclConfig_sh_in 30 Sep 2008 08:39:05
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- unix/tclConfig.sh.in.orig Sat Sep 27 14:26:16 2008
++++ unix/tclConfig.sh.in Sat Sep 27 14:26:48 2008
+@@ -146,7 +146,7 @@ TCL_UNSHARED_LIB_SUFFIX='@CFG_TCL_UNSHARED_LIB_SUFFIX@
+ # different place than the directory containing the source files, this
+ # points to the location of the sources, not the location where Tcl was
+ # compiled.
+-TCL_SRC_DIR='@TCL_SRC_DIR@'
++TCL_SRC_DIR='@includedir@'
+
+ # List of standard directories in which to look for packages during
+ # "package require" commands. Contains the "prefix" directory plus also
Index: lang/tcl/8.4/patches/patch-unix_tcl_m4
===================================================================
RCS file: lang/tcl/8.4/patches/patch-unix_tcl_m4
diff -N lang/tcl/8.4/patches/patch-unix_tcl_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/tcl/8.4/patches/patch-unix_tcl_m4 30 Sep 2008 08:39:05 -0000
@@ -0,0 +1,37 @@
+$OpenBSD$
+--- unix/tcl.m4.orig Thu Apr 17 16:29:49 2008
++++ unix/tcl.m4 Sat Sep 27 21:50:01 2008
+@@ -1501,21 +1501,15 @@ dnl AC_CHECK_TOOL(AR, ar)
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ ;;
+ *)
+- # OpenBSD/SPARC[64] needs -fPIC, -fpic will not do.
+- case `machine` in
+- sparc|sparc64)
+- SHLIB_CFLAGS="-fPIC";;
+- *)
+- SHLIB_CFLAGS="-fpic";;
+- esac
++ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD="${CC} -shared ${SHLIB_CFLAGS}"
+ SHLIB_LD_LIBS='${LIBS}'
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS=""
+- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
++ CC_SEARCH_FLAGS=''
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
++
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
+ AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
+ AC_EGREP_CPP(yes, [
+ #ifdef __ELF__
+@@ -1530,6 +1524,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+ ;;
+ esac
+
++ CFLAGS_WARNING="-Wall"
++ CFLAGS_OPTIMIZE="-O2"
+ # OpenBSD doesn't do version numbers with dots.
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ TCL_LIB_VERSIONS_OK=nodots
Index: lang/tcl/8.4/pkg/DESCR
===================================================================
RCS file: /cvs/ports/lang/tcl/8.4/pkg/DESCR,v
retrieving revision 1.4
diff -u -r1.4 DESCR
--- lang/tcl/8.4/pkg/DESCR 11 Dec 2007 11:18:05 -0000 1.4
+++ lang/tcl/8.4/pkg/DESCR 30 Sep 2008 08:39:05 -0000
@@ -1,14 +1,20 @@
-This is Tcl8.4, an embeddable tool command language. It is an easy-to-use
-scripting language with clear syntax. Because it is a scripting
-language, programs written in it are easily portable to other operating
-systems. Feature include networking functionality, string and number
-manipulation, and regular expression support.
+Tcl (Tool Command Language) is a very powerful but easy to learn dynamic
+programming language, suitable for a very wide range of uses, including
+web and desktop applications, networking, administration, testing and
+many more. Open source and business-friendly, Tcl is a mature yet
+evolving language that is truly cross platform, easily deployed and
+highly extensible.
-A rich set of extensions to the language are available, as well.
+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
-The best way to get started with Tcl is to read ``Practical Programming in
-TCL and Tk, 4th Edition'' by Brent Welch and Ken Jones, Prentice Hall PTR,
-ISBN 0-13-038560-3. There's also the collectable ``Tcl and the Tk
-Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-20-163337-X.
-
-A full set of manual pages is also provided with this package.
+"Routine maintenance of Tcl/Tk 8.4 has now come to an end. We intend
+Tcl/Tk 8.4.19 to be the final 8.4.* releases. The current stable
+releases of Tcl/Tk are 8.5.2, and development has begun on Tcl/Tk 8.6.
+It is possible that a bug fix of great enough importance or severity
+might prompt a release of 8.4.20, but there is no plan for that at the
+moment. Even that level of support will fade away quickly."
+- Tcl/Tk 8.4.19 Release Announcement April 18, 2008
Index: lang/tcl/8.4/pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/lang/tcl/8.4/pkg/PFRAG.shared,v
retrieving revision 1.3
diff -u -r1.3 PFRAG.shared
--- lang/tcl/8.4/pkg/PFRAG.shared 8 Jan 2006 13:08:01 -0000 1.3
+++ lang/tcl/8.4/pkg/PFRAG.shared 30 Sep 2008 08:39:05 -0000
@@ -1,2 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2006/01/08 13:08:01 alek Exp $
@lib lib/libtcl84.so.${LIBtcl84_VERSION}
+lib/libtcl84_pic.a
+lib/libtclstub84_pic.a
Index: lang/tcl/8.4/pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/tcl/8.4/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- lang/tcl/8.4/pkg/PLIST 31 Jan 2007 15:12:08 -0000 1.7
+++ lang/tcl/8.4/pkg/PLIST 30 Sep 2008 08:39:05 -0000
@@ -1,34 +1,25 @@
@comment $OpenBSD: PLIST,v 1.7 2007/01/31 15:12:08 espie Exp $
@option no-default-conflict
@conflict tcl->=8.4,<8.5
-bin/tclsh8.4
+%%SHARED%%
[EMAIL PROTECTED] bin/tclsh8.4
include/tcl8.4/
include/tcl8.4/generic/
-include/tcl8.4/generic/regcustom.h
-include/tcl8.4/generic/regerrs.h
-include/tcl8.4/generic/regex.h
-include/tcl8.4/generic/regguts.h
include/tcl8.4/generic/tcl.h
-include/tcl8.4/generic/tclCompile.h
include/tcl8.4/generic/tclDecls.h
-include/tcl8.4/generic/tclIO.h
-include/tcl8.4/generic/tclInitScript.h
include/tcl8.4/generic/tclInt.h
include/tcl8.4/generic/tclIntDecls.h
include/tcl8.4/generic/tclIntPlatDecls.h
include/tcl8.4/generic/tclMath.h
include/tcl8.4/generic/tclPlatDecls.h
include/tcl8.4/generic/tclPort.h
-include/tcl8.4/generic/tclRegexp.h
include/tcl8.4/tcl.h
include/tcl8.4/tclDecls.h
include/tcl8.4/tclPlatDecls.h
include/tcl8.4/unix/
include/tcl8.4/unix/tclUnixPort.h
-include/tcl8.4/unix/tclUnixThrd.h
lib/libtcl84.a
lib/libtclstub84.a
-lib/libtclstub84_pic.a
lib/tcl8.4/
lib/tcl8.4/auto.tcl
lib/tcl8.4/encoding/
@@ -114,100 +105,15 @@
lib/tcl8.4/http1.0/
lib/tcl8.4/http1.0/http.tcl
lib/tcl8.4/http1.0/pkgIndex.tcl
-lib/tcl8.4/http2.4/
-lib/tcl8.4/http2.4/http.tcl
-lib/tcl8.4/http2.4/pkgIndex.tcl
+lib/tcl8.4/http2.5/
+lib/tcl8.4/http2.5/http.tcl
+lib/tcl8.4/http2.5/pkgIndex.tcl
lib/tcl8.4/init.tcl
-lib/tcl8.4/ldAix
lib/tcl8.4/ldAout.tcl
@mandir lib/tcl8.4/man/
lib/tcl8.4/man/man1/
@man lib/tcl8.4/man/man1/tclsh.1
lib/tcl8.4/man/man3/
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Access.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/AddErrInfo.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Alloc.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/AllowExc.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/AppInit.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/AssocData.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Async.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/BackgdErr.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Backslash.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/BoolObj.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/ByteArrObj.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/CallDel.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/ChnlStack.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/CmdCmplt.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Concat.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/CrtChannel.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/CrtChnlHdlr.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/CrtCloseHdlr.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/CrtCommand.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/CrtFileHdlr.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/CrtInterp.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/CrtMathFnc.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/CrtObjCmd.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/CrtSlave.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/CrtTimerHdlr.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/CrtTrace.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/DString.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/DetachPids.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/DoOneEvent.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/DoWhenIdle.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/DoubleObj.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/DumpActiveMemory.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Encoding.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Environment.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Eval.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Exit.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/ExprLong.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/ExprLongObj.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/FileSystem.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/FindExec.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/GetCwd.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/GetHostName.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/GetIndex.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/GetInt.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/GetOpnFl.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/GetStdChan.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/GetTime.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/GetVersion.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Hash.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Init.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/InitStubs.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/IntObj.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Interp.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/LinkVar.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/ListObj.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Macintosh.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Notifier.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Object.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/ObjectType.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/OpenFileChnl.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/OpenTcp.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Panic.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/ParseCmd.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/PkgRequire.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Preserve.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/PrintDbl.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/RecEvalObj.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/RecordEval.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/RegExp.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/SaveResult.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/SetErrno.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/SetRecLmt.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/SetResult.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/SetVar.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Signal.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Sleep.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/SourceRCFile.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/SplitList.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/SplitPath.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/StaticPkg.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/StdChannels.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/StrMatch.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/StringObj.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/SubstObj.3
@man lib/tcl8.4/man/man3/TCL_MEM_DEBUG.3
@man lib/tcl8.4/man/man3/Tcl_Access.3
@man lib/tcl8.4/man/man3/Tcl_AddErrorInfo.3
@@ -252,6 +158,7 @@
@man lib/tcl8.4/man/man3/Tcl_ChannelOutputProc.3
@man lib/tcl8.4/man/man3/Tcl_ChannelSeekProc.3
@man lib/tcl8.4/man/man3/Tcl_ChannelSetOptionProc.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Tcl_ChannelThreadActionProc.3
@man lib/tcl8.4/man/man3/Tcl_ChannelVersion.3
@man lib/tcl8.4/man/man3/Tcl_ChannelWatchProc.3
@man lib/tcl8.4/man/man3/Tcl_ChannelWideSeekProc.3
@@ -701,15 +608,6 @@
@man lib/tcl8.4/man/man3/Tcl_WriteObj.3
@man lib/tcl8.4/man/man3/Tcl_WriteRaw.3
@man lib/tcl8.4/man/man3/Tcl_WrongNumArgs.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Thread.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/ToUpper.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/TraceCmd.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/TraceVar.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Translate.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/UniCharIsAlpha.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/UpVar.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/Utf.3
[EMAIL PROTECTED] lib/tcl8.4/man/man3/WrongNumArgs.3
@man lib/tcl8.4/man/man3/attemptckalloc.3
@man lib/tcl8.4/man/man3/attemptckrealloc.3
@man lib/tcl8.4/man/man3/ckalloc.3
@@ -769,7 +667,6 @@
@man lib/tcl8.4/man/mann/interp.n
@man lib/tcl8.4/man/mann/join.n
@man lib/tcl8.4/man/mann/lappend.n
[EMAIL PROTECTED] lib/tcl8.4/man/mann/library.n
@man lib/tcl8.4/man/mann/lindex.n
@man lib/tcl8.4/man/mann/linsert.n
@man lib/tcl8.4/man/mann/list.n
@@ -785,11 +682,9 @@
@man lib/tcl8.4/man/mann/namespace.n
@man lib/tcl8.4/man/mann/open.n
@man lib/tcl8.4/man/mann/package.n
[EMAIL PROTECTED] lib/tcl8.4/man/mann/packagens.n
@man lib/tcl8.4/man/mann/parray.n
@man lib/tcl8.4/man/mann/pid.n
@man lib/tcl8.4/man/mann/pkg::create.n
[EMAIL PROTECTED] lib/tcl8.4/man/mann/pkgMkIndex.n
@man lib/tcl8.4/man/mann/pkg_mkIndex.n
@man lib/tcl8.4/man/mann/proc.n
@man lib/tcl8.4/man/mann/puts.n
@@ -802,7 +697,6 @@
@man lib/tcl8.4/man/mann/rename.n
@man lib/tcl8.4/man/mann/resource.n
@man lib/tcl8.4/man/mann/return.n
[EMAIL PROTECTED] lib/tcl8.4/man/mann/safe.n
@man lib/tcl8.4/man/mann/scan.n
@man lib/tcl8.4/man/mann/seek.n
@man lib/tcl8.4/man/mann/set.n
@@ -847,6 +741,3 @@
lib/tcl8.4/tcltest2.2/pkgIndex.tcl
lib/tcl8.4/tcltest2.2/tcltest.tcl
lib/tcl8.4/word.tcl
-share/aclocal/
-share/aclocal/tcl.m4
-%%SHARED%%
Index: x11/tk/8.4/Makefile
===================================================================
RCS file: /cvs/ports/x11/tk/8.4/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- x11/tk/8.4/Makefile 2 May 2008 13:17:16 -0000 1.15
+++ x11/tk/8.4/Makefile 30 Sep 2008 08:39:05 -0000
@@ -1,54 +1,81 @@
# $OpenBSD: Makefile,v 1.15 2008/05/02 13:17:16 sthen Exp $
-COMMENT= graphical toolkit for Tcl
+COMMENT = graphical toolkit for Tcl
-VERSION= 8.4.7
+V = 8.4.19
+DISTNAME = tk${V}
+PKGNAME = tk-${V}
+
+SHARED_LIBS = tk84 1.1
+
+CATEGORIES = x11 x11/tk
+
+HOMEPAGE = http://www.tcl.tk/
+
+MAINTAINER = Stuart Cassoff <[EMAIL PROTECTED]>
+
+# BSD
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
+
+WANTLIB = X11 c m
+
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcl/}
+DISTFILES = ${DISTNAME}-src.tar.gz
+
+LIB_DEPENDS = tcl84:tcl-${V}:lang/tcl/8.4
+
+.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
+MAKE_FLAGS += TK_BUILD_EXP_FILE="libtk84.a" \
+ TK_EXP_FILE="libtk84.a"
+.endif
+
+FAKE_FLAGS = INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" \
+ INSTALL_LIBRARY="${INSTALL_DATA}" \
+ INSTALL_DATA="${INSTALL_DATA}" \
+ INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+
+REGRESS_FLAGS = HOME=${TESTHOME} \
+ DISPLAY=${DISPLAY} \
+ XAUTHORITY=${XAUTHORITY}
+
+SEPARATE_BUILD = concurrent
+USE_X11 = Yes
+
+AUTOCONF_VERSION = 2.13
+CONFIGURE_STYLE = autoconf no-autoheader old
+CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
+ --includedir="${LOCALBASE}/include/tk8.4" \
+ --mandir="${LOCALBASE}/lib/tk8.4/man" \
+ --sysconfdir="${SYSCONFDIR}" \
+ --enable-man-symlinks \
+ --with-tcl="${LOCALBASE}/lib/tcl8.4"
+
+CONFIGURE_ENV += SHLIB_VERSION="${LIBtk84_VERSION}" \
+ CFLAGS=""
-DISTNAME= tk${VERSION}-src
-PKGNAME= tk-${VERSION}p2
-SHARED_LIBS= tk84 1.0
-CATEGORIES= x11 x11/tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
-
-HOMEPAGE= http://www.tcl.tk/
-
-# BSD
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
-WANTLIB= X11 c m
-
-LIB_DEPENDS= tcl84:tcl-8.4.*:lang/tcl/8.4
-
-MAKE_FLAGS= CFLAGS="${CFLAGS}"
-FAKE_FLAGS= INSTALL="install -c" INSTALL_ROOT="${WRKINST}" \
- BASE_INCLUDE_DIR='$$(prefix)/include/tk$$(VERSION)' \
- INCLUDE_INSTALL_DIR='$$(INSTALL_ROOT)$$(BASE_INCLUDE_DIR)' \
- GENERIC_INCLUDE_INSTALL_DIR='$$(BASE_INCLUDE_DIR)/generic' \
- UNIX_INCLUDE_INSTALL_DIR='$$(BASE_INCLUDE_DIR)/unix' \
- MAN_INSTALL_DIR='$${INSTALL_ROOT}$$(TK_LIBRARY)/man'
-
-SEPARATE_BUILD= simple
-USE_X11= Yes
-AUTOCONF_VERSION=2.13
-CONFIGURE_STYLE=autoconf no-autoheader
-CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
- --with-tcl="${LOCALBASE}/lib/tcl8.4"
-CONFIGURE_ENV= PORTSDIR="${PORTSDIR}" \
- LIBtk84_VERSION="${LIBtk84_VERSION}"
-
-WRKDIST= ${WRKDIR}/tk${VERSION}/unix
-
-REGRESS_TARGET=test
-REGRESS_DEPENDS=::lang/tcl/8.4:regress
-REGRESS_FLAGS=TCL_BIN_DIR=`cd ${PORTSDIR}/lang/tcl/8.4 && ${MAKE}
show=WRKBUILD`
# This regression test wants an X11 display
-REGRESS_FLAGS+=DISPLAY=${DISPLAY} XAUTHORITY=${XAUTHORITY}
-REGRESS_IS_INTERACTIVE=Yes
+REGRESS_IS_INTERACTIVE =Yes
+
+WRKSRC = ${WRKDIST}/unix
+REGRESS_TARGET = test
+
+TESTHOME = ${WRKDIR}/testhome
+
+pre-regress:
+.for t in DISPLAY XAUTHORITY
+. if !defined($t)
+ @echo "$t needs to be set to run regress"; exit 1
+. endif
+.endfor
+ @mkdir -p ${TESTHOME}
post-install:
- @strip ${PREFIX}/bin/wish8.4
+.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
+ ln -s libtk84.a ${PREFIX}/lib/libtk84_pic.a
ln -s libtkstub84.a ${PREFIX}/lib/libtkstub84_pic.a
+.endif
.include <bsd.port.mk>
Index: x11/tk/8.4/distinfo
===================================================================
RCS file: /cvs/ports/x11/tk/8.4/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- x11/tk/8.4/distinfo 5 Apr 2007 17:36:24 -0000 1.6
+++ x11/tk/8.4/distinfo 30 Sep 2008 08:39:05 -0000
@@ -1,5 +1,5 @@
-MD5 (tk8.4.7-src.tar.gz) = uGsNscKHI+bTE56IJQNTpg==
-RMD160 (tk8.4.7-src.tar.gz) = jrahnOAQW/llJAyMhBLq7kDCiKY=
-SHA1 (tk8.4.7-src.tar.gz) = 6RwWpkDOOMj1uHBkf7ZZ/nx65RM=
-SHA256 (tk8.4.7-src.tar.gz) = Pmwcf69SKsd15O/0pvrb1h6UHZu0o2thqBQvTbgTDPg=
-SIZE (tk8.4.7-src.tar.gz) = 3186531
+MD5 (tk8.4.19-src.tar.gz) = m5mNBFbRuVbrnaYQg3qcRw==
+RMD160 (tk8.4.19-src.tar.gz) = yWMpdlV0CtSympnEicNaZOXoF84=
+SHA1 (tk8.4.19-src.tar.gz) = VtCb6KdnCyaG12t1Jv8ksCQMoSA=
+SHA256 (tk8.4.19-src.tar.gz) = 0Fb+bCBKwxU5YW4QaVIt1YZKWAtk5SH+Gkm8iVyoaZ8=
+SIZE (tk8.4.19-src.tar.gz) = 3362694
Index: x11/tk/8.4/patches/patch-unix_Makefile_in
===================================================================
RCS file: x11/tk/8.4/patches/patch-unix_Makefile_in
diff -N x11/tk/8.4/patches/patch-unix_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/tk/8.4/patches/patch-unix_Makefile_in 30 Sep 2008 08:39:05 -0000
@@ -0,0 +1,140 @@
+$OpenBSD$
+--- unix/Makefile.in.orig Thu Apr 17 11:14:08 2008
++++ unix/Makefile.in Sun Sep 28 18:00:06 2008
+@@ -482,7 +482,7 @@ DEMOPROGS = browse hello ixset rmt rolodex square tcol
+
+ all: binaries libraries doc
+
+-binaries: ${LIB_FILE} ${STUB_LIB_FILE} wish
++binaries: ${LIB_FILE} ${STUB_LIB_FILE} ${TK_BUILD_EXP_FILE} wish
+
+ libraries:
+
+@@ -502,6 +502,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+ rm -f $@
+ @MAKE_STUB_LIB@
+
++${TK_BUILD_EXP_FILE}: ${OBJS}
++ rm -f $@
++ ${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@
++
+ # Build Aqua resource files
+ ${TK_RSRC_FILE}: $(AQUA_RESOURCES)
+ rm -f $@
+@@ -616,18 +620,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) ; \
+ do \
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+- mkdir -p $$i; \
+- chmod 755 $$i; \
++ ${INSTALL_DATA_DIR} $$i; \
+ else true; \
+ fi; \
+ done;
+- @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); \
+@@ -640,16 +640,16 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $
+ fi
+ @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
+ @@INSTALL_LIB@
+- @chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE)
+ @if test "$(TK_BUILD_EXP_FILE)" != ""; then \
+ echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
+ $(INSTALL_DATA) $(TK_BUILD_EXP_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
+ @if test "$(STUB_LIB_FILE)" != "" ; then \
+ echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
+ @INSTALL_STUB_LIB@ ; \
+@@ -660,29 +660,36 @@ 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} \
++ $(INCLUDE_INSTALL_DIR)/generic $(INCLUDE_INSTALL_DIR)/unix \
+ $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images \
+ $(SCRIPT_INSTALL_DIR)/msgs; \
+ do \
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+- mkdir -p $$i; \
+- chmod 755 $$i; \
++ ${INSTALL_DATA_DIR} $$i; \
+ else true; \
+ fi; \
+ done;
+- @if test ! -x $(SRC_DIR)/install-sh; then \
+- chmod +x $(SRC_DIR)/install-sh; \
+- fi
+ @echo "Installing header files";
+ @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
+ $(GENERIC_DIR)/tkPlatDecls.h $(@[EMAIL PROTECTED]) ; \
+ do \
+ $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
++ cd $(INCLUDE_INSTALL_DIR)/generic && ln -sf ../`basename $$i`
./`basename $$i`; \
+ done;
+ @list='$(@[EMAIL PROTECTED])'; for i in $$list ; \
+ do \
+ $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/X11; \
+ done;
++ @for i in $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \
++ $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h ; \
++ do \
++ $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/generic; \
++ done;
++ @for i in $(@[EMAIL PROTECTED]); \
++ do \
++ $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/unix; \
++ done;
+ @echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
+ @for i in $(TOP_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
+ $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
+@@ -711,8 +718,7 @@ install-demos:
+ do \
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+- mkdir -p $$i; \
+- chmod 755 $$i; \
++ ${INSTALL_DATA_DIR} $$i; \
+ else true; \
+ fi; \
+ done;
+@@ -722,11 +728,12 @@ install-demos:
+ 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`; \
+ fi; \
+ done;
+ @for i in $(DEMOPROGS); \
+ do \
+- chmod 755 $(SCRIPT_INSTALL_DIR)/demos/$$i; \
++ chmod 555 $(SCRIPT_INSTALL_DIR)/demos/$$i; \
+ done;
+ @echo "Installing demo images";
+ @for i in $(TOP_DIR)/library/demos/images/*; \
+@@ -744,8 +751,7 @@ install-doc:
+ do \
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+- mkdir -p $$i; \
+- chmod 755 $$i; \
++ ${INSTALL_DATA_DIR} $$i; \
+ else true; \
+ fi; \
+ done;
Index: x11/tk/8.4/patches/patch-unix_tcl_m4
===================================================================
RCS file: x11/tk/8.4/patches/patch-unix_tcl_m4
diff -N x11/tk/8.4/patches/patch-unix_tcl_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/tk/8.4/patches/patch-unix_tcl_m4 30 Sep 2008 08:39:05 -0000
@@ -0,0 +1,37 @@
+$OpenBSD$
+--- unix/tcl.m4.orig Thu Apr 17 11:14:08 2008
++++ unix/tcl.m4 Sun Sep 28 15:46:02 2008
+@@ -1501,21 +1501,15 @@ dnl AC_CHECK_TOOL(AR, ar)
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ ;;
+ *)
+- # OpenBSD/SPARC[64] needs -fPIC, -fpic will not do.
+- case `machine` in
+- sparc|sparc64)
+- SHLIB_CFLAGS="-fPIC";;
+- *)
+- SHLIB_CFLAGS="-fpic";;
+- esac
++ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD="${CC} -shared ${SHLIB_CFLAGS}"
+ SHLIB_LD_LIBS='${LIBS}'
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS=""
+- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
++ CC_SEARCH_FLAGS=''
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
++
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
+ AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
+ AC_EGREP_CPP(yes, [
+ #ifdef __ELF__
+@@ -1530,6 +1524,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+ ;;
+ esac
+
++ CFLAGS_WARNING="-Wall"
++ CFLAGS_OPTIMIZE="-O2"
+ # OpenBSD doesn't do version numbers with dots.
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ TCL_LIB_VERSIONS_OK=nodots
Index: x11/tk/8.4/patches/patch-unix_tkConfig_sh_in
===================================================================
RCS file: x11/tk/8.4/patches/patch-unix_tkConfig_sh_in
diff -N x11/tk/8.4/patches/patch-unix_tkConfig_sh_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/tk/8.4/patches/patch-unix_tkConfig_sh_in 30 Sep 2008 08:39:05
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- unix/tkConfig.sh.in.orig Sun Sep 28 15:46:41 2008
++++ unix/tkConfig.sh.in Sun Sep 28 15:47:38 2008
+@@ -69,7 +69,7 @@ TK_INCLUDE_SPEC='@TK_INCLUDE_SPEC@'
+ # different place than the directory containing the source files, this
+ # points to the location of the sources, not the location where Tk was
+ # compiled.
+-TK_SRC_DIR='@TK_SRC_DIR@'
++TK_SRC_DIR='@includedir@'
+
+ # Needed if you want to make a 'fat' shared library library
+ # containing tk objects or link a different wish.
Index: x11/tk/8.4/pkg/DESCR
===================================================================
RCS file: /cvs/ports/x11/tk/8.4/pkg/DESCR,v
retrieving revision 1.3
diff -u -r1.3 DESCR
--- x11/tk/8.4/pkg/DESCR 17 Dec 2003 04:57:21 -0000 1.3
+++ x11/tk/8.4/pkg/DESCR 30 Sep 2008 08:39:05 -0000
@@ -1,8 +1,11 @@
-This is Tk version 8.4, a GUI toolkit for Tcl. It provides the means
-to write simple scripts to create and manipulate X window system
-windows with the various manipulators available in X11 libraries.
+Tk is a graphical user interface toolkit that takes developing desktop
+applications to a higher level than conventional approaches. Tk is the
+standard GUI not only for Tcl, but for many other dynamic languages, and
+can produce rich, native applications that run unchanged across most
+platforms.
-The best way to get started with Tcl and Tk is to read ``Tcl and the Tk
-Toolkit, 4th ed'' by John K. Ousterhout, Addison-Wesley, ISBN 0-13-038560-3.
-
-A full set of manual pages is also provided with this package.
+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
Index: x11/tk/8.4/pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/x11/tk/8.4/pkg/PFRAG.shared,v
retrieving revision 1.4
diff -u -r1.4 PFRAG.shared
--- x11/tk/8.4/pkg/PFRAG.shared 8 Jan 2006 20:56:08 -0000 1.4
+++ x11/tk/8.4/pkg/PFRAG.shared 30 Sep 2008 08:39:05 -0000
@@ -1,3 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2006/01/08 20:56:08 naddy Exp $
@lib lib/libtk84.so.${LIBtk84_VERSION}
-lib/tk8.4/pkgIndex.tcl
+lib/libtk84_pic.a
+lib/libtkstub84_pic.a
Index: x11/tk/8.4/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/tk/8.4/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- x11/tk/8.4/pkg/PLIST 31 Jan 2007 17:06:39 -0000 1.7
+++ x11/tk/8.4/pkg/PLIST 30 Sep 2008 08:39:05 -0000
@@ -1,44 +1,24 @@
@comment $OpenBSD: PLIST,v 1.7 2007/01/31 17:06:39 espie Exp $
@option no-default-conflict
@conflict tk->=8.4,<8.5
-bin/wish8.4
[EMAIL PROTECTED] bin/wish8.4
include/tk8.4/
include/tk8.4/generic/
-include/tk8.4/generic/default.h
-include/tk8.4/generic/ks_names.h
include/tk8.4/generic/tk.h
-include/tk8.4/generic/tk3d.h
-include/tk8.4/generic/tkButton.h
-include/tk8.4/generic/tkCanvas.h
-include/tk8.4/generic/tkColor.h
include/tk8.4/generic/tkDecls.h
-include/tk8.4/generic/tkFileFilter.h
-include/tk8.4/generic/tkFont.h
-include/tk8.4/generic/tkInitScript.h
include/tk8.4/generic/tkInt.h
include/tk8.4/generic/tkIntDecls.h
include/tk8.4/generic/tkIntPlatDecls.h
-include/tk8.4/generic/tkIntXlibDecls.h
-include/tk8.4/generic/tkMenu.h
-include/tk8.4/generic/tkMenubutton.h
include/tk8.4/generic/tkPlatDecls.h
include/tk8.4/generic/tkPort.h
-include/tk8.4/generic/tkScale.h
-include/tk8.4/generic/tkScrollbar.h
-include/tk8.4/generic/tkSelect.h
-include/tk8.4/generic/tkText.h
-include/tk8.4/generic/tkUndo.h
include/tk8.4/tk.h
include/tk8.4/tkDecls.h
-include/tk8.4/tkIntXlibDecls.h
include/tk8.4/tkPlatDecls.h
include/tk8.4/unix/
-include/tk8.4/unix/tkUnixDefault.h
include/tk8.4/unix/tkUnixInt.h
include/tk8.4/unix/tkUnixPort.h
lib/libtk84.a
lib/libtkstub84.a
-lib/libtkstub84_pic.a
lib/tk8.4/
lib/tk8.4/bgerror.tcl
lib/tk8.4/button.tcl
@@ -135,86 +115,6 @@
lib/tk8.4/man/man1/
@man lib/tk8.4/man/man1/wish.1
lib/tk8.4/man/man3/
[EMAIL PROTECTED] lib/tk8.4/man/man3/3DBorder.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/AddOption.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/BindTable.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/CanvPsY.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/CanvTkwin.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/CanvTxtInfo.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/Clipboard.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/ClrSelect.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/ConfigWidg.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/ConfigWind.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/CoordToWin.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/CrtCmHdlr.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/CrtErrHdlr.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/CrtGenHdlr.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/CrtImgType.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/CrtItemType.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/CrtPhImgFmt.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/CrtSelHdlr.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/CrtWindow.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/DeleteImg.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/DrawFocHlt.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/EventHndlr.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/FindPhoto.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/FontId.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/FreeXId.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GeomReq.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetAnchor.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetBitmap.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetCapStyl.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetClrmap.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetColor.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetCursor.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetDash.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetFont.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetGC.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetHINSTANCE.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetHWND.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetImage.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetJoinStl.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetJustify.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetOption.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetPixels.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetPixmap.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetRelief.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetRootCrd.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetScroll.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetSelect.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetUid.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetVRoot.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/GetVisual.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/Grab.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/HWNDToWindow.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/HandleEvent.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/IdToWindow.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/ImgChanged.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/InternAtom.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/MainLoop.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/MainWin.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/MaintGeom.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/ManageGeom.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/MapWindow.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/MeasureChar.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/MoveToplev.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/Name.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/NameOfImg.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/OwnSelect.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/ParseArgv.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/QWinEvent.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/Restack.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/RestrictEv.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/SetAppName.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/SetCaret.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/SetClass.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/SetClassProcs.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/SetGrid.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/SetOptions.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/SetVisual.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/StrictMotif.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/TextLayout.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/TkInitStubs.3
@man lib/tk8.4/man/man3/Tk_3DBorderColor.3
@man lib/tk8.4/man/man3/Tk_3DBorderGC.3
@man lib/tk8.4/man/man3/Tk_3DHorizontalBevel.3
@@ -470,7 +370,6 @@
@man lib/tk8.4/man/man3/Tk_WindowId.3
@man lib/tk8.4/man/man3/Tk_X.3
@man lib/tk8.4/man/man3/Tk_Y.3
[EMAIL PROTECTED] lib/tk8.4/man/man3/WindowId.3
lib/tk8.4/man/mann/
@man lib/tk8.4/man/mann/bell.n
@man lib/tk8.4/man/mann/bind.n
@@ -479,21 +378,16 @@
@man lib/tk8.4/man/mann/button.n
@man lib/tk8.4/man/mann/canvas.n
@man lib/tk8.4/man/mann/checkbutton.n
[EMAIL PROTECTED] lib/tk8.4/man/mann/chooseColor.n
[EMAIL PROTECTED] lib/tk8.4/man/mann/chooseDirectory.n
@man lib/tk8.4/man/mann/clipboard.n
@man lib/tk8.4/man/mann/colors.n
@man lib/tk8.4/man/mann/console.n
@man lib/tk8.4/man/mann/cursors.n
@man lib/tk8.4/man/mann/destroy.n
[EMAIL PROTECTED] lib/tk8.4/man/mann/dialog.n
@man lib/tk8.4/man/mann/entry.n
@man lib/tk8.4/man/mann/event.n
@man lib/tk8.4/man/mann/focus.n
[EMAIL PROTECTED] lib/tk8.4/man/mann/focusNext.n
@man lib/tk8.4/man/mann/font.n
@man lib/tk8.4/man/mann/frame.n
[EMAIL PROTECTED] lib/tk8.4/man/mann/getOpenFile.n
@man lib/tk8.4/man/mann/grab.n
@man lib/tk8.4/man/mann/grid.n
@man lib/tk8.4/man/mann/image.n
@@ -504,20 +398,15 @@
@man lib/tk8.4/man/mann/loadTk.n
@man lib/tk8.4/man/mann/lower.n
@man lib/tk8.4/man/mann/menu.n
[EMAIL PROTECTED] lib/tk8.4/man/mann/menubar.n
@man lib/tk8.4/man/mann/menubutton.n
@man lib/tk8.4/man/mann/message.n
[EMAIL PROTECTED] lib/tk8.4/man/mann/messageBox.n
@man lib/tk8.4/man/mann/option.n
[EMAIL PROTECTED] lib/tk8.4/man/mann/optionMenu.n
@man lib/tk8.4/man/mann/options.n
@man lib/tk8.4/man/mann/pack-old.n
@man lib/tk8.4/man/mann/pack.n
[EMAIL PROTECTED] lib/tk8.4/man/mann/palette.n
@man lib/tk8.4/man/mann/panedwindow.n
@man lib/tk8.4/man/mann/photo.n
@man lib/tk8.4/man/mann/place.n
[EMAIL PROTECTED] lib/tk8.4/man/mann/popup.n
@man lib/tk8.4/man/mann/radiobutton.n
@man lib/tk8.4/man/mann/raise.n
@man lib/tk8.4/man/mann/scale.n
@@ -564,14 +453,17 @@
lib/tk8.4/msgs/eo.msg
lib/tk8.4/msgs/es.msg
lib/tk8.4/msgs/fr.msg
+lib/tk8.4/msgs/hu.msg
lib/tk8.4/msgs/it.msg
lib/tk8.4/msgs/nl.msg
lib/tk8.4/msgs/pl.msg
+lib/tk8.4/msgs/pt.msg
lib/tk8.4/msgs/ru.msg
lib/tk8.4/obsolete.tcl
lib/tk8.4/optMenu.tcl
lib/tk8.4/palette.tcl
lib/tk8.4/panedwindow.tcl
+lib/tk8.4/pkgIndex.tcl
lib/tk8.4/prolog.ps
lib/tk8.4/safetk.tcl
lib/tk8.4/scale.tcl
