summaryrefslogtreecommitdiff
path: root/devel/clisp-wildcard/patches
diff options
context:
space:
mode:
authorhans <hans@pkgsrc.org>2011-04-20 18:50:00 +0000
committerhans <hans@pkgsrc.org>2011-04-20 18:50:00 +0000
commit6f53ce95872513a08d2099fc2a177cdad2b86d3a (patch)
tree2d31accea7524e6a64c8d1d89604f8c4a87759c8 /devel/clisp-wildcard/patches
parent76e3bdaf9de9e7e701ac5036ea82e2d59f96529d (diff)
downloadpkgsrc-6f53ce95872513a08d2099fc2a177cdad2b86d3a.tar.gz
Add package for wildcard module of lang/clisp. Remove conflicting option
wildcard from lang/clisp.
Diffstat (limited to 'devel/clisp-wildcard/patches')
-rw-r--r--devel/clisp-wildcard/patches/patch-aa26
-rw-r--r--devel/clisp-wildcard/patches/patch-ab33
2 files changed, 59 insertions, 0 deletions
diff --git a/devel/clisp-wildcard/patches/patch-aa b/devel/clisp-wildcard/patches/patch-aa
new file mode 100644
index 00000000000..d4d1c0812fb
--- /dev/null
+++ b/devel/clisp-wildcard/patches/patch-aa
@@ -0,0 +1,26 @@
+$NetBSD: patch-aa,v 1.1 2011/04/20 18:50:02 hans Exp $
+
+Override ac_install_sh.
+
+--- modules/wildcard/configure.orig 2010-06-24 20:09:40.000000000 +0200
++++ modules/wildcard/configure 2011-04-20 18:27:39.393837015 +0200
+@@ -2390,19 +2390,6 @@ fi
+ $as_echo "$cl_cv_clisp_FFI" >&6; }
+ ${required} && test $cl_cv_clisp_FFI = no && \
+ as_fn_error "no FFI in CLISP" "$LINENO" 5
+-ac_aux_dir=
+-for ac_dir in $cl_cv_clisp_libdir/build-aux "$srcdir"/$cl_cv_clisp_libdir/build-aux; do
+- for ac_t in install-sh install.sh shtool; do
+- if test -f "$ac_dir/$ac_t"; then
+- ac_aux_dir=$ac_dir
+- ac_install_sh="$ac_aux_dir/$ac_t -c"
+- break 2
+- fi
+- done
+-done
+-if test -z "$ac_aux_dir"; then
+- as_fn_error "cannot find install-sh, install.sh, or shtool in $cl_cv_clisp_libdir/build-aux \"$srcdir\"/$cl_cv_clisp_libdir/build-aux" "$LINENO" 5
+-fi
+
+ # These three variables are undocumented and unsupported,
+ # and are intended to be withdrawn in a future Autoconf release.
diff --git a/devel/clisp-wildcard/patches/patch-ab b/devel/clisp-wildcard/patches/patch-ab
new file mode 100644
index 00000000000..e04f1f458ff
--- /dev/null
+++ b/devel/clisp-wildcard/patches/patch-ab
@@ -0,0 +1,33 @@
+$NetBSD: patch-ab,v 1.1 2011/04/20 18:50:02 hans Exp $
+
+--- modules/wildcard/Makefile.in.orig 2010-03-24 20:46:07.000000000 +0100
++++ modules/wildcard/Makefile.in 2011-04-20 19:19:44.692300084 +0200
+@@ -5,6 +5,7 @@ CC = @CC@
+ CPPFLAGS = @CPPFLAGS@
+ CFLAGS = @CFLAGS@
+ CLISP = @CLISP@ -norc -q
++CLISP_CFLAGS = @CLISP_CFLAGS@
+ CLISP_LIBDIR = @CLISP_LIBDIR@
+ CLISP_LINKKIT = @CLISP_LINKKIT@
+
+@@ -28,7 +29,7 @@ wildcard.c wildcard.fas : $(srcdir)/wild
+ $(CLISP) -c $(srcdir)/wildcard.lisp -o ./
+
+ wildcard.o : wildcard.c config.h gllib
+- $(CC) $(CPPFLAGS) $(CFLAGS) -I$(CLISP_LINKKIT) \
++ $(CC) $(CPPFLAGS) $(CFLAGS) $(CLISP_CFLAGS) -I$(CLISP_LINKKIT) \
+ -Igllib -I$(srcdir)/gllib -c wildcard.c
+
+ am--refresh :
+@@ -39,9 +40,9 @@ gllib libgnu_wc.a : force
+ mkdir -p gllib
+ test -f gllib/Makefile || sh config.status gllib/Makefile depfiles
+ cd gllib; \
+- $(MAKE) srcdir="$(srcdir)/gllib" \
++ $(MAKE) \
+ ACLOCAL_M4="$(srcdir)/gllib/Makefile.am" \
+- CFLAGS="$(CFLAGS) -I$(CLISP_LIBDIR)"; \
++ CFLAGS="$(CFLAGS) $(CLISP_CFLAGS) -I$(CLISP_LIBDIR)"; \
+ $(LN) libgnu.a ../libgnu_wc.a
+
+ # Make a module distribution into $(distribdir)