UPDATE: CIL 1.5.0
On Thu, Mar 29, 2012 at 08:55:14PM +0300, Lazaros Koromilas wrote:
Hello,
I've been using CIL 1.4.0 for a while and thought I'd also
update the port.
* Needs findlib now
* Perl module magic is partially handled in Makefile.in patch
* ARCHOS is used the same way in configure
Tested on i386 and macppc.
New version is out. For a list of changes and fixes check:
http://sourceforge.net/mailarchive/message.php?msg_id=29403134
Comments?
Thanx!
Lazaros.
Index: Makefile
===
RCS file: /cvs/ports/devel/cil/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile7 Dec 2010 14:57:19 - 1.20
+++ Makefile19 Jun 2012 12:23:01 -
@@ -5,11 +5,10 @@ ONLY_FOR_ARCHS= i386 amd64 powerpc
COMMENT= framework for analysis and transformation of C
-DISTNAME= cil-1.3.6
-REVISION= 3
+DISTNAME= cil-1.5.0
CATEGORIES=devel lang
-HOMEPAGE= http://www.eecs.berkeley.edu/~necula/cil/
-MASTER_SITES= ${HOMEPAGE}/distrib/
+HOMEPAGE= http://cil.sourceforge.net/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cil/}
# BSD license
PERMIT_PACKAGE_CDROM= Yes
@@ -19,12 +18,13 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= c curses m pthread
MODULES= lang/ocaml
-WRKDIST= ${WRKDIR}/cil
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= sysutils/findlib
OURFILES= nullint kerneltrace randomvars
CONFIGURE_STYLE= autoconf no-autoheader
-AUTOCONF_VERSION= 2.61
+AUTOCONF_VERSION= 2.68
USE_GMAKE= yes
ALL_TARGET= setup
CONFIGURE_ARGS= EXTRAFEATURES=${OURFILES}
@@ -33,32 +33,23 @@ P5INST= ${PREFIX}/${P5SITE}
SUBST_VARS+= P5SITE
GCC=/usr/bin/gcc # cant use CC in case it's set to cilly
+FAKE_ENV= OCAMLFIND_DESTDIR=${PREFIX}/lib/ocaml/site-lib/cil
+
post-extract:
.for i in ${OURFILES}
@cp ${FILESDIR}/$i.ml ${WRKSRC}/src/ext
.endfor
pre-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/libexec/cil
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml/site-lib/cil
${INSTALL_DATA_DIR} ${P5INST}/CIL
post-install:
sed -e 's,@CILHOME@,${LOCALBASE},g' \
--e 's,@CILLIBDIR@,${LOCALBASE}/${P5SITE}/CIL,g' \
--e 's,@ARCHOS@,libexec/cil,g' \
- -e 's,@DEFAULT_CIL_MODE@,GNUCC,g' \
--e 's,@CC@,${GCC},g' \
+ -e 's,@CILLIBDIR@,${LOCALBASE}/${P5SITE}/CIL,g' \
+ -e 's,@ARCHOS@,libexec/cil,g' \
+ -e 's,@DEFAULT_CIL_MODE@,GNUCC,g' \
+ -e 's,@CC@,${GCC},g' \
${WRKSRC}/bin/CilConfig.pm.in ${P5INST}/CilConfig.pm
-
- ${INSTALL_SCRIPT} ${WRKBUILD}/bin/cilly ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKBUILD}/bin/patcher ${PREFIX}/bin
-
-.for i in Cilly KeptFile OutputFile TempFile
- ${INSTALL_DATA} ${WRKSRC}/lib/${i}.pm ${P5INST}/CIL
-.endfor
-
-.for i in machdep.exe cilly.byte.exe cilly.asm.exe
- ${INSTALL_PROGRAM} ${WRKBUILD}/obj/x86_LINUX/${i} ${PREFIX}/libexec/cil
-.endfor
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/devel/cil/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo11 Mar 2009 21:20:27 - 1.7
+++ distinfo19 Jun 2012 12:23:01 -
@@ -1,5 +1,5 @@
-MD5 (cil-1.3.6.tar.gz) = ES37q90OEoCADWK6REmrRQ==
-RMD160 (cil-1.3.6.tar.gz) = 5Q9Kt6rGI6rbWcHlHhKAIm4uteA=
-SHA1 (cil-1.3.6.tar.gz) = tXsI+tJrVKheY8D7be14WDdpOeI=
-SHA256 (cil-1.3.6.tar.gz) = Ocx0Y5hVG0g7PStNkNW9Wq0yb5RrdPzdZ9VDT3x/hU8=
-SIZE (cil-1.3.6.tar.gz) = 1368573
+MD5 (cil-1.5.0.tar.gz) = VWT1iX0coTM4WVXC9ouuIw==
+RMD160 (cil-1.5.0.tar.gz) = HKi3xRkiwuxE/ltXSelSFDggpgg=
+SHA1 (cil-1.5.0.tar.gz) = pxycawF0fGWcQ7VBDKTVlnH+buU=
+SHA256 (cil-1.5.0.tar.gz) = 4NpQvRv+1I8ZelpppYB4NA5rGx9U+aGTe2AlMtuF678=
+SIZE (cil-1.5.0.tar.gz) = 1792051
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/devel/cil/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 7 Dec 2010 14:57:19 - 1.2
+++ patches/patch-Makefile_in 19 Jun 2012 12:23:01 -
@@ -1,24 +1,27 @@
$OpenBSD: patch-Makefile_in,v 1.2 2010/12/07 14:57:19 dcoppa Exp $
Makefile.in.orig Mon Feb 5 22:10:29 2007
-+++ Makefile.inWed Nov 10 17:15:22 2010
-@@ -115,7 +115,7 @@ $(OBJDIR)/cilly$(EXE) : $(CILLY_MODULES:%=$(OBJDIR)/%.
- @$(NARRATIVE) Linking $(COMPILETOWHAT) $@ $(LINKMSG)
- $(AT)$(CAMLLINK) -verbose -o $@ \
- $(CILLY_LIBS:%=%.$(CMXA)) \
--$(CILLY_LIBS:%=-cclib -l%) \
-+$(unix camlstr -l%) \
- $^
+--- Makefile.in.orig Thu Jun 14 14:19:27 2012
Makefile.inTue Jun 19 15:09:03 2012
+@@ -407,17 +407,17 @@
+ pkglibexecdir = $(libexecdir)/cil
+ bindir = @bindir@
+ # Hack - I don't know how to find perl_vendorlib
+-perl_vendorlib = $(libdir)
Re: Update: CIL
On Thu, Mar 29, 2012 at 08:55:14PM +0300, Lazaros Koromilas wrote:
Hello,
I've been using CIL 1.4.0 for a while and thought I'd also
update the port.
* Needs findlib now
* Perl module magic is partially handled in Makefile.in patch
* ARCHOS is used the same way in configure
Tested on i386 and macppc.
Without REVISION this time.
Index: Makefile
===
RCS file: /cvs/ports/devel/cil/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile7 Dec 2010 14:57:19 - 1.20
+++ Makefile30 Mar 2012 08:31:22 -
@@ -5,11 +5,10 @@ ONLY_FOR_ARCHS= i386 amd64 powerpc
COMMENT= framework for analysis and transformation of C
-DISTNAME= cil-1.3.6
-REVISION= 3
+DISTNAME= cil-1.4.0
CATEGORIES=devel lang
-HOMEPAGE= http://www.eecs.berkeley.edu/~necula/cil/
-MASTER_SITES= ${HOMEPAGE}/distrib/
+HOMEPAGE= http://cil.sourceforge.net/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cil/}
# BSD license
PERMIT_PACKAGE_CDROM= Yes
@@ -19,12 +18,13 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= c curses m pthread
MODULES= lang/ocaml
-WRKDIST= ${WRKDIR}/cil
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= sysutils/findlib
OURFILES= nullint kerneltrace randomvars
CONFIGURE_STYLE= autoconf no-autoheader
-AUTOCONF_VERSION= 2.61
+AUTOCONF_VERSION= 2.68
USE_GMAKE= yes
ALL_TARGET= setup
CONFIGURE_ARGS= EXTRAFEATURES=${OURFILES}
@@ -33,32 +33,23 @@ P5INST= ${PREFIX}/${P5SITE}
SUBST_VARS+= P5SITE
GCC=/usr/bin/gcc # cant use CC in case it's set to cilly
+FAKE_ENV= OCAMLFIND_DESTDIR=${PREFIX}/lib/ocaml/site-lib/cil
+
post-extract:
.for i in ${OURFILES}
@cp ${FILESDIR}/$i.ml ${WRKSRC}/src/ext
.endfor
pre-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/libexec/cil
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml/site-lib/cil
${INSTALL_DATA_DIR} ${P5INST}/CIL
post-install:
sed -e 's,@CILHOME@,${LOCALBASE},g' \
--e 's,@CILLIBDIR@,${LOCALBASE}/${P5SITE}/CIL,g' \
--e 's,@ARCHOS@,libexec/cil,g' \
- -e 's,@DEFAULT_CIL_MODE@,GNUCC,g' \
--e 's,@CC@,${GCC},g' \
+ -e 's,@CILLIBDIR@,${LOCALBASE}/${P5SITE}/CIL,g' \
+ -e 's,@ARCHOS@,libexec/cil,g' \
+ -e 's,@DEFAULT_CIL_MODE@,GNUCC,g' \
+ -e 's,@CC@,${GCC},g' \
${WRKSRC}/bin/CilConfig.pm.in ${P5INST}/CilConfig.pm
-
- ${INSTALL_SCRIPT} ${WRKBUILD}/bin/cilly ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKBUILD}/bin/patcher ${PREFIX}/bin
-
-.for i in Cilly KeptFile OutputFile TempFile
- ${INSTALL_DATA} ${WRKSRC}/lib/${i}.pm ${P5INST}/CIL
-.endfor
-
-.for i in machdep.exe cilly.byte.exe cilly.asm.exe
- ${INSTALL_PROGRAM} ${WRKBUILD}/obj/x86_LINUX/${i} ${PREFIX}/libexec/cil
-.endfor
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/devel/cil/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo11 Mar 2009 21:20:27 - 1.7
+++ distinfo30 Mar 2012 08:31:22 -
@@ -1,5 +1,5 @@
-MD5 (cil-1.3.6.tar.gz) = ES37q90OEoCADWK6REmrRQ==
-RMD160 (cil-1.3.6.tar.gz) = 5Q9Kt6rGI6rbWcHlHhKAIm4uteA=
-SHA1 (cil-1.3.6.tar.gz) = tXsI+tJrVKheY8D7be14WDdpOeI=
-SHA256 (cil-1.3.6.tar.gz) = Ocx0Y5hVG0g7PStNkNW9Wq0yb5RrdPzdZ9VDT3x/hU8=
-SIZE (cil-1.3.6.tar.gz) = 1368573
+MD5 (cil-1.4.0.tar.gz) = phsyn2bnZGFjraVgRlRa9Q==
+RMD160 (cil-1.4.0.tar.gz) = LghUdKC4ScHGrQuw0vBcg/bu7sE=
+SHA1 (cil-1.4.0.tar.gz) = c8S/OKDf5oim1LV+HPvLZmGIYZw=
+SHA256 (cil-1.4.0.tar.gz) = yFJPBcoECaO8GkmP1P0JHUI/nBw3j6mew52VJZp71Jo=
+SIZE (cil-1.4.0.tar.gz) = 1790014
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/devel/cil/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 7 Dec 2010 14:57:19 - 1.2
+++ patches/patch-Makefile_in 30 Mar 2012 08:31:22 -
@@ -1,24 +1,39 @@
$OpenBSD: patch-Makefile_in,v 1.2 2010/12/07 14:57:19 dcoppa Exp $
Makefile.in.orig Mon Feb 5 22:10:29 2007
-+++ Makefile.inWed Nov 10 17:15:22 2010
-@@ -115,7 +115,7 @@ $(OBJDIR)/cilly$(EXE) : $(CILLY_MODULES:%=$(OBJDIR)/%.
- @$(NARRATIVE) Linking $(COMPILETOWHAT) $@ $(LINKMSG)
- $(AT)$(CAMLLINK) -verbose -o $@ \
- $(CILLY_LIBS:%=%.$(CMXA)) \
--$(CILLY_LIBS:%=-cclib -l%) \
-+$(unix camlstr -l%) \
- $^
+--- Makefile.in.orig Fri Nov 4 20:20:53 2011
Makefile.inThu Mar 29 18:42:05 2012
+@@ -215,10 +215,10 @@
+ lib/Cilly.pm: lib/Cilly.pm.in src/machdep-ml.c configure.in Makefile.in
+ cp lib/Cilly.pm.in lib/Cilly.pm
+ if $(MACHDEPCC) -m32 src/machdep-ml.c -o $(OBJDIR)/machdep-ml32.exe
;then \
+-sed -i -e s|nogcc32model|`$(EMUL)
Update: CIL
Hello,
I've been using CIL 1.4.0 for a while and thought I'd also
update the port.
* Needs findlib now
* Perl module magic is partially handled in Makefile.in patch
* ARCHOS is used the same way in configure
Tested on i386 and macppc.
Thanx!
Lazaros.
Index: Makefile
===
RCS file: /cvs/ports/devel/cil/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile7 Dec 2010 14:57:19 - 1.20
+++ Makefile29 Mar 2012 17:11:06 -
@@ -5,11 +5,11 @@ ONLY_FOR_ARCHS= i386 amd64 powerpc
COMMENT= framework for analysis and transformation of C
-DISTNAME= cil-1.3.6
-REVISION= 3
+DISTNAME= cil-1.4.0
+REVISION= 0
CATEGORIES=devel lang
-HOMEPAGE= http://www.eecs.berkeley.edu/~necula/cil/
-MASTER_SITES= ${HOMEPAGE}/distrib/
+HOMEPAGE= http://cil.sourceforge.net/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cil/}
# BSD license
PERMIT_PACKAGE_CDROM= Yes
@@ -19,12 +19,13 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= c curses m pthread
MODULES= lang/ocaml
-WRKDIST= ${WRKDIR}/cil
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= sysutils/findlib
OURFILES= nullint kerneltrace randomvars
CONFIGURE_STYLE= autoconf no-autoheader
-AUTOCONF_VERSION= 2.61
+AUTOCONF_VERSION= 2.68
USE_GMAKE= yes
ALL_TARGET= setup
CONFIGURE_ARGS= EXTRAFEATURES=${OURFILES}
@@ -33,32 +34,23 @@ P5INST= ${PREFIX}/${P5SITE}
SUBST_VARS+= P5SITE
GCC=/usr/bin/gcc # cant use CC in case it's set to cilly
+FAKE_ENV= OCAMLFIND_DESTDIR=${PREFIX}/lib/ocaml/site-lib/cil
+
post-extract:
.for i in ${OURFILES}
@cp ${FILESDIR}/$i.ml ${WRKSRC}/src/ext
.endfor
pre-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/libexec/cil
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml/site-lib/cil
${INSTALL_DATA_DIR} ${P5INST}/CIL
post-install:
sed -e 's,@CILHOME@,${LOCALBASE},g' \
--e 's,@CILLIBDIR@,${LOCALBASE}/${P5SITE}/CIL,g' \
--e 's,@ARCHOS@,libexec/cil,g' \
- -e 's,@DEFAULT_CIL_MODE@,GNUCC,g' \
--e 's,@CC@,${GCC},g' \
+ -e 's,@CILLIBDIR@,${LOCALBASE}/${P5SITE}/CIL,g' \
+ -e 's,@ARCHOS@,libexec/cil,g' \
+ -e 's,@DEFAULT_CIL_MODE@,GNUCC,g' \
+ -e 's,@CC@,${GCC},g' \
${WRKSRC}/bin/CilConfig.pm.in ${P5INST}/CilConfig.pm
-
- ${INSTALL_SCRIPT} ${WRKBUILD}/bin/cilly ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKBUILD}/bin/patcher ${PREFIX}/bin
-
-.for i in Cilly KeptFile OutputFile TempFile
- ${INSTALL_DATA} ${WRKSRC}/lib/${i}.pm ${P5INST}/CIL
-.endfor
-
-.for i in machdep.exe cilly.byte.exe cilly.asm.exe
- ${INSTALL_PROGRAM} ${WRKBUILD}/obj/x86_LINUX/${i} ${PREFIX}/libexec/cil
-.endfor
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/devel/cil/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo11 Mar 2009 21:20:27 - 1.7
+++ distinfo29 Mar 2012 17:11:06 -
@@ -1,5 +1,5 @@
-MD5 (cil-1.3.6.tar.gz) = ES37q90OEoCADWK6REmrRQ==
-RMD160 (cil-1.3.6.tar.gz) = 5Q9Kt6rGI6rbWcHlHhKAIm4uteA=
-SHA1 (cil-1.3.6.tar.gz) = tXsI+tJrVKheY8D7be14WDdpOeI=
-SHA256 (cil-1.3.6.tar.gz) = Ocx0Y5hVG0g7PStNkNW9Wq0yb5RrdPzdZ9VDT3x/hU8=
-SIZE (cil-1.3.6.tar.gz) = 1368573
+MD5 (cil-1.4.0.tar.gz) = phsyn2bnZGFjraVgRlRa9Q==
+RMD160 (cil-1.4.0.tar.gz) = LghUdKC4ScHGrQuw0vBcg/bu7sE=
+SHA1 (cil-1.4.0.tar.gz) = c8S/OKDf5oim1LV+HPvLZmGIYZw=
+SHA256 (cil-1.4.0.tar.gz) = yFJPBcoECaO8GkmP1P0JHUI/nBw3j6mew52VJZp71Jo=
+SIZE (cil-1.4.0.tar.gz) = 1790014
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/devel/cil/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 7 Dec 2010 14:57:19 - 1.2
+++ patches/patch-Makefile_in 29 Mar 2012 17:11:06 -
@@ -1,24 +1,39 @@
$OpenBSD: patch-Makefile_in,v 1.2 2010/12/07 14:57:19 dcoppa Exp $
Makefile.in.orig Mon Feb 5 22:10:29 2007
-+++ Makefile.inWed Nov 10 17:15:22 2010
-@@ -115,7 +115,7 @@ $(OBJDIR)/cilly$(EXE) : $(CILLY_MODULES:%=$(OBJDIR)/%.
- @$(NARRATIVE) Linking $(COMPILETOWHAT) $@ $(LINKMSG)
- $(AT)$(CAMLLINK) -verbose -o $@ \
- $(CILLY_LIBS:%=%.$(CMXA)) \
--$(CILLY_LIBS:%=-cclib -l%) \
-+$(unix camlstr -l%) \
- $^
+--- Makefile.in.orig Fri Nov 4 20:20:53 2011
Makefile.inThu Mar 29 18:42:05 2012
+@@ -215,10 +215,10 @@
+ lib/Cilly.pm: lib/Cilly.pm.in src/machdep-ml.c configure.in Makefile.in
+ cp lib/Cilly.pm.in lib/Cilly.pm
+ if $(MACHDEPCC) -m32 src/machdep-ml.c -o $(OBJDIR)/machdep-ml32.exe
;then \
+-sed -i -e s|nogcc32model|`$(EMUL) $(OBJDIR)/machdep-ml32.exe
--env`| lib/Cilly.pm; \
++perl -pi -e
Re: Update: CIL
New version doesn't need REVISION line El 03/29/12 14:55, Lazaros Koromilas escribió: +REVISION=0 -- Sending from my Computer.
