From da188bcd4c47cdd9d95ce21c306ae510dc0116da Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 12 Jan 2006 15:04:18 +0000 Subject: Add DragonFly supoprt. On FreeBSD, dlerror() can be used as well. --- lang/STk/distinfo | 7 ++++--- lang/STk/patches/patch-ac | 26 +++++++++++++++++++------- lang/STk/patches/patch-ae | 18 ++++++++++++------ lang/STk/patches/patch-an | 13 +++++++++++++ 4 files changed, 48 insertions(+), 16 deletions(-) create mode 100644 lang/STk/patches/patch-an (limited to 'lang/STk') diff --git a/lang/STk/distinfo b/lang/STk/distinfo index b3c60af1d2f..69b87456ad5 100644 --- a/lang/STk/distinfo +++ b/lang/STk/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.6 2006/01/11 17:43:34 joerg Exp $ +$NetBSD: distinfo,v 1.7 2006/01/12 15:04:18 joerg Exp $ SHA1 (STk-4.0.1.tar.gz) = 50dc98c2b64db1c9cca54411cb406feb4cb57600 RMD160 (STk-4.0.1.tar.gz) = 58ad3c66f77a6ab33db5d4ca9f2510d50b6b6f0d Size (STk-4.0.1.tar.gz) = 3673684 bytes SHA1 (patch-aa) = 15c6df46138d136fc88028ff1602e5e4dbc2891c SHA1 (patch-ab) = 9bb574febca26ab89d9e9a4074667e91ffffaf26 -SHA1 (patch-ac) = 9cf798540381669e132b52b06f19d41bd30858cc +SHA1 (patch-ac) = f1fd66d383504a486d93316f5ad85c59036e8d8c SHA1 (patch-ad) = c27349d17bb5085ffe81a4c74862662360a08ff1 -SHA1 (patch-ae) = d37ff01621189e7a2451196847be75a4f80e4b42 +SHA1 (patch-ae) = 0f07c54b19c1484a3c0c03e92ddbcbe371ba1f99 SHA1 (patch-af) = 2625837a9d784071b2bfed71e2798891c6c47b71 SHA1 (patch-ag) = dde1a30f1b0f0d781d8d2389af6bc2393dd40729 SHA1 (patch-ah) = 353ac24f2a097e360067a292828ef2f469e137c8 @@ -16,3 +16,4 @@ SHA1 (patch-aj) = 17158d45f3a57a822a5eb13ad7f8c2e631329e41 SHA1 (patch-ak) = 7548a9912788c1a951ef9d14f0b21bebf0899b66 SHA1 (patch-al) = c5a8f2f3d2a70ef5c4ca23c1574b5b25f2c0dacb SHA1 (patch-am) = cb59da47c5e7fd1f07c456fa1a1258217c798ed5 +SHA1 (patch-an) = 0ee1b8edf2fe7a8910c42d46375ba0ad90bf1bd6 diff --git a/lang/STk/patches/patch-ac b/lang/STk/patches/patch-ac index db197bdbf58..97c6b7ebb7b 100644 --- a/lang/STk/patches/patch-ac +++ b/lang/STk/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2003/05/10 00:26:34 jtb Exp $ +$NetBSD: patch-ac,v 1.4 2006/01/12 15:04:18 joerg Exp $ ---- configure.orig +--- configure.orig 1999-09-26 15:02:14.000000000 +0000 +++ configure -@@ -565,7 +565,11 @@ +@@ -565,7 +565,11 @@ echo "#define STK_VERSION \"$VERSION\"" # determine the kind of the machine which is running this script os=`uname -s` version=`uname -r` @@ -15,16 +15,28 @@ $NetBSD: patch-ac,v 1.3 2003/05/10 00:26:34 jtb Exp $ case $os in Linux*) -@@ -691,7 +695,7 @@ +@@ -580,6 +584,9 @@ case $os in + case $machine in + i*86) machine=ix86;; + esac;; ++ DragonFly*) ++ version=${OS_VERSION} ++ ;; + SunOS*) + case $version in + 4.1.*) version=4.1.X;; +@@ -691,8 +698,9 @@ case $MACHINE in ULTRIX*) OS=ULTRIX;; HP*) OS=HPUX; DFLGS="$DFLGS -Dhpux";; Linux*) OS=LINUX;; - NetBSD-1*) OS=NETBSD1;; + NetBSD*) OS=NETBSD;; FreeBSD*) OS=FREEBSD;; ++ DragonFly*) OS=DRAGONFLY;; IRIX-5*) OS=IRIX5;; IRIX*-6*) OS=IRIX5;; -@@ -1874,7 +1878,7 @@ + CYGWIN32*) OS=WIN32; FLAVOR=win; DFLGS="$DFLGS -DCYGWIN32";; +@@ -1878,7 +1886,7 @@ fi if test "$x_libraries" != "" then @@ -33,7 +45,7 @@ $NetBSD: patch-ac,v 1.3 2003/05/10 00:26:34 jtb Exp $ fi XLIBSW="$XLIBSW $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" -@@ -2269,11 +2273,12 @@ +@@ -2273,11 +2281,12 @@ case $OS in SH_LDFLAGS="-shared -o" SH_LOADER="ld" SH_SUFFIX='so' ;; @@ -42,7 +54,7 @@ $NetBSD: patch-ac,v 1.3 2003/05/10 00:26:34 jtb Exp $ - SH_LDFLAGS="-Bshareable -o" - SH_LOADER="ld" - SH_SUFFIX='so';; -+ NETBSD) ++ NETBSD | DRAGONFLY) + SH_CCFLAGS="-fPIC" + SH_LDFLAGS="-shared -o" + SH_LOADER="cc" diff --git a/lang/STk/patches/patch-ae b/lang/STk/patches/patch-ae index d51faa407c5..67d7507165e 100644 --- a/lang/STk/patches/patch-ae +++ b/lang/STk/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1 2003/05/10 00:26:34 jtb Exp $ +$NetBSD: patch-ae,v 1.2 2006/01/12 15:04:18 joerg Exp $ ---- Src/dynload.c.orig +--- Src/dynload.c.orig 1999-09-26 15:02:14.000000000 +0000 +++ Src/dynload.c -@@ -46,11 +46,15 @@ +@@ -46,16 +46,19 @@ # include #endif @@ -19,16 +19,22 @@ $NetBSD: patch-ae,v 1.1 2003/05/10 00:26:34 jtb Exp $ # define DLOPEN_COMPATIBLE #endif -@@ -172,7 +176,7 @@ +-#if defined(FREEBSD) +-# define dlerror() "error unknown" /* dlerror() isn't implemented in FreeBSD too */ ++#if defined(FREEBSD) || defined(DRAGONFLY) + # define DLOPEN_COMPATIBLE + #endif + +@@ -172,7 +175,7 @@ static void load_and_call(char *path, ch #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) ++#if defined(SUNOS4) || defined(SUNOS5) || defined(NETBSD) || defined(FREEBSD) || defined(IRIX5) || defined(OSF1) ||defined(LINUX_ELF) || defined(DRAGONFLY) #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 @@ +@@ -360,7 +363,7 @@ void STk_load_object_file(char *path) for (p = path, slash = p-1; *p; p++) /* Find position of last '/' */ if (*p == '/') slash = p; diff --git a/lang/STk/patches/patch-an b/lang/STk/patches/patch-an new file mode 100644 index 00000000000..cb6254d0294 --- /dev/null +++ b/lang/STk/patches/patch-an @@ -0,0 +1,13 @@ +$NetBSD: patch-an,v 1.1 2006/01/12 15:04:18 joerg Exp $ + +--- Src/dump.c.orig 2006-01-12 14:35:48.000000000 +0000 ++++ Src/dump.c +@@ -22,7 +22,7 @@ + + int STk_dumped_core = 0; + +-#if defined (SUNOS4) || defined(FREEBSD) || defined(LINUX) ++#if defined (SUNOS4) || defined(FREEBSD) || defined(LINUX) || defined(DRAGONFLY) + static caddr_t current_break = (caddr_t) -1; + static long data_size = 0; + static long data_start = 0; -- cgit v1.2.3