3 files changed, 71 insertions, 25 deletions

diff --git a/cad/systemc/Makefile b/cad/systemc/Makefile
index ee9771f315fc..6697623bf914 100644
--- a/cad/systemc/Makefile
+++ b/cad/systemc/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	systemc
-PORTVERSION=	2.1.v1
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	cad devel
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dthiele@gmx.net
 COMMENT=	A modeling platform for system-level C++ models
 
-RESTRICTED=	You have to register at http://www.systemc.org/account/register.php first
+RESTRICTED=	You have to register at http://www.systemc.org/kmembership_info/individual_signup first
 
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
@@ -28,7 +27,7 @@ INSTALL_WRKSRC=	${WRKSRC}/objdir
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=		is restricted. You have to register at http://www.systemc.org/account/register.php and download ${DISTFILES} from there first. Then put ${DISTFILES} into ${DISTDIR} and run make again
+IGNORE=		is restricted. You have to register at http://www.systemc.org/kmembership_info/individual_signup and download ${DISTFILES} from http://www.systemc.org/downloads/standards/ first. Then put ${DISTFILES} into ${DISTDIR} and run make again
 .endif
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
@@ -46,4 +45,7 @@ pre-configure:
 	@${REINPLACE_CMD} -e 's|\(OPT_CXXFLAGS="\).*"|\1${CXXFLAGS}"|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
+post-patch:
+	@find ${WRKSRC} -name .DS_Store -delete
+
 .include <bsd.port.post.mk>
diff --git a/cad/systemc/distinfo b/cad/systemc/distinfo
index a03ff621ba9b..c363140ee8a8 100644
--- a/cad/systemc/distinfo
+++ b/cad/systemc/distinfo
@@ -1,3 +1,3 @@
-MD5 (systemc-2.1.v1.tgz) = 418923135b0c12fbf90622f017f1eee9
-SHA256 (systemc-2.1.v1.tgz) = f2d071819f012d45050d7e5be98c5a32e7c0b307cd154a163ab7dc74ae46c031
-SIZE (systemc-2.1.v1.tgz) = 3605838
+MD5 (systemc-2.2.0.tgz) = ccd0a9b8987b2902de647cfd0794e668
+SHA256 (systemc-2.2.0.tgz) = fd7db3ac2b547bf54c94c0310f15f079ed59ffa318ed5b0043a65410960859e7
+SIZE (systemc-2.2.0.tgz) = 2050634
diff --git a/cad/systemc/pkg-plist b/cad/systemc/pkg-plist
index 57efdfce153f..c34bdc8100a7 100644
--- a/cad/systemc/pkg-plist
+++ b/cad/systemc/pkg-plist
@@ -6,10 +6,8 @@ systemc/LICENSE
 systemc/NEWS
 systemc/README
 systemc/RELEASENOTES
-systemc/docs/.DS_Store
-systemc/docs/._.DS_Store
 systemc/docs/FuncSpec20.pdf
-systemc/docs/LRM_version2.1_April25_2005.pdf
+systemc/docs/IEEE1666_specification
 systemc/docs/License.pdf
 systemc/docs/README
 systemc/docs/SystemC_2_1_features.pdf
@@ -92,24 +90,22 @@ systemc/include/sysc/kernel/sc_constants.h
 systemc/include/sysc/kernel/sc_cor.h
 systemc/include/sysc/kernel/sc_dynamic_processes.h
 systemc/include/sysc/kernel/sc_event.h
+systemc/include/sysc/kernel/sc_except.h
 systemc/include/sysc/kernel/sc_externs.h
 systemc/include/sysc/kernel/sc_join.h
 systemc/include/sysc/kernel/sc_kernel_ids.h
-systemc/include/sysc/kernel/sc_lambda.h
-systemc/include/sysc/kernel/sc_lambda_defs.h
-systemc/include/sysc/kernel/sc_lambda_exps.h
-systemc/include/sysc/kernel/sc_lambda_friends.h
 systemc/include/sysc/kernel/sc_macros.h
 systemc/include/sysc/kernel/sc_module.h
 systemc/include/sysc/kernel/sc_module_name.h
 systemc/include/sysc/kernel/sc_object.h
 systemc/include/sysc/kernel/sc_process.h
-systemc/include/sysc/kernel/sc_process_b.h
-systemc/include/sysc/kernel/sc_process_base.h
-systemc/include/sysc/kernel/sc_process_host.h
+systemc/include/sysc/kernel/sc_process_handle.h
+systemc/include/sysc/kernel/sc_reset.h
 systemc/include/sysc/kernel/sc_runnable.h
 systemc/include/sysc/kernel/sc_sensitive.h
 systemc/include/sysc/kernel/sc_simcontext.h
+systemc/include/sysc/kernel/sc_spawn.h
+systemc/include/sysc/kernel/sc_spawn_options.h
 systemc/include/sysc/kernel/sc_time.h
 systemc/include/sysc/kernel/sc_ver.h
 systemc/include/sysc/kernel/sc_wait.h
@@ -133,6 +129,7 @@ systemc/include/sysc/packages/boost/config/compiler/borland.hpp
 systemc/include/sysc/packages/boost/config/compiler/comeau.hpp
 systemc/include/sysc/packages/boost/config/compiler/common_edg.hpp
 systemc/include/sysc/packages/boost/config/compiler/compaq_cxx.hpp
+systemc/include/sysc/packages/boost/config/compiler/digitalmars.hpp
 systemc/include/sysc/packages/boost/config/compiler/gcc.hpp
 systemc/include/sysc/packages/boost/config/compiler/greenhills.hpp
 systemc/include/sysc/packages/boost/config/compiler/hp_acc.hpp
@@ -172,43 +169,83 @@ systemc/include/sysc/packages/boost/config/suffix.hpp
 systemc/include/sysc/packages/boost/config/user.hpp
 systemc/include/sysc/packages/boost/current_function.hpp
 systemc/include/sysc/packages/boost/detail/algorithm.hpp
-systemc/include/sysc/packages/boost/detail/allocator.hpp
+systemc/include/sysc/packages/boost/detail/allocator_utilities.hpp
 systemc/include/sysc/packages/boost/detail/atomic_count.hpp
 systemc/include/sysc/packages/boost/detail/atomic_count_gcc.hpp
-systemc/include/sysc/packages/boost/detail/atomic_count_linux.hpp
 systemc/include/sysc/packages/boost/detail/atomic_count_pthreads.hpp
 systemc/include/sysc/packages/boost/detail/atomic_count_win32.hpp
+systemc/include/sysc/packages/boost/detail/bad_weak_ptr.hpp
 systemc/include/sysc/packages/boost/detail/binary_search.hpp
 systemc/include/sysc/packages/boost/detail/call_traits.hpp
 systemc/include/sysc/packages/boost/detail/catch_exceptions.hpp
 systemc/include/sysc/packages/boost/detail/compressed_pair.hpp
 systemc/include/sysc/packages/boost/detail/dynamic_bitset.hpp
+systemc/include/sysc/packages/boost/detail/endian.hpp
+systemc/include/sysc/packages/boost/detail/indirect_traits.hpp
+systemc/include/sysc/packages/boost/detail/interlocked.hpp
+systemc/include/sysc/packages/boost/detail/is_function_ref_tester.hpp
+systemc/include/sysc/packages/boost/detail/is_incrementable.hpp
+systemc/include/sysc/packages/boost/detail/is_xxx.hpp
 systemc/include/sysc/packages/boost/detail/iterator.hpp
 systemc/include/sysc/packages/boost/detail/lightweight_mutex.hpp
 systemc/include/sysc/packages/boost/detail/lightweight_test.hpp
 systemc/include/sysc/packages/boost/detail/limits.hpp
-systemc/include/sysc/packages/boost/detail/lwm_gcc.hpp
-systemc/include/sysc/packages/boost/detail/lwm_irix.hpp
-systemc/include/sysc/packages/boost/detail/lwm_linux.hpp
 systemc/include/sysc/packages/boost/detail/lwm_nop.hpp
 systemc/include/sysc/packages/boost/detail/lwm_pthreads.hpp
-systemc/include/sysc/packages/boost/detail/lwm_win32.hpp
 systemc/include/sysc/packages/boost/detail/lwm_win32_cs.hpp
 systemc/include/sysc/packages/boost/detail/named_template_params.hpp
+systemc/include/sysc/packages/boost/detail/no_exceptions_support.hpp
+systemc/include/sysc/packages/boost/detail/none_t.hpp
 systemc/include/sysc/packages/boost/detail/numeric_traits.hpp
 systemc/include/sysc/packages/boost/detail/ob_call_traits.hpp
 systemc/include/sysc/packages/boost/detail/ob_compressed_pair.hpp
+systemc/include/sysc/packages/boost/detail/quick_allocator.hpp
+systemc/include/sysc/packages/boost/detail/reference_content.hpp
 systemc/include/sysc/packages/boost/detail/select_type.hpp
 systemc/include/sysc/packages/boost/detail/shared_array_nmt.hpp
 systemc/include/sysc/packages/boost/detail/shared_count.hpp
 systemc/include/sysc/packages/boost/detail/shared_ptr_nmt.hpp
-systemc/include/sysc/packages/boost/detail/winapi.hpp
+systemc/include/sysc/packages/boost/detail/sp_counted_base.hpp
+systemc/include/sysc/packages/boost/detail/sp_counted_base_cw_ppc.hpp
+systemc/include/sysc/packages/boost/detail/sp_counted_base_cw_x86.hpp
+systemc/include/sysc/packages/boost/detail/sp_counted_base_gcc_ia64.hpp
+systemc/include/sysc/packages/boost/detail/sp_counted_base_gcc_ppc.hpp
+systemc/include/sysc/packages/boost/detail/sp_counted_base_gcc_x86.hpp
+systemc/include/sysc/packages/boost/detail/sp_counted_base_nt.hpp
+systemc/include/sysc/packages/boost/detail/sp_counted_base_pt.hpp
+systemc/include/sysc/packages/boost/detail/sp_counted_base_w32.hpp
+systemc/include/sysc/packages/boost/detail/sp_counted_impl.hpp
+systemc/include/sysc/packages/boost/detail/templated_streams.hpp
+systemc/include/sysc/packages/boost/detail/utf8_codecvt_facet.hpp
+systemc/include/sysc/packages/boost/detail/workaround.hpp
+systemc/include/sysc/packages/boost/get_pointer.hpp
 systemc/include/sysc/packages/boost/mem_fn.hpp
+systemc/include/sysc/packages/boost/mpl/aux_/adl_barrier.hpp
+systemc/include/sysc/packages/boost/mpl/aux_/config/adl.hpp
+systemc/include/sysc/packages/boost/mpl/aux_/config/gcc.hpp
+systemc/include/sysc/packages/boost/mpl/aux_/config/intel.hpp
+systemc/include/sysc/packages/boost/mpl/aux_/config/msvc.hpp
+systemc/include/sysc/packages/boost/mpl/aux_/config/static_constant.hpp
+systemc/include/sysc/packages/boost/mpl/aux_/config/workaround.hpp
+systemc/include/sysc/packages/boost/mpl/bool.hpp
+systemc/include/sysc/packages/boost/mpl/bool_fwd.hpp
+systemc/include/sysc/packages/boost/mpl/integral_c_tag.hpp
+systemc/include/sysc/packages/boost/non_type.hpp
 systemc/include/sysc/packages/boost/ref.hpp
 systemc/include/sysc/packages/boost/shared_ptr.hpp
 systemc/include/sysc/packages/boost/throw_exception.hpp
 systemc/include/sysc/packages/boost/type.hpp
 systemc/include/sysc/packages/boost/utility/addressof.hpp
+systemc/include/sysc/packages/boost/utility/base_from_member.hpp
+systemc/include/sysc/packages/boost/utility/compare_pointees.hpp
+systemc/include/sysc/packages/boost/utility/detail/in_place_factory_prefix.hpp
+systemc/include/sysc/packages/boost/utility/detail/in_place_factory_suffix.hpp
+systemc/include/sysc/packages/boost/utility/detail/result_of_iterate.hpp
+systemc/include/sysc/packages/boost/utility/enable_if.hpp
+systemc/include/sysc/packages/boost/utility/in_place_factory.hpp
+systemc/include/sysc/packages/boost/utility/result_of.hpp
+systemc/include/sysc/packages/boost/utility/typed_in_place_factory.hpp
+systemc/include/sysc/packages/boost/utility/value_init.hpp
 systemc/include/sysc/packages/boost/weak_ptr.hpp
 systemc/include/sysc/qt/md/axp.1.Makefile
 systemc/include/sysc/qt/md/axp.2.Makefile
@@ -228,6 +265,8 @@ systemc/include/sysc/qt/md/i386.README
 systemc/include/sysc/qt/md/i386.h
 systemc/include/sysc/qt/md/i386.s
 systemc/include/sysc/qt/md/i386_b.s
+systemc/include/sysc/qt/md/iX86_64.h
+systemc/include/sysc/qt/md/iX86_64.s
 systemc/include/sysc/qt/md/ksr1.Makefile
 systemc/include/sysc/qt/md/ksr1.h
 systemc/include/sysc/qt/md/ksr1.s
@@ -253,6 +292,7 @@ systemc/include/sysc/qt/md/powerpc_sys5.h
 systemc/include/sysc/qt/md/powerpc_sys5.s
 systemc/include/sysc/qt/md/powerpc_sys5_b.s
 systemc/include/sysc/qt/md/pthreads.Makefile
+systemc/include/sysc/qt/md/qtmd.h
 systemc/include/sysc/qt/md/solaris.README
 systemc/include/sysc/qt/md/sparc.h
 systemc/include/sysc/qt/md/sparc.s
@@ -268,6 +308,7 @@ systemc/include/sysc/tracing/sc_wif_trace.h
 systemc/include/sysc/utils/sc_hash.h
 systemc/include/sysc/utils/sc_iostream.h
 systemc/include/sysc/utils/sc_list.h
+systemc/include/sysc/utils/sc_machine.h
 systemc/include/sysc/utils/sc_mempool.h
 systemc/include/sysc/utils/sc_pq.h
 systemc/include/sysc/utils/sc_report.h
@@ -283,7 +324,6 @@ systemc/lib-freebsd/libsystemc.a
 @dirrmtry systemc/examples/sysc/2.1
 @dirrmtry systemc/examples/sysc/fft
 @dirrmtry systemc/examples/sysc
-@dirrmtry systemc/examples/systemc
 @dirrmtry systemc/examples
 @dirrm systemc/include/sysc/communication
 @dirrm systemc/include/sysc/datatypes/bit
@@ -298,6 +338,10 @@ systemc/lib-freebsd/libsystemc.a
 @dirrm systemc/include/sysc/packages/boost/config/stdlib
 @dirrm systemc/include/sysc/packages/boost/config
 @dirrm systemc/include/sysc/packages/boost/detail
+@dirrm systemc/include/sysc/packages/boost/mpl/aux_/config
+@dirrm systemc/include/sysc/packages/boost/mpl/aux_
+@dirrm systemc/include/sysc/packages/boost/mpl
+@dirrm systemc/include/sysc/packages/boost/utility/detail
 @dirrm systemc/include/sysc/packages/boost/utility
 @dirrm systemc/include/sysc/packages/boost
 @dirrm systemc/include/sysc/packages