summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/STk/Makefile4
-rw-r--r--lang/STk/distinfo2
-rw-r--r--lang/STk/files/patch-aa131
3 files changed, 39 insertions, 98 deletions
diff --git a/lang/STk/Makefile b/lang/STk/Makefile
index 68a6549..68613d0 100644
--- a/lang/STk/Makefile
+++ b/lang/STk/Makefile
@@ -3,10 +3,10 @@
# Date created: 17 Sep 96
# Whom: jmacd@cs.berkeley.edu
#
-# $Id: Makefile,v 1.12 1996/11/12 02:18:01 obrien Exp $
+# $Id: Makefile,v 1.13 1997/03/06 10:58:52 asami Exp $
#
-DISTNAME= STk-3.1
+DISTNAME= STk-3.1.1
CATEGORIES= lang
MASTER_SITES= ftp://kaolin.unice.fr/pub/
diff --git a/lang/STk/distinfo b/lang/STk/distinfo
index 7227b17..4dc9dc7 100644
--- a/lang/STk/distinfo
+++ b/lang/STk/distinfo
@@ -1 +1 @@
-MD5 (STk-3.1.tar.gz) = 3814aeabc52757359060cec9c82d1411
+MD5 (STk-3.1.1.tar.gz) = 7cc038e09dc86132e7c3a12eff28a3f9
diff --git a/lang/STk/files/patch-aa b/lang/STk/files/patch-aa
index 723821d..6fbb467 100644
--- a/lang/STk/files/patch-aa
+++ b/lang/STk/files/patch-aa
@@ -35,65 +35,6 @@ diff -cr STk-3.1/Makefile.in STk-3.1.new/Makefile.in
(cd Tcl; $(MAKE) install)
(cd Tk; $(MAKE) install)
(cd Mp; $(MAKE) install)
-diff -cr STk-3.1/Snow/io.c STk-3.1.new/Snow/io.c
-*** STk-3.1/Snow/io.c Sun Jul 21 03:54:35 1996
---- STk-3.1.new/Snow/io.c Tue Sep 17 15:25:42 1996
-***************
-*** 90,96 ****
- if (Tk_initialized) {
- filled = 0;
- while (!filled) {
-! Tcl_DoOneEvent(TK_DONT_WAIT);
- if (Tk_GetNumMainWindows() <= 0) return EOF;
- }
- }
---- 90,96 ----
- if (Tk_initialized) {
- filled = 0;
- while (!filled) {
-! Tcl_DoOneEvent(0);
- if (Tk_GetNumMainWindows() <= 0) return EOF;
- }
- }
-diff -cr STk-3.1/Src/io.c STk-3.1.new/Src/io.c
-*** STk-3.1/Src/io.c Sun Jul 21 03:54:35 1996
---- STk-3.1.new/Src/io.c Tue Sep 17 15:25:42 1996
-***************
-*** 90,96 ****
- if (Tk_initialized) {
- filled = 0;
- while (!filled) {
-! Tcl_DoOneEvent(TK_DONT_WAIT);
- if (Tk_GetNumMainWindows() <= 0) return EOF;
- }
- }
---- 90,96 ----
- if (Tk_initialized) {
- filled = 0;
- while (!filled) {
-! Tcl_DoOneEvent(0);
- if (Tk_GetNumMainWindows() <= 0) return EOF;
- }
- }
-*** STk-3.1/Lib/Makefile Mon Jul 22 06:50:06 1996
---- STk-3.1.new/Lib/Makefile Tue Sep 17 15:36:07 1996
-***************
-*** 18,24 ****
- -if [ ! -d $(SITE_SCHEME) ] ; then mkdir -p $(SITE_SCHEME); fi
- -if [ ! -d $(STK_IMAGES) ] ; then mkdir -p $(STK_IMAGES); fi
- -if [ ! -d $(STK_STK) ] ; then mkdir -p $(STK_STK); fi
-! for i in *.stk *.stklos prolog.ps STk.init; \
- do \
- sed -e 's=/usr/local/lib/stk=$(libdir)=' \
- -e 's=/usr/local/bin=$(bindir)=' $$i > $(STK_STK)/$$i ;\
---- 18,24 ----
- -if [ ! -d $(SITE_SCHEME) ] ; then mkdir -p $(SITE_SCHEME); fi
- -if [ ! -d $(STK_IMAGES) ] ; then mkdir -p $(STK_IMAGES); fi
- -if [ ! -d $(STK_STK) ] ; then mkdir -p $(STK_STK); fi
-! for i in *.stk prolog.ps STk.init; \
- do \
- sed -e 's=/usr/local/lib/stk=$(libdir)=' \
- -e 's=/usr/local/bin=$(bindir)=' $$i > $(STK_STK)/$$i ;\
*** STk-3.1/Tk/unix/Makefile.in Tue Sep 17 15:47:29 1996
--- STk-3.1.new/Tk/unix/Makefile.in Tue Sep 17 15:57:13 1996
***************
@@ -123,41 +64,41 @@ diff -cr STk-3.1/Src/io.c STk-3.1.new/Src/io.c
# Libraries to use when linking: must include at least Tk, Tcl, Xlib,
# and the math library (in that order). The "LIBS" part will be
+*** STk-3.1.1/configure.in.orig Sat Mar 7 17:05:37 1998
+--- STk-3.1.1/configure.in Sat Mar 7 17:05:48 1998
***************
-*** 188,196 ****
- CC = @CC@
- CC_SWITCHES = $(STKCFLAGS) $(DFLGS) $(ALLOC) ${CFLAGS} -I${UNIX_DIR} \
- -I${GENERIC_DIR} \
-! -I../../Tcl -I../../Src -I${BMAP_DIR} -I${TCL_DIR} \
- ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \
-! ${KEYSYM_FLAGS}
-
- WISH_OBJS = tkAppInit.o
-
---- 188,196 ----
- CC = @CC@
- CC_SWITCHES = $(STKCFLAGS) $(DFLGS) $(ALLOC) ${CFLAGS} -I${UNIX_DIR} \
- -I${GENERIC_DIR} \
-! -I../../Tcl -I../../Src -I${BMAP_DIR} -I${TCLDIR} \
- ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \
-! ${KEYSYM_FLAGS} ${X11_INCLUDES}
-
- WISH_OBJS = tkAppInit.o
-
+*** 387,393 ****
+ STKLDFLAGS="$STKLDFLAGS -Wl,-E"
+ LIB_DLD=-ldld;;
+ FREEBSD)
+! SH_CCFLAGS="-pic"
+ SH_LDFLAGS="-Bshareable -o"
+ SH_LOADER="ld"
+ LIB_MALLOC="-lgnumalloc"
+--- 387,393 ----
+ STKLDFLAGS="$STKLDFLAGS -Wl,-E"
+ LIB_DLD=-ldld;;
+ FREEBSD)
+! SH_CCFLAGS="-fpic"
+ SH_LDFLAGS="-Bshareable -o"
+ SH_LOADER="ld"
+ LIB_MALLOC="-lgnumalloc"
+*** STk-3.1.1/configure.orig Sat Mar 7 17:17:50 1998
+--- STk-3.1.1/configure Sat Mar 7 17:17:59 1998
***************
-*** 285,291 ****
-
- test: tktest
- @cwd=`pwd`; \
-! cd $(TCL_DIR); TCL_LIBRARY=`pwd`/../library; export TCL_LIBRARY; \
- cd $$cwd; cd $(TOP_DIR); TK_LIBRARY=`pwd`/library; export TK_LIBRARY; \
- cd $$cwd; ( echo cd $(TOP_DIR)/tests\; source all\; exit ) | ./tktest
-
---- 285,291 ----
-
- test: tktest
- @cwd=`pwd`; \
-! cd $(TCLDIR); TCL_LIBRARY=`pwd`/../library; export TCL_LIBRARY; \
- cd $$cwd; cd $(TOP_DIR); TK_LIBRARY=`pwd`/library; export TK_LIBRARY; \
- cd $$cwd; ( echo cd $(TOP_DIR)/tests\; source all\; exit ) | ./tktest
-
+*** 1536,1542 ****
+ STKLDFLAGS="$STKLDFLAGS -Wl,-E"
+ LIB_DLD=-ldld;;
+ FREEBSD)
+! SH_CCFLAGS="-pic"
+ SH_LDFLAGS="-Bshareable -o"
+ SH_LOADER="ld"
+ LIB_MALLOC="-lgnumalloc"
+--- 1536,1542 ----
+ STKLDFLAGS="$STKLDFLAGS -Wl,-E"
+ LIB_DLD=-ldld;;
+ FREEBSD)
+! SH_CCFLAGS="-fpic"
+ SH_LDFLAGS="-Bshareable -o"
+ SH_LOADER="ld"
+ LIB_MALLOC="-lgnumalloc"
OpenPOWER on IntegriCloud