Update to 1.0.4, and make this port safe for when libsigc++-1.2 gets added

to the tree.

Prompted by:	Neil Darlow <neil@darlow.co.uk>

8 files changed, 68 insertions, 91 deletions

diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index def1ffbc6a5..d6abd586da5 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -6,10 +6,13 @@
 #
 
 PORTNAME=	libsigc++
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/libsigc++
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	libsigc \
+			stable/sources/libsigc++
+			
 #DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -17,6 +20,11 @@ MAINTAINER=	gnome@FreeBSD.org
 USE_LIBTOOL=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/libsigc++20/distinfo b/devel/libsigc++20/distinfo
index 03c129d6a76..db0504ceda5 100644
--- a/devel/libsigc++20/distinfo
+++ b/devel/libsigc++20/distinfo
@@ -1 +1 @@
-MD5 (libsigc++-1.0.3.tar.gz) = a7e0f529bc49fdcc097108a48c55796d
+MD5 (libsigc++-1.0.4.tar.gz) = 88d34840acc1cc5d47b347726e4a09e0
diff --git a/devel/libsigc++20/files/patch-ab b/devel/libsigc++20/files/patch-ab
index 38dd856ea37..e69de29bb2d 100644
--- a/devel/libsigc++20/files/patch-ab
+++ b/devel/libsigc++20/files/patch-ab
@@ -1,29 +0,0 @@
---- configure.orig	Sat May 20 20:46:13 2000
-+++ configure	Tue Jul 25 14:39:44 2000
-@@ -2566,14 +2566,14 @@
- 
- if test "x$enable_threads" = "xyes" ; then
- enable_threads="no"
--echo $ac_n "checking for pthread_self in -lpthread""... $ac_c" 1>&6
--echo "configure:2571: checking for pthread_self in -lpthread" >&5
-+echo $ac_n "checking for pthread_self in -pthread""... $ac_c" 1>&6
-+echo "configure:2571: checking for pthread_self in -pthread" >&5
- ac_lib_var=`echo pthread'_'pthread_self | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2579 "configure"
- #include "confdefs.h"
-@@ -2604,7 +2604,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  enable_threads="yes";THREAD_LIB="-lpthread"
-+  enable_threads="yes";THREAD_LIB="-pthread"
- else
-   echo "$ac_t""no" 1>&6
- fi
diff --git a/devel/libsigc++20/files/patch-ac b/devel/libsigc++20/files/patch-ac
index d4d1b3004da..40715320d19 100644
--- a/devel/libsigc++20/files/patch-ac
+++ b/devel/libsigc++20/files/patch-ac
@@ -1,20 +1,21 @@
---- sigc++/Makefile.in.orig	Sat May 20 20:47:52 2000
-+++ sigc++/Makefile.in	Tue Jul 25 14:37:44 2000
-@@ -64,7 +64,7 @@
- CPP = @CPP@
- CXX = @CXX@
+--- sigc++/Makefile.in.orig	Tue Oct 23 07:40:58 2001
++++ sigc++/Makefile.in	Tue Aug  6 16:13:28 2002
+@@ -66,7 +66,7 @@
  DLLTOOL = @DLLTOOL@
+ DLL_DEFINE = @DLL_DEFINE@
+ EXEEXT = @EXEEXT@
 -LIBSIGC_SO_VERSION = @LIBSIGC_SO_VERSION@
 +LIBSIGC_SO_VERSION = 1:0:1
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
  M4 = @M4@
-@@ -90,7 +90,7 @@
- libsigc_la_SOURCES =     object.cc   scope.cc   marshal.cc   slot.cc    basic_signal.cc adaptor.cc thread.cc
+@@ -94,8 +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++20/files/patch-ad b/devel/libsigc++20/files/patch-ad
index 201ea9b1db2..43928bfe4f5 100644
--- a/devel/libsigc++20/files/patch-ad
+++ b/devel/libsigc++20/files/patch-ad
@@ -1,11 +1,11 @@
---- sigc++/config/Makefile.in	Thu Jan 20 03:40:58 2000
-+++ sigc++/config/Makefile.in	Thu Jan 27 23:34:37 1994
-@@ -81,7 +81,7 @@
+--- sigc++/config/Makefile.in.orig	Tue Aug  6 16:14:37 2002
++++ sigc++/config/Makefile.in	Tue Aug  6 16:16:36 2002
+@@ -82,7 +82,7 @@
  
  EXTRA_DIST = sigc++config.h.in
  
--includedir = $(libdir)/sigc++/include
-+includedir = $(prefix)/include
- include_HEADERS = sigc++config.h 
+-includedir = $(libdir)/sigc++-1.0/include
++includedir = $(prefix)/include/sigc++-1.0
+ include_HEADERS = sigc++config.h
  mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
  CONFIG_HEADER = sigc++config.h
diff --git a/devel/libsigc++20/files/patch-ae b/devel/libsigc++20/files/patch-ae
index 338287cde7b..b84b620264d 100644
--- a/devel/libsigc++20/files/patch-ae
+++ b/devel/libsigc++20/files/patch-ae
@@ -1,11 +1,11 @@
---- sigc++/macros/Makefile.in	Thu Jan 20 03:40:59 2000
-+++ sigc++/macros/Makefile.in	Fri Jan 28 00:03:54 1994
-@@ -83,7 +83,7 @@
- templates =    template.macros.m4  slot.h.m4          func_slot.h.m4      class_slot.h.m4     object_slot.h.m4   basic_signal.h.m4                                          bind.h.m4           rettype.h.m4        convert.h.m4
+--- sigc++/macros/Makefile.in.orig	Tue Oct 23 07:40:58 2001
++++ sigc++/macros/Makefile.in	Tue Aug  6 13:52:37 2002
+@@ -84,7 +84,7 @@
+ templates =    template.macros.m4  slot.h.m4          func_slot.h.m4      class_slot.h.m4     object_slot.h.m4   basic_signal.h.m4                                          bind.h.m4           rettype.h.m4        convert.h.m4   retbind.h.m4
  
  
--m4includedir = $(includedir)/sigc++/macros
-+m4includedir = $(prefix)/share/libsigc++
+-m4includedir = $(includedir)/sigc++-1.0/sigc++/macros
++m4includedir = $(prefix)/share/sigc++-1.0/sigc++/macros
  m4include_HEADERS = $(templates)
  
  EXTRA_DIST = README $(templates)
diff --git a/devel/libsigc++20/files/patch-af b/devel/libsigc++20/files/patch-af
index 6ac813699ae..026dad7441c 100644
--- a/devel/libsigc++20/files/patch-af
+++ b/devel/libsigc++20/files/patch-af
@@ -1,11 +1,11 @@
---- sigc-config.in	Thu Jan 13 07:23:16 2000
-+++ sigc-config.in	Mon Jan 31 10:34:45 2000
-@@ -220,7 +220,7 @@
+--- sigc-config.in.orig	Sat Oct 20 11:38:36 2001
++++ sigc-config.in	Tue Aug  6 13:53:55 2002
+@@ -217,7 +217,7 @@
  if test "@libdir@" != /usr/lib ; then
    libs="-L@libdir@"
  fi
--af_cflags="$af_cflags -I@libdir@/sigc++/include $includes"
-+af_cflags="$af_cflags $includes"
+-af_cflags="$af_cflags -I@libdir@/sigc++-1.0/include -I@includedir@/sigc++-1.0"
++af_cflags="$af_cflags -I@includedir@/sigc++-1.0"
  af_libs="$libs -lsigc @THREAD_LIB@ $af_libs"
  
  
diff --git a/devel/libsigc++20/pkg-plist b/devel/libsigc++20/pkg-plist
index 2e1419e7ea1..9a57fee546e 100644
--- a/devel/libsigc++20/pkg-plist
+++ b/devel/libsigc++20/pkg-plist
@@ -1,24 +1,24 @@
 bin/sigc-config
-include/sigc++config.h
-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++/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
+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++/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
+include/sigc++-1.0/sigc++config.h
 lib/libsigc.a
 lib/libsigc.so
 lib/libsigc.so.1
@@ -36,16 +36,13 @@ share/doc/libsigc++/requirements
 share/doc/libsigc++/riscos
 share/doc/libsigc++/signals
 share/doc/libsigc++/win32
-share/libsigc++/basic_signal.h.m4
-share/libsigc++/bind.h.m4
-share/libsigc++/class_slot.h.m4
-share/libsigc++/convert.h.m4
-share/libsigc++/func_slot.h.m4
-share/libsigc++/object_slot.h.m4
-share/libsigc++/retbind.h.m4
-share/libsigc++/rettype.h.m4
-share/libsigc++/slot.h.m4
-share/libsigc++/template.macros.m4
-@dirrm include/sigc++
-@dirrm share/doc/libsigc++
-@dirrm share/libsigc++
+share/sigc++-1.0/sigc++/macros/basic_signal.h.m4
+share/sigc++-1.0/sigc++/macros/bind.h.m4
+share/sigc++-1.0/sigc++/macros/class_slot.h.m4
+share/sigc++-1.0/sigc++/macros/convert.h.m4
+share/sigc++-1.0/sigc++/macros/func_slot.h.m4
+share/sigc++-1.0/sigc++/macros/object_slot.h.m4
+share/sigc++-1.0/sigc++/macros/retbind.h.m4
+share/sigc++-1.0/sigc++/macros/rettype.h.m4
+share/sigc++-1.0/sigc++/macros/slot.h.m4
+share/sigc++-1.0/sigc++/macros/template.macros.m4