diff -urN /usr/ports/devel/cil/Makefile devel/cil/Makefile --- /usr/ports/devel/cil/Makefile 2011-11-14 23:23:35.000000000 +0900 +++ devel/cil/Makefile 2012-06-17 15:38:16.000000000 +0900 @@ -6,48 +6,81 @@ # PORTNAME= cil -PORTVERSION= 1.4.0 +PORTVERSION= 1.5.0 CATEGORIES= devel lang -MASTER_SITES= SF/${PORTNAME}/${PORTNAME} \ - http://hal.cs.berkeley.edu/cil/distrib/ +MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Infrastructure for C Program Analysis and Transformation +LICENSE= BSD +LICENSE_FILE= ${WRKSRC}/LICENSE + BUILD_DEPENDS= ${LOCALBASE}/bin/ocamlopt:${PORTSDIR}/lang/ocaml +OPTIONS_DEFINE= DOCS + CONFLICTS= ccured-[0-9]* -ONLY_FOR_ARCHS= i386 amd64 USE_PERL5= yes USE_GMAKE= yes GNU_CONFIGURE= yes +MAKE_JOBS_UNSAFE=yes + +PORTDOCS= * +PLIST_FILES= ${BINFILES:S,^,bin/,} ${LEXECFILES:S,^,libexec/cil/,} \ + %%SITE_PERL%%/CilConfig.pm ${LIBFILES:S,^,%%SITE_PERL%%/CIL/,} +PLIST_DIRS= %%SITE_PERL%%/CIL libexec/cil BINFILES= cilly patcher teetwo LIBFILES= Cilly.pm KeptFile.pm OutputFile.pm TempFile.pm +LEXECFILES= cilly.asm.exe cilly.byte.exe + +.include + +.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" +BROKEN= Does not compile on ia64, powerpc, or sparc64 +.endif post-patch: - @${REINPLACE_CMD} -e 's:@CILHOME@/lib:${SITE_PERL}/CIL:g; s:\@CILHOME\@:${PREFIX}:g' ${WRKSRC}/bin/CilConfig.pm.in - @${REINPLACE_CMD} -e 's|$$::cilhome|${PREFIX}|g; s|obj/$$::archos|libexec/cil|g' ${WRKSRC}/bin/cilly - @${REINPLACE_CMD} -e 's|^use Cilly;|use CIL::Cilly|' ${WRKSRC}/bin/cilly - @${REINPLACE_CMD} -e 's|^use KeptFile;|use CIL::KeptFile;|; s|^use OutputFile;|use CIL::OutputFile;|; s|^use TempFile;|use CIL::TempFile;|' ${WRKSRC}/lib/Cilly.pm.in - @${REINPLACE_CMD} -e 's|^use OutputFile;|use CIL::OutputFile;|' ${WRKSRC}/lib/KeptFile.pm - @${REINPLACE_CMD} -e 's|^use OutputFile;|use CIL::OutputFile;|' ${WRKSRC}/lib/TempFile.pm + @${REINPLACE_CMD} -e \ + 's|@CILHOME@/lib|${SITE_PERL}/CIL|g ; \ + s|\@CILHOME\@|${PREFIX}|g' ${WRKSRC}/bin/CilConfig.pm.in + @${REINPLACE_CMD} -e \ + '/^#!/s|/.*|${PERL}| ; \ + s|$$::cilhome|${PREFIX}|g ; \ + s|obj/$$::archos|libexec/cil|g ; \ + s|^use Cilly;|use CIL::Cilly|' ${WRKSRC}/bin/cilly + @${REINPLACE_CMD} -e \ + '/^#!/s|/.*|${PERL}|' ${WRKSRC}/bin/patcher + @${REINPLACE_CMD} -e \ + '/^#!/s|/.*|/bin/sh|' ${WRKSRC}/bin/teetwo + @${REINPLACE_CMD} -e \ + 's|^use KeptFile;|use CIL::KeptFile;| ; \ + s|^use OutputFile;|use CIL::OutputFile;| ; \ + s|^use TempFile;|use CIL::TempFile;|' ${WRKSRC}/lib/Cilly.pm.in + @${REINPLACE_CMD} -e \ + 's|^use OutputFile;|use CIL::OutputFile;|' ${WRKSRC}/lib/KeptFile.pm + @${REINPLACE_CMD} -e \ + 's|^use OutputFile;|use CIL::OutputFile;|' ${WRKSRC}/lib/TempFile.pm do-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC}/doc && ${FIND} . -print | \ - ${CPIO} -pdu -R ${BINOWN}:${BINGRP} --quiet ${DOCSDIR} -.endif .for f in ${BINFILES} - ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${PREFIX}/bin .endfor - ${MKDIR} ${SITE_PERL}/CIL + @${MKDIR} ${SITE_PERL} + ${INSTALL_DATA} ${WRKSRC}/bin/CilConfig.pm ${SITE_PERL} + @${MKDIR} ${SITE_PERL}/CIL .for f in ${LIBFILES} - ${INSTALL_DATA} ${WRKSRC}/lib/${f} ${SITE_PERL}/CIL/ + ${INSTALL_DATA} ${WRKSRC}/lib/${f} ${SITE_PERL}/CIL .endfor - ${INSTALL_DATA} ${WRKSRC}/bin/CilConfig.pm ${SITE_PERL}/ - ${MKDIR} ${PREFIX}/libexec/cil + @${MKDIR} ${PREFIX}/libexec/cil +.for f in ${LEXECFILES} + ${INSTALL_PROGRAM} ${WRKSRC}/obj/${ARCH}_${OPSYS:U}/${f} ${PREFIX}/libexec/cil +.endfor +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} + @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}) +.endif -.include +.include diff -urN /usr/ports/devel/cil/distinfo devel/cil/distinfo --- /usr/ports/devel/cil/distinfo 2011-11-14 23:23:35.000000000 +0900 +++ devel/cil/distinfo 2012-06-17 06:02:34.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (cil-1.4.0.tar.gz) = c8524f05ca0409a3bc1a498fd4fd091d423f9c1c378fa99ec39d95259a7bd49a -SIZE (cil-1.4.0.tar.gz) = 1790014 +SHA256 (cil-1.5.0.tar.gz) = e0da50bd1bfed48f197a5a69a58078340e6b1b1f54f9a1937b602532db85ebbf +SIZE (cil-1.5.0.tar.gz) = 1792051 diff -urN /usr/ports/devel/cil/files/patch-bin_teetwo.sh devel/cil/files/patch-bin_teetwo.sh --- /usr/ports/devel/cil/files/patch-bin_teetwo.sh 2011-11-14 23:23:35.000000000 +0900 +++ devel/cil/files/patch-bin_teetwo.sh 1970-01-01 09:00:00.000000000 +0900 @@ -1,8 +0,0 @@ ---- bin/teetwo.orig 2011-11-13 08:39:24.000000000 +0100 -+++ bin/teetwo 2011-11-13 08:39:27.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # run a command, sending stdout to one file and stderr to another, - # but also sending both to this process' stdout/stderr, respectively - diff -urN /usr/ports/devel/cil/pkg-descr devel/cil/pkg-descr --- /usr/ports/devel/cil/pkg-descr 2011-08-03 05:58:01.000000000 +0900 +++ devel/cil/pkg-descr 2012-06-17 05:57:28.000000000 +0900 @@ -8,3 +8,5 @@ ambiguous constructs and removing redundant ones, and also higher-level than typical intermediate languages designed for compilation, by maintaining types and a close relationship with the source program. + +WWW: http://kerneis.github.com/cil/ diff -urN /usr/ports/devel/cil/pkg-plist devel/cil/pkg-plist --- /usr/ports/devel/cil/pkg-plist 2011-11-14 23:23:35.000000000 +0900 +++ devel/cil/pkg-plist 1970-01-01 09:00:00.000000000 +0900 @@ -1,176 +0,0 @@ -bin/cilly -bin/patcher -bin/teetwo -%%PORTDOCS%%%%DOCSDIR%%/fullpage.sty -%%PORTDOCS%%%%DOCSDIR%%/proof.sty -%%PORTDOCS%%%%DOCSDIR%%/cil.itarget -%%PORTDOCS%%%%DOCSDIR%%/cil.odocl -%%PORTDOCS%%%%DOCSDIR%%/program.sty -%%PORTDOCS%%%%DOCSDIR%%/makefiles.txt -%%PORTDOCS%%%%DOCSDIR%%/main.html -%%PORTDOCS%%%%DOCSDIR%%/header.html.in -%%PORTDOCS%%%%DOCSDIR%%/header.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/cil.tex -%%PORTDOCS%%%%DOCSDIR%%/cvssetup.tex -%%PORTDOCS%%%%DOCSDIR%%/comment.sty -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cilpp.haux -%%PORTDOCS%%%%DOCSDIR%%/html/cil/contents_motif.gif -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cil017.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/CIL-API.pdf -%%PORTDOCS%%%%DOCSDIR%%/html/cil/ext.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/merger.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Dataflow.ForwardsTransfer.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Dataflow.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Dataflow.BackwardsDataFlow.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/index_values.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Alpha.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/index_attributes.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Formatcil.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Clist.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Stats.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Dominators.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Cil.cilVisitor.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/index_classes.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Dataflow.ForwardsDataFlow.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/index_methods.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Cil.descriptiveCilPrinter.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Cil.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/index_class_types.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Cil.descriptiveCilPrinterClass.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Cil.defaultCilPrinterClass-c.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Errormsg.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Cil.nopCilVisitor-c.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Cil.plainCilPrinterClass-c.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Dataflow.ForwardsDataFlow.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Dataflow.BackwardsTransfer.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Cil.descriptiveCilPrinter-c.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/index_types.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Cil.descriptiveCilPrinterClass-c.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Pretty.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Cil.nopCilVisitor.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Cil.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Cillower.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/style.css -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Dataflow.ForwardsTransfer.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Stats.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Cil.cilPrinter.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Cil.cilVisitor-c.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Cfg.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/index_modules.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Cil.plainCilPrinterClass.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Dataflow.BackwardsDataFlow.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Dataflow.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Pretty.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Alpha.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Cil.defaultCilPrinterClass.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Formatcil.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/index_module_types.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Clist.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Dominators.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Cil.cilPrinter-c.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Dataflow.BackwardsTransfer.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Pretty.MakeMapPrinter.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Cillower.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Pretty.MakeSetPrinter.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/Cfg.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/index_exceptions.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Pretty.MakeMapPrinter.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Errormsg.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/api/type_Pretty.MakeSetPrinter.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cil003.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/attributes.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cil007.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cilpp.htoc -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cil002.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/header.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/changes.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cil012.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex44.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex38.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex43.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex31.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex36.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex27.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex8.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex20.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex1.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex29.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex6.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex15.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex12.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex37.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex30.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex42.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex45.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex39.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex13.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex14.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex28.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex7.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex21.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex26.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex9.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex17.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex10.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex19.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex3.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex4.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex25.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex22.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex33.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex48.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex34.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex46.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex41.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex23.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex24.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex5.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex2.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex18.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex11.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex16.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex40.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex47.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex35.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/examples/ex32.txt -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cil016.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cil.css -%%PORTDOCS%%%%DOCSDIR%%/html/cil/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/previous_motif.gif -%%PORTDOCS%%%%DOCSDIR%%/html/cil/CIL.pdf -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cil.version.tex -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cil018.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cil004.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/next_motif.gif -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cil010.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/patcher.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cil.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cil011.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/ciltoc.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cil009.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cil015.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cil001.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cil019.html -%%PORTDOCS%%%%DOCSDIR%%/html/cil/cilly.html -%%PORTDOCS%%%%DOCSDIR%%/cilcode.pl -%%PORTDOCS%%%%DOCSDIR%%/sendmail.txt -%%PORTDOCS%%%%DOCSDIR%%/tips-and-tricks.txt -%%PORTDOCS%%%%DOCSDIR%%/ocamldoc.html -%%PORTDOCS%%%%DOCSDIR%%/index.html.in -%%PORTDOCS%%%%DOCSDIR%%/hevea.sty -%%PORTDOCS%%%%DOCSDIR%%/ocamldoc.patch -%%PORTDOCS%%%%DOCSDIR%%/setup.tex -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/cil/api -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/cil/examples -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/cil -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm libexec/cil -%%SITE_PERL%%/CIL/Cilly.pm -%%SITE_PERL%%/CIL/KeptFile.pm -%%SITE_PERL%%/CIL/OutputFile.pm -%%SITE_PERL%%/CIL/TempFile.pm -%%SITE_PERL%%/CilConfig.pm -@dirrm %%SITE_PERL%%/CIL