cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to tcl/tk 8.4, ok brad@ naddy@

Browse Source
This commit is contained in:
jose 2003-12-27 23:34:42 +00:00
parent e62f2e868b
commit 7bc6e421e0
39 changed files with 146 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/tkcvs/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2002/10/25 22:37:52 naddy Exp $
# $OpenBSD: Makefile,v 1.21 2003/12/27 23:40:49 jose Exp $
COMMENT= "graphical frontend to CVS"
DISTNAME= tkcvs-6.0
@ -13,7 +13,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/sorted/packages-7.6/apps/tkcvs-6.0/
BUILD_DEPENDS= :tk-8.3.*:x11/tk/8.3
BUILD_DEPENDS= :tk-8.4.*:x11/tk/8.4
RUN_DEPENDS= ${BUILD_DEPENDS}
NO_BUILD= Yes

4
devel/tkcvs/patches/patch-aa
View File

@ -2,7 +2,7 @@
+++ tkcvs/doinstall Tue Mar 28 06:46:46 2000
@@ -2,10 +2,10 @@
#
# $Id: patch-aa,v 1.3 2000/03/27 16:05:44 kevlo Exp $
# $Id: patch-aa,v 1.4 2003/12/27 23:40:49 jose Exp $
#
-
+PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
@ -24,7 +24,7 @@
-WISH=`which wish4.0`
-if [ ! -f $WISH ]; then
+WISH=`which wish8.3`
+WISH=`which wish8.4`
+if [ ! -f ${WISH} ]
+then
+ WISH=`which wish4.2`

4
devel/tkcvs/patches/patch-ab
View File

@ -4,7 +4,7 @@
#!/bin/sh
# \
- exec tclsh $0 ${1+"$@"}
+ exec tclsh8.3 $0 ${1+"$@"}
+ exec tclsh8.4 $0 ${1+"$@"}
# $Id: patch-ab,v 1.3 2000/03/27 16:05:44 kevlo Exp $
# $Id: patch-ab,v 1.4 2003/12/27 23:40:49 jose Exp $
#

6
emulators/frodo/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2002/10/26 12:52:48 naddy Exp $
# $OpenBSD: Makefile,v 1.13 2003/12/27 23:41:01 jose Exp $
COMMENT= "Commodore 64 emulator"
@ -21,10 +21,10 @@ PERMIT_DISTFILES_CDROM= Yes
CONFIGURE_STYLE= gnu
USE_X11= Yes
RUN_DEPENDS= ::x11/tk/8.3
RUN_DEPENDS= ::x11/tk/8.4
LIB_DEPENDS= SDL:sdl-*-!no_x11:devel/sdl
WISH=wish8.3
WISH=wish8.4
FRODOLIBDIR=${PREFIX}/lib/frodo
CONFIGURE_ENV= CFLAGS='${CFLAGS} -O3 -D__unix -DX_USE_SHM -fno-exceptions'

6
lang/python/2.2/files/Setup.tkinter
View File

@ -17,8 +17,8 @@ TKPATH=:lib-tk
# *** Always uncomment this (leave the leading underscore in!):
_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
# *** Uncomment and edit to reflect where your Tcl/Tk headers are:
-I${LOCALBASE}/include/tcl8.3 \
-I${LOCALBASE}/include/tk8.3 \
-I${LOCALBASE}/include/tcl8.4 \
-I${LOCALBASE}/include/tk8.4 \
# *** Uncomment and edit to reflect where your X11 header files are:
-I${X11BASE}/include \
# *** Or uncomment this for Solaris:
@ -34,7 +34,7 @@ _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
# *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
-L${LOCALBASE}/lib \
# *** Uncomment and edit to reflect your Tcl/Tk versions:
-ltk83 -ltcl83 \
-ltk84 -ltcl84 \
# *** Uncomment and edit to reflect where your X11 libraries are:
-L${X11BASE}/lib \
# *** Or uncomment this for Solaris:

8
lang/python/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.10 2003/12/13 15:03:07 sturm Exp $
# $OpenBSD: Makefile.inc,v 1.11 2003/12/27 23:36:09 jose Exp $
# IMPORTANT! If you make any changes to the Python ports, be sure
# to also update files/CHANGES.OpenBSD for your change. This is a
@ -76,7 +76,7 @@ RUN_DEPENDS+= ::lang/python/${VERSION},-tkinter
.endif
.if empty(FLAVOR:L:Mno_tkinter)
BUILD_DEPENDS+= ::x11/tk/8.3
BUILD_DEPENDS+= ::x11/tk/8.4
SETUP_LOCAL+= Setup.tkinter
. if !defined(NO_SHARED_LIBS) || ${NO_SHARED_LIBS:U} != YES
MULTI_PACKAGES+= -tkinter
@ -84,14 +84,14 @@ SED_PLIST+= | sed -e '/^%%tkinter%%/d' \
| sed -e '/^%%tkinter_no_shared%%/r${PKGDIR}/PFRAG-tkinter.no_shared' -e '//d'
. else
SED_PLIST+= | sed -e '/^%%tkinter%%/r${PKGDIR}/PFRAG-tkinter.no_shared' -e '//d'
LIB_DEPENDS+= tk83::x11/tk/8.3
LIB_DEPENDS+= tk84::x11/tk/8.4
. endif
.else
SED_PLIST+= | sed -e '/^%%tkinter%%/d'
.endif
.if defined(PACKAGING) && ${SUBPACKAGE} == "-tkinter"
LIB_DEPENDS+= tk83::x11/tk/8.3
LIB_DEPENDS+= tk84::x11/tk/8.4
.endif
.if empty(FLAVOR:L:Mno_mpz)

10
lang/ruby/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2002/12/26 15:48:22 couderc Exp $
# $OpenBSD: Makefile,v 1.26 2003/12/27 23:40:35 jose Exp $
COMMENT= "object oriented script language with threads"
@ -40,11 +40,11 @@ CONFIGURE_ENV= YACC=yacc
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
.if ${FLAVOR:L} == "tk"
LIB_DEPENDS= tcl83.::lang/tcl/8.3 \
tk83.::x11/tk/8.3
LIB_DEPENDS= tcl84.::lang/tcl/8.4 \
tk84.::x11/tk/8.4
CONFIGURE_ARGS+= --with-tcl-include=${PREFIX}/include/tcl8.3 \
--with-tk-include=${PREFIX}/include/tk8.3 \
CONFIGURE_ARGS+= --with-tcl-include=${PREFIX}/include/tcl8.4 \
--with-tk-include=${PREFIX}/include/tk8.4 \
--with-X11-dir=${X11BASE}
.else
CONFIGURE_ARGS+= --without-x11

12
mail/tkrat/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.15 2002/10/27 17:21:40 naddy Exp $
# $OpenBSD: Makefile,v 1.16 2003/12/27 23:34:42 jose Exp $
COMMENT= "mail user agent for X in C with a Tcl/Tk frontend"
DISTNAME= tkrat-2.0.3
DISTNAME= tkrat-2.1.2
CATEGORIES= mail x11
HOMEPAGE= http://www.tkrat.org/
@ -16,14 +16,14 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}/downloads/stable/
LIB_DEPENDS= tcl83.1.3::lang/tcl/8.3 \
tk83.1.3::x11/tk/8.3
LIB_DEPENDS= tcl84::lang/tcl/8.4 \
tk84::x11/tk/8.4
USE_X11= Yes
CONFIGURE_STYLE= gnu dest
CONFIGURE_ARGS= --with-tcl-bin="${LOCALBASE}/bin" \
--with-tcl-include="${LOCALBASE}/include/tcl8.3 \
${LOCALBASE}/include/tk8.3"
--with-tcl-include="${LOCALBASE}/include/tcl8.4 \
${LOCALBASE}/include/tk8.4"
NO_REGRESS= Yes

6
mail/tkrat/distinfo
View File

@ -1,3 +1,3 @@
MD5 (tkrat-2.0.3.tar.gz) = 484f46b21af62705cb8948c821c8bfdb
RMD160 (tkrat-2.0.3.tar.gz) = 232d67b7dad85f3bf72f31b589fa790589cdc149
SHA1 (tkrat-2.0.3.tar.gz) = ba12e06d0fce7a1d724901df74bf437675cb63d7
MD5 (tkrat-2.1.2.tar.gz) = 98ffcba3be5e89a1e1756cb40b6c8007
RMD160 (tkrat-2.1.2.tar.gz) = fec9ba376724b19d40abd7dbbe22b4966320397d
SHA1 (tkrat-2.1.2.tar.gz) = 1679a1d3a8880234ddf1fb25edc88e1b2916cff6

8
mail/tkrat/patches/patch-Makefile.in
View File

@ -1,8 +1,8 @@
--- Makefile.in.orig Mon Jul 9 20:52:29 2001
+++ Makefile.in Mon Jul 9 20:52:46 2001
@@ -23,8 +23,8 @@
--- Makefile.in.orig 2002-05-29 17:13:29.000000000 -0400
+++ Makefile.in 2003-12-20 18:39:30.000000000 -0500
@@ -25,8 +25,8 @@ build:
else \
${MAKE} ${OSTYPE} EXTRACFLAGS="${EXTRACFLAGS}"; \
${MAKE} ${OSTYPE} ${IMAPFLAGS} EXTRACFLAGS="${EXTRACFLAGS}"; \
fi
- cd lib; ${MAKE}
cd util; ${MAKE}

24
mail/tkrat/patches/patch-lib_Makefile_in
View File

@ -1,6 +1,6 @@
--- lib/Makefile.in.orig Mon May 1 20:31:01 2000
+++ lib/Makefile.in Mon Jul 9 20:57:46 2001
@@ -25,7 +25,7 @@
--- lib/Makefile.in.orig 2003-09-23 14:13:37.000000000 -0400
+++ lib/Makefile.in 2003-12-20 19:17:54.000000000 -0500
@@ -25,7 +25,7 @@ EXTRA_CFLAGS = @CFLAGS@ @MEM_DEBUG_FLAGS
MAN_DIR = @mandir@
BIN_DIR = @bindir@
DATA_DIR = @datadir@/`echo tkrat${VERSION} | sed '${TRANSFORM}'`
@ -9,7 +9,7 @@
# Pointer to the imap c-client directory
C_CLIENT = ${TOP_DIR}/imap/c-client
@@ -51,6 +51,7 @@
@@ -54,6 +54,7 @@ SHELL = /bin/sh
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
VERSION = @VERSION@
RATLIB_SUFFIX = @RATLIB_SUFFIX@
@ -17,7 +17,7 @@
INSTALL = @INSTALL@
TCLSH = @tclsh@
TRANSFORM = @program_transform_name@
@@ -64,7 +65,8 @@
@@ -67,7 +68,8 @@ SHELL = /bin/sh
CFLAGS = ${TK_DEFS} ${EXTRA_CFLAGS} -I${C_CLIENT} ${FIX_INCLUDE} ${INCLUDES} \
${SHLIB_CFLAGS} -DVERSION=\"${VERSION}\"
C_CLIENT_LIB = ${C_CLIENT}/c-client.a
@ -26,28 +26,28 @@
+BUSYLIB = blt_busy${SHLIB_SUFFIX}.${BUSYLIB_VERSION}
DUMMYLIB = ratDummy${SHLIB_SUFFIX}
SRC = ratAppInit.c ratFolder.c ratStdFolder.c ratMessage.c ratCode.c \
@@ -86,9 +88,11 @@
HEADERS = rat.h ratFolder.h ratPGP.h ratStdFolder.h
@@ -90,9 +92,11 @@ ${DUMMYLIB}: ratDummy.o
${SHLIB_LD} -o ${DUMMYLIB} ratDummy.o $(EXTRA_LIBS) ${SHLIB_LD_LIBS}
pkgIndex.tcl: ${RATLIB} ${DUMMYLIB}
+ cp ../util/${BUSYLIB} . ; \
echo "if [catch {load ./${DUMMYLIB}; \
load ./${RATLIB}; \
- pkg_mkIndex -verbose . ${RATLIB}} error] \
- pkg_mkIndex . ${RATLIB}} error] \
+ load ./${BUSYLIB}; \
+ pkg_mkIndex -verbose . ${RATLIB} ${BUSYLIB}} error] \
+ pkg_mkIndex . ${RATLIB} ${BUSYLIB}} error] \
{puts \$$error; exit 1}" | ${TCLSH}
install.bin: ${RATLIB} ${DUMMYLIB}
@@ -99,9 +103,7 @@
@@ -103,9 +107,7 @@ install.bin: ${RATLIB} ${DUMMYLIB}
INST=${INSTALL_PREFIX}${LIB_DIR}; \
echo "if [catch {load ./${DUMMYLIB}; \
cd $$INST; \
- pkg_mkIndex -verbose -load ./*${SHLIB_SUFFIX} . \
- pkg_mkIndex -load ./*${SHLIB_SUFFIX} . \
- *${SHLIB_SUFFIX}} error] \
- {puts \$$error; exit 1}" | ${TCLSH}
+ pkg_mkIndex -verbose -load ./${RATLIB}} ]" | ${TCLSH}
install: install.data
install: install.bin

25
mail/tkrat/patches/patch-lib_ratStdMessage_c
View File

@ -1,17 +1,18 @@
$OpenBSD: patch-lib_ratStdMessage_c,v 1.1 2003/06/18 03:14:44 avsm Exp $
--- lib/ratStdMessage.c.orig Wed Jun 18 03:58:36 2003
+++ lib/ratStdMessage.c Wed Jun 18 04:04:00 2003
@@ -435,10 +435,9 @@ Std_MakeChildrenProc(Tcl_Interp *interp,
$OpenBSD: patch-lib_ratStdMessage_c,v 1.2 2003/12/27 23:34:42 jose Exp $
--- lib/ratStdMessage.c.orig 2002-02-04 15:35:10.000000000 -0500
+++ lib/ratStdMessage.c 2003-12-20 18:43:31.000000000 -0500
@@ -435,10 +435,10 @@ Std_MakeChildrenProc(Tcl_Interp *interp,
partInfoPtr->msgPtr = bodyInfoPtr->msgPtr;
partInfoPtr->clientData = (ClientData)partStdInfoPtr;
if (stdBodyInfoPtr->section) {
- partStdInfoPtr->section = (char*)ckalloc(
- strlen(stdBodyInfoPtr->section)+8);
- snprintf(partStdInfoPtr->section,
- sizeof(partStdInfoPtr->section), "%s.%d",
+ size_t section_len = strlen(stdBodyInfoPtr->section)+8;
+ partStdInfoPtr->section = (char*)ckalloc(section_len);
+ snprintf(partStdInfoPtr->section, section_len, "%s.%d",
stdBodyInfoPtr->section, index++);
- size = strlen(stdBodyInfoPtr->section) + 8;
- partStdInfoPtr->section = (char*)ckalloc(size);
- snprintf(partStdInfoPtr->section, size, "%s.%d",
- stdBodyInfoPtr->section, index++);
+ size_t section_len = strlen(stdBodyInfoPtr->section)+8;
+ partStdInfoPtr->section = (char*)ckalloc(section_len);
+ snprintf(partStdInfoPtr->section, section_len, "%s.%d",
+ stdBodyInfoPtr->section, index++);
} else {
partStdInfoPtr->section = (char*)ckalloc(8);
sprintf(partStdInfoPtr->section, "%d", index++);

13
mail/tkrat/patches/patch-util_Makefile_in
View File

@ -1,6 +1,6 @@
--- util/Makefile.in.orig Sat Jul 7 16:40:27 2001
+++ util/Makefile.in Sat Jul 7 17:46:35 2001
@@ -37,8 +37,8 @@
--- util/Makefile.in.orig 2003-09-23 14:13:37.000000000 -0400
+++ util/Makefile.in 2003-12-20 18:44:56.000000000 -0500
@@ -37,8 +37,8 @@ SHELL = /bin/sh
exec_prefix = @exec_prefix@
MAN_DIR = @mandir@
BIN_DIR = @bindir@
@ -11,7 +11,7 @@
CC = @CC@
INCLUDES = @TCL_INCLUDE@ @XINCLUDES@
@@ -66,7 +66,7 @@
@@ -69,7 +69,7 @@ BUSYLIB_VERSION = @BUSYLIB_VERSION@
DUMMYLIB = rat_dummy${SHLIB_SUFFIX}
CFLAGS = ${TK_DEFS} ${EXTRA_CFLAGS} ${FIX_INCLUDE} ${INCLUDES} \
${SHLIB_CFLAGS} -DBUSYLIB_VERSION=\"${BUSYLIB_VERSION}\"
@ -20,14 +20,15 @@
BUSYSRC = blt_busy.c blt_window.c
BUSYOBJ = ${BUSYSRC:.c=.o}
@@ -101,9 +101,7 @@
@@ -105,9 +105,8 @@ install.bin: ${TARGETS_LIB} ${DUMMYLIB}
INST=${INSTALL_PREFIX}${LIB_DIR}; \
echo "if [catch {load ./${DUMMYLIB}; \
cd $$INST; \
- pkg_mkIndex -verbose -load ./*${SHLIB_SUFFIX} . \
- pkg_mkIndex -load ./*${SHLIB_SUFFIX} . \
- *${SHLIB_SUFFIX}} error] \
- {puts \$$error; exit 1}" | ${TCLSH}
+ pkg_mkIndex -verbose -load ./${BUSYLIB}}]" | ${TCLSH}
+
install.shared: ${TARGETS_data}
if test ! -d ${INSTALL_PREFIX}${DATA_DIR} ; then\

6
mail/tkrat/pkg/PFRAG.shared
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2001/07/12 08:38:32 kevlo Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2003/12/27 23:34:42 jose Exp $
lib/tkrat/blt_busy.so.1.0
lib/tkrat/ratatosk.so.2.0
NEWDYNLIBDIR(%B)
lib/tkrat/ratatosk.so.2.1
NEWDYNLIBDIR(%D/lib/tkrat)

18
mail/tkrat/pkg/PLIST
View File

@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.5 2003/08/14 18:46:30 espie Exp $
@comment $OpenBSD: PLIST,v 1.6 2003/12/27 23:34:42 jose Exp $
bin/tkrat
lib/tkrat/pkgIndex.tcl
%%SHARED%%
man/man1/tkrat.1
share/doc/tkrat/CONFIGURATION
share/doc/tkrat/interface
@ -18,11 +17,14 @@ share/tkrat/exp.tcl
share/tkrat/folder.tcl
share/tkrat/font.tcl
share/tkrat/help.tcl
share/tkrat/html.tcl
share/tkrat/info.tcl
share/tkrat/keydef.tcl
share/tkrat/languages.tcl
share/tkrat/mime.tcl
share/tkrat/options.tcl
share/tkrat/pgp.tcl
share/tkrat/pkgIndex.tcl
share/tkrat/preferences.tcl
share/tkrat/print.tcl
share/tkrat/show.tcl
@ -33,24 +35,32 @@ share/tkrat/text_balText_de.tcl
share/tkrat/text_balText_en.tcl
share/tkrat/text_balText_fr.tcl
share/tkrat/text_balText_it.tcl
share/tkrat/text_balText_pl.tcl
share/tkrat/text_balText_pt.tcl
share/tkrat/text_balText_sr.tcl
share/tkrat/text_balText_sv.tcl
share/tkrat/text_changes_de.tcl
share/tkrat/text_changes_en.tcl
share/tkrat/text_changes_fr.tcl
share/tkrat/text_changes_it.tcl
share/tkrat/text_changes_pl.tcl
share/tkrat/text_changes_pt.tcl
share/tkrat/text_changes_sr.tcl
share/tkrat/text_changes_sv.tcl
share/tkrat/text_help_de.tcl
share/tkrat/text_help_en.tcl
share/tkrat/text_help_fr.tcl
share/tkrat/text_help_it.tcl
share/tkrat/text_help_pl.tcl
share/tkrat/text_help_pt.tcl
share/tkrat/text_help_sr.tcl
share/tkrat/text_help_sv.tcl
share/tkrat/text_t_de.tcl
share/tkrat/text_t_en.tcl
share/tkrat/text_t_fr.tcl
share/tkrat/text_t_it.tcl
share/tkrat/text_t_pl.tcl
share/tkrat/text_t_pt.tcl
share/tkrat/text_t_sr.tcl
share/tkrat/text_t_sv.tcl
share/tkrat/tkrat.xbm
@ -62,15 +72,17 @@ share/tkrat/util/pkgIndex.tcl
share/tkrat/util/rat_balloon.tcl
share/tkrat/util/rat_ed.tcl
share/tkrat/util/rat_edit.tcl
share/tkrat/util/rat_enriched.tcl
share/tkrat/util/rat_fbox.tcl
share/tkrat/util/rat_ispell.tcl
share/tkrat/util/rat_list.tcl
share/tkrat/util/rat_tabbed.tcl
share/tkrat/util/rat_textlist.tcl
share/tkrat/util/rat_tree.tcl
share/tkrat/vfolder.tcl
share/tkrat/vfolderdef.tcl
share/tkrat/watcher.tcl
share/tkrat/winctl.tcl
%%SHARED%%
@dirrm share/tkrat/util
@dirrm share/tkrat
@dirrm share/doc/tkrat

4
misc/impress/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2002/10/27 21:07:53 naddy Exp $
# $OpenBSD: Makefile,v 1.8 2003/12/27 23:37:02 jose Exp $
COMMENT= "publishing and presentation tool"
@ -18,7 +18,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
RUN_DEPENDS= ::x11/tk/8.3
RUN_DEPENDS= ::x11/tk/8.4
WRKDIST= ${WRKDIR}/${PKGNAME}

2
misc/impress/patches/patch-src_impress_tcl
View File

@ -5,7 +5,7 @@
#
# restart trick \
-exec wish "$0" "$@"
+exec wish8.3 "$0" "$@"
+exec wish8.4 "$0" "$@"
option add *Radiobutton*borderWidth 1
option add *Button*borderWidth 1

4
misc/remind/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2002/10/27 21:07:54 naddy Exp $
# $OpenBSD: Makefile,v 1.18 2003/12/27 23:37:18 jose Exp $
COMMENT= "scripting language for reminders, with a Tk front end"
@ -18,7 +18,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
# Can run without TK, but most unglamorous without it.
RUN_DEPENDS= ::x11/tk/8.3
RUN_DEPENDS= ::x11/tk/8.4
CONFIGURE_STYLE= gnu dest

4
misc/remind/patches/patch-scripts-cm2rem
View File

@ -1,11 +1,11 @@
--- scripts/cm2rem.tcl.orig Fri Jun 16 17:23:33 2000
+++ scripts/cm2rem.tcl Fri Jun 16 17:23:55 2000
@@ -16,7 +16,7 @@
# $Id: patch-scripts-cm2rem,v 1.1 2000/06/16 01:33:57 kevlo Exp $
# $Id: patch-scripts-cm2rem,v 1.2 2003/12/27 23:37:18 jose Exp $
# the next line restarts using tclsh \
-exec tclsh "$0" "$@"
+exec tclsh8.3 "$0" "$@"
+exec tclsh8.4 "$0" "$@"
set i 0
foreach month {January February March April May June

4
misc/remind/patches/patch-scripts-tkremind
View File

@ -1,11 +1,11 @@
--- scripts/tkremind.orig Tue Mar 28 22:43:44 2000
+++ scripts/tkremind Tue Mar 28 22:43:59 2000
@@ -15,7 +15,7 @@
# $Id: patch-scripts-tkremind,v 1.1 2000/04/14 08:06:57 turan Exp $
# $Id: patch-scripts-tkremind,v 1.2 2003/12/27 23:37:18 jose Exp $
# the next line restarts using wish \
-exec wish "$0" "$@"
+exec wish8.3 "$0" "$@"
+exec wish8.4 "$0" "$@"
wm withdraw .

4
misc/tkcron/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2002/12/23 00:37:51 pvalchev Exp $
# $OpenBSD: Makefile,v 1.16 2003/12/27 23:37:31 jose Exp $
COMMENT= "frontend to crontab"
@ -13,7 +13,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
RUN_DEPENDS= ::x11/tk/8.3
RUN_DEPENDS= ::x11/tk/8.4
EXTRACT_CASES=*) gunzip -c ${FULLDISTDIR}/$$archive >tkcron.tcl;;
WRKDIST= ${WRKDIR}

2
misc/tkcron/files/Makefile
View File

@ -4,7 +4,7 @@ WISHDIR?= ${BINDIR}
all: tkcron
tkcron:
sed -e "\:/usr/local/bin/wish: s;;${BINDIR}/wish8.3;g" tkcron.tcl > tkcron
sed -e "\:/usr/local/bin/wish: s;;${BINDIR}/wish8.4;g" tkcron.tcl > tkcron
install: all
${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} tkcron ${BINDIR}

6
misc/tkinfo/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.15 2002/12/23 00:37:51 pvalchev Exp $
# $OpenBSD: Makefile,v 1.16 2003/12/27 23:37:45 jose Exp $
COMMENT= "Tk script to read GNU info files and display them"
DISTNAME= tkinfo-2.5
DISTNAME= tkinfo-2.6
CATEGORIES= misc
MASTER_SITES= ${HOMEPAGE}
@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
RUN_DEPENDS= :tk-8.3.*:x11/tk/8.3
RUN_DEPENDS= :tk-8.4.*:x11/tk/8.4
NO_BUILD= Yes
NO_REGRESS= Yes

6
misc/tkinfo/distinfo
View File

@ -1,3 +1,3 @@
MD5 (tkinfo-2.5.tar.gz) = e194131e1900d1214c4157b247054c0b
RMD160 (tkinfo-2.5.tar.gz) = ea41672aa28ef825b527c52049db96b74bed21c7
SHA1 (tkinfo-2.5.tar.gz) = 3d2ac8c187b59585e8038779b66f69ebcd3216e1
MD5 (tkinfo-2.6.tar.gz) = dabcea3b9399c7e0f4741c98bd009b6c
RMD160 (tkinfo-2.6.tar.gz) = 7be280043495c343740fe53f41a9105df703b0f5
SHA1 (tkinfo-2.6.tar.gz) = 754b19682f29cd9633407f5899eebc3c42104a25

2
misc/tkinfo/patches/patch-aa
View File

@ -4,7 +4,7 @@
#!/bin/sh
# This is a Tcl/Tk script to be interpreted by wish (Tk4.0 or better): \
-exec wish "$0" "$@"
+exec wish8.3 "$0" "$@"
+exec wish8.4 "$0" "$@"
##########################################################################

4
misc/tkman/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2002/12/23 00:37:51 pvalchev Exp $
# $OpenBSD: Makefile,v 1.17 2003/12/27 23:38:02 jose Exp $
COMMENT= "Tcl/Tk-based manual browser"
@ -14,7 +14,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tkman/}
LIB_DEPENDS= tk83.1.::x11/tk/8.3
LIB_DEPENDS= tk84::x11/tk/8.4
RUN_DEPENDS= ::textproc/rman \
::textproc/glimpse

4
misc/tkman/patches/patch-Makefile
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile,v 1.1 2002/12/23 08:36:43 pvalchev Exp $
$OpenBSD: patch-Makefile,v 1.2 2003/12/27 23:38:02 jose Exp $
--- Makefile.orig Thu Jun 22 16:39:42 2000
+++ Makefile Mon Dec 23 01:33:34 2002
@@ -26,14 +26,12 @@ mintk = 8.3
@ -8,7 +8,7 @@ $OpenBSD: patch-Makefile,v 1.1 2002/12/23 08:36:43 pvalchev Exp $
-WISH = /private/share/bin/wish
#WISH = /private/share/bin/wish8.3
-#WISH = /usr/local/bin/wish8.3
+WISH = /usr/local/bin/wish8.3
+WISH = /usr/local/bin/wish8.4
# the executable `tkman' is placed in BINDIR
# this should be a directory that's in your bin PATH

6
net/roxirc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2003/06/20 03:31:25 kevlo Exp $
# $OpenBSD: Makefile,v 1.7 2003/12/27 23:39:06 jose Exp $
COMMENT= "Tcl/Tk irc client"
@ -16,13 +16,13 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}/download/betas/
RUN_DEPENDS= :tk-8.3.*:x11/tk/8.3
RUN_DEPENDS= :tk-8.4.*:x11/tk/8.4
NO_BUILD= Yes
NO_REGRESS= Yes
DOCS= bindings config extras help hilight lagmeter menus mirccolors \
oper prefs single startup xresources
oper prefs single startup
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/roxirc

4
net/roxirc/distinfo
View File

@ -1,3 +1 @@
MD5 (roxirc-2.0.tar.gz) = dc18191dcafb0ac8d6955f69b63c9be9
RMD160 (roxirc-2.0.tar.gz) = 48d700acfb97570d40d613726e76908ea7b65371
SHA1 (roxirc-2.0.tar.gz) = 7acbad5d2994e91eb6d6f9dc4575169c5fcfc78d
SHA1 (roxirc-2.0.tar.gz) = fca9efa9b4985a26b86faaafa527ab11e91fcfc7

4
net/roxirc/patches/patch-roxirc
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-roxirc,v 1.1 2003/06/20 03:31:42 kevlo Exp $
$OpenBSD: patch-roxirc,v 1.2 2003/12/27 23:39:06 jose Exp $
--- roxirc.orig Fri Jun 20 11:21:26 2003
+++ roxirc Fri Jun 20 11:21:51 2003
@@ -1,7 +1,4 @@
@ -6,7 +6,7 @@ $OpenBSD: patch-roxirc,v 1.1 2003/06/20 03:31:42 kevlo Exp $
-# \
-if [ -x "$HOME/.roxirc/.wish" ]; then exec $HOME/.roxirc/.wish "$0" -- "$@"; elif [ `which tclkit` ]; then exec tclkit "$0" -- "$@"; elif [ `which wish` ]; then exec wish "$0" -- "$@"; else echo "Please make sure tclkit or wish is in your PATH or link $HOME/.roxirc/.wish to wish 8.3 or newer"; exit; fi;
-
+#!/usr/local/bin/wish8.3
+#!/usr/local/bin/wish8.4
# Copyright (c) 1997-2003 Aaron Faupell (roxirc@lighter.net)
#
# Redistribution and use in source and binary forms, with or without

3
net/roxirc/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2003/06/20 03:31:47 kevlo Exp $
@comment $OpenBSD: PLIST,v 1.3 2003/12/27 23:39:06 jose Exp $
bin/roxirc
share/doc/roxirc/bindings
share/doc/roxirc/config
@ -12,5 +12,4 @@ share/doc/roxirc/oper
share/doc/roxirc/prefs
share/doc/roxirc/single
share/doc/roxirc/startup
share/doc/roxirc/xresources
@dirrm share/doc/roxirc

4
net/tkirc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2002/10/28 01:38:46 naddy Exp $
# $OpenBSD: Makefile,v 1.7 2003/12/27 23:39:34 jose Exp $
COMMENT= "ircII internet relay chat client"
@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.netsplit.de/pub/tcltk/
RUN_DEPENDS= :ircII-*:net/ircII \
:tk-8.3.*:x11/tk/8.3
:tk-8.4.*:x11/tk/8.4
NO_BUILD= Yes
NO_REGRESS= Yes

14
net/tkirc/patches/patch-tkirc2
View File

@ -1,6 +1,14 @@
--- tkirc2.orig Sat Dec 16 15:38:36 2000
+++ tkirc2 Sat Dec 16 15:39:28 2000
@@ -840,7 +840,7 @@
--- tkirc2.orig 2001-07-21 08:04:45.000000000 -0400
+++ tkirc2 2003-12-21 23:21:38.000000000 -0500
@@ -1,6 +1,6 @@
#! /bin/sh
# \
-exec wish8.3 "$0" "$@"
+exec wish8.4 "$0" "$@"
#############################################################################
# #
@@ -840,7 +840,7 @@ set user_styles {
set history_max 20
set lines_max 256
set lines_all 0

4
textproc/boust/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2003/09/23 15:29:41 sturm Exp $
# $OpenBSD: Makefile,v 1.3 2003/12/27 23:36:46 jose Exp $
COMMENT= "boustrophedon text reader"
DISTNAME= boust-0.161
@ -14,7 +14,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}bin/
RUN_DEPENDS= ::x11/tk/8.3
RUN_DEPENDS= ::x11/tk/8.4
USE_X11= Yes
NO_BUILD= Yes

6
textproc/boust/patches/patch-boust
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-boust,v 1.1.1.1 2002/11/28 12:43:44 naddy Exp $
$OpenBSD: patch-boust,v 1.2 2003/12/27 23:36:46 jose Exp $
--- boust.orig Thu Nov 7 00:06:00 2002
+++ boust Wed Nov 6 23:53:47 2002
@@ -2,9 +2,9 @@
@ -6,10 +6,10 @@ $OpenBSD: patch-boust,v 1.1.1.1 2002/11/28 12:43:44 naddy Exp $
# If it is, run tclsh, otherwise, run wish.
# (The backslash makes the following line a comment as well... \
-THESH="wish"
+THESH="wish8.3"
+THESH="wish8.4"
# blah\
-for arg in "$@" ; do if [ "$arg" == "--o" ] ; then THESH="tclsh" ; fi ; done ; \
+for arg in "$@" ; do if [ "$arg" == "--o" ] ; then THESH="tclsh8.3" ; fi ; done ; \
+for arg in "$@" ; do if [ "$arg" == "--o" ] ; then THESH="tclsh8.4" ; fi ; done ; \
# \
exec $THESH "$0" "$@"

6
textproc/xml2rfc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.26 2003/11/15 15:12:55 sturm Exp $
# $OpenBSD: Makefile,v 1.27 2003/12/27 23:35:45 jose Exp $
COMMENT= "convert memos written in XML to the RFC format"
@ -18,7 +18,7 @@ PERMIT_PACKAGE_FTP= No
PERMIT_DISTFILES_CDROM= No
PERMIT_DISTFILES_FTP= No
RUN_DEPENDS= :tcl-8.3.*:lang/tcl/8.3
RUN_DEPENDS= :tcl-8.4.*:lang/tcl/8.4
FLAVORS= no_x11
FLAVOR?=
@ -27,7 +27,7 @@ FLAVOR?=
USE_X11= No
.else
USE_X11= Yes
RUN_DEPENDS+= :tk-8.3.*:x11/tk/8.3
RUN_DEPENDS+= :tk-8.4.*:x11/tk/8.4
.endif
do-build:

6
textproc/xml2rfc/files/xml2rfc
View File

@ -1,9 +1,9 @@
#!/bin/sh
#
# $Id: xml2rfc,v 1.3 2003/02/17 13:29:17 jakob Exp $
# $Id: xml2rfc,v 1.4 2003/12/27 23:35:46 jose Exp $
wish=y0y0y0/bin/wish8.3
tclsh=y0y0y0/bin/tclsh8.3
wish=y0y0y0/bin/wish8.4
tclsh=y0y0y0/bin/tclsh8.4
xml2rfc=y0y0y0/share/xml2rfc/xml2rfc.tcl
if [ $# -gt 0 ]; then

4
textproc/xml2rfc/files/xml2rfc.no_x11
View File

@ -1,8 +1,8 @@
#!/bin/sh
#
# $Id: xml2rfc.no_x11,v 1.2 2003/02/17 13:29:17 jakob Exp $
# $Id: xml2rfc.no_x11,v 1.3 2003/12/27 23:35:46 jose Exp $
tclsh=y0y0y0/bin/tclsh8.3
tclsh=y0y0y0/bin/tclsh8.4
xml2rfc=y0y0y0/share/xml2rfc/xml2rfc.tcl
exec $tclsh $xml2rfc xml2rfc $@

12
x11/tktable/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2003/10/08 17:13:18 sturm Exp $
# $OpenBSD: Makefile,v 1.13 2003/12/27 23:36:27 jose Exp $
COMMENT= "tk extension"
@ -18,14 +18,14 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tktable/}
BUILD_DEPENDS= ::x11/tk/8.3
BUILD_DEPENDS= ::x11/tk/8.4
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.3 \
--with-tk=${PREFIX}/lib/tk8.3 \
--with-tclinclude=${PREFIX}/include/tcl8.3 \
--with-tkinclude=${PREFIX}/include/tk8.3
CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.4 \
--with-tk=${PREFIX}/lib/tk8.4 \
--with-tclinclude=${PREFIX}/include/tcl8.4 \
--with-tkinclude=${PREFIX}/include/tk8.4
MAKE_ENV= DISPLAY="${DISPLAY}" XAUTHORITY="${XAUTHORITY}"
REGRESS_TARGET= test