summaryrefslogtreecommitdiff
path: root/lang/ossp-js/patches
diff options
context:
space:
mode:
Diffstat (limited to 'lang/ossp-js/patches')
-rw-r--r--lang/ossp-js/patches/patch-aa17
-rw-r--r--lang/ossp-js/patches/patch-ab77
-rw-r--r--lang/ossp-js/patches/patch-ac19
-rw-r--r--lang/ossp-js/patches/patch-ad17
-rw-r--r--lang/ossp-js/patches/patch-ae45
5 files changed, 175 insertions, 0 deletions
diff --git a/lang/ossp-js/patches/patch-aa b/lang/ossp-js/patches/patch-aa
new file mode 100644
index 00000000000..438e0b9cbc1
--- /dev/null
+++ b/lang/ossp-js/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1.1.1 2008/02/06 04:22:33 bjs Exp $
+
+--- src/jslibmath.h.orig 2006-07-23 08:22:18.000000000 -0400
++++ src/jslibmath.h
+@@ -85,11 +85,7 @@
+
+ #ifdef OSSP
+ #undef JS_USE_FDLIBM_MATH
+-#if defined(__FreeBSD__)
+-#define JS_USE_FDLIBM_MATH 0
+-#else
+-#define JS_USE_FDLIBM_MATH 1
+-#endif
++#define JS_USE_FDLIBM_MATH PKG_JS_FDLIBM_REQUESTED
+ #endif
+
+ #if !JS_USE_FDLIBM_MATH
diff --git a/lang/ossp-js/patches/patch-ab b/lang/ossp-js/patches/patch-ab
new file mode 100644
index 00000000000..619a018150c
--- /dev/null
+++ b/lang/ossp-js/patches/patch-ab
@@ -0,0 +1,77 @@
+$NetBSD: patch-ab,v 1.1.1.1 2008/02/06 04:22:33 bjs Exp $
+
+--- Makefile.in.orig 2007-02-08 04:25:33.000000000 -0500
++++ Makefile.in
+@@ -95,8 +95,9 @@ LIB_OBJS = src/jsapi.lo
+ src/jsxdrapi.lo \
+ src/jsxml.lo \
+ src/prmjtime.lo \
+- src/jsdso.lo \
+- src/fdlibm/e_acos.lo \
++ src/jsdso.lo
++.if defined(PKG_FDLIBM_MATH_REQUESTED)
++LIB_OBJS+= src/fdlibm/e_acos.lo \
+ src/fdlibm/e_asin.lo \
+ src/fdlibm/e_atan2.lo \
+ src/fdlibm/e_exp.lo \
+@@ -129,6 +130,7 @@ LIB_OBJS = src/jsapi.lo
+ src/fdlibm/w_log.lo \
+ src/fdlibm/w_pow.lo \
+ src/fdlibm/w_sqrt.lo
++.endif
+ LIB_NAME = libjs.la
+
+ CLI_OBJS = src/js.o @CLI_OBJS@
+@@ -155,7 +157,7 @@ subdirs:
+ @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
+
+ $(LIB_NAME): $(LIB_OBJS)
+- @$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) -version-info 1:6
++ @$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) $(LIBS) -rpath $(libdir) -version-info 1:6
+
+ $(CLI_NAME): $(CLI_OBJS) $(LIB_NAME)
+ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CLI_LDFLAGS) -o $(CLI_NAME) $(CLI_OBJS) $(LIB_NAME) $(LIBS) $(CLI_LIBS)
+@@ -176,22 +178,27 @@ src/jsopcode.h src/jsopcode.c: src/jsopc
+
+ .PHONY: install
+ install: all
+- $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix)
+- $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir)
+- $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
+- $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man3
+- $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(includedir)/js
+- $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(libdir)/pkgconfig
+- $(SHTOOL) install -c -m 644 js.1 $(DESTDIR)$(mandir)/man1/
+- $(SHTOOL) install -c -m 644 js-config.1 $(DESTDIR)$(mandir)/man1/
+- $(SHTOOL) install -c -m 644 js.3 $(DESTDIR)$(mandir)/man3/
+- $(SHTOOL) install -c -m 644 src/js*.h $(DESTDIR)$(includedir)/js/
+- @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(LIB_NAME) $(DESTDIR)$(libdir)/
+- $(SHTOOL) install -c -m 644 js.pc $(DESTDIR)$(libdir)/pkgconfig/
+- $(SHTOOL) install -c -m 755 js-config.sh $(DESTDIR)$(bindir)/js-config
+- @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 js $(DESTDIR)$(bindir)/
+- $(SHTOOL) install -e 's;#!\./js;#!$(bindir)/js;' -c -m 755 jslint.js $(DESTDIR)$(bindir)/jslint
+- $(SHTOOL) install -e 's;#!\./js;#!$(bindir)/js;' -c -m 755 jspack.js $(DESTDIR)$(bindir)/jspack
++ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(prefix)
++ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
++ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
++ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man3
++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(includedir)/js
++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(libdir)/pkgconfig
++ $(BSD_INSTALL_MAN) js.1 $(DESTDIR)$(mandir)/man1/
++ $(BSD_INSTALL_MAN) js-config.1 $(DESTDIR)$(mandir)/man1/
++ $(BSD_INSTALL_MAN) js.3 $(DESTDIR)$(mandir)/man3/
++ @for fn in src/js*.h; do \
++ $(BSD_INSTALL_DATA) $$fn $(DESTDIR)$(includedir)/js/; \
++ done
++ @$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LIB_NAME) $(DESTDIR)$(libdir)/
++ $(BSD_INSTALL_DATA) js.pc $(DESTDIR)$(libdir)/pkgconfig/
++ $(BSD_INSTALL_SCRIPT) js-config.sh $(DESTDIR)$(bindir)/js-config
++ @$(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) \
++ js $(DESTDIR)$(bindir)/
++ for fn in jslint jspack; do \
++ $(BSD_INSTALL_SCRIPT) $${fn}.js $(DESTDIR)$(bindir)/$${fn}; \
++ done
++
+ @if [ ".$(WITH_PERL)" = ".yes" ]; then \
+ (cd src/perlconnect; $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \
+ fi
diff --git a/lang/ossp-js/patches/patch-ac b/lang/ossp-js/patches/patch-ac
new file mode 100644
index 00000000000..a1e576717f8
--- /dev/null
+++ b/lang/ossp-js/patches/patch-ac
@@ -0,0 +1,19 @@
+$NetBSD: patch-ac,v 1.1.1.1 2008/02/06 04:22:33 bjs Exp $
+
+Move two closed parentheses to their proper places. The patch-a[de] files
+reflect this change.
+
+--- aclocal.m4.orig 2006-08-03 08:16:32.000000000 -0400
++++ aclocal.m4
+@@ -195,9 +195,9 @@ AC_DEFUN(AC_CHECK_VA_COPY,[
+ dnl # 6. check for assignment approach (assuming va_list is a pointer)
+ __va_copy_check(ASP, [do { *(d) = *(s); } while (0)])
+ dnl # 7. check for memory copying approach (assuming va_list is a struct)
+- __va_copy_check(CPS, [memcpy((void *)&(d), (void *)&(s)), sizeof((s))])
++ __va_copy_check(CPS, [memcpy((void *)&(d), (void *)&(s), sizeof((s)))])
+ dnl # 8. check for memory copying approach (assuming va_list is a pointer)
+- __va_copy_check(CPP, [memcpy((void *)(d), (void *)(s)), sizeof(*(s))])
++ __va_copy_check(CPP, [memcpy((void *)(d), (void *)(s), sizeof(*(s)))])
+ if test ".$ac_cv_va_copy" = .; then
+ AC_ERROR([no working implementation found])
+ fi
diff --git a/lang/ossp-js/patches/patch-ad b/lang/ossp-js/patches/patch-ad
new file mode 100644
index 00000000000..53e85d8605f
--- /dev/null
+++ b/lang/ossp-js/patches/patch-ad
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.1.1.1 2008/02/06 04:22:33 bjs Exp $
+
+--- config.h.in.orig 2007-02-08 04:39:29.000000000 -0500
++++ config.h.in
+@@ -10,10 +10,10 @@
+ #define __VA_COPY_USE_C99(d, s) va_copy((d), (s))
+
+ /* Predefined possible va_copy() implementation (id: CPP) */
+-#define __VA_COPY_USE_CPP(d, s) memcpy((void *)(d), (void *)(s)), sizeof(*(s))
++#define __VA_COPY_USE_CPP(d, s) memcpy((void *)(d), (void *)(s), sizeof(*(s)))
+
+ /* Predefined possible va_copy() implementation (id: CPS) */
+-#define __VA_COPY_USE_CPS(d, s) memcpy((void *)&(d), (void *)&(s)), sizeof((s))
++#define __VA_COPY_USE_CPS(d, s) memcpy((void *)&(d), (void *)&(s), sizeof((s)))
+
+ /* Predefined possible va_copy() implementation (id: GCB) */
+ #define __VA_COPY_USE_GCB(d, s) __builtin_va_copy((d), (s))
diff --git a/lang/ossp-js/patches/patch-ae b/lang/ossp-js/patches/patch-ae
new file mode 100644
index 00000000000..690d32e1a8c
--- /dev/null
+++ b/lang/ossp-js/patches/patch-ae
@@ -0,0 +1,45 @@
+$NetBSD: patch-ae,v 1.1.1.1 2008/02/06 04:22:33 bjs Exp $
+
+${LIBM} is defined as -lm if we're using the system math library; otherwise
+it's blank. This should configure everything properly downstream.
+
+--- configure.orig 2007-02-08 04:39:29.000000000 -0500
++++ configure
+@@ -3894,7 +3894,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
+-#define DO_VA_COPY(d, s) memcpy((void *)&(d), (void *)&(s))
++#define DO_VA_COPY(d, s) memcpy((void *)&(d), (void *)&(s), sizeof((s)))
+ void test(char *str, ...)
+ {
+ va_list ap, ap2;
+@@ -3975,7 +3975,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
+-#define DO_VA_COPY(d, s) memcpy((void *)(d), (void *)(s))
++#define DO_VA_COPY(d, s) memcpy((void *)(d), (void *)(s), sizeof(*(s)))
+ void test(char *str, ...)
+ {
+ va_list ap, ap2;
+@@ -4338,7 +4338,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++ conftest$ac_xexeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_m_floor" >&5
+@@ -4348,7 +4348,9 @@ if test $ac_cv_lib_m_floor = yes; then
+ #define HAVE_LIBM 1
+ _ACEOF
+
+- LIBS="-lm $LIBS"
++if test "x$LIBM" != x; then
++ LIBS="${LIBM} $LIBS"
++fi
+
+ fi
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-30 10:33:44 +0000