summaryrefslogtreecommitdiff
path: root/lang/STk/patches
diff options
context:
space:
mode:
authorjtb <jtb@pkgsrc.org>2003-05-10 00:26:33 +0000
committerjtb <jtb@pkgsrc.org>2003-05-10 00:26:33 +0000
commitef091fdc86871fb121a7bfa0ea9a56f37468b77e (patch)
tree32e58213c16df322a96bd7ef4c6e18ff18ac32dc /lang/STk/patches
parent59cd6577688b99dfdb34500d6ef294321faf0c5d (diff)
downloadpkgsrc-ef091fdc86871fb121a7bfa0ea9a56f37468b77e.tar.gz
Update to 4.0.1.
Notable changes include: * Dynamic loading now works on NetBSD ELF systems. * Integration of SRFI-9 (records) * Accepts mailto: links in the browser * <Scroll-Frame>, <Toolbar> STklos classes. * Integration of some finals SRFI (0, 2, 6, 8) * define-syntax (but not let-syntax and let-syntax*) * New License Policy (request for commercial apps no more needed). * A console mode (which is used by default on Windows, but can be used with the -console option on Unix) * A new editor with Scheme fontification and indentation * New kind of ports: virtual ports * All the code dealing with files has been rewritten. * Tk level is 8.0.3 (the latest stable Tk release) * New STklos Classes: + <Hierarchy-tree> and <Hierarchy-item> to draw hierarchy such as files/directories, class/metaclasses ... + <Notepad> to define ... notepads + <Scheme-text> which extends <Text> to "font-lockify" Scheme buffers * Method and generic function editor * A class browser (type "(class-browser)" to access it) * some new manual pages * Base64 Encoding/Decoding extension * Locale extension to treat strings and character using locale information * Better installation scripts (+ some corrections) * Lot of bug fixes.
Diffstat (limited to 'lang/STk/patches')
-rw-r--r--lang/STk/patches/patch-ab18
-rw-r--r--lang/STk/patches/patch-ac37
-rw-r--r--lang/STk/patches/patch-ad62
-rw-r--r--lang/STk/patches/patch-ae39
-rw-r--r--lang/STk/patches/patch-af13
-rw-r--r--lang/STk/patches/patch-ag13
-rw-r--r--lang/STk/patches/patch-ah13
7 files changed, 149 insertions, 46 deletions
diff --git a/lang/STk/patches/patch-ab b/lang/STk/patches/patch-ab
index b0082c3338b..8a824c985de 100644
--- a/lang/STk/patches/patch-ab
+++ b/lang/STk/patches/patch-ab
@@ -1,10 +1,8 @@
-$NetBSD: patch-ab,v 1.1 1998/09/08 08:51:50 agc Exp $
+$NetBSD: patch-ab,v 1.2 2003/05/10 00:26:33 jtb Exp $
-Allow STk to install itself if it's already installed
-
---- Demos/Makefile 1998/09/08 08:20:39 1.1
-+++ Demos/Makefile 1998/09/08 08:21:24
-@@ -21,13 +21,15 @@
+--- Demos/Makefile.orig
++++ Demos/Makefile
+@@ -34,13 +34,15 @@
do \
chmod 0755 $(DEMODIR)/`basename $$i`; \
done
@@ -16,10 +14,10 @@ Allow STk to install itself if it's already installed
- mkdir $(DEMODIR)/Html-Demos/Images; chmod 0755 $(DEMODIR)/Html-Demos/Images
+ -mkdir $(DEMODIR)/Html-Demos/Images
+ -chmod 0755 $(DEMODIR)/Html-Demos/Images
- cp Html-Demos/Images/* $(DEMODIR)/Html-Demos/Images
+ cp Html-Demos/Images/*.gif $(DEMODIR)/Html-Demos/Images
chmod 0644 $(DEMODIR)/Html-Demos/Images/*
- (cd $(DEMODIR)/Html-Demos; ln -s ../amib.stklos ../stklos-widgets .)
+ (cd $(DEMODIR)/Html-Demos; ln -fs ../amib.stklos ../stklos-widgets .)
-
- install.libs:
-
+ -if [ ! -d $(DEMODIR)lib ] ; then mkdir -p $(DEMODIR)/lib; fi
+ $(CP) ../Contrib/STk-wtour/lib/*.xbm $(DEMODIR)/lib
+ chmod 0644 $(DEMODIR)/lib/*
diff --git a/lang/STk/patches/patch-ac b/lang/STk/patches/patch-ac
index dae34d19e9a..db197bdbf58 100644
--- a/lang/STk/patches/patch-ac
+++ b/lang/STk/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2000/09/26 02:02:33 hubertf Exp $
+$NetBSD: patch-ac,v 1.3 2003/05/10 00:26:34 jtb Exp $
---- configure.in.orig Sat Jun 6 14:19:03 1998
-+++ configure.in
-@@ -14,7 +14,11 @@
+--- configure.orig
++++ configure
+@@ -565,7 +565,11 @@
# determine the kind of the machine which is running this script
os=`uname -s`
version=`uname -r`
@@ -15,7 +15,16 @@ $NetBSD: patch-ac,v 1.2 2000/09/26 02:02:33 hubertf Exp $
case $os in
Linux*)
-@@ -125,7 +129,7 @@
+@@ -691,7 +695,7 @@
+ ULTRIX*) OS=ULTRIX;;
+ HP*) OS=HPUX; DFLGS="$DFLGS -Dhpux";;
+ Linux*) OS=LINUX;;
+- NetBSD-1*) OS=NETBSD1;;
++ NetBSD*) OS=NETBSD;;
+ FreeBSD*) OS=FREEBSD;;
+ IRIX-5*) OS=IRIX5;;
+ IRIX*-6*) OS=IRIX5;;
+@@ -1874,7 +1878,7 @@
if test "$x_libraries" != ""
then
@@ -24,3 +33,21 @@ $NetBSD: patch-ac,v 1.2 2000/09/26 02:02:33 hubertf Exp $
fi
XLIBSW="$XLIBSW $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+@@ -2269,11 +2273,12 @@
+ SH_LDFLAGS="-shared -o"
+ SH_LOADER="ld"
+ SH_SUFFIX='so' ;;
+- NETBSD1)
+- SH_CCFLAGS="-fpic"
+- SH_LDFLAGS="-Bshareable -o"
+- SH_LOADER="ld"
+- SH_SUFFIX='so';;
++ NETBSD)
++ SH_CCFLAGS="-fPIC"
++ SH_LDFLAGS="-shared -o"
++ SH_LOADER="cc"
++ SH_SUFFIX="so"
++ STKLDFLAGS="-Wl,-E";;
+ HPUX)
+ SH_CCFLAGS="+Z"
+ SH_LDFLAGS="-b -o"
diff --git a/lang/STk/patches/patch-ad b/lang/STk/patches/patch-ad
index 9cd7d7299ec..cb1fdfb34df 100644
--- a/lang/STk/patches/patch-ad
+++ b/lang/STk/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2000/09/26 02:02:33 hubertf Exp $
+$NetBSD: patch-ad,v 1.3 2003/05/10 00:26:34 jtb Exp $
---- configure.orig Sat Jun 6 14:19:03 1998
-+++ configure
-@@ -553,7 +553,10 @@
+--- configure.in.orig
++++ configure.in
+@@ -16,7 +16,10 @@
# determine the kind of the machine which is running this script
os=`uname -s`
version=`uname -r`
@@ -14,30 +14,30 @@ $NetBSD: patch-ad,v 1.2 2000/09/26 02:02:33 hubertf Exp $
case $os in
Linux*)
-@@ -969,7 +972,7 @@
- # just checking for Solaris.
- # It would also be nice to do this for all -L options, not just this one.
- if test -n "$x_libraries"; then
-- X_LIBS="$X_LIBS -L$x_libraries"
-+ X_LIBS="$X_LIBS -Wl,-R$x_libraries -L$x_libraries"
- if test "`(uname) 2>/dev/null`" = SunOS &&
- uname -r | grep '^5' >/dev/null; then
- X_LIBS="$X_LIBS -R $x_libraries"
-@@ -979,7 +982,7 @@
- # Check for libraries that X11R6 Xt/Xaw programs need.
-
- ac_save_LDFLAGS="$LDFLAGS"
-- LDFLAGS="$LDFLAGS -L$x_libraries"
-+ LDFLAGS="$LDFLAGS -Wl,-R$x_libraries -L$x_libraries"
- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
- # check for ICE first), but we must link in the order -lSM -lICE or
- # we get undefined symbols. So assume we have SM if we have ICE.
-@@ -1193,7 +1196,7 @@
-
- if test "$x_libraries" != ""
- then
-- XLIBSW="-L$x_libraries"
-+ XLIBSW="-Wl,-R$x_libraries -L$x_libraries"
- fi
-
- XLIBSW="$XLIBSW $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+@@ -113,7 +116,7 @@
+ ULTRIX*) OS=ULTRIX;;
+ HP*) OS=HPUX; DFLGS="$DFLGS -Dhpux";;
+ Linux*) OS=LINUX;;
+- NetBSD-1*) OS=NETBSD1;;
++ NetBSD*) OS=NETBSD;;
+ FreeBSD*) OS=FREEBSD;;
+ IRIX-5*) OS=IRIX5;;
+ IRIX*-6*) OS=IRIX5;;
+@@ -443,11 +446,12 @@
+ SH_LDFLAGS="-shared -o"
+ SH_LOADER="ld"
+ SH_SUFFIX='so' ;;
+- NETBSD1)
+- SH_CCFLAGS="-fpic"
+- SH_LDFLAGS="-Bshareable -o"
+- SH_LOADER="ld"
+- SH_SUFFIX='so';;
++ NETBSD)
++ SH_CCFLAGS="-fPIC"
++ SH_LDFLAGS="-shared -o"
++ SH_LOADER="cc"
++ SH_SUFFIX="so"
++ STKLDFLAGS="-Wl,-E";;
+ HPUX)
+ SH_CCFLAGS="+Z"
+ SH_LDFLAGS="-b -o"
diff --git a/lang/STk/patches/patch-ae b/lang/STk/patches/patch-ae
new file mode 100644
index 00000000000..d51faa407c5
--- /dev/null
+++ b/lang/STk/patches/patch-ae
@@ -0,0 +1,39 @@
+$NetBSD: patch-ae,v 1.1 2003/05/10 00:26:34 jtb Exp $
+
+--- Src/dynload.c.orig
++++ Src/dynload.c
+@@ -46,11 +46,15 @@
+ # include <dld.h>
+ #endif
+
+-#if defined(NETBSD1)
++#if defined(NETBSD)
++#if defined(__ELF__)
++# include <dlfcn.h>
++#else
+ # include <sys/types.h>
+ # include <nlist.h>
+ # include <link.h>
+ # define dlerror() "error unknown" /* dlerror() isn't implemented in NetBSD 1.0 */
++#endif
+ # define DLOPEN_COMPATIBLE
+ #endif
+
+@@ -172,7 +176,7 @@
+ #endif /* MSC_VER WIN32 */
+
+
+-#if defined(SUNOS4) || defined(SUNOS5) || defined(NETBSD1) || defined(FREEBSD) || defined(IRIX5) || defined(OSF1) ||defined(LINUX_ELF)
++#if defined(SUNOS4) || defined(SUNOS5) || defined(NETBSD) || defined(FREEBSD) || defined(IRIX5) || defined(OSF1) ||defined(LINUX_ELF)
+
+ #define MAKE_STAT_PTR(p) (STk_make_Cpointer(ANONYMOUS_STAT_PTR_ID, (p), TRUE))
+ #define MAKE_DYN_PTR(p) (STk_make_Cpointer(ANONYMOUS_DYN_PTR_ID, (p), FALSE))
+@@ -360,7 +364,7 @@
+ for (p = path, slash = p-1; *p; p++) /* Find position of last '/' */
+ if (*p == '/') slash = p;
+
+-#if defined(NETBSD1)
++#if defined(NETBSD) && !defined(__ELF__)
+ sprintf(fct_name, "_STk_init_%s", slash + 1);
+ #else
+ sprintf(fct_name, "STk_init_%s", slash + 1);
diff --git a/lang/STk/patches/patch-af b/lang/STk/patches/patch-af
new file mode 100644
index 00000000000..2a6a86e8c9a
--- /dev/null
+++ b/lang/STk/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2003/05/10 00:26:34 jtb Exp $
+
+--- Doc/Makefile.orig
++++ Doc/Makefile
+@@ -20,7 +20,7 @@
+
+ MAN1_DIR=$(mandir)/man1
+ MANN_DIR=$(mandir)/mann
+-DOC_DIR=$(prefix)/doc/stk-$(VERSION)
++DOC_DIR=$(prefix)/share/doc/stk
+
+ DIRS=Extension Reference STklos+Tk Manual Isotas96
+
diff --git a/lang/STk/patches/patch-ag b/lang/STk/patches/patch-ag
new file mode 100644
index 00000000000..0369495dca7
--- /dev/null
+++ b/lang/STk/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2003/05/10 00:26:34 jtb Exp $
+
+--- Doc/Extension/Makefile.orig
++++ Doc/Extension/Makefile
+@@ -11,7 +11,7 @@
+ ps: Extending.ps
+
+
+-install: ps
++install:
+ $(CP) Extending.ps $(DOC_DIR)
+
+ Extending.dvi: $(SRC)
diff --git a/lang/STk/patches/patch-ah b/lang/STk/patches/patch-ah
new file mode 100644
index 00000000000..0f4f89f82b5
--- /dev/null
+++ b/lang/STk/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2003/05/10 00:26:34 jtb Exp $
+
+--- Doc/Reference/Makefile.orig
++++ Doc/Reference/Makefile
+@@ -10,7 +10,7 @@
+ dvi: manual.dvi
+ ps: manual.ps
+
+-install: ps
++install:
+ $(CP) manual.ps $(DOC_DIR)
+
+ manual.dvi: bibli $(TEX)