head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.20 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.18 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.16 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.14 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.12 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.10 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.8 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.6 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.4 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.2 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.5.0.8 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.6 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.4 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.2 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.3.0.22 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.20 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.18 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.16 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.14 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.12 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.10 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.8 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.6 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.4 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.2 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1; locks; strict; comment @# @; 1.6 date 2008.02.29.19.34.44; author tnn; state dead; branches; next 1.5; 1.5 date 2007.04.01.12.45.39; author tron; state Exp; branches; next 1.4; 1.4 date 2007.03.29.12.00.14; author tron; state Exp; branches; next 1.3; 1.3 date 2004.03.29.02.46.18; author perry; state dead; branches; next 1.2; 1.2 date 2003.07.13.14.34.49; author dillo; state Exp; branches; next 1.1; 1.1 date 2002.03.14.07.44.23; author jmc; state Exp; branches; next ; desc @@ 1.6 log @Update to 2.44.1, packaged by Aleksej Saushev. Major changes from 2.41: - Use pkgsrc-supplied libffcall - Use libtool - New PKG_OPTIONS to enable support for db4, gdbm, gtk2, fastcgi, pcre. - lots of bugfixes @ text @$NetBSD: patch-ah,v 1.5 2007/04/01 12:45:39 tron Exp $ --- libcharset/lib/Makefile.in.orig 2005-03-23 21:28:10.000000000 +0200 +++ libcharset/lib/Makefile.in @@@@ -78,11 +78,11 @@@@ ref-del.sed : $(srcdir)/ref-del.sin # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. install-lib : all force $(mkinstalldirs) $(libdir) - $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la + $(LIBTOOL_INSTALL) $(TOOLS_PLATFORM.install) -c -m 644 libcharset.la $(libdir)/libcharset.la test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \ || orig=charset.alias; \ sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \ - $(INSTALL_DATA) $(libdir)/t-charset.alias $(libdir)/charset.alias; \ + $(TOOLS_PLATFORM.install) -c -m 644 $(libdir)/t-charset.alias $(libdir)/charset.alias; \ rm -f $(libdir)/t-charset.alias # The following is needed in order to install a simple file in $(libdir) @ 1.5 log @Use "$(TOOLS_PLATFORM.install)" instead of hard coded "install" to fix build problems under Solaris. Based on a suggestion by Aleksey Cheusov. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.4 2007/03/29 12:00:14 tron Exp $ @ 1.4 log @Make this build as non-root user. Patches provided by Aleksey Cheusov in PR pkg/34987. This also fixes PR pkg/36096. @ text @d1 1 a1 1 $NetBSD$ d10 1 a10 1 + $(LIBTOOL_INSTALL) install -c -m 644 libcharset.la $(libdir)/libcharset.la d15 1 a15 1 + install -c -m 644 $(libdir)/t-charset.alias $(libdir)/charset.alias; \ @ 1.3 log @Update to 2.33 @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.2 2003/07/13 14:34:49 dillo Exp $ d3 16 a18 77 --- ../ffcall/callback/trampoline_r/trampoline.c.orig Tue Jul 2 10:11:01 2002 +++ ../ffcall/callback/trampoline_r/trampoline.c @@@@ -21,12 +21,16 @@@@ #endif #endif #if defined(__rs6000__) +#if defined(__NetBSD__) +#define __powerpcnetbsd__ +#else #if !defined(_AIX) #define __rs6000sysv4__ /* SysV.4 ABI, real machine code. */ #else #define __rs6000aix__ /* AIX ABI, just a closure. */ #endif #endif +#endif #if defined(__hppanew__) /* * A function pointer is a biased pointer to a data area whose first word @@@@ -259,7 +263,7 @@@@ extern int shmctl (); #include #endif /* Inline assembly function for instruction cache flush. */ -#if defined(__sparc__) || defined(__sparc64__) || defined(__alpha__) || defined(__hppaold__) || defined(__rs6000sysv4__) || defined(__convex__) +#if defined(__sparc__) || defined(__sparc64__) || defined(__alpha__) || defined(__hppaold__) || defined(__rs6000sysv4__) || defined(__convex__) || defined(__powerpcnetbsd__) #ifdef __GNUC__ extern inline #if defined(__sparc__) || defined(__sparc64__) @@@@ -336,7 +340,7 @@@@ extern void __TR_clear_cache(); #define TRAMP_LENGTH 32 #define TRAMP_ALIGN 4 #endif -#ifdef __rs6000sysv4__ +#if defined(__rs6000sysv4__) || defined(__powerpcnetbsd__) #define TRAMP_LENGTH 24 #define TRAMP_ALIGN 4 #endif @@@@ -910,6 +914,39 @@@@ __TR_function alloc_trampoline_r (addres #define is_tramp(function) \ *(unsigned short *) (function + 0) == 0x3D60 && \ *(unsigned short *) (function + 4) == 0x616B && \ + *(unsigned short *) (function + 8) == 0x3C00 && \ + *(unsigned short *) (function +12) == 0x6000 && \ + *(unsigned long *) (function +16) == 0x7C0903A6 && \ + *(unsigned long *) (function +20) == 0x4E800420 +#define hilo(hiword,loword) \ + (((unsigned long) (hiword) << 16) | (unsigned long) (loword)) +#define tramp_address(function) \ + hilo(*(unsigned short *) (function +10), *(unsigned short *) (function +14)) +#define tramp_data(function) \ + hilo(*(unsigned short *) (function + 2), *(unsigned short *) (function + 6)) +#endif +#ifdef __powerpcnetbsd__ + /* function: + * {liu|lis} 13,hi16() 3D A0 hi16() + * {oril|ori} 13,13,lo16() 61 AD lo16() + * {liu|lis} 0,hi16(
) 3C 00 hi16(
) + * {oril|ori} 0,0,lo16(
) 60 00 lo16(
) + * mtctr 0 7C 09 03 A6 + * bctr 4E 80 04 20 + */ + *(short *) (function + 0) = 0x3DA0; + *(short *) (function + 2) = (unsigned long) data >> 16; + *(short *) (function + 4) = 0x61AD; + *(short *) (function + 6) = (unsigned long) data & 0xffff; + *(short *) (function + 8) = 0x3C00; + *(short *) (function +10) = (unsigned long) address >> 16; + *(short *) (function +12) = 0x6000; + *(short *) (function +14) = (unsigned long) address & 0xffff; + *(long *) (function +16) = 0x7C0903A6; + *(long *) (function +20) = 0x4E800420; +#define is_tramp(function) \ + *(unsigned short *) (function + 0) == 0x3DA0 && \ + *(unsigned short *) (function + 4) == 0x61AD && \ *(unsigned short *) (function + 8) == 0x3C00 && \ *(unsigned short *) (function +12) == 0x6000 && \ *(unsigned long *) (function +16) == 0x7C0903A6 && \ @ 1.2 log @upgrade to 2.30 does no longer include (copies of) libintl and libiconv numerous enhancements and bug fixes, see included NEWS file @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Port to powerpc: Provide a trampoline implementation that doesn't presume r11 is free (it's not in dynamically linked programs and the ELF ABI says as much but somehow linux managed to avoid this it seems). Use r13 for the time being since while gcc will allocate it, it's the last "local" one allocated so none of the clisp code hits that (nothing needed 17+ local registers in use ever). Update the vacall implementation to match the trampoline calls but otherwise for any assembly use the linux code. Make these changes specific to netbsd, update the test cases so everything works. This now passes all the clisp tests when done/installed. @ text @d3 2 a4 2 --- ../ffcall/callback/trampoline_r/trampoline.c.orig Thu Mar 14 07:23:32 2002 +++ ../ffcall/callback/trampoline_r/trampoline.c Thu Mar 14 07:23:35 2002 d22 1 a22 1 @@@@ -259,7 +263,7 @@@@ d31 1 a31 1 @@@@ -336,7 +340,7 @@@@ d40 1 a40 1 @@@@ -872,6 +876,39 @@@@ @