Update to 1.0.4, provided by Adan Ciarcinski.

 * Changed include directory to
   $(includedir)/sigc++-1.0/sigc++
   to allow parallel installation with sigc-1.2.  Added an
   install-data-hook rule deleting the old headers.
   (Daniel Elstner)
 * Ming patch from cgustin@ibelgique.com
   (This is probably not complete, because the sigc_res.rc
   file was not in cvs - an emtpy file has been added.)
Converted to buildlink2 by me.

7 files changed, 65 insertions, 64 deletions

diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index a0ea3dccea8..56a729220ff 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2001/10/21 12:46:24 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/11 21:29:27 wiz Exp $
 
-DISTNAME=		libsigc++-1.0.3
+DISTNAME=		libsigc++-1.0.4
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libsigc/}
 
@@ -11,7 +11,7 @@ COMMENT=		libsigc++ is provides a callback system for C++ programs
 GNU_CONFIGURE=		YES
 CONFIGURE_ARG=		--disable-threads
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/scripts/ltconfig
 
diff --git a/devel/libsigc++/PLIST b/devel/libsigc++/PLIST
index 4fa7b3df9ff..656036b0600 100644
--- a/devel/libsigc++/PLIST
+++ b/devel/libsigc++/PLIST
@@ -1,35 +1,35 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:42 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/11 21:29:27 wiz Exp $
 bin/sigc-config
-include/sigc++/adaptor.h
-include/sigc++/basic_signal.h
-include/sigc++/bind.h
-include/sigc++/class_slot.h
-include/sigc++/convert.h
-include/sigc++/func_slot.h
-include/sigc++/generator.h
-include/sigc++/handle.h
-include/sigc++/handle_system.h
-include/sigc++/macros/basic_signal.h.m4
-include/sigc++/macros/bind.h.m4
-include/sigc++/macros/class_slot.h.m4
-include/sigc++/macros/convert.h.m4
-include/sigc++/macros/func_slot.h.m4
-include/sigc++/macros/object_slot.h.m4
-include/sigc++/macros/retbind.h.m4
-include/sigc++/macros/rettype.h.m4
-include/sigc++/macros/slot.h.m4
-include/sigc++/macros/template.macros.m4
-include/sigc++/marshal.h
-include/sigc++/object.h
-include/sigc++/object_slot.h
-include/sigc++/retbind.h
-include/sigc++/rettype.h
-include/sigc++/scope.h
-include/sigc++/signal_system.h
-include/sigc++/slot.h
-include/sigc++/thread.h
-include/sigc++/type.h
-lib/sigc++/include/sigc++config.h
+include/sigc++-1.0/sigc++/adaptor.h
+include/sigc++-1.0/sigc++/basic_signal.h
+include/sigc++-1.0/sigc++/bind.h
+include/sigc++-1.0/sigc++/class_slot.h
+include/sigc++-1.0/sigc++/convert.h
+include/sigc++-1.0/sigc++/func_slot.h
+include/sigc++-1.0/sigc++/generator.h
+include/sigc++-1.0/sigc++/handle.h
+include/sigc++-1.0/sigc++/handle_system.h
+include/sigc++-1.0/sigc++/macros/basic_signal.h.m4
+include/sigc++-1.0/sigc++/macros/bind.h.m4
+include/sigc++-1.0/sigc++/macros/class_slot.h.m4
+include/sigc++-1.0/sigc++/macros/convert.h.m4
+include/sigc++-1.0/sigc++/macros/func_slot.h.m4
+include/sigc++-1.0/sigc++/macros/object_slot.h.m4
+include/sigc++-1.0/sigc++/macros/retbind.h.m4
+include/sigc++-1.0/sigc++/macros/rettype.h.m4
+include/sigc++-1.0/sigc++/macros/slot.h.m4
+include/sigc++-1.0/sigc++/macros/template.macros.m4
+include/sigc++-1.0/sigc++/marshal.h
+include/sigc++-1.0/sigc++/object.h
+include/sigc++-1.0/sigc++/object_slot.h
+include/sigc++-1.0/sigc++/retbind.h
+include/sigc++-1.0/sigc++/rettype.h
+include/sigc++-1.0/sigc++/scope.h
+include/sigc++-1.0/sigc++/signal_system.h
+include/sigc++-1.0/sigc++/slot.h
+include/sigc++-1.0/sigc++/thread.h
+include/sigc++-1.0/sigc++/type.h
+lib/sigc++-1.0/include/sigc++config.h
 lib/libsigc.a
 lib/libsigc.la
 lib/libsigc.so
@@ -48,7 +48,8 @@ share/doc/sigc++/riscos
 share/doc/sigc++/signals
 share/doc/sigc++/win32
 @dirrm share/doc/sigc++
-@dirrm lib/sigc++/include
-@dirrm lib/sigc++
-@dirrm include/sigc++/macros
-@dirrm include/sigc++
+@dirrm lib/sigc++-1.0/include
+@dirrm lib/sigc++-1.0
+@dirrm include/sigc++-1.0/sigc++/macros
+@dirrm include/sigc++-1.0/sigc++
+@dirrm include/sigc++-1.0
diff --git a/devel/libsigc++/buildlink.mk b/devel/libsigc++/buildlink.mk
index ed8996763ec..44c6d9f2d31 100644
--- a/devel/libsigc++/buildlink.mk
+++ b/devel/libsigc++/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/10/23 02:15:38 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/09/11 21:29:28 wiz Exp $
 #
 # This Makefile fragment is included by packages that use libsigc++.
 #
@@ -17,13 +17,13 @@ LIBSIGCXX_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.libsigcxx?=	libsigc++>=0.4
+BUILDLINK_DEPENDS.libsigcxx?=	libsigc++>=1.0.4
 DEPENDS+=	${BUILDLINK_DEPENDS.libsigcxx}:../../devel/libsigc++
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libsigcxx=libsigc++
 BUILDLINK_PREFIX.libsigcxx_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.libsigcxx=	include/sigc++/*
-BUILDLINK_FILES.libsigcxx+=	lib/sigc++/include/sigc++config.h
+BUILDLINK_FILES.libsigcxx=	include/sigc++-1.0/sigc++/*
+BUILDLINK_FILES.libsigcxx+=	lib/sigc++-1.0/include/sigc++config.h
 BUILDLINK_FILES.libsigcxx+=	lib/libsigc.*
 
 BUILDLINK_TARGETS.libsigcxx=	libsigcxx-buildlink
diff --git a/devel/libsigc++/buildlink2.mk b/devel/libsigc++/buildlink2.mk
index abbb73b0523..a59cbd920c7 100644
--- a/devel/libsigc++/buildlink2.mk
+++ b/devel/libsigc++/buildlink2.mk
@@ -1,16 +1,16 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:32 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/11 21:29:28 wiz Exp $
 
 .if !defined(LIBSIGCXX_BUILDLINK2_MK)
 LIBSIGCXX_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libsigcxx
-BUILDLINK_DEPENDS.libsigcxx?=	libsigc++>=0.4
+BUILDLINK_DEPENDS.libsigcxx?=	libsigc++>=1.0.4
 BUILDLINK_PKGSRCDIR.libsigcxx?=	../../devel/libsigc++
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libsigcxx=libsigc++
 BUILDLINK_PREFIX.libsigcxx_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.libsigcxx=	include/sigc++/*
-BUILDLINK_FILES.libsigcxx+=	lib/sigc++/include/sigc++config.h
+BUILDLINK_FILES.libsigcxx=	include/sigc++-1.0/sigc++/*
+BUILDLINK_FILES.libsigcxx+=	lib/sigc++-1.0/include/sigc++config.h
 BUILDLINK_FILES.libsigcxx+=	lib/libsigc.*
 
 BUILDLINK_TARGETS+=	libsigcxx-buildlink
diff --git a/devel/libsigc++/distinfo b/devel/libsigc++/distinfo
index 772632bcbf6..7ac1cd178bc 100644
--- a/devel/libsigc++/distinfo
+++ b/devel/libsigc++/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/04/24 19:36:23 rh Exp $
+$NetBSD: distinfo,v 1.4 2002/09/11 21:29:28 wiz Exp $
 
-SHA1 (libsigc++-1.0.3.tar.gz) = 22f08c9170a0f2f30d49c34a140fa8069dabe44f
-Size (libsigc++-1.0.3.tar.gz) = 209930 bytes
-SHA1 (patch-aa) = 3cc05e693928e60ef653c098f75f2f00485f3ae9
-SHA1 (patch-ab) = 7c807bae072f65b624c95efc13787d6d8b037889
+SHA1 (libsigc++-1.0.4.tar.gz) = 15a687edc5f64a317ef40f4df04dc5adeccfb88d
+Size (libsigc++-1.0.4.tar.gz) = 212089 bytes
+SHA1 (patch-aa) = e660c4969e51af26003be34a3db5f2a7e24c8483
+SHA1 (patch-ab) = c5938da194d91e0608ecdfd6bc95f8ca1928fda4
diff --git a/devel/libsigc++/patches/patch-aa b/devel/libsigc++/patches/patch-aa
index ded87d15075..40d54416a1c 100644
--- a/devel/libsigc++/patches/patch-aa
+++ b/devel/libsigc++/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2000/07/15 08:41:28 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2002/09/11 21:29:29 wiz Exp $
 
---- sigc++/Makefile.in.orig	Sat May 20 14:47:52 2000
-+++ sigc++/Makefile.in	Sat Jul 15 04:31:27 2000
-@@ -90,7 +90,7 @@
- libsigc_la_SOURCES =     object.cc   scope.cc   marshal.cc   slot.cc    basic_signal.cc adaptor.cc thread.cc
+--- sigc++/Makefile.in.orig	Tue May 28 14:32:45 2002
++++ sigc++/Makefile.in	Tue May 28 14:32:52 2002
+@@ -94,7 +94,7 @@
  
+ EXTRA_libsigc_la_SOURCES = sigc_res.rc
  
 -libsigc_la_LDFLAGS = -version-info $(LIBSIGC_SO_VERSION)                      -release $(SIGC_RELEASE) -no-undefined
 +libsigc_la_LDFLAGS = -version-info $(LIBSIGC_SO_VERSION) -no-undefined
  
- libsigcdir = $(prefix)/include/sigc++
  
+ lib_LTLIBRARIES = libsigc.la
diff --git a/devel/libsigc++/patches/patch-ab b/devel/libsigc++/patches/patch-ab
index 90a99d7aab6..3271ae83141 100644
--- a/devel/libsigc++/patches/patch-ab
+++ b/devel/libsigc++/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1 2000/07/15 08:41:28 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2002/09/11 21:29:30 wiz Exp $
 
---- sigc-config.in.orig	Thu Oct 21 02:28:33 1999
-+++ sigc-config.in	Sat Jul 15 04:32:16 2000
+--- sigc-config.in.orig	Sat Oct 20 17:38:36 2001
++++ sigc-config.in	Tue May 28 14:33:11 2002
 @@ -150,7 +150,7 @@
      case "$i" in
      # a library, save it for later, in reverse order
@@ -11,12 +11,12 @@ $NetBSD: patch-ab,v 1.1 2000/07/15 08:41:28 jlam Exp $
          if test "X$af_echo_libs_L" = "Xyes"; then
              case " $af_lib_L_flags " in
              *\ $i\ *) ;;                              # already there
-@@ -218,7 +218,7 @@
-   includes="-I@includedir@"
- fi
+@@ -215,7 +215,7 @@
+ 
+ 
  if test "@libdir@" != /usr/lib ; then
 -  libs="-L@libdir@"
 +  libs="-Wl,-R@libdir@ -L@libdir@"
  fi
- af_cflags="$af_cflags -I@libdir@/sigc++/include $includes"
+ af_cflags="$af_cflags -I@libdir@/sigc++-1.0/include -I@includedir@/sigc++-1.0"
  af_libs="$libs -lsigc @THREAD_LIB@ $af_libs"