--- a/components/cloog/Makefile	Wed Jan 11 23:54:04 2017 -0600
+++ b/components/cloog/Makefile	Wed Mar 29 13:16:33 2017 -0700
@@ -27,15 +27,15 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		cloog
-COMPONENT_VERSION=	0.18.3
+COMPONENT_VERSION=	0.18.4
 COMPONENT_PROJECT_URL=	http://www.cloog.org/
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:460c6c740acb8cdfbfbb387156b627cf731b3837605f2ec0001d079d89c69734
+    sha256:325adf3710ce2229b7eeb9e84d3b539556d093ae860027185e7af8a8b00a750e
 COMPONENT_ARCHIVE_URL=	http://www.bastoul.net/cloog/pages/download/$(COMPONENT_ARCHIVE)
-COMPONENT_BUGDB=	library/cloog
+COMPONENT_BUGDB=	utility/gnu-compiler
 COMPONENT_ANITYA_ID=	13279
 
-TPNO=			23800
+TPNO=			33342
 
 include $(WS_MAKE_RULES)/common.mk
 
@@ -67,7 +67,7 @@
 CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align
 
 CXXFLAGS = $(CC_BITS)
-CXXFLAGS += -O2 -std=c++03
+CXXFLAGS += -O2
 CXXFLAGS += $(CPP_XPG5MODE)
 CXXFLAGS += $(CLOOG_GCC_ARCH)
 CXXFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align
@@ -146,5 +146,5 @@
      '-e "s/copied [0-9]\{1,\}\./copied/g"'
 
 REQUIRED_PACKAGES += library/gmp
+REQUIRED_PACKAGES += library/isl
 REQUIRED_PACKAGES += library/mpfr
-REQUIRED_PACKAGES += library/isl

--- a/components/cloog/cloog.license	Wed Jan 11 23:54:04 2017 -0600
+++ b/components/cloog/cloog.license	Wed Mar 29 13:16:33 2017 -0700
@@ -1,6 +1,6 @@
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -11,7 +11,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -112,8 +112,8 @@
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -159,7 +159,7 @@
   You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
-
+
   2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
@@ -217,7 +217,7 @@
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-
+
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -268,7 +268,7 @@
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-
+
   6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -330,7 +330,7 @@
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-
+
   7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -371,7 +371,7 @@
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-
+
   11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -423,7 +423,7 @@
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-
+
   14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -433,7 +433,7 @@
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -456,4 +456,49 @@
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+

--- a/components/cloog/cloog.p5m	Wed Jan 11 23:54:04 2017 -0600
+++ b/components/cloog/cloog.p5m	Wed Mar 29 13:16:33 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -71,5 +71,5 @@
 link path=usr/lib/libcloog-isl.so.4 target=libcloog-isl.so.4.0.0
 file path=usr/lib/libcloog-isl.so.4.0.0
 file path=usr/lib/pkgconfig/cloog-isl.pc
-license cloog.license license=LGPLv2
+license cloog.license license=LGPLv2.1