Add package for wildcard module of lang/clisp. Remove conflicting option

wildcard from lang/clisp.

8 files changed, 105 insertions, 7 deletions

diff --git a/devel/Makefile b/devel/Makefile
index d4a7caa863f..628dd92d82c 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1444 2011/04/15 09:41:09 abs Exp $
+# $NetBSD: Makefile,v 1.1445 2011/04/20 18:50:00 hans Exp $
 #
 
 COMMENT=	Development utilities
@@ -102,6 +102,7 @@ SUBDIR+=	chrpath
 SUBDIR+=	clib
 SUBDIR+=	clisp-pcre
 SUBDIR+=	clisp-syscalls
+SUBDIR+=	clisp-wildcard
 SUBDIR+=	clisp-zlib
 SUBDIR+=	cmake
 SUBDIR+=	cmake-mode
diff --git a/devel/clisp-wildcard/DESCR b/devel/clisp-wildcard/DESCR
new file mode 100644
index 00000000000..17e5b8eb969
--- /dev/null
+++ b/devel/clisp-wildcard/DESCR
@@ -0,0 +1 @@
+CLISP wildcard matching module
diff --git a/devel/clisp-wildcard/Makefile b/devel/clisp-wildcard/Makefile
new file mode 100644
index 00000000000..cca41699296
--- /dev/null
+++ b/devel/clisp-wildcard/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2011/04/20 18:50:01 hans Exp $
+#
+
+CLISP_MODULE=	wildcard
+
+PKGNAME=	clisp-$(CLISP_MODULE)-$(CLISP_VERSION)
+PKGREVISION=	1
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clisp/}
+
+MAINTAINER=	hans@netbsd.org
+HOMEPAGE=	http://clisp.cons.org/
+COMMENT=	CLISP wildcard matching module
+
+MAKE_JOBS_SAFE=	no
+
+post-extract:
+	(cd ${WRKSRC} && cp -p src/gllib/alloca.in.h src/gllib/alloca.h)
+
+.include "../../lang/clisp/module.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/clisp-wildcard/PLIST b/devel/clisp-wildcard/PLIST
new file mode 100644
index 00000000000..3225bdd20f0
--- /dev/null
+++ b/devel/clisp-wildcard/PLIST
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST,v 1.1 2011/04/20 18:50:01 hans Exp $
+lib/clisp/dynmod/lib-wildcard.so
+lib/clisp/dynmod/wildcard.lisp
+lib/clisp/wildcard/Makefile
+lib/clisp/wildcard/README
+lib/clisp/wildcard/libgnu_wc.a
+lib/clisp/wildcard/link.sh
+lib/clisp/wildcard/wildcard.fas
+lib/clisp/wildcard/wildcard.lisp
+lib/clisp/wildcard/wildcard.o
diff --git a/devel/clisp-wildcard/distinfo b/devel/clisp-wildcard/distinfo
new file mode 100644
index 00000000000..2ba7a23b542
--- /dev/null
+++ b/devel/clisp-wildcard/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2011/04/20 18:50:02 hans Exp $
+
+SHA1 (clisp-2.49.tar.gz) = 1743e7917013162400c955af441e991db43b3323
+RMD160 (clisp-2.49.tar.gz) = ae30f3b681cb023e885c6e4ed12210ee5ba14c76
+Size (clisp-2.49.tar.gz) = 9823111 bytes
+SHA1 (patch-aa) = dfc81991edd465415009b7509d8ee9cf72008cc1
+SHA1 (patch-ab) = 856e2c4b955acb9279a65b28bd527ff89fbe8e35
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)
diff --git a/lang/clisp/options.mk b/lang/clisp/options.mk
index 42ea2524694..c215265e169 100644
--- a/lang/clisp/options.mk
+++ b/lang/clisp/options.mk
@@ -1,11 +1,10 @@
-# $NetBSD: options.mk,v 1.8 2011/04/20 18:44:56 hans Exp $
+# $NetBSD: options.mk,v 1.9 2011/04/20 18:50:00 hans Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.clisp
 
 # this option is essential for some others to work:
 PKG_SUPPORTED_OPTIONS+=		ffcall
 
-PKG_SUPPORTED_OPTIONS+=		wildcard
 PKG_SUPPORTED_OPTIONS+=		readline
 
 PKG_SUPPORTED_OPTIONS+=		gmalloc
@@ -39,10 +38,6 @@ CONFIGURE_ARGS+=	--with-dynamic-ffi
 .  include "../../devel/ffcall/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Mwildcard)
-CONFIGURE_ARGS+=	--with-module=wildcard
-.endif
-
 .if !empty(PKG_OPTIONS:Mreadline)
 USE_GNU_READLINE=	YES
 CONFIGURE_ARGS+=	--with-readline
@@ -52,6 +47,10 @@ CONFIGURE_ARGS+=	--with-readline
 
 # Options for those who wishes to build "static" CLISP:
 
+#.if !empty(PKG_OPTIONS:Mwildcard)
+#CONFIGURE_ARGS+=	--with-module=wildcard
+#.endif
+
 #.if !empty(PKG_OPTIONS:Mpari)
 #CONFIGURE_ARGS+=	--with-module=pari
 #.  include "../../math/pari/buildlink3.mk"