diff --git a/devel/libsigc++-2/Makefile b/devel/libsigc++-2/Makefile
index 6e1da13cb55..dec62fc930b 100644
--- a/devel/libsigc++-2/Makefile
+++ b/devel/libsigc++-2/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2007/09/16 02:53:00 merdely Exp $
+# $OpenBSD: Makefile,v 1.8 2007/10/24 08:51:57 wilfried Exp $
 
 COMMENT-main=		callback framework for C++
 COMMENT-docs=		callback framework for C++ documentation
 
-VERSION=		2.0.17
+VERSION=		2.0.18
 DISTNAME=		libsigc++-${VERSION}
-PKGNAME-main=		${DISTNAME}p0
 PKGNAME-docs=		libsigc++-docs-${VERSION}
 V=			2.0
 SUBST_VARS=		V
diff --git a/devel/libsigc++-2/distinfo b/devel/libsigc++-2/distinfo
index c61d018a82e..5b0b67d72bb 100644
--- a/devel/libsigc++-2/distinfo
+++ b/devel/libsigc++-2/distinfo
@@ -1,5 +1,5 @@
-MD5 (libsigc++-2.0.17.tar.gz) = VWxfZsWO8CkG4iqxmcNSIg==
-RMD160 (libsigc++-2.0.17.tar.gz) = IRLxQhCuOjeyg6ya85heirYG61I=
-SHA1 (libsigc++-2.0.17.tar.gz) = pGXDxVJ0534mfOyptHVEPykUXK0=
-SHA256 (libsigc++-2.0.17.tar.gz) = ICPKvnpQIjIXfJvcpXTjrZe9gdKnutu0J/Vh4XA659s=
-SIZE (libsigc++-2.0.17.tar.gz) = 2293739
+MD5 (libsigc++-2.0.18.tar.gz) = D2gxtrN+dYlTCwT17sko2A==
+RMD160 (libsigc++-2.0.18.tar.gz) = gExgu40pM/2NidXxb35G5XX9zK0=
+SHA1 (libsigc++-2.0.18.tar.gz) = 1ky7jWCwRgXnEa5ziPF4d5EBXrQ=
+SHA256 (libsigc++-2.0.18.tar.gz) = pf4vmi1SwYAsMrjcU5NccB0WY2B5XkxIQa7eqsS5MBM=
+SIZE (libsigc++-2.0.18.tar.gz) = 2457196
diff --git a/devel/libsigc++-2/pkg/PLIST-docs b/devel/libsigc++-2/pkg/PLIST-docs
index 2759152972f..93f49199733 100644
--- a/devel/libsigc++-2/pkg/PLIST-docs
+++ b/devel/libsigc++-2/pkg/PLIST-docs
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-docs,v 1.2 2006/10/18 17:43:01 wilfried Exp $
+@comment $OpenBSD: PLIST-docs,v 1.3 2007/10/24 08:51:57 wilfried Exp $
 @option no-default-conflict
 @conflict libsigc++-docs-2.*
 share/doc/libsigc-${V}/
@@ -73,6 +73,7 @@ share/doc/libsigc-${V}/docs/reference/html/class__slot_8h.html
 share/doc/libsigc-${V}/docs/reference/html/classes.html
 share/doc/libsigc-${V}/docs/reference/html/classinternal_1_1lambda__core.html
 share/doc/libsigc-${V}/docs/reference/html/classinternal_1_1lambda__core__inherit__graph.png
+share/doc/libsigc-${V}/docs/reference/html/classnil.html
 share/doc/libsigc-${V}/docs/reference/html/classsigc_1_1bound__argument-members.html
 share/doc/libsigc-${V}/docs/reference/html/classsigc_1_1bound__argument.html
 share/doc/libsigc-${V}/docs/reference/html/classsigc_1_1bound__argument_3_01const__reference__wrapper_3_01T__wrapped_01_4_01_4-members.html
@@ -376,15 +377,6 @@ share/doc/libsigc-${V}/docs/reference/html/compose_8h.html
 share/doc/libsigc-${V}/docs/reference/html/connection_8h.html
 share/doc/libsigc-${V}/docs/reference/html/deduce__result__type_8h.html
 share/doc/libsigc-${V}/docs/reference/html/deprecated.html
-share/doc/libsigc-${V}/docs/reference/html/dir__2Fhome_2Fmurrayc_2Fcvs_2Fgnome214_2Flibsigc_2B_2B2_2Fsigc_2B_2B_2F.html
-share/doc/libsigc-${V}/docs/reference/html/dir__2Fhome_2Fmurrayc_2Fcvs_2Fgnome214_2Flibsigc_2B_2B2_2Fsigc_2B_2B_2F_dep.png
-share/doc/libsigc-${V}/docs/reference/html/dir__2Fhome_2Fmurrayc_2Fcvs_2Fgnome214_2Flibsigc_2B_2B2_2Fsigc_2B_2B_2Fadaptors_2F.html
-share/doc/libsigc-${V}/docs/reference/html/dir__2Fhome_2Fmurrayc_2Fcvs_2Fgnome214_2Flibsigc_2B_2B2_2Fsigc_2B_2B_2Fadaptors_2F_dep.png
-share/doc/libsigc-${V}/docs/reference/html/dir__2Fhome_2Fmurrayc_2Fcvs_2Fgnome214_2Flibsigc_2B_2B2_2Fsigc_2B_2B_2Fadaptors_2Flambda_2F.html
-share/doc/libsigc-${V}/docs/reference/html/dir__2Fhome_2Fmurrayc_2Fcvs_2Fgnome214_2Flibsigc_2B_2B2_2Fsigc_2B_2B_2Fadaptors_2Flambda_2F_dep.png
-share/doc/libsigc-${V}/docs/reference/html/dir__2Fhome_2Fmurrayc_2Fcvs_2Fgnome214_2Flibsigc_2B_2B2_2Fsigc_2B_2B_2Ffunctors_2F.html
-share/doc/libsigc-${V}/docs/reference/html/dir__2Fhome_2Fmurrayc_2Fcvs_2Fgnome214_2Flibsigc_2B_2B2_2Fsigc_2B_2B_2Ffunctors_2F_dep.png
-share/doc/libsigc-${V}/docs/reference/html/dirs.html
 share/doc/libsigc-${V}/docs/reference/html/doxygen.css
 share/doc/libsigc-${V}/docs/reference/html/doxygen.png
 share/doc/libsigc-${V}/docs/reference/html/exception__catch_8h.html
@@ -431,15 +423,40 @@ share/doc/libsigc-${V}/docs/reference/html/functions_func_0x76.html
 share/doc/libsigc-${V}/docs/reference/html/functions_func_0x7e.html
 share/doc/libsigc-${V}/docs/reference/html/functions_rela.html
 share/doc/libsigc-${V}/docs/reference/html/functions_type.html
+share/doc/libsigc-${V}/docs/reference/html/functions_type_0x63.html
+share/doc/libsigc-${V}/docs/reference/html/functions_type_0x64.html
+share/doc/libsigc-${V}/docs/reference/html/functions_type_0x65.html
+share/doc/libsigc-${V}/docs/reference/html/functions_type_0x66.html
+share/doc/libsigc-${V}/docs/reference/html/functions_type_0x67.html
+share/doc/libsigc-${V}/docs/reference/html/functions_type_0x69.html
+share/doc/libsigc-${V}/docs/reference/html/functions_type_0x6c.html
+share/doc/libsigc-${V}/docs/reference/html/functions_type_0x6f.html
+share/doc/libsigc-${V}/docs/reference/html/functions_type_0x70.html
+share/doc/libsigc-${V}/docs/reference/html/functions_type_0x72.html
+share/doc/libsigc-${V}/docs/reference/html/functions_type_0x73.html
+share/doc/libsigc-${V}/docs/reference/html/functions_type_0x74.html
+share/doc/libsigc-${V}/docs/reference/html/functions_type_0x76.html
 share/doc/libsigc-${V}/docs/reference/html/functions_vars.html
+share/doc/libsigc-${V}/docs/reference/html/functions_vars_0x61.html
+share/doc/libsigc-${V}/docs/reference/html/functions_vars_0x62.html
+share/doc/libsigc-${V}/docs/reference/html/functions_vars_0x63.html
+share/doc/libsigc-${V}/docs/reference/html/functions_vars_0x64.html
+share/doc/libsigc-${V}/docs/reference/html/functions_vars_0x65.html
+share/doc/libsigc-${V}/docs/reference/html/functions_vars_0x66.html
+share/doc/libsigc-${V}/docs/reference/html/functions_vars_0x67.html
+share/doc/libsigc-${V}/docs/reference/html/functions_vars_0x69.html
+share/doc/libsigc-${V}/docs/reference/html/functions_vars_0x6c.html
+share/doc/libsigc-${V}/docs/reference/html/functions_vars_0x6f.html
+share/doc/libsigc-${V}/docs/reference/html/functions_vars_0x70.html
+share/doc/libsigc-${V}/docs/reference/html/functions_vars_0x72.html
+share/doc/libsigc-${V}/docs/reference/html/functions_vars_0x73.html
+share/doc/libsigc-${V}/docs/reference/html/functions_vars_0x74.html
+share/doc/libsigc-${V}/docs/reference/html/functions_vars_0x76.html
 share/doc/libsigc-${V}/docs/reference/html/functor__trait_8h.html
 share/doc/libsigc-${V}/docs/reference/html/functors_2slot_8h.html
 share/doc/libsigc-${V}/docs/reference/html/functors_8h.html
 share/doc/libsigc-${V}/docs/reference/html/globals.html
 share/doc/libsigc-${V}/docs/reference/html/globals_defs.html
-share/doc/libsigc-${V}/docs/reference/html/globals_func.html
-share/doc/libsigc-${V}/docs/reference/html/globals_type.html
-share/doc/libsigc-${V}/docs/reference/html/globals_vars.html
 share/doc/libsigc-${V}/docs/reference/html/graph_legend.dot
 share/doc/libsigc-${V}/docs/reference/html/graph_legend.html
 share/doc/libsigc-${V}/docs/reference/html/graph_legend.png
@@ -656,6 +673,7 @@ share/doc/libsigc-${V}/docs/reference/html/inherit__graph__26.png
 share/doc/libsigc-${V}/docs/reference/html/inherit__graph__260.png
 share/doc/libsigc-${V}/docs/reference/html/inherit__graph__261.png
 share/doc/libsigc-${V}/docs/reference/html/inherit__graph__262.png
+share/doc/libsigc-${V}/docs/reference/html/inherit__graph__263.png
 share/doc/libsigc-${V}/docs/reference/html/inherit__graph__27.png
 share/doc/libsigc-${V}/docs/reference/html/inherit__graph__28.png
 share/doc/libsigc-${V}/docs/reference/html/inherit__graph__29.png
@@ -744,7 +762,33 @@ share/doc/libsigc-${V}/docs/reference/html/method__slot_8h.html
 share/doc/libsigc-${V}/docs/reference/html/modules.html
 share/doc/libsigc-${V}/docs/reference/html/namespaceSigC.html
 share/doc/libsigc-${V}/docs/reference/html/namespacemembers.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_0x62.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_0x63.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_0x64.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_0x65.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_0x66.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_0x67.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_0x68.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_0x6d.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_0x6f.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_0x70.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_0x72.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_0x73.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_0x75.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_0x76.html
 share/doc/libsigc-${V}/docs/reference/html/namespacemembers_func.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_func_0x63.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_func_0x64.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_func_0x65.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_func_0x67.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_func_0x68.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_func_0x6d.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_func_0x6f.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_func_0x70.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_func_0x72.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_func_0x73.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_func_0x75.html
+share/doc/libsigc-${V}/docs/reference/html/namespacemembers_func_0x76.html
 share/doc/libsigc-${V}/docs/reference/html/namespacemembers_type.html
 share/doc/libsigc-${V}/docs/reference/html/namespacemembers_vars.html
 share/doc/libsigc-${V}/docs/reference/html/namespaces.html
diff --git a/devel/libsigc++-2/pkg/PLIST-main b/devel/libsigc++-2/pkg/PLIST-main
index 142ba86a849..2d67e008f7c 100644
--- a/devel/libsigc++-2/pkg/PLIST-main
+++ b/devel/libsigc++-2/pkg/PLIST-main
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2006/11/25 08:30:21 steven Exp $
-@pkgpath devel/libsigc++-2
+@comment $OpenBSD: PLIST-main,v 1.2 2007/10/24 08:51:58 wilfried Exp $
 @option no-default-conflict
 @conflict libsigc++-2.*
+@pkgpath devel/libsigc++-2
 %%SHARED%%
 include/sigc++-${V}/
 include/sigc++-${V}/sigc++/