Update cil to 1.7.3 Fix: Patch attached with submission follows:
Responsible Changed From-To: freebsd-ports-bugs->madpilot I'll take it.
State Changed From-To: open->closed Committed, with minor changes. Thanks!
Author: madpilot Date: Sat Aug 31 16:07:19 2013 New Revision: 325816 URL: http://svnweb.freebsd.org/changeset/ports/325816 Log: - Update to 1.7.3 - While here convert to USES PR: ports/181494 Submitted by: chris petrik <c.petrik.sosa@gmail.com> (maintainer) Modified: head/devel/cil/Makefile head/devel/cil/distinfo (contents, props changed) Modified: head/devel/cil/Makefile ============================================================================== --- head/devel/cil/Makefile Sat Aug 31 15:47:33 2013 (r325815) +++ head/devel/cil/Makefile Sat Aug 31 16:07:19 2013 (r325816) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cil -PORTVERSION= 1.6.0 +PORTVERSION= 1.7.3 CATEGORIES= devel lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME} @@ -12,63 +12,76 @@ COMMENT= Infrastructure for C Program An 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 +USES= gmake perl5 +USE_OCAML= yes +USE_OCAML_FINDLIB= 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 +PLIST_FILES= ${BINFILES:S,^,bin/,} \ + %%SITE_PERL%%/CilConfig.pm \ + ${LIBFILES:S,^,%%SITE_PERL%%/CIL/,} \ + ${LIBBINS:S,^,%%SITE_PERL%%/CIL/,} \ + ${LIBAFILES:S,^,%%SITE_PERL%%/CIL/,} +PLIST_DIRS= %%SITE_PERL%%/CIL/App/Cilly \ + %%SITE_PERL%%/CIL/App \ + %%SITE_PERL%%/CIL +BINFILES= cilly cilly.native +LIBAFILES= App/Cilly.pm +LIBFILES= App/Cilly/KeptFile.pm \ + App/Cilly/OutputFile.pm \ + App/Cilly/TempFile.pm +LIBBINS= patcher .include <bsd.port.pre.mk> post-patch: @${REINPLACE_CMD} -e \ + '35 s|make|gmake|g' ${WRKSRC}/myocamlbuild.ml + @${REINPLACE_CMD} -e \ 's|@CILHOME@/lib|${SITE_PERL}/CIL|g ; \ - s|\@CILHOME\@|${PREFIX}|g' ${WRKSRC}/bin/CilConfig.pm.in + s|\@CILHOME\@|${PREFIX}|g' \ + ${WRKSRC}/lib/App/Cilly/CilConfig.pm.in + @${REINPLACE_CMD} -e \ + '/^#!/s|/.*|${PERL}|' ${WRKSRC}/lib/patcher @${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 + s|^use TempFile;|use CIL::TempFile;|' \ + ${WRKSRC}/lib/App/Cilly.pm.in @${REINPLACE_CMD} -e \ - 's|^use OutputFile;|use CIL::OutputFile;|' ${WRKSRC}/lib/KeptFile.pm + 's|^use OutputFile;|use CIL::OutputFile;|' \ + ${WRKSRC}/lib/App/Cilly/KeptFile.pm @${REINPLACE_CMD} -e \ - 's|^use OutputFile;|use CIL::OutputFile;|' ${WRKSRC}/lib/TempFile.pm + 's|^use OutputFile;|use CIL::OutputFile;|' \ + ${WRKSRC}/lib/App/Cilly/TempFile.pm do-install: .for f in ${BINFILES} ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${PREFIX}/bin .endfor @${MKDIR} ${SITE_PERL} - ${INSTALL_DATA} ${WRKSRC}/bin/CilConfig.pm ${SITE_PERL} - @${MKDIR} ${SITE_PERL}/CIL + ${INSTALL_DATA} ${WRKSRC}/lib/App/Cilly/CilConfig.pm ${SITE_PERL} + @${MKDIR} ${SITE_PERL}/CIL/App/Cilly .for f in ${LIBFILES} - ${INSTALL_DATA} ${WRKSRC}/lib/${f} ${SITE_PERL}/CIL + ${INSTALL_DATA} ${WRKSRC}/lib/${f} ${SITE_PERL}/CIL/App/Cilly .endfor - @${MKDIR} ${PREFIX}/libexec/cil -.for f in ${LEXECFILES} - ${INSTALL_PROGRAM} ${WRKSRC}/obj/${ARCH}_${OPSYS:U}/${f} ${PREFIX}/libexec/cil +.for f in ${LIBAFILES} + ${INSTALL_DATA} ${WRKSRC}/lib/${f} ${SITE_PERL}/CIL/App +.endfor +.for f in ${LIBBINS} + ${INSTALL_DATA} ${WRKSRC}/lib/${f} ${SITE_PERL}/CIL .endfor .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} Modified: head/devel/cil/distinfo ============================================================================== --- head/devel/cil/distinfo Sat Aug 31 15:47:33 2013 (r325815) +++ head/devel/cil/distinfo Sat Aug 31 16:07:19 2013 (r325816) @@ -1,2 +1,2 @@ -SHA256 (cil-1.6.0.tar.gz) = 00d74b5cfdc18683e60472cf49a754251793d8dcfd90018176a0b54a8171eea4 -SIZE (cil-1.6.0.tar.gz) = 1795800 +SHA256 (cil-1.7.3.tar.gz) = 69b7f290d2b15dd44e2b837d3de0922245be841f79ab56a7e9ba8205544be314 +SIZE (cil-1.7.3.tar.gz) = 1893257 _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"