From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 24 00:00:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7D106EE for ; Sat, 24 Aug 2013 00:00:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5BB402D42 for ; Sat, 24 Aug 2013 00:00:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r7O001DA095159 for ; Sat, 24 Aug 2013 00:00:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r7O000kP095157; Sat, 24 Aug 2013 00:00:00 GMT (envelope-from gnats) Resent-Date: Sat, 24 Aug 2013 00:00:00 GMT Resent-Message-Id: <201308240000.r7O000kP095157@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, chris petrik Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3B912F1F for ; Fri, 23 Aug 2013 23:58:56 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 290642D33 for ; Fri, 23 Aug 2013 23:58:56 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r7NNwtvs067905 for ; Fri, 23 Aug 2013 23:58:55 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r7NNwtPT067894; Fri, 23 Aug 2013 23:58:55 GMT (envelope-from nobody) Message-Id: <201308232358.r7NNwtPT067894@oldred.freebsd.org> Date: Fri, 23 Aug 2013 23:58:55 GMT From: chris petrik To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/181494: [PATCH] update devel/cil to 1.7.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Aug 2013 00:00:01 -0000 >Number: 181494 >Category: ports >Synopsis: [PATCH] update devel/cil to 1.7.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Aug 24 00:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: chris petrik >Release: >Organization: bsdjunk >Environment: >Description: Update cil to 1.7.3 >How-To-Repeat: >Fix: Patch attached with submission follows: Index: cil/Makefile =================================================================== --- cil/Makefile (revision 325046) +++ cil/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cil -PORTVERSION= 1.6.0 +PORTVERSION= 1.7.3 CATEGORIES= devel lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME} @@ -12,8 +12,6 @@ LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${LOCALBASE}/bin/ocamlopt:${PORTSDIR}/lang/ocaml - OPTIONS_DEFINE= DOCS CONFLICTS= ccured-[0-9]* @@ -21,40 +19,54 @@ ONLY_FOR_ARCHS= i386 amd64 USE_PERL5= yes USE_GMAKE= yes +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 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} @@ -61,15 +73,17 @@ ${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/App/Cilly +.endfor +.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 - @${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}) Index: cil/distinfo =================================================================== --- cil/distinfo (revision 325046) +++ cil/distinfo (working copy) @@ -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 >Release-Note: >Audit-Trail: >Unformatted: