Upgrade to v1.3.6. Upstream changes from the previous version

of the port include:

 - A new 'descriptiveCilPrinter' class for friendlier messages.
 - Bug fixes, esp. for 64-bit architectures.

A few APIs have also changed so 3rd-party code using the CIL toolkit
may need to be adapted.

5 files changed, 10 insertions, 40 deletions

diff --git a/devel/cil/Makefile b/devel/cil/Makefile
index 07c1c79fbe7..8eaa23c6342 100644
--- a/devel/cil/Makefile
+++ b/devel/cil/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	cil
-PORTVERSION=	1.3.5
-PORTREVISION=	1
+PORTVERSION=	1.3.6
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://manju.cs.berkeley.edu/cil/distrib/
+		http://hal.cs.berkeley.edu/cil/distrib/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jkoshy@FreeBSD.org
diff --git a/devel/cil/distinfo b/devel/cil/distinfo
index 294d3412890..c66cdc6179a 100644
--- a/devel/cil/distinfo
+++ b/devel/cil/distinfo
@@ -1,3 +1,3 @@
-MD5 (cil-1.3.5.tar.gz) = 626fdcfa311c31262fd2c6825f08111f
-SHA256 (cil-1.3.5.tar.gz) = 7f06debdac7b72b2c7aecce5cc69a46f1e45df9723a7b92c574e834b4de81069
-SIZE (cil-1.3.5.tar.gz) = 1139611
+MD5 (cil-1.3.6.tar.gz) = 112dfbabdd0e1280800d62ba4449ab45
+SHA256 (cil-1.3.6.tar.gz) = 39cc746398551b483b3d2b4d90d5bd5aad326f946b74fcdd67d5434f7c7f854f
+SIZE (cil-1.3.6.tar.gz) = 1368573
diff --git a/devel/cil/files/patch-Makefile.in b/devel/cil/files/patch-Makefile.in
deleted file mode 100644
index ace8b083492..00000000000
--- a/devel/cil/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sun May 21 09:44:15 2006
-+++ Makefile.in	Mon Jul 10 10:17:48 2006
-@@ -243,7 +243,7 @@
- 	echo "   Zrapp.feature;" >> $@  
- endif
- # Now the extra features, with the first letter capitalized
--	echo -ne \
-+	echo -e \
-           $(foreach f,@EXTRAFEATURES@, \
-              `echo $f | cut -c 1 | tr "[a-z]" "[A-Z]"``echo $f | cut -c 2-`".feature;\n") >> $@
- 	echo "]"   >>$@ 
diff --git a/devel/cil/files/patch-configure b/devel/cil/files/patch-configure
deleted file mode 100644
index d6f5a615c20..00000000000
--- a/devel/cil/files/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig	Sun May 21 09:44:15 2006
-+++ configure	Fri Aug  4 08:56:05 2006
-@@ -4202,11 +4202,18 @@
- # $target is typically processor-vendor-os
- case "$target" in
-   # linux
--  *86*linux*|*86*freebsd*|*86*openbsd*|*86*darwin*)
-+  *86*linux*|*86*openbsd*|*86*darwin*)
-     echo "$as_me:$LINENO: result: configuring for linux/x86" >&5
- echo "${ECHO_T}configuring for linux/x86" >&6
- 
-     ARCHOS=x86_LINUX
-+    ;;
-+
-+    *amd64*freebsd*|*i386*freebsd*)
-+    echo "$as_me:$LINENO: result: configuring for freebsd/${ARCH}" >&5
-+echo "${ECHO_T}configuring for freebsd/${ARCH}" >&6
-+
-+    ARCHOS=`uname -p`_FREEBSD
-     ;;
- 
-   # Mac OS X
diff --git a/devel/cil/pkg-plist b/devel/cil/pkg-plist
index 4805d9f25d6..33ae01444c9 100644
--- a/devel/cil/pkg-plist
+++ b/devel/cil/pkg-plist
@@ -10,6 +10,8 @@ libexec/cil/machdep.exe
 %%PORTDOCS%%%%DOCSDIR%%/api/Cil.cilPrinter.html
 %%PORTDOCS%%%%DOCSDIR%%/api/Cil.cilVisitor.html
 %%PORTDOCS%%%%DOCSDIR%%/api/Cil.defaultCilPrinterClass.html
+%%PORTDOCS%%%%DOCSDIR%%/api/Cil.descriptiveCilPrinter.html
+%%PORTDOCS%%%%DOCSDIR%%/api/Cil.descriptiveCilPrinterClass.html
 %%PORTDOCS%%%%DOCSDIR%%/api/Cil.html
 %%PORTDOCS%%%%DOCSDIR%%/api/Cil.nopCilVisitor.html
 %%PORTDOCS%%%%DOCSDIR%%/api/Cil.plainCilPrinterClass.html
@@ -43,6 +45,8 @@ libexec/cil/machdep.exe
 %%PORTDOCS%%%%DOCSDIR%%/api/type_Cil.cilPrinter.html
 %%PORTDOCS%%%%DOCSDIR%%/api/type_Cil.cilVisitor.html
 %%PORTDOCS%%%%DOCSDIR%%/api/type_Cil.defaultCilPrinterClass.html
+%%PORTDOCS%%%%DOCSDIR%%/api/type_Cil.descriptiveCilPrinter.html
+%%PORTDOCS%%%%DOCSDIR%%/api/type_Cil.descriptiveCilPrinterClass.html
 %%PORTDOCS%%%%DOCSDIR%%/api/type_Cil.html
 %%PORTDOCS%%%%DOCSDIR%%/api/type_Cil.nopCilVisitor.html
 %%PORTDOCS%%%%DOCSDIR%%/api/type_Cil.plainCilPrinterClass.html
@@ -60,6 +64,7 @@ libexec/cil/machdep.exe
 %%PORTDOCS%%%%DOCSDIR%%/api/type_Pretty.MakeSetPrinter.html
 %%PORTDOCS%%%%DOCSDIR%%/api/type_Pretty.html
 %%PORTDOCS%%%%DOCSDIR%%/api/type_Stats.html
+%%PORTDOCS%%%%DOCSDIR%%/attributes.html
 %%PORTDOCS%%%%DOCSDIR%%/changes.html
 %%PORTDOCS%%%%DOCSDIR%%/cil.css
 %%PORTDOCS%%%%DOCSDIR%%/cil.html
@@ -68,7 +73,6 @@ libexec/cil/machdep.exe
 %%PORTDOCS%%%%DOCSDIR%%/cil002.html
 %%PORTDOCS%%%%DOCSDIR%%/cil003.html
 %%PORTDOCS%%%%DOCSDIR%%/cil004.html
-%%PORTDOCS%%%%DOCSDIR%%/cil006.html
 %%PORTDOCS%%%%DOCSDIR%%/cil007.html
 %%PORTDOCS%%%%DOCSDIR%%/cil009.html
 %%PORTDOCS%%%%DOCSDIR%%/cil010.html