Update to 1.2.3. This version is almost a rewrite of the previous 1.0.x

branch (incompatible with it).

6 files changed, 69 insertions, 122 deletions

diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index e6613bec9f9..df8bb5514bd 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2002/09/17 05:24:24 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/01 11:54:07 jmmv Exp $
 
-DISTNAME=	libsigc++-1.0.4
-PKGREVISION=	1
+DISTNAME=	libsigc++-1.2.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libsigc/}
 
@@ -9,10 +8,17 @@ MAINTAINER=	bsieker@freenet.de
 HOMEPAGE=	http://libsigc.sourceforge.net/
 COMMENT=	type-safe callback system for C++ programs
 
+BUILD_DEPENDS=		m4>=1.4:../../devel/m4
+
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/scripts/ltconfig
+USE_GMAKE=		YES
+
+LIBTOOL_OVERRIDE=	${WRKSRC}/scripts/libtool
+PKGCONFIG_OVERRIDE=	${WRKSRC}/sigc++-1.2.pc.in
+
+CONFIGURE_ENV+=		ac_cv_prog_M4=${LOCALBASE}/bin/gm4
 
 .include "../../mk/pthread.buildlink2.mk"
 
@@ -20,8 +26,4 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/scripts/ltconfig
 CONFIGURE_ARGS+=	--disable-threads
 .endif
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sigc++
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/sigc++
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libsigc++/PLIST b/devel/libsigc++/PLIST
index 656036b0600..2a0b76e1e16 100644
--- a/devel/libsigc++/PLIST
+++ b/devel/libsigc++/PLIST
@@ -1,55 +1,41 @@
-@comment $NetBSD: PLIST,v 1.2 2002/09/11 21:29:27 wiz Exp $
-bin/sigc-config
-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
-lib/libsigc.so.0
-lib/libsigc.so.0.0
-share/aclocal/sigc++.m4
-share/doc/sigc++/API
-share/doc/sigc++/FAQ
-share/doc/sigc++/UML
-share/doc/sigc++/conventions
-share/doc/sigc++/diagrams
-share/doc/sigc++/marshal
-share/doc/sigc++/powerusers
-share/doc/sigc++/requirements
-share/doc/sigc++/riscos
-share/doc/sigc++/signals
-share/doc/sigc++/win32
-@dirrm share/doc/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
+@comment $NetBSD: PLIST,v 1.3 2003/03/01 11:54:07 jmmv Exp $
+include/sigc++-1.2/sigc++/adaptor.h
+include/sigc++-1.2/sigc++/bind.h
+include/sigc++-1.2/sigc++/bind_return.h
+include/sigc++-1.2/sigc++/class_slot.h
+include/sigc++-1.2/sigc++/connection.h
+include/sigc++-1.2/sigc++/hide.h
+include/sigc++-1.2/sigc++/macros/bind.h.m4
+include/sigc++-1.2/sigc++/macros/bind_return.h.m4
+include/sigc++-1.2/sigc++/macros/class_slot.h.m4
+include/sigc++-1.2/sigc++/macros/hide.h.m4
+include/sigc++-1.2/sigc++/macros/method_slot.h.m4
+include/sigc++-1.2/sigc++/macros/object_slot.h.m4
+include/sigc++-1.2/sigc++/macros/retype.h.m4
+include/sigc++-1.2/sigc++/macros/retype_return.h.m4
+include/sigc++-1.2/sigc++/macros/signal.h.m4
+include/sigc++-1.2/sigc++/macros/slot.h.m4
+include/sigc++-1.2/sigc++/macros/template.macros.m4
+include/sigc++-1.2/sigc++/marshal.h
+include/sigc++-1.2/sigc++/method_slot.h
+include/sigc++-1.2/sigc++/node.h
+include/sigc++-1.2/sigc++/object.h
+include/sigc++-1.2/sigc++/object_slot.h
+include/sigc++-1.2/sigc++/retype.h
+include/sigc++-1.2/sigc++/retype_return.h
+include/sigc++-1.2/sigc++/sigc++.h
+include/sigc++-1.2/sigc++/signal.h
+include/sigc++-1.2/sigc++/slot.h
+include/sigc++-1.2/sigc++/trait.h
+lib/libsigc-1.2.a
+lib/libsigc-1.2.la
+lib/libsigc-1.2.so
+lib/libsigc-1.2.so.5
+lib/libsigc-1.2.so.5.3
+lib/pkgconfig/sigc++-1.2.pc
+lib/sigc++-1.2/include/sigcconfig.h
+@dirrm lib/sigc++-1.2/include
+@dirrm lib/sigc++-1.2
+@dirrm include/sigc++-1.2/sigc++/macros
+@dirrm include/sigc++-1.2/sigc++
+@dirrm include/sigc++-1.2
diff --git a/devel/libsigc++/buildlink2.mk b/devel/libsigc++/buildlink2.mk
index ae167c168e0..22ef57bffef 100644
--- a/devel/libsigc++/buildlink2.mk
+++ b/devel/libsigc++/buildlink2.mk
@@ -1,19 +1,24 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/09/17 05:46:54 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/03/01 11:54:07 jmmv Exp $
+#
+# This Makefile fragment is included by packages that use libsigc++.
+#
+# This file was created automatically using createbuildlink 2.4.
+#
 
 .if !defined(LIBSIGCXX_BUILDLINK2_MK)
 LIBSIGCXX_BUILDLINK2_MK=	# defined
 
-BUILDLINK_PACKAGES+=		libsigcxx
-BUILDLINK_DEPENDS.libsigcxx?=	libsigc++>=1.0.4nb1
-BUILDLINK_PKGSRCDIR.libsigcxx?=	../../devel/libsigc++
+BUILDLINK_PACKAGES+=			libsigcxx
+BUILDLINK_DEPENDS.libsigcxx?=		libsigc++>=1.2.3
+BUILDLINK_PKGSRCDIR.libsigcxx?=		../../devel/libsigc++
 
-EVAL_PREFIX+=			BUILDLINK_PREFIX.libsigcxx=libsigc++
+EVAL_PREFIX+=	BUILDLINK_PREFIX.libsigcxx=libsigcxx
 BUILDLINK_PREFIX.libsigcxx_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.libsigcxx=	include/sigc++-1.0/sigc++/*
-BUILDLINK_FILES.libsigcxx+=	lib/sigc++-1.0/include/sigc++config.h
-BUILDLINK_FILES.libsigcxx+=	lib/libsigc.*
-
-.include "../../mk/pthread.buildlink2.mk"
+BUILDLINK_FILES.libsigcxx+=	include/sigc++-1.2/sigc++/*
+BUILDLINK_FILES.libsigcxx+=	include/sigc++-1.2/sigc++/macros/*
+BUILDLINK_FILES.libsigcxx+=	lib/libsigc-1.2.*
+BUILDLINK_FILES.libsigcxx+=	lib/pkgconfig/sigc++-1.2.pc
+BUILDLINK_FILES.libsigcxx+=	lib/sigc++-1.2/include/*
 
 BUILDLINK_TARGETS+=	libsigcxx-buildlink
 
diff --git a/devel/libsigc++/distinfo b/devel/libsigc++/distinfo
index 0ff56256fda..a4242575375 100644
--- a/devel/libsigc++/distinfo
+++ b/devel/libsigc++/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/09/17 05:41:53 jlam Exp $
+$NetBSD: distinfo,v 1.6 2003/03/01 11:54:07 jmmv Exp $
 
-SHA1 (libsigc++-1.0.4.tar.gz) = 15a687edc5f64a317ef40f4df04dc5adeccfb88d
-Size (libsigc++-1.0.4.tar.gz) = 212089 bytes
-SHA1 (patch-aa) = 5e4bf439221264c9997e3491e461efcb87cf7849
-SHA1 (patch-ab) = c5938da194d91e0608ecdfd6bc95f8ca1928fda4
+SHA1 (libsigc++-1.2.3.tar.gz) = 691257b431d5c2739c177fa77cab1c6bca4e2946
+Size (libsigc++-1.2.3.tar.gz) = 277375 bytes
diff --git a/devel/libsigc++/patches/patch-aa b/devel/libsigc++/patches/patch-aa
deleted file mode 100644
index 366544e5a8f..00000000000
--- a/devel/libsigc++/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/09/17 05:41:54 jlam Exp $
-
---- sigc++/Makefile.in.orig	Tue Oct 23 04:40:58 2001
-+++ sigc++/Makefile.in
-@@ -94,7 +94,7 @@ libsigc_la_SOURCES =     object.cc   sco
- 
- 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
- 
- 
- lib_LTLIBRARIES = libsigc.la
-@@ -121,7 +121,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../sigc+
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libsigc_la_LIBADD = 
-+libsigc_la_LIBADD = $(THREAD_LIB)
- @SIGCRC_TRUE@libsigc_la_OBJECTS =  object.lo scope.lo marshal.lo slot.lo \
- @SIGCRC_TRUE@basic_signal.lo adaptor.lo thread.lo sigc_res.lo
- @SIGCRC_FALSE@libsigc_la_OBJECTS =  object.lo scope.lo marshal.lo \
diff --git a/devel/libsigc++/patches/patch-ab b/devel/libsigc++/patches/patch-ab
deleted file mode 100644
index 3271ae83141..00000000000
--- a/devel/libsigc++/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/09/11 21:29:30 wiz Exp $
-
---- 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
-     -l*) af_rev_libs="$i $af_rev_libs" ;;
--    -L*|-R*)
-+    -L*|-R*|-Wl,-R*)
-         if test "X$af_echo_libs_L" = "Xyes"; then
-             case " $af_lib_L_flags " in
-             *\ $i\ *) ;;                              # already there
-@@ -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++-1.0/include -I@includedir@/sigc++-1.0"
- af_libs="$libs -lsigc @THREAD_LIB@ $af_libs"