4 files changed, 7 insertions, 41 deletions

diff --git a/devel/cil/Makefile b/devel/cil/Makefile
index e3bd26c726c9..5987a106b1d6 100644
--- a/devel/cil/Makefile
+++ b/devel/cil/Makefile
@@ -6,35 +6,31 @@
 #
 
 PORTNAME=	cil
-PORTVERSION=	1.3.6
-PORTREVISION=	1
+PORTVERSION=	1.3.7
 CATEGORIES=	devel lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF \
 		http://hal.cs.berkeley.edu/cil/distrib/
-MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Infrastructure for C Program Analysis and Transformation
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/ocamlopt:${PORTSDIR}/lang/ocaml
 
-CONFLICTS=	ccured-*
+CONFLICTS=	ccured-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_PERL5=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
 
 BINFILES=	cilly patcher teetwo
 LIBFILES=	Cilly.pm KeptFile.pm OutputFile.pm TempFile.pm
-EXECFILES=	cilly.byte.exe machdep.exe
 
 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
+	@${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
 
@@ -53,8 +49,5 @@ do-install:
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/bin/CilConfig.pm ${SITE_PERL}/
 	${MKDIR} ${PREFIX}/libexec/cil
-.for f in ${EXECFILES}
-	${INSTALL} ${WRKSRC}/obj/${ARCH}_FREEBSD/${f} ${PREFIX}/libexec/cil/
-.endfor
 
 .include <bsd.port.mk>
diff --git a/devel/cil/distinfo b/devel/cil/distinfo
index c66cdc6179a8..213a44816888 100644
--- a/devel/cil/distinfo
+++ b/devel/cil/distinfo
@@ -1,3 +1,3 @@
-MD5 (cil-1.3.6.tar.gz) = 112dfbabdd0e1280800d62ba4449ab45
-SHA256 (cil-1.3.6.tar.gz) = 39cc746398551b483b3d2b4d90d5bd5aad326f946b74fcdd67d5434f7c7f854f
-SIZE (cil-1.3.6.tar.gz) = 1368573
+MD5 (cil-1.3.7.tar.gz) = e0e3ce3b04c0d9cccf98381feb6d89de
+SHA256 (cil-1.3.7.tar.gz) = 4047e82a1ef2f7f10b2ab922594281b9da3642d9026499c6cce032dfaf3dacf2
+SIZE (cil-1.3.7.tar.gz) = 1295940
diff --git a/devel/cil/files/patch-Makefile.in b/devel/cil/files/patch-Makefile.in
deleted file mode 100644
index 42d13b825bba..000000000000
--- a/devel/cil/files/patch-Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.in.orig	2009-04-10 02:07:19.000000000 +0400
-+++ Makefile.in	2009-04-10 02:07:54.000000000 +0400
-@@ -213,7 +213,7 @@
- # build two libraries
- .PHONY: cillib libcil
- ifeq ($(NATIVECAML),1)
--cillib: $(OBJDIR)/cil.$(CMXA) $(OBJDIR)/libcil.a
-+cillib: $(OBJDIR)/cil.$(CMXA) $(OBJDIR)/libcil.o
- else
- cillib: $(OBJDIR)/cil.$(CMXA) 
- endif
-@@ -271,11 +271,11 @@
- # be called from C code; this is like the target above, except
- # it is callable from C instead of from Ocaml
- ifeq ($(NATIVECAML),1)
--$(OBJDIR)/libcil.a: $(OCAML_CIL_LIB_CMODULES:%=$(OBJDIR)/lib%.a) \
-+$(OBJDIR)/libcil.o: $(OCAML_CIL_LIB_CMODULES:%=$(OBJDIR)/lib%.a) \
-                     $(OCAML_CIL_LIB_MODULES:%=$(OBJDIR)/%.$(CMO))
- 	ocamlopt -output-obj -o $@ $(CILLY_LIBS:%=%.cmxa) $^
- else
--$(OBJDIR)/libcil.a:
-+$(OBJDIR)/libcil.o:
- 	@echo "Can only build $@ when NATIVECAML is 1."
- 	exit 2
- endif
diff --git a/devel/cil/pkg-plist b/devel/cil/pkg-plist
index 33ae01444c9c..0b338a55b95e 100644
--- a/devel/cil/pkg-plist
+++ b/devel/cil/pkg-plist
@@ -1,8 +1,6 @@
 bin/cilly
 bin/patcher
 bin/teetwo
-libexec/cil/cilly.byte.exe
-libexec/cil/machdep.exe
 %%PORTDOCS%%%%DOCSDIR%%/CIL-API.pdf
 %%PORTDOCS%%%%DOCSDIR%%/CIL.pdf
 %%PORTDOCS%%%%DOCSDIR%%/api/Alpha.html