summaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1999-11-28 18:32:45 +0000
committerSteve Price <steve@FreeBSD.org>1999-11-28 18:32:45 +0000
commitbc087374d35aa9c841dd63d44e9c9697702921ed (patch)
tree9bfffecdf0e79fc2f3af0e2a2f1044536ad164ca /x11-toolkits
parentgcc 2.95 requires us to be explicit about the return type of functions. (diff)
Update to use Tcl/Tk version 8.2.
Submitted by: Ade Lovett <ade@lovett.com>
Notes
Notes: svn path=/head/; revision=23474
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/blt/Makefile12
-rw-r--r--x11-toolkits/itk/Makefile11
-rw-r--r--x11-toolkits/itk/files/Makefile.lib4
-rw-r--r--x11-toolkits/itk/pkg-plist4
-rw-r--r--x11-toolkits/iwidgets/Makefile6
-rw-r--r--x11-toolkits/p5-Tcl-Tk/Makefile4
-rw-r--r--x11-toolkits/p5-Tcl-Tk/files/patch-aa4
-rw-r--r--x11-toolkits/p5-TclTk/Makefile4
-rw-r--r--x11-toolkits/p5-TclTk/files/patch-aa4
-rw-r--r--x11-toolkits/ruby-tk/Makefile4
-rw-r--r--x11-toolkits/ruby14-tk/Makefile4
11 files changed, 27 insertions, 34 deletions
diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 324e46be8963..0265b88e071f 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -8,12 +8,12 @@
DISTNAME= BLT2.4m
PKGNAME= blt-2.4m
-CATEGORIES= x11-toolkits tk80
+CATEGORIES= x11-toolkits tk82
MASTER_SITES= ftp://ftp.tcltk.com/pub/blt/
MAINTAINER= kjc@csl.sony.co.jp
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
WRKSRC= ${WRKDIR}/blt2.4m
GNU_CONFIGURE= yes
@@ -24,14 +24,8 @@ MANN= BLT.n barchart.n beep.n bgexec.n bitmap.n \
.include <bsd.port.pre.mk>
-.if ${PORTOBJFORMAT} == "elf"
-SO_VERSION= 2
-.else
-SO_VERSION= 2.4
-.endif
-
post-install:
- ${LN} -sf libBLT24.so.${SO_VERSION} ${PREFIX}/lib/libBLT24.so
+ ${LN} -sf libBLT24.so.2 ${PREFIX}/lib/libBLT24.so
${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.include <bsd.port.post.mk>
diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index f40c8ba87bb2..f33fecb428e9 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -8,17 +8,17 @@
DISTNAME= itcl3.0.1
PKGNAME= itk-3.0.1
-CATEGORIES= x11-toolkits tk80
+CATEGORIES= x11-toolkits tk82
MASTER_SITES= ftp://ftp.tcltk.com/pub/itcl/
MAINTAINER= dmlb@ragnet.demon.co.uk
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 \
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
itcl30.1:${PORTSDIR}/lang/itcl
WRKSRC= ${WRKDIR}/itcl3.0.1/itk/unix
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.0 --with-itcl=${PREFIX}/lib/itcl3.0 --with-tk=${PREFIX}/lib/tk8.0
+CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.2 --with-itcl=${PREFIX}/lib/itcl3.0 --with-tk=${PREFIX}/lib/tk8.2
CONFIGURE_ENV= PORTSDIR=${PORTSDIR} ITK_LIB_FILE=${ITK_LIB_FILE}
SHLIB_MAJOR= 1
@@ -32,11 +32,7 @@ MANN= Archetype.n Toplevel.n Widget.n itk.n itkvars.n usual.n
.include <bsd.port.pre.mk>
-.if ${PORTOBJFORMAT} == "elf"
ITK_LIB_FILE= ${ITK_LIB}.${SHLIB_MAJOR}
-.else
-ITK_LIB_FILE= ${ITK_LIB}.${SHLIB_MAJOR}.${SHLIB_MINOR}
-.endif
post-configure:
@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
@@ -48,6 +44,7 @@ pre-build:
TCL_PREFIX=${PREFIX} ITCL_PREFIX=${PREFIX} TK_PREFIX=${PREFIX}
post-install:
+ ${LN} -sf itkwish3.0 ${PREFIX}/bin/itkwish
${LN} -sf ${ITK_LIB_FILE} ${PREFIX}/lib/${ITK_LIB}
${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/x11-toolkits/itk/files/Makefile.lib b/x11-toolkits/itk/files/Makefile.lib
index 2eed56b86d2e..9f362ba9fcd8 100644
--- a/x11-toolkits/itk/files/Makefile.lib
+++ b/x11-toolkits/itk/files/Makefile.lib
@@ -2,9 +2,9 @@ NOPROFILE= yes
LIB= itk30
ITK_LIBRARY= ${PREFIX}/lib/itk3.0
CFLAGS+= -I. -I./../generic \
- -I${TCL_PREFIX}/include/tcl8.0/generic \
+ -I${TCL_PREFIX}/include/tcl8.2/generic \
-I${ITCL_PREFIX}/include/itcl3.0/generic \
- -I${TK_PREFIX}/include/tk8.0/generic \
+ -I${TK_PREFIX}/include/tk8.2/generic \
-I/usr/X11R6/include \
-DHAVE_GETCWD=1 -DNO_VALUES_H=1 -DHAVE_UNISTD_H=1 -DUSE_TERMIOS=1\
-DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1\
diff --git a/x11-toolkits/itk/pkg-plist b/x11-toolkits/itk/pkg-plist
index 46c5ee8e56bc..c75e1f7edd39 100644
--- a/x11-toolkits/itk/pkg-plist
+++ b/x11-toolkits/itk/pkg-plist
@@ -1,7 +1,9 @@
bin/itkwish3.0
+@exec /bin/ln -s %D/%F %B/itkwish
+@unexec rm %B/itkwish
include/itk3.0/generic/itk.h
include/itk3.0/itk.h
-lib/libitk30.so.1.1
+lib/libitk30.so.1
lib/libitk30.so
lib/libitk30.a
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile
index 70957f96345a..92a3d74516c7 100644
--- a/x11-toolkits/iwidgets/Makefile
+++ b/x11-toolkits/iwidgets/Makefile
@@ -8,18 +8,18 @@
DISTNAME= itcl3.0.1
PKGNAME= iwidgets-3.0.0
-CATEGORIES= x11-toolkits tk80
+CATEGORIES= x11-toolkits tk82
MASTER_SITES= ftp://ftp.tcltk.com/pub/itcl/
MAINTAINER= dmlb@ragnet.demon.co.uk
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 \
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
itcl30.1:${PORTSDIR}/lang/itcl \
itk30.1:${PORTSDIR}/x11-toolkits/itk
WRKSRC= ${WRKDIR}/itcl3.0.1/iwidgets3.0.0/unix
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.0 --with-itcl=${PREFIX}/lib/itcl3.0 --with-tk=${PREFIX}/lib/tk8.0 --with-itk=${PREFIX}/lib/itk3.0
+CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.2 --with-itcl=${PREFIX}/lib/itcl3.0 --with-tk=${PREFIX}/lib/tk8.2 --with-itk=${PREFIX}/lib/itk3.0
CONFIGURE_ENV= PORTSDIR=${PORTSDIR}
MANN= buttonbox.n calendar.n canvasprintbox.n canvasprintdialog.n \
diff --git a/x11-toolkits/p5-Tcl-Tk/Makefile b/x11-toolkits/p5-Tcl-Tk/Makefile
index b08af10819d2..63c0bbba40e2 100644
--- a/x11-toolkits/p5-Tcl-Tk/Makefile
+++ b/x11-toolkits/p5-Tcl-Tk/Makefile
@@ -7,14 +7,14 @@
DISTNAME= TclTk-b2
PKGNAME= p5-Tcl-Tk-b2
-CATEGORIES= x11-toolkits lang perl5 tk80
+CATEGORIES= x11-toolkits lang perl5 tk82
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tcl
MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
USE_PERL5= YES
diff --git a/x11-toolkits/p5-Tcl-Tk/files/patch-aa b/x11-toolkits/p5-Tcl-Tk/files/patch-aa
index 090e6d5585f1..d916d5e67b56 100644
--- a/x11-toolkits/p5-Tcl-Tk/files/patch-aa
+++ b/x11-toolkits/p5-Tcl-Tk/files/patch-aa
@@ -6,6 +6,6 @@
DISTNAME => "TclTk",
- LIBS => ["-ltk -ltcl -L/usr/X11R6/lib -lX11 -lm"],
- INC => "-I/usr/local/include -I/usr/include/tcl");
-+ LIBS => ["-L$ENV{PREFIX}/lib -L$ENV{X11BASE}/lib -ltk80 -ltcl80 -lX11 -lm"],
-+ INC => "-I$ENV{PREFIX}/include -I$ENV{PREFIX}/include/tcl8.0 -I$ENV{PREFIX}/include/tk8.0 -I$ENV{X11BASE}/include");
++ LIBS => ["-L$ENV{PREFIX}/lib -L$ENV{X11BASE}/lib -ltk82 -ltcl82 -lX11 -lm"],
++ INC => "-I$ENV{PREFIX}/include -I$ENV{PREFIX}/include/tcl8.2 -I$ENV{PREFIX}/include/tk8.2 -I$ENV{X11BASE}/include");
#sub MY::tool_autosplit { "AUTOSPLITFILE = :" }
diff --git a/x11-toolkits/p5-TclTk/Makefile b/x11-toolkits/p5-TclTk/Makefile
index b08af10819d2..63c0bbba40e2 100644
--- a/x11-toolkits/p5-TclTk/Makefile
+++ b/x11-toolkits/p5-TclTk/Makefile
@@ -7,14 +7,14 @@
DISTNAME= TclTk-b2
PKGNAME= p5-Tcl-Tk-b2
-CATEGORIES= x11-toolkits lang perl5 tk80
+CATEGORIES= x11-toolkits lang perl5 tk82
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tcl
MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
USE_PERL5= YES
diff --git a/x11-toolkits/p5-TclTk/files/patch-aa b/x11-toolkits/p5-TclTk/files/patch-aa
index 090e6d5585f1..d916d5e67b56 100644
--- a/x11-toolkits/p5-TclTk/files/patch-aa
+++ b/x11-toolkits/p5-TclTk/files/patch-aa
@@ -6,6 +6,6 @@
DISTNAME => "TclTk",
- LIBS => ["-ltk -ltcl -L/usr/X11R6/lib -lX11 -lm"],
- INC => "-I/usr/local/include -I/usr/include/tcl");
-+ LIBS => ["-L$ENV{PREFIX}/lib -L$ENV{X11BASE}/lib -ltk80 -ltcl80 -lX11 -lm"],
-+ INC => "-I$ENV{PREFIX}/include -I$ENV{PREFIX}/include/tcl8.0 -I$ENV{PREFIX}/include/tk8.0 -I$ENV{X11BASE}/include");
++ LIBS => ["-L$ENV{PREFIX}/lib -L$ENV{X11BASE}/lib -ltk82 -ltcl82 -lX11 -lm"],
++ INC => "-I$ENV{PREFIX}/include -I$ENV{PREFIX}/include/tcl8.2 -I$ENV{PREFIX}/include/tk8.2 -I$ENV{X11BASE}/include");
#sub MY::tool_autosplit { "AUTOSPLITFILE = :" }
diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile
index 728ad15994f0..062ab1af3eb3 100644
--- a/x11-toolkits/ruby-tk/Makefile
+++ b/x11-toolkits/ruby-tk/Makefile
@@ -45,8 +45,8 @@ EXAMPLESDIR= ${PREFIX}/share/examples/ruby
# Set these vars as the version numbers (without decimal points) of Tcl/Tk
# you want to use with Ruby/Tk.
# e.g.: make TCL_VERSION=42 TK_VERSION=76 WITH_TCL_JP=yes build
-TCL_VERSION?= 80
-TK_VERSION?= 80
+TCL_VERSION?= 82
+TK_VERSION?= 82
.if defined(WITH_TCL_JP)
TCL_CATEGORY= japanese
TK_CATEGORY= japanese
diff --git a/x11-toolkits/ruby14-tk/Makefile b/x11-toolkits/ruby14-tk/Makefile
index 728ad15994f0..062ab1af3eb3 100644
--- a/x11-toolkits/ruby14-tk/Makefile
+++ b/x11-toolkits/ruby14-tk/Makefile
@@ -45,8 +45,8 @@ EXAMPLESDIR= ${PREFIX}/share/examples/ruby
# Set these vars as the version numbers (without decimal points) of Tcl/Tk
# you want to use with Ruby/Tk.
# e.g.: make TCL_VERSION=42 TK_VERSION=76 WITH_TCL_JP=yes build
-TCL_VERSION?= 80
-TK_VERSION?= 80
+TCL_VERSION?= 82
+TK_VERSION?= 82
.if defined(WITH_TCL_JP)
TCL_CATEGORY= japanese
TK_CATEGORY= japanese
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 11:44:10 +0000