Add package for the new-clx module of lang/clisp. Remove conflicting

option new-clx from lang/clisp

8 files changed, 189 insertions, 9 deletions

diff --git a/lang/clisp/options.mk b/lang/clisp/options.mk
index 129e6155746..0378e1debaf 100644
--- a/lang/clisp/options.mk
+++ b/lang/clisp/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2011/04/20 18:31:35 hans Exp $
+# $NetBSD: options.mk,v 1.6 2011/04/20 18:36:16 hans Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.clisp
 
@@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS+=		pari wildcard
 PKG_SUPPORTED_OPTIONS+=		readline
 
 PKG_OPTIONS_OPTIONAL_GROUPS=	x11-bindings
-PKG_OPTIONS_GROUP.x11-bindings=	mit-clx new-clx
+PKG_OPTIONS_GROUP.x11-bindings=	mit-clx
 
 PKG_SUPPORTED_OPTIONS+=		gmalloc
 
@@ -47,12 +47,6 @@ CONFIGURE_ARGS+=	--with-module=pari
 .  include "../../math/pari/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Mnew-clx)
-CONFIGURE_ARGS+=	--with-module=clx/new-clx
-.  include "../../x11/libX11/buildlink3.mk"
-.  include "../../x11/libXau/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mmit-clx)
 CONFIGURE_ARGS+=	--with-module=clx/mit-clx
 .  include "../../x11/libX11/buildlink3.mk"
@@ -72,6 +66,12 @@ CONFIGURE_ARGS+=	--with-readline
 
 # Options for those who wishes to build "static" CLISP:
 
+#.if !empty(PKG_OPTIONS:Mnew-clx)
+#CONFIGURE_ARGS+=	--with-module=clx/new-clx
+#.  include "../../x11/libX11/buildlink3.mk"
+#.  include "../../x11/libXau/buildlink3.mk"
+#.endif
+
 #.if !empty(PKG_OPTIONS:Mbdb)
 # it requires version 4, not anything older
 #CONFIGURE_ARGS+=	--with-module=berkeley-db
diff --git a/x11/Makefile b/x11/Makefile
index aaa6a16804b..c4b9386600c 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.633 2011/03/18 17:15:03 drochner Exp $
+# $NetBSD: Makefile,v 1.634 2011/04/20 18:36:16 hans Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -24,6 +24,7 @@ SUBDIR+=	bigreqsproto
 SUBDIR+=	bitmap
 SUBDIR+=	blt
 SUBDIR+=	clisp-gtk2
+SUBDIR+=	clisp-new-clx
 SUBDIR+=	compositeproto
 SUBDIR+=	damageproto
 SUBDIR+=	desklaunch
diff --git a/x11/clisp-new-clx/DESCR b/x11/clisp-new-clx/DESCR
new file mode 100644
index 00000000000..da93c28375d
--- /dev/null
+++ b/x11/clisp-new-clx/DESCR
@@ -0,0 +1 @@
+CLISP New-CLX module
diff --git a/x11/clisp-new-clx/Makefile b/x11/clisp-new-clx/Makefile
new file mode 100644
index 00000000000..c5db559fcd7
--- /dev/null
+++ b/x11/clisp-new-clx/Makefile
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.1 2011/04/20 18:36:16 hans Exp $
+#
+
+CLISP_MODULE=	clx/new-clx
+
+PKGNAME=	clisp-new-clx-$(CLISP_VERSION)
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clisp/}
+
+MAINTAINER=	hans@netbsd.org
+HOMEPAGE=	http://clisp.cons.org/
+COMMENT=	CLISP New CLX module
+
+MAKE_JOBS_SAFE=	no
+
+.include "../../lang/clisp/module.mk"
+
+post-configure:
+	(cd ${WRKSRC}/modules && ${CC} ${CPPFLAGS} ${CFLAGS} -o ccmp2c ../utils/ccmp2c.c)
+
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXau/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/clisp-new-clx/PLIST b/x11/clisp-new-clx/PLIST
new file mode 100644
index 00000000000..48f70a2e05c
--- /dev/null
+++ b/x11/clisp-new-clx/PLIST
@@ -0,0 +1,108 @@
+@comment $NetBSD: PLIST,v 1.1 2011/04/20 18:36:16 hans Exp $
+lib/clisp/clx/new-clx/Makefile
+lib/clisp/clx/new-clx/README
+lib/clisp/clx/new-clx/clx-preload.lisp
+lib/clisp/clx/new-clx/clx.fas
+lib/clisp/clx/new-clx/clx.lisp
+lib/clisp/clx/new-clx/clx.o
+lib/clisp/clx/new-clx/demos/README
+lib/clisp/clx/new-clx/demos/bball.lisp
+lib/clisp/clx/new-clx/demos/bwindow.lisp
+lib/clisp/clx/new-clx/demos/clclock.lisp
+lib/clisp/clx/new-clx/demos/clx-demos.lisp
+lib/clisp/clx/new-clx/demos/greynetic.lisp
+lib/clisp/clx/new-clx/demos/hanoi.lisp
+lib/clisp/clx/new-clx/demos/koch.lisp
+lib/clisp/clx/new-clx/demos/petal.lisp
+lib/clisp/clx/new-clx/demos/plaid.lisp
+lib/clisp/clx/new-clx/demos/qix.lisp
+lib/clisp/clx/new-clx/demos/recurrence.lisp
+lib/clisp/clx/new-clx/demos/screens/screen.1
+lib/clisp/clx/new-clx/demos/screens/screen.10
+lib/clisp/clx/new-clx/demos/screens/screen.11
+lib/clisp/clx/new-clx/demos/screens/screen.12
+lib/clisp/clx/new-clx/demos/screens/screen.13
+lib/clisp/clx/new-clx/demos/screens/screen.14
+lib/clisp/clx/new-clx/demos/screens/screen.15
+lib/clisp/clx/new-clx/demos/screens/screen.16
+lib/clisp/clx/new-clx/demos/screens/screen.17
+lib/clisp/clx/new-clx/demos/screens/screen.18
+lib/clisp/clx/new-clx/demos/screens/screen.19
+lib/clisp/clx/new-clx/demos/screens/screen.2
+lib/clisp/clx/new-clx/demos/screens/screen.20
+lib/clisp/clx/new-clx/demos/screens/screen.21
+lib/clisp/clx/new-clx/demos/screens/screen.22
+lib/clisp/clx/new-clx/demos/screens/screen.23
+lib/clisp/clx/new-clx/demos/screens/screen.24
+lib/clisp/clx/new-clx/demos/screens/screen.25
+lib/clisp/clx/new-clx/demos/screens/screen.26
+lib/clisp/clx/new-clx/demos/screens/screen.27
+lib/clisp/clx/new-clx/demos/screens/screen.28
+lib/clisp/clx/new-clx/demos/screens/screen.29
+lib/clisp/clx/new-clx/demos/screens/screen.3
+lib/clisp/clx/new-clx/demos/screens/screen.30
+lib/clisp/clx/new-clx/demos/screens/screen.31
+lib/clisp/clx/new-clx/demos/screens/screen.32
+lib/clisp/clx/new-clx/demos/screens/screen.33
+lib/clisp/clx/new-clx/demos/screens/screen.34
+lib/clisp/clx/new-clx/demos/screens/screen.35
+lib/clisp/clx/new-clx/demos/screens/screen.36
+lib/clisp/clx/new-clx/demos/screens/screen.37
+lib/clisp/clx/new-clx/demos/screens/screen.38
+lib/clisp/clx/new-clx/demos/screens/screen.39
+lib/clisp/clx/new-clx/demos/screens/screen.4
+lib/clisp/clx/new-clx/demos/screens/screen.40
+lib/clisp/clx/new-clx/demos/screens/screen.41
+lib/clisp/clx/new-clx/demos/screens/screen.42
+lib/clisp/clx/new-clx/demos/screens/screen.43
+lib/clisp/clx/new-clx/demos/screens/screen.44
+lib/clisp/clx/new-clx/demos/screens/screen.45
+lib/clisp/clx/new-clx/demos/screens/screen.46
+lib/clisp/clx/new-clx/demos/screens/screen.47
+lib/clisp/clx/new-clx/demos/screens/screen.48
+lib/clisp/clx/new-clx/demos/screens/screen.49
+lib/clisp/clx/new-clx/demos/screens/screen.5
+lib/clisp/clx/new-clx/demos/screens/screen.50
+lib/clisp/clx/new-clx/demos/screens/screen.6
+lib/clisp/clx/new-clx/demos/screens/screen.7
+lib/clisp/clx/new-clx/demos/screens/screen.8
+lib/clisp/clx/new-clx/demos/screens/screen.9
+lib/clisp/clx/new-clx/demos/sokoban.lisp
+lib/clisp/clx/new-clx/demos/xpms/centerwall.xpm
+lib/clisp/clx/new-clx/demos/xpms/east_twall.xpm
+lib/clisp/clx/new-clx/demos/xpms/eastwall.xpm
+lib/clisp/clx/new-clx/demos/xpms/floor.xpm
+lib/clisp/clx/new-clx/demos/xpms/goal.xpm
+lib/clisp/clx/new-clx/demos/xpms/horizwall.xpm
+lib/clisp/clx/new-clx/demos/xpms/llcorner.xpm
+lib/clisp/clx/new-clx/demos/xpms/lonewall.xpm
+lib/clisp/clx/new-clx/demos/xpms/lrcorner.xpm
+lib/clisp/clx/new-clx/demos/xpms/man.xpm
+lib/clisp/clx/new-clx/demos/xpms/man_down.xpm
+lib/clisp/clx/new-clx/demos/xpms/man_left.xpm
+lib/clisp/clx/new-clx/demos/xpms/man_right.xpm
+lib/clisp/clx/new-clx/demos/xpms/man_up.xpm
+lib/clisp/clx/new-clx/demos/xpms/north_twall.xpm
+lib/clisp/clx/new-clx/demos/xpms/northwall.xpm
+lib/clisp/clx/new-clx/demos/xpms/object.xpm
+lib/clisp/clx/new-clx/demos/xpms/save_man_down.xpm
+lib/clisp/clx/new-clx/demos/xpms/save_man_left.xpm
+lib/clisp/clx/new-clx/demos/xpms/save_man_right.xpm
+lib/clisp/clx/new-clx/demos/xpms/save_man_up.xpm
+lib/clisp/clx/new-clx/demos/xpms/saveman.xpm
+lib/clisp/clx/new-clx/demos/xpms/south_twall.xpm
+lib/clisp/clx/new-clx/demos/xpms/southwall.xpm
+lib/clisp/clx/new-clx/demos/xpms/treasure.xpm
+lib/clisp/clx/new-clx/demos/xpms/ulcorner.xpm
+lib/clisp/clx/new-clx/demos/xpms/urcorner.xpm
+lib/clisp/clx/new-clx/demos/xpms/vertiwall.xpm
+lib/clisp/clx/new-clx/demos/xpms/wall.xpm
+lib/clisp/clx/new-clx/demos/xpms/west_twall.xpm
+lib/clisp/clx/new-clx/demos/xpms/westwall.xpm
+lib/clisp/clx/new-clx/image.fas
+lib/clisp/clx/new-clx/image.lisp
+lib/clisp/clx/new-clx/link.sh
+lib/clisp/clx/new-clx/resource.fas
+lib/clisp/clx/new-clx/resource.lisp
+lib/clisp/dynmod/clx.lisp
+lib/clisp/dynmod/lib-clx.so
diff --git a/x11/clisp-new-clx/distinfo b/x11/clisp-new-clx/distinfo
new file mode 100644
index 00000000000..63647241fea
--- /dev/null
+++ b/x11/clisp-new-clx/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2011/04/20 18:36:17 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) = 1bbf4d2d63b941ee12c9a20938bda383883197c9
+SHA1 (patch-ab) = 59518b59a59e6ed1e0249074782a35927bf99e4f
diff --git a/x11/clisp-new-clx/patches/patch-aa b/x11/clisp-new-clx/patches/patch-aa
new file mode 100644
index 00000000000..595423072aa
--- /dev/null
+++ b/x11/clisp-new-clx/patches/patch-aa
@@ -0,0 +1,27 @@
+$NetBSD: patch-aa,v 1.1 2011/04/20 18:36:17 hans Exp $
+
+Override ac_install_sh.
+
+--- modules/clx/new-clx/configure.orig	2010-06-24 20:09:38.000000000 +0200
++++ modules/clx/new-clx/configure	2011-04-20 16:52:29.618213220 +0200
+@@ -2462,20 +2462,6 @@ $as_echo "$cl_cv_have_clisp" >&6; }
+ required=true
+ ${required} && test $cl_cv_have_clisp = no && as_fn_error "CLISP not found" "$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.
+ # They can cause serious problems if a builder's source tree is in a directory
diff --git a/x11/clisp-new-clx/patches/patch-ab b/x11/clisp-new-clx/patches/patch-ab
new file mode 100644
index 00000000000..a0ecf52771c
--- /dev/null
+++ b/x11/clisp-new-clx/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2011/04/20 18:36:17 hans Exp $
+
+--- modules/clx/new-clx/Makefile.in.orig	2010-03-24 20:44:56.000000000 +0100
++++ modules/clx/new-clx/Makefile.in	2011-04-20 16:54:04.545746107 +0200
+@@ -3,7 +3,7 @@
+ srcdir = @srcdir@
+ CC = @CC@
+ CPPFLAGS = @CPPFLAGS@
+-CFLAGS = -O
++CFLAGS = @CLISP_CFLAGS@
+ CLISP = @CLISP@ -norc -q
+ CLISP_LINKKIT = @CLISP_LINKKIT@
+ LN = @LN@