6 files changed, 22 insertions, 30 deletions

diff --git a/net-im/libyahoo2/Makefile b/net-im/libyahoo2/Makefile
index de57ea50f7df..8b3310ec70b0 100644
--- a/net-im/libyahoo2/Makefile
+++ b/net-im/libyahoo2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libyahoo2
 PORTVERSION=	0.6.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +16,11 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C library that handles the new Yahoo! Messenger protocol
 
-USE_GNOME=	glib20
-USE_LIBTOOL=	yes
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+
+USE_GNOME=	gnomehack glib20
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/net-im/libyahoo2/files/patch-ltmain.sh b/net-im/libyahoo2/files/patch-ltmain.sh
index 0e3b5bb2ae00..71d1d3044562 100644
--- a/net-im/libyahoo2/files/patch-ltmain.sh
+++ b/net-im/libyahoo2/files/patch-ltmain.sh
@@ -1,6 +1,6 @@
---- ltmain.sh.orig	Sun Apr  6 12:12:51 2003
-+++ ltmain.sh	Sun Apr  6 12:14:51 2003
-@@ -1043,14 +1043,14 @@
+--- ltmain.sh.orig	Tue Jan 28 03:11:49 2003
++++ ltmain.sh	Tue May 13 06:46:55 2003
+@@ -1043,7 +1043,7 @@
  	    # These systems don't actually have a C library (as such)
  	    test "X$arg" = "X-lc" && continue
  	    ;;
@@ -9,14 +9,6 @@
  	    # Do not include libc due to us having libc/libc_r.
  	    test "X$arg" = "X-lc" && continue
  	    ;;
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
 @@ -2441,7 +2441,7 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
diff --git a/net-im/libyahoo2/pkg-plist b/net-im/libyahoo2/pkg-plist
index be58f8f11f6d..9e5115cc97ae 100644
--- a/net-im/libyahoo2/pkg-plist
+++ b/net-im/libyahoo2/pkg-plist
@@ -3,8 +3,8 @@ include/libyahoo2/yahoo2_callbacks.h
 include/libyahoo2/yahoo2_types.h
 include/libyahoo2/yahoo_httplib.h
 include/libyahoo2/yahoo_list.h
-@dirrm include/libyahoo2
 lib/libyahoo2.a
 lib/libyahoo2.so
 lib/libyahoo2.so.3
-lib/pkgconfig/libyahoo2.pc
+libdata/pkgconfig/libyahoo2.pc
+@dirrm include/libyahoo2
diff --git a/net/libyahoo2/Makefile b/net/libyahoo2/Makefile
index de57ea50f7df..8b3310ec70b0 100644
--- a/net/libyahoo2/Makefile
+++ b/net/libyahoo2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libyahoo2
 PORTVERSION=	0.6.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +16,11 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C library that handles the new Yahoo! Messenger protocol
 
-USE_GNOME=	glib20
-USE_LIBTOOL=	yes
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+
+USE_GNOME=	gnomehack glib20
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/net/libyahoo2/files/patch-ltmain.sh b/net/libyahoo2/files/patch-ltmain.sh
index 0e3b5bb2ae00..71d1d3044562 100644
--- a/net/libyahoo2/files/patch-ltmain.sh
+++ b/net/libyahoo2/files/patch-ltmain.sh
@@ -1,6 +1,6 @@
---- ltmain.sh.orig	Sun Apr  6 12:12:51 2003
-+++ ltmain.sh	Sun Apr  6 12:14:51 2003
-@@ -1043,14 +1043,14 @@
+--- ltmain.sh.orig	Tue Jan 28 03:11:49 2003
++++ ltmain.sh	Tue May 13 06:46:55 2003
+@@ -1043,7 +1043,7 @@
  	    # These systems don't actually have a C library (as such)
  	    test "X$arg" = "X-lc" && continue
  	    ;;
@@ -9,14 +9,6 @@
  	    # Do not include libc due to us having libc/libc_r.
  	    test "X$arg" = "X-lc" && continue
  	    ;;
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
 @@ -2441,7 +2441,7 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
diff --git a/net/libyahoo2/pkg-plist b/net/libyahoo2/pkg-plist
index be58f8f11f6d..9e5115cc97ae 100644
--- a/net/libyahoo2/pkg-plist
+++ b/net/libyahoo2/pkg-plist
@@ -3,8 +3,8 @@ include/libyahoo2/yahoo2_callbacks.h
 include/libyahoo2/yahoo2_types.h
 include/libyahoo2/yahoo_httplib.h
 include/libyahoo2/yahoo_list.h
-@dirrm include/libyahoo2
 lib/libyahoo2.a
 lib/libyahoo2.so
 lib/libyahoo2.so.3
-lib/pkgconfig/libyahoo2.pc
+libdata/pkgconfig/libyahoo2.pc
+@dirrm include/libyahoo2