4 files changed, 26 insertions, 40 deletions

diff --git a/devel/libsigcx/Makefile b/devel/libsigcx/Makefile
index f067bae96bda..1ff52c0ac3fd 100644
--- a/devel/libsigcx/Makefile
+++ b/devel/libsigcx/Makefile
@@ -7,24 +7,22 @@
 #
 
 PORTNAME=	libsigcx
-PORTVERSION=	0.6.2
+PORTVERSION=	0.6.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	libsigcx
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	libSigC++ Extras
+COMMENT=	An extension of libSigC++
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
 
-USE_REINPLACE=	yes
-USE_GNOME=	gtk20 gnomehack
-USE_LIBTOOL=	yes
+USE_GNOME=	gnomehack gtk20
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--enable-static --enable-shared
 INSTALLS_SHLIB=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,-pthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/devel/libsigcx/distinfo b/devel/libsigcx/distinfo
index 09d174973411..740ee4a5f126 100644
--- a/devel/libsigcx/distinfo
+++ b/devel/libsigcx/distinfo
@@ -1 +1 @@
-MD5 (libsigcx-0.6.2.tar.gz) = 9eeaba953b3132a1e85d4f54e2249e73
+MD5 (libsigcx-0.6.4.tar.gz) = 02e78c3cfbdb4be285d97653e563f65a
diff --git a/devel/libsigcx/files/patch-ltmain.sh b/devel/libsigcx/files/patch-ltmain.sh
index 20298f9f87ba..0ee73652b707 100644
--- a/devel/libsigcx/files/patch-ltmain.sh
+++ b/devel/libsigcx/files/patch-ltmain.sh
@@ -1,32 +1,15 @@
---- scripts/ltmain.sh.orig	Sat Mar  8 14:36:10 2003
-+++ scripts/ltmain.sh	Sun Apr  6 15:01:17 2003
-@@ -1065,14 +1065,14 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd* | *-*-freebsd*)
-+	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
+--- scripts/ltmain.sh.orig	Tue Apr 22 04:13:43 2003
++++ scripts/ltmain.sh	Tue Nov 11 21:24:05 2003
+@@ -1277,7 +1277,7 @@
  	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
 -	 *-*-openbsd* | *-*-freebsd*)
 +	 *-*-openbsd*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -2495,7 +2495,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd* | *-*-freebsd*)
-+	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
- 	  *)
-@@ -4325,10 +4325,12 @@
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -5425,10 +5425,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/devel/libsigcx/pkg-plist b/devel/libsigcx/pkg-plist
index 10dfb7b3e250..d5d00b612de2 100644
--- a/devel/libsigcx/pkg-plist
+++ b/devel/libsigcx/pkg-plist
@@ -18,12 +18,17 @@ include/sigcx-0.6/sigcx/thread_tunnel.h
 include/sigcx-0.6/sigcx/timeval.h
 include/sigcx-0.6/sigcx/tunnel.h
 include/sigcx-0.6/sigcx/util.h
-@dirrm include/sigcx-0.6/sigcx/macros
-@dirrm include/sigcx-0.6/sigcx
-@dirrm include/sigcx-0.6
+lib/libsigcx-0.6.a
 lib/libsigcx-0.6.so
-lib/libsigcx-0.6.so.1
+lib/libsigcx-0.6.so.2
+lib/libsigcx-gtk-0.6.a
 lib/libsigcx-gtk-0.6.so
 lib/libsigcx-gtk-0.6.so.1
+lib/sigcx-0.6/include/sigcxconfig.h
 libdata/pkgconfig/sigcx-0.6-gtk+.pc
 libdata/pkgconfig/sigcx-0.6.pc
+@dirrm lib/sigcx-0.6/include
+@dirrm lib/sigcx-0.6
+@dirrm include/sigcx-0.6/sigcx/macros
+@dirrm include/sigcx-0.6/sigcx
+@dirrm include/sigcx-0.6