Update to 8.0.3, new mastersite

This commit is contained in:
niklas 1998-11-03 17:49:39 +00:00
parent 63761ead7a
commit 33c521debc
5 changed files with 28 additions and 33 deletions

View File

@ -3,20 +3,20 @@
# Date created: 2 December 1997
# Whom: niklas
#
# $OpenBSD: Makefile,v 1.3 1998/02/10 10:45:20 niklas Exp $
# $OpenBSD: Makefile,v 1.4 1998/11/03 17:49:39 niklas Exp $
# $FreeBSD: Makefile,v 1.7 1997/12/01 16:50:58 pst Exp $
#
DISTNAME= tk8.0p2
PKGNAME= tk-8.0.2
DISTNAME= tk8.0.3
PKGNAME= tk-8.0.3
CATEGORIES= x11 tk80
MASTER_SITES= ftp://ftp.sunlabs.com/pub/tcl/
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_0
MAINTAINER= niklas@openbsd.org
LIB_DEPENDS= tcl80\\.1\\.2:${PORTSDIR}/lang/tcl80
LIB_DEPENDS= tcl80\\.1\\.3:${PORTSDIR}/lang/tcl80
WRKSRC= ${WRKDIR}/tk8.0/unix
WRKSRC= ${WRKDIR}/tk8.0.3/unix
GNU_CONFIGURE= yes
.if (${MACHINE_ARCH} != "alpha")
CONFIGURE_ARGS= --enable-shared

View File

@ -1 +1 @@
MD5 (tk8.0p2.tar.gz) = e7711ce7e584bf1c0388cdbb86ffe7cc
MD5 (tk8.0.3.tar.gz) = 0d738e6ca31b49067b0e6e7efdec6532

View File

@ -1,10 +1,10 @@
--- configure.orig Fri Aug 15 22:17:52 1997
+++ configure Wed Oct 1 10:50:54 1997
@@ -662,14 +662,14 @@
if test -n "$withval"; then
--- configure.orig Mon Aug 31 23:06:42 1998
+++ configure Tue Nov 3 18:38:58 1998
@@ -842,14 +842,14 @@
withval="$with_tcl"
TCL_BIN_DIR=$withval
else
- TCL_BIN_DIR=`cd ../../tcl8.0/unix; pwd`
- TCL_BIN_DIR=`cd ../../tcl8.0$TK_PATCH_LEVEL/unix; pwd`
+ TCL_BIN_DIR=${prefix}/lib/tcl8.0
fi
@ -18,19 +18,19 @@
fi
#--------------------------------------------------------------------
@@ -688,6 +688,8 @@
DL_LIBS=$TCL_DL_LIBS
LD_FLAGS=$TCL_LD_FLAGS
@@ -889,6 +889,8 @@
CFLAGS_DEBUG=$TCL_CFLAGS_DEBUG
CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
+
LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
# If Tcl and Tk are installed in different places, adjust the library
@@ -2271,6 +2273,7 @@
s%@SHLIB_VERSION@%$SHLIB_VERSION%g
s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
@@ -2554,6 +2556,7 @@
s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
s%@TCL_DBGX@%$TCL_DBGX%g
s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g
+s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
s%@TCL_VERSION@%$TCL_VERSION%g

View File

@ -1,5 +1,5 @@
--- Makefile.in.orig Tue Nov 25 08:41:56 1997
+++ Makefile.in Wed Apr 8 20:15:33 1998
--- Makefile.in.orig Mon Aug 31 23:06:42 1998
+++ Makefile.in Tue Nov 3 18:41:52 1998
@@ -56,7 +56,9 @@
BIN_DIR = $(exec_prefix)/bin
@ -11,21 +11,16 @@
# Top-level directory for manual entries:
MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
@@ -94,11 +96,11 @@
@@ -112,7 +114,7 @@
# Libraries to use when linking. This definition is determined by the
# configure script.
-LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
+LIBS = -L${PREFIX}/lib -ltcl80 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
# To change the compiler switches, for example to change from -O
# to -g, change the following line:
-CFLAGS = -O
+CFLAGS = @CFLAGS@
# To turn off the security checks that disallow incoming sends when
# the X server appears to be insecure, reverse the comments on the
@@ -134,7 +136,7 @@
@@ -148,7 +150,7 @@
# "install" around; better to use the install-sh script that comes
# with the distribution, which is slower but guaranteed to work.
@ -34,9 +29,9 @@
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
@@ -290,6 +292,11 @@
@@ -311,6 +313,11 @@
@MAKE_LIB@
$(RANLIB) @TK_LIB_FILE@
$(RANLIB) ${TK_LIB_FILE}
+libtk80.a: ${OBJS}
+ rm -f libtk80.a
@ -46,7 +41,7 @@
# Make target which outputs the list of the .o contained in the Tk lib
# usefull to build a single big shared library containing Tcl/Tk and other
# extensions. used for the Tcl Plugin. -- dl
@@ -340,7 +347,7 @@
@@ -365,7 +372,7 @@
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
@ -55,7 +50,7 @@
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
@@ -354,13 +361,19 @@
@@ -379,13 +386,19 @@
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@ -76,7 +71,7 @@
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
do \
if [ ! -d $$i ] ; then \
@@ -370,8 +383,18 @@
@@ -395,8 +408,18 @@
else true; \
fi; \
done;

View File

@ -1,6 +1,6 @@
bin/wish8.0
lib/libtk80.a
lib/libtk80.so.1.2
lib/libtk80.so.1.3
@exec /sbin/ldconfig -m %B
lib/tk8.0/tkConfig.sh
lib/tk8.0/images/README