From 9133fee1a6842a45a1920bd376fe864f224571d8 Mon Sep 17 00:00:00 2001
From: tijl <tijl@FreeBSD.org>
Date: Fri, 8 Jul 2016 18:02:59 +0000
Subject: Update to 3.6.0.

---
 lang/sdcc/Makefile                       |  5 +++--
 lang/sdcc/distinfo                       |  5 +++--
 lang/sdcc/files/patch-src_SDCClospre.hpp | 15 ---------------
 lang/sdcc/files/patch-src_SDCCnaddr.hpp  | 15 ---------------
 lang/sdcc/files/patch-src_SDCCralloc.hpp | 15 ---------------
 lang/sdcc/pkg-descr                      |  6 +++---
 6 files changed, 9 insertions(+), 52 deletions(-)
 delete mode 100644 lang/sdcc/files/patch-src_SDCClospre.hpp
 delete mode 100644 lang/sdcc/files/patch-src_SDCCnaddr.hpp
 delete mode 100644 lang/sdcc/files/patch-src_SDCCralloc.hpp

diff --git a/lang/sdcc/Makefile b/lang/sdcc/Makefile
index f5da1bd..9419705 100644
--- a/lang/sdcc/Makefile
+++ b/lang/sdcc/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	sdcc
-PORTVERSION=	3.5.0
+PORTVERSION=	3.6.0
 DISTVERSIONPREFIX=	src-
-PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	SF
 
@@ -62,6 +61,8 @@ post-patch:
 	@${REINPLACE_CMD} '/install:/s/:.*/:/' \
 		${WRKSRC}/Makefile.in \
 		${WRKSRC}/support/sdbinutils/libiberty/Makefile.in
+	@${REINPLACE_CMD} '/^SUBDIRS =/s/doc//' \
+		${WRKSRC}/support/sdbinutils/bfd/Makefile.in
 	@${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/PICARCH/g' \
 		${WRKSRC}/device/lib/pic14/Makefile.common \
 		${WRKSRC}/device/lib/pic14/Makefile.in \
diff --git a/lang/sdcc/distinfo b/lang/sdcc/distinfo
index 048a330..37179af 100644
--- a/lang/sdcc/distinfo
+++ b/lang/sdcc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (sdcc-src-3.5.0.tar.bz2) = f82978d1614244b22e093402c0a4de1f688a07c807b2980126c964eb3df85fa9
-SIZE (sdcc-src-3.5.0.tar.bz2) = 10504517
+TIMESTAMP = 1467992784
+SHA256 (sdcc-src-3.6.0.tar.bz2) = e85dceb11e01ffefb545ec389da91265130c91953589392dddd2e5ec0b7ca374
+SIZE (sdcc-src-3.6.0.tar.bz2) = 17993788
diff --git a/lang/sdcc/files/patch-src_SDCClospre.hpp b/lang/sdcc/files/patch-src_SDCClospre.hpp
deleted file mode 100644
index 34ac061..0000000
--- a/lang/sdcc/files/patch-src_SDCClospre.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/SDCClospre.hpp.orig	2014-01-03 17:18:45 UTC
-+++ src/SDCClospre.hpp
-@@ -19,6 +19,12 @@
- //
- // Lifetime-optimal speculative partial redundancy elimination.
- 
-+// Workaround for boost bug #11880
-+#include <boost/version.hpp>
-+#if BOOST_VERSION == 106000
-+	#include <boost/type_traits/ice.hpp>
-+#endif
-+
- #include <boost/graph/graphviz.hpp>
- #include <boost/tuple/tuple.hpp>
- #include <boost/tuple/tuple_comparison.hpp>
diff --git a/lang/sdcc/files/patch-src_SDCCnaddr.hpp b/lang/sdcc/files/patch-src_SDCCnaddr.hpp
deleted file mode 100644
index 28b9fba..0000000
--- a/lang/sdcc/files/patch-src_SDCCnaddr.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/SDCCnaddr.hpp.orig	2015-04-01 13:50:35 UTC
-+++ src/SDCCnaddr.hpp
-@@ -37,6 +37,12 @@
- #include <sstream>
- #include <fstream>
- 
-+// Workaround for boost bug #11880
-+#include <boost/version.hpp>
-+#if BOOST_VERSION == 106000
-+	#include <boost/type_traits/ice.hpp>
-+#endif
-+
- #include <boost/graph/graphviz.hpp>
- 
- #include "SDCCtree_dec.hpp"
diff --git a/lang/sdcc/files/patch-src_SDCCralloc.hpp b/lang/sdcc/files/patch-src_SDCCralloc.hpp
deleted file mode 100644
index 5b09fe1..0000000
--- a/lang/sdcc/files/patch-src_SDCCralloc.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/SDCCralloc.hpp.orig	2015-02-25 10:25:50 UTC
-+++ src/SDCCralloc.hpp
-@@ -51,6 +51,12 @@
- #include <sstream>
- #include <fstream>
- 
-+// Workaround for boost bug #11880
-+#include <boost/version.hpp>
-+#if BOOST_VERSION == 106000
-+	#include <boost/type_traits/ice.hpp>
-+#endif
-+
- #include <boost/graph/graphviz.hpp>
- #include <boost/graph/adjacency_matrix.hpp>
- #include <boost/graph/connected_components.hpp>
diff --git a/lang/sdcc/pkg-descr b/lang/sdcc/pkg-descr
index b75f29e..c556803 100644
--- a/lang/sdcc/pkg-descr
+++ b/lang/sdcc/pkg-descr
@@ -1,8 +1,8 @@
 SDCC is a retargettable, optimizing ANSI C compiler suite that targets
 the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.),
 Maxim (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola)
-HC08 based (hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80,
-Rabbit 2000/3000, Rabbit 3000A). Work is in progress on supporting the
-Microchip PIC16 and PIC18 targets.
+HC08 (hc08, s08), Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000,
+Rabbit 3000A, TLCS-90) and STMicroelectronics STM8.  Work is in progress
+to support Microchip PIC16 and PIC18 targets.
 
 WWW: http://sdcc.sourceforge.net/
-- 
cgit v1.1