cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to coccinelle 1.0.0-rc15

Browse Source
This commit is contained in:
sthen 2012-10-12 19:59:32 +00:00
parent 32dc0089f4
commit dec8980a0f
10 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
devel/coccinelle/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2012/07/18 08:04:43 sthen Exp $
# $OpenBSD: Makefile,v 1.16 2012/10/12 19:59:32 sthen Exp $
SHARED_ONLY = Yes
@ -6,7 +6,7 @@ COMMENT = program matching and transformation engine
# if updating, check for any additional use of diff/grep which
# may need to be switched to gdiff/ggrep
DISTNAME = coccinelle-1.0.0-rc11
DISTNAME = coccinelle-1.0.0-rc15
PKGNAME = ${DISTNAME:S/-rc/rc/}
EXTRACT_SUFX = .tgz
@ -14,15 +14,13 @@ CATEGORIES = devel
HOMEPAGE = http://coccinelle.lip6.fr/
MAINTAINER = Stuart Henderson <sthen@openbsd.org>
# GPLv2 only
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB += c m pthread util pcre ${MODPY_WANTLIB}
WANTLIB += c curses m pthread util pcre ${MODPY_WANTLIB}
MASTER_SITES = ${HOMEPAGE}distrib/
@ -39,34 +37,35 @@ RUN_DEPENDS = devel/ocaml-pcre \
# asks questions at the end if it does better than expected
REGRESS_IS_INTERACTIVE = Yes
USE_GMAKE = Yes
CONFIGURE_STYLE = simple
CONFIGURE_ENV = MAKE_PROGRAM=${MAKE_PROGRAM}
PYTHON_LIBS != pkg-config --static --libs python
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = MAKE_PROGRAM=${MAKE_PROGRAM} \
PYTHON_LIBS="${PYTHON_LIBS}"
CONFIGURE_ARGS = --with-python=${MODPY_BIN}
REGRESS_TARGET = test
SUBST_VARS += MAKE_PROGRAM
USE_GMAKE = Yes
# can't use MODOCAML_NATIVE here because we need not
# just native code, but also dynlink
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
# "world"=build both bytecode and native binaries
# "all.opt"=only build native binaries (but regression
# tests didn't work with this)
ALL_TARGET = world
INSTALL_TARGET = install-common install-def install-man
PKG_ARGS += -DOCAMLOPT=.opt
REGRESS_TARGET = test
.include <bsd.port.arch.mk>
.if ${PROPERTIES:Mocaml_native_dynlink}
# word builds both: opt AND byte
ALL_TARGET = world
.else
WANTLIB += curses
PKG_ARGS += -DOCAMLOPT=
# all-release builds either opt OR byte
ALL_TARGET = all-release
.endif
pre-configure:
${SUBST_CMD} ${WRKSRC}/pycaml/Makefile
perl -pi -e s,/usr/local,${TRUEPREFIX},g ${WRKSRC}/scripts/spatch*
post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
${PREFIX}/share/coccinelle/python/coccilib
mv \
${PREFIX}/share/coccinelle/dllpycaml_stubs.so \
${PREFIX}/lib/ocaml/stublibs/
.include <bsd.port.mk>

7
devel/coccinelle/distinfo
View File

@ -1,5 +1,2 @@
MD5 (coccinelle-1.0.0-rc11.tgz) = Yx/XH+BnMQ3XYAuGMyKryA==
RMD160 (coccinelle-1.0.0-rc11.tgz) = 6si/XpLdWyBHNv+mWiEfA8jokuU=
SHA1 (coccinelle-1.0.0-rc11.tgz) = pI37mtEHadqWdsnThwQ5eghm/0I=
SHA256 (coccinelle-1.0.0-rc11.tgz) = J10L7uWhZe1u39TacLmPn4AubeXVnrwHUEH/jBJtA98=
SIZE (coccinelle-1.0.0-rc11.tgz) = 2356524
SHA256 (coccinelle-1.0.0-rc15.tgz) = B/q04XUSkluViJC7E8CAl5cHTy5EoRB7AHS9zBVrlZY=
SIZE (coccinelle-1.0.0-rc15.tgz) = 3328556

38
devel/coccinelle/patches/patch-Makefile
View File

@ -1,12 +1,36 @@
$OpenBSD: patch-Makefile,v 1.5 2012/07/18 08:04:43 sthen Exp $
--- Makefile.orig Sun Mar 11 22:52:49 2012
+++ Makefile Wed Mar 14 23:37:53 2012
@@ -355,7 +355,7 @@ install-man:
mkdir -p $(DESTDIR)$(MANDIR)/man1
mkdir -p $(DESTDIR)$(MANDIR)/man3
$OpenBSD: patch-Makefile,v 1.6 2012/10/12 19:59:32 sthen Exp $
--- Makefile.orig Mon Jul 16 17:22:27 2012
+++ Makefile Sun Aug 5 10:53:42 2012
@@ -278,9 +278,9 @@ purebytecode:
# copies the stubs libraries (if any) to the root directory
copy-stubs:
@if test -f ./bundles/pycaml/dllpycaml_stubs.so; then \
- cp -fv ./bundles/pycaml/dllpycaml_stubs.so .; fi
+ cp -f ./bundles/pycaml/dllpycaml_stubs.so .; fi
@if test -f ./bundles/pcre/dllpcre_stubs.so; then \
- cp -fv ./bundles/pcre/dllpcre_stubs.so .; fi
+ cp -f ./bundles/pcre/dllpcre_stubs.so .; fi
##############################################################################
# Build version information
@@ -361,7 +361,7 @@ install-man:
$(MKDIR_P) $(DESTDIR)$(MANDIR)/man1
$(MKDIR_P) $(DESTDIR)$(MANDIR)/man3
$(INSTALL_DATA) docs/spatch.1 $(DESTDIR)$(MANDIR)/man1/
- $(INSTALL_DATA) docs/Coccilib.3cocci $(DESTDIR)$(MANDIR)/man3/
+ $(INSTALL_DATA) docs/Coccilib.3cocci $(DESTDIR)$(MANDIR)/man3/Coccilib.3
install-bash:
mkdir -p $(DESTDIR)$(BASH_COMPLETION_DIR)
@echo "Installing bash completion in: ${DESTDIR}${BASH_COMPLETION_DIR}"
@@ -392,9 +392,9 @@ install-python:
install-stubs:
$(MKDIR_P) $(DESTDIR)$(SHAREDIR)
@if test -f ./bundles/pycaml/dllpycaml_stubs.so; then \
- cp -fv ./bundles/pycaml/dllpycaml_stubs.so $(DESTDIR)$(SHAREDIR); fi
+ cp -f ./bundles/pycaml/dllpycaml_stubs.so $(DESTDIR)$(SHAREDIR); fi
@if test -f ./bundles/pcre/dllpcre_stubs.so; then \
- cp -fv ./bundles/pcre/dllpcre_stubs.so $(DESTDIR)$(SHAREDIR); fi
+ cp -f ./bundles/pcre/dllpcre_stubs.so $(DESTDIR)$(SHAREDIR); fi
install: install-man install-common install-stubs $(PYTHON_INSTALL_TARGET)
rm -f $(DESTDIR)$(SHAREDIR)/spatch

12
devel/coccinelle/patches/patch-cocci_ml
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cocci_ml,v 1.4 2012/07/18 08:04:43 sthen Exp $
--- cocci.ml.orig Sun Mar 11 22:52:49 2012
+++ cocci.ml Wed Mar 14 23:37:53 2012
@@ -268,8 +268,8 @@ let show_or_not_diff2 cfile outfile =
$OpenBSD: patch-cocci_ml,v 1.5 2012/10/12 19:59:32 sthen Exp $
--- cocci.ml.orig Mon Jul 16 17:22:27 2012
+++ cocci.ml Sun Aug 5 09:31:54 2012
@@ -269,8 +269,8 @@ let show_or_not_diff2 cfile outfile =
let line =
match !Flag_parsing_c.diff_lines with
@ -12,7 +12,7 @@ $OpenBSD: patch-cocci_ml,v 1.4 2012/07/18 08:04:43 sthen Exp $
let res = Common.cmd_to_list line in
let res =
List.map
@@ -528,7 +528,7 @@ let worth_trying cfiles tokens =
@@ -529,7 +529,7 @@ let worth_trying cfiles tokens =
| _ -> s
) in
@ -21,7 +21,7 @@ $OpenBSD: patch-cocci_ml,v 1.4 2012/07/18 08:04:43 sthen Exp $
in
(match Sys.command com with
| 0 (* success *) -> true
@@ -2048,7 +2048,7 @@ let check_duplicate_modif2 xs =
@@ -2049,7 +2049,7 @@ let check_duplicate_modif2 xs =
match res2 with
| None -> false
| Some res2 ->

10
devel/coccinelle/patches/patch-commons_common_ml
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-commons_common_ml,v 1.2 2012/07/18 08:04:43 sthen Exp $
--- commons/common.ml.orig Sun Mar 11 22:00:27 2012
+++ commons/common.ml Wed Mar 14 23:37:53 2012
@@ -5352,7 +5352,7 @@ let (diff: (int -> int -> diff -> unit)-> (string list
$OpenBSD: patch-commons_common_ml,v 1.3 2012/10/12 19:59:32 sthen Exp $
--- commons/common.ml.orig Mon Jul 16 16:29:26 2012
+++ commons/common.ml Sun Aug 5 09:31:54 2012
@@ -5357,7 +5357,7 @@ let (diff: (int -> int -> diff -> unit)-> (string list
write_file file1 (unwords xs);
write_file file2 (unwords ys);
command2
@ -10,7 +10,7 @@ $OpenBSD: patch-commons_common_ml,v 1.2 2012/07/18 08:04:43 sthen Exp $
let res = cat fileresult in
let a = ref 0 in
let b = ref 0 in
@@ -5380,7 +5380,7 @@ let (diff2: (int -> int -> diff -> unit) -> (string *
@@ -5385,7 +5385,7 @@ let (diff2: (int -> int -> diff -> unit) -> (string *
write_file "/tmp/diff1" xstr;
write_file "/tmp/diff2" ystr;
command2

12
devel/coccinelle/patches/patch-configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.4 2012/07/18 08:04:43 sthen Exp $
--- configure.orig Sun Mar 11 22:00:27 2012
+++ configure Wed Mar 14 23:37:53 2012
@@ -236,7 +236,7 @@ if ($opt eq ".opt") {
pr2 "";
$error += check_config(
- "make -v 2>&1 |grep Make|",
+ "${MAKE_PROGRAM} -v 2>&1 |grep Make|",
"GNU Make [^0-9]*3\.[0-9]+.*", #version 3.79.1, 3.81
"make (gnu version) is present.",
"The program gnu make is missing or is not a good version.

16
devel/coccinelle/patches/patch-pycaml_Makefile
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-pycaml_Makefile,v 1.1.1.1 2011/05/14 15:02:50 sthen Exp $
--- pycaml/Makefile.orig Sat Jan 29 14:43:21 2011
+++ pycaml/Makefile Thu May 5 22:23:52 2011
@@ -1,9 +1,9 @@
#pad: was called Makefile.deb-pycaml before
OCAMLMAKEFILE = OCamlMakefile
-PY_PREFIX = $(shell python getprefix.py)
-PY_VERSION = $(shell python getversion.py)
-CLIBS = python$(PY_VERSION) pthread dl util m c
+PY_PREFIX = $(shell ${MODPY_BIN} getprefix.py)
+PY_VERSION = $(shell ${MODPY_BIN} getversion.py)
+CLIBS = python$(PY_VERSION) pthread util m c
SOURCES = pycaml.ml pycaml_ml.c
RESULT = pycaml

3
devel/coccinelle/pkg/PFRAG.native Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PFRAG.native,v 1.1 2012/10/12 19:59:33 sthen Exp $
bin/spatch.opt
@bin share/coccinelle/spatch.opt

2
devel/coccinelle/pkg/PFRAG.shared Normal file
View File

@ -0,0 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2012/10/12 19:59:33 sthen Exp $
lib/ocaml/stublibs/dllpycaml_stubs.so

13
devel/coccinelle/pkg/PLIST
View File

@ -1,10 +1,15 @@
@comment $OpenBSD: PLIST,v 1.6 2011/09/08 20:09:00 sthen Exp $
@comment $OpenBSD: PLIST,v 1.7 2012/10/12 19:59:33 sthen Exp $
bin/spatch
lib/dllpycaml_stubs.so
bin/spatch.byte
%%native%%
%%SHARED%%
lib/ocaml/
lib/ocaml/stublibs/
@man man/man1/spatch.1
@man man/man3/Coccilib.3
share/coccinelle/
share/coccinelle/commons/
share/coccinelle/commons/commands.cmi
share/coccinelle/commons/common.cmi
share/coccinelle/commons/common_extra.cmi
share/coccinelle/commons/glimpse.cmi
@ -13,7 +18,6 @@ share/coccinelle/commons/oarray.cmi
share/coccinelle/commons/oassoc.cmi
share/coccinelle/commons/objet.cmi
share/coccinelle/commons/ocollection.cmi
share/coccinelle/commons/ofullcommon.cmi
share/coccinelle/commons/ograph.cmi
share/coccinelle/commons/ograph_extended.cmi
share/coccinelle/commons/ograph_simple.cmi
@ -21,7 +25,6 @@ share/coccinelle/commons/osequence.cmi
share/coccinelle/commons/oset.cmi
share/coccinelle/commons/parser_combinators.cmi
share/coccinelle/commons/seti.cmi
share/coccinelle/commons/sexp_common.cmi
share/coccinelle/globals/
share/coccinelle/globals/iteration.cmi
share/coccinelle/ocaml/
@ -88,6 +91,6 @@ share/coccinelle/python/coccilib/report.py
share/coccinelle/python/coccilib/report.pyc
share/coccinelle/python/coccilib/trac.py
share/coccinelle/python/coccilib/trac.pyc
@bin share/coccinelle/spatch${OCAMLOPT}
@bin share/coccinelle/spatch
share/coccinelle/standard.h
share/coccinelle/standard.iso