Update to 0.1.6a: pkgsrc fixes integrated upstream; another

post-0.1.6a patch from upstream for a pkgsrc bug report added.

7 files changed, 74 insertions, 115 deletions

diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile
index 32754bd925d..fc1dc1326d4 100644
--- a/devel/coccinelle/Makefile
+++ b/devel/coccinelle/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2009/03/22 17:51:36 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/06 10:11:05 wiz Exp $
 
-DISTNAME=	coccinelle-0.1.6
-PKGREVISION=	1
+DISTNAME=	coccinelle-0.1.6a
 CATEGORIES=	devel
 MASTER_SITES=	http://www.emn.fr/x-info/coccinelle/distrib/
 EXTRACT_SUFX=	.tgz
@@ -15,24 +14,30 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 HAS_CONFIGURE=	yes
 USE_TOOLS=	gmake perl
 REPLACE_PERL=	configure
-REPLACE_SH=	runspatch.opt scripts/spatch.sh
+BUILD_TARGET=	all all.opt
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIG_SHELL=	${PERL5}
 
+PYTHON_VERSIONS_ACCEPTED=	25
+
 SUBST_CLASSES+=		python
 SUBST_FILES.python+=	pycaml/Makefile
 SUBST_SED.python+=	-e "s, python , ${PYTHONBIN} ,g"
 SUBST_STAGE.python=	post-configure
 SUBST_MESSAGE.python=	Fixing python executable name.
 
+SUBST_CLASSES+=		man
+SUBST_FILES.man+=	docs/spatch.1
+SUBST_SED.man+=		-e "s,/usr/local,${PREFIX},g"
+SUBST_STAGE.man=	post-configure
+SUBST_MESSAGE.man=	Fixing path to examples in man page.
+
 TEST_TARGET=	test
 
-.include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 
-.if ${OPSYS} != "Linux"
-BUILDLINK_TRANSFORM+=	rm:-ldl
-.endif
+BUILDLINK_TRANSFORM+=   opt:-ldl:${BUILDLINK_LDADD.dl:M*}
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/devel/coccinelle/PLIST b/devel/coccinelle/PLIST
index 0af4067ed78..d72cfec3aaf 100644
--- a/devel/coccinelle/PLIST
+++ b/devel/coccinelle/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/03/21 23:50:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/04/06 10:11:05 wiz Exp $
 bin/spatch
+bin/spatch.opt
 lib/dllpycaml_stubs.so
 man/man1/spatch.1
-share/coccinelle/python/coccilib/Makefile
 share/coccinelle/python/coccilib/__init__.py
-share/coccinelle/python/coccilib/coccigui/Makefile
 share/coccinelle/python/coccilib/coccigui/__init__.py
 share/coccinelle/python/coccilib/coccigui/coccigui.py
 share/coccinelle/python/coccilib/coccigui/pycoccimodel.py
@@ -18,6 +17,7 @@ share/coccinelle/python/coccilib/elems.py
 share/coccinelle/python/coccilib/output.py
 share/coccinelle/python/coccilib/output_base.py
 share/coccinelle/python/coccilib/output_trac.py
+share/coccinelle/spatch
 share/coccinelle/spatch.opt
 share/coccinelle/standard.h
 share/coccinelle/standard.iso
diff --git a/devel/coccinelle/distinfo b/devel/coccinelle/distinfo
index 75a1cfa1f49..4a1450576a9 100644
--- a/devel/coccinelle/distinfo
+++ b/devel/coccinelle/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2009/03/22 17:51:36 wiz Exp $
+$NetBSD: distinfo,v 1.3 2009/04/06 10:11:05 wiz Exp $
 
-SHA1 (coccinelle-0.1.6.tgz) = f027dc3f14b7e9b9ad0c28d73e57c01dc7ac02a6
-RMD160 (coccinelle-0.1.6.tgz) = 2836e816aa16147d18051265563164b6de73a447
-Size (coccinelle-0.1.6.tgz) = 3308204 bytes
-SHA1 (patch-aa) = 4322764ba5a7572aafe9d5fdd8d8ce7e6bc43cc1
-SHA1 (patch-ab) = 9f66851118d443140ded2c2e84177b746c676b2b
-SHA1 (patch-ac) = bbf01eab3030f897c910add77c48f320795baf4a
+SHA1 (coccinelle-0.1.6a.tgz) = 31bcd77f8708da23604821392f87468f6c8325cc
+RMD160 (coccinelle-0.1.6a.tgz) = fa42b46da2c3c81b1d2023a2132c7bf1822a4a55
+Size (coccinelle-0.1.6a.tgz) = 2909054 bytes
+SHA1 (patch-ad) = c3e41db702596255c60357676b713429dfb0a1ea
diff --git a/devel/coccinelle/patches/patch-aa b/devel/coccinelle/patches/patch-aa
deleted file mode 100644
index 138b434cf3e..00000000000
--- a/devel/coccinelle/patches/patch-aa
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/03/21 23:50:53 wiz Exp $
-
---- Makefile.orig	2009-03-20 18:15:41.000000000 +0000
-+++ Makefile
-@@ -207,12 +207,19 @@ install-common:
- 	mkdir -p $(DESTDIR)$(LIBDIR)
- 	mkdir -p $(DESTDIR)$(SHAREDIR)
- 	mkdir -p $(DESTDIR)$(MANDIR)/man1
--	cp standard.h $(DESTDIR)$(SHAREDIR)
--	cp standard.iso $(DESTDIR)$(SHAREDIR)
--	cp docs/spatch.1 $(DESTDIR)$(MANDIR)/man1/
-+	${BSD_INSTALL_DATA} standard.h $(DESTDIR)$(SHAREDIR)
-+	${BSD_INSTALL_DATA} standard.iso $(DESTDIR)$(SHAREDIR)
-+	${BSD_INSTALL_DATA} docs/spatch.1 $(DESTDIR)$(MANDIR)/man1/
- 	mkdir -p $(DESTDIR)$(SHAREDIR)/python
--	cp -a python/coccilib $(DESTDIR)$(SHAREDIR)/python
--	cp -f dllpycaml_stubs.so $(DESTDIR)$(LIBDIR)
-+	mkdir -p $(DESTDIR)$(SHAREDIR)/python/coccilib
-+	${BSD_INSTALL_DATA} python/coccilib/Makefile \
-+		$(DESTDIR)$(SHAREDIR)/python/coccilib
-+	${BSD_INSTALL_DATA} python/coccilib/*.* \
-+		$(DESTDIR)$(SHAREDIR)/python/coccilib
-+	mkdir -p $(DESTDIR)$(SHAREDIR)/python/coccilib/coccigui
-+	${BSD_INSTALL_DATA} python/coccilib/coccigui/* \
-+		$(DESTDIR)$(SHAREDIR)/python/coccilib/coccigui
-+	${BSD_INSTALL_LIB} dllpycaml_stubs.so $(DESTDIR)$(LIBDIR)
- 	@echo ""
- 	@echo "You can also install spatch by copying the program spatch"
- 	@echo "(available in this directory) anywhere you want and"
-@@ -221,17 +228,18 @@ install-common:
- 
- # user will use spatch to run spatch.opt (native)
- install: all.opt install-common
--	cp spatch.opt $(DESTDIR)$(SHAREDIR)
--	cat scripts/spatch.sh | sed "s|SHAREDIR|$(DESTDIR)$(SHAREDIR)|g" > $(DESTDIR)$(BINDIR)/spatch
-+	${BSD_INSTALL_PROGRAM} spatch.opt $(DESTDIR)$(SHAREDIR)
-+	cat scripts/spatch.sh | sed "s|SHAREDIR|$(SHAREDIR)|g" > $(DESTDIR)$(BINDIR)/spatch
-+	chmod 555 $(DESTDIR)$(BINDIR)/spatch
- 
- # user will use spatch to run spatch (bytecode)
- install-byte: all install-common
--	cp spatch $(DESTDIR)$(SHAREDIR)
-+	${BSD_INSTALL_PROGRAM} spatch $(DESTDIR)$(SHAREDIR)
- 	cat scripts/spatch.sh | sed "s|\.opt||" | sed "s|SHAREDIR|$(DESTDIR)$(SHAREDIR)|g" > $(DESTDIR)$(BINDIR)/spatch
- 
- # user will use spatch.opt to run spatch.opt (native)
- install-opt: all.opt install-common
--	cp spatch.opt $(DESTDIR)$(SHAREDIR)
-+	${BSD_INSTALL_PROGRAM} spatch.opt $(DESTDIR)$(SHAREDIR)
- 	cat scripts/spatch.sh | sed "s|SHAREDIR|$(DESTDIR)$(SHAREDIR)|g" > $(DESTDIR)$(BINDIR)/spatch.opt
- 
- uninstall:
diff --git a/devel/coccinelle/patches/patch-ab b/devel/coccinelle/patches/patch-ab
deleted file mode 100644
index 909ab89b517..00000000000
--- a/devel/coccinelle/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/03/22 17:51:36 wiz Exp $
-
---- tools/alloc_free.ml.orig	2009-03-22 17:22:38.000000000 +0000
-+++ tools/alloc_free.ml
-@@ -167,7 +167,7 @@ let _ =
-   then
-     begin
-       let o = open_out (Printf.sprintf "%s/files" !dir) in
--      Printf.fprintf o "#!/bin/bash\n\n";
-+      Printf.fprintf o "#!/bin/sh\n\n";
-       sedify o !gen !dir l;
-       sedify_ors o !gen !dir l;
-       Printf.fprintf o "\nwait\n/bin/rm tmp*out\n";
diff --git a/devel/coccinelle/patches/patch-ac b/devel/coccinelle/patches/patch-ac
deleted file mode 100644
index 7aab484242d..00000000000
--- a/devel/coccinelle/patches/patch-ac
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/03/22 17:51:36 wiz Exp $
-
---- scripts/spatch.sh.orig	2009-03-19 10:42:38.000000000 +0000
-+++ scripts/spatch.sh
-@@ -1,20 +1,20 @@
--#!/bin/bash
-+#!/bin/sh
- 
- echo setting COCCINELLE_HOME=${COCCINELLE_HOME:=SHAREDIR}
- 
--if [ ! -r $COCCINELLE_HOME/standard.iso ] ; then
-+if [ ! -r "$COCCINELLE_HOME"/standard.iso ] ; then
-     echo "There is no standard.iso in SHAREDIR."
-     echo "Are you sure you run a properly installed version of spatch ?\n"
- else
- 
-  export COCCINELLE_HOME
-- export LD_LIBRARY_PATH=$COCCINELLE_HOME:$LD_LIBRARY_PATH
-- export PYTHONPATH=$COCCINELLE_HOME/python:$PYTHONPATH
-+ export LD_LIBRARY_PATH="$COCCINELLE_HOME:$LD_LIBRARY_PATH"
-+ export PYTHONPATH="$COCCINELLE_HOME/python:$PYTHONPATH"
-  
-- echo setting LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-- echo setting PYTHONPATH=$PYTHONPATH
-+ echo setting LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
-+ echo setting PYTHONPATH="$PYTHONPATH"
- 
- fi
- 
--$COCCINELLE_HOME/spatch.opt $*
-+"$COCCINELLE_HOME"/spatch.opt "$@"
- 
diff --git a/devel/coccinelle/patches/patch-ad b/devel/coccinelle/patches/patch-ad
new file mode 100644
index 00000000000..d1be725f39c
--- /dev/null
+++ b/devel/coccinelle/patches/patch-ad
@@ -0,0 +1,53 @@
+$NetBSD: patch-ad,v 1.1 2009/04/06 10:11:05 wiz Exp $
+
+--- Makefile.orig	2009-03-22 20:48:19.000000000 +0000
++++ Makefile
+@@ -38,7 +38,7 @@ ifeq ($(FEATURE_PYTHON),1)
+ PYCMA=pycaml/pycaml.cma
+ PYDIR=pycaml
+ PYLIB=dllpycaml_stubs.so
+-# the following is essential for Coccinelle to compile under gentoo (wierd)
++# the following is essential for Coccinelle to compile under gentoo (weird)
+ OPTLIBFLAGS=-cclib dllpycaml_stubs.so
+ else
+ PYCMA=
+@@ -224,22 +224,36 @@ install-python:
+ 		$(DESTDIR)$(SHAREDIR)/python/coccilib
+ 	$(INSTALL_DATA) python/coccilib/coccigui/*.py \
+ 		$(DESTDIR)$(SHAREDIR)/python/coccilib/coccigui
++	$(INSTALL_DATA) python/coccilib/coccigui/pygui.glade \
++		$(DESTDIR)$(SHAREDIR)/python/coccilib/coccigui
++	$(INSTALL_DATA) python/coccilib/coccigui/pygui.gladep \
++		$(DESTDIR)$(SHAREDIR)/python/coccilib/coccigui
+ 	$(INSTALL_LIB) dllpycaml_stubs.so $(DESTDIR)$(LIBDIR)
+ 
++install:
++	@if test -x spatch -a ! -x spatch.opt ; then \
++		$(MAKE) install-byte;fi
++	@if test ! -x spatch -a -x spatch.opt ; then \
++		$(MAKE) install-def; $(MAKE) install-opt;fi
++	@if test -x spatch -a -x spatch.opt ; then \
++		$(MAKE) install-byte; $(MAKE) install-opt;fi
++	@if test ! -x spatch -a ! -x spatch.opt ; then \
++		echo "\n\n\t==> Run 'make', 'make opt', or both first. <==\n\n";fi
++
+ # user will use spatch to run spatch.opt (native)
+-install: all.opt install-common
++install-def: install-common
+ 	$(INSTALL_PROGRAM) spatch.opt $(DESTDIR)$(SHAREDIR)
+ 	cat scripts/spatch.sh | sed "s|SHAREDIR|$(SHAREDIR)|g" > $(DESTDIR)$(BINDIR)/spatch
+ 	chmod 755 $(DESTDIR)$(BINDIR)/spatch
+ 
+ # user will use spatch to run spatch (bytecode)
+-install-byte: all install-common
++install-byte: install-common
+ 	$(INSTALL_PROGRAM) spatch $(DESTDIR)$(SHAREDIR)
+ 	cat scripts/spatch.sh | sed "s|\.opt||" | sed "s|SHAREDIR|$(SHAREDIR)|g" > $(DESTDIR)$(BINDIR)/spatch
+ 	chmod 755 $(DESTDIR)$(BINDIR)/spatch
+ 
+ # user will use spatch.opt to run spatch.opt (native)
+-install-opt: all.opt install-common
++install-opt: install-common
+ 	$(INSTALL_PROGRAM) spatch.opt $(DESTDIR)$(SHAREDIR)
+ 	cat scripts/spatch.sh | sed "s|SHAREDIR|$(SHAREDIR)|g" > $(DESTDIR)$(BINDIR)/spatch.opt
+ 	chmod 755 $(DESTDIR)$(BINDIR)/spatch.opt