Adapt to new KDE2 buildlink.mk structure.

4 files changed, 44 insertions, 20 deletions

diff --git a/chat/kyahoo/Makefile b/chat/kyahoo/Makefile
index 695c01bac0b..2ecccbffd9a 100644
--- a/chat/kyahoo/Makefile
+++ b/chat/kyahoo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2001/10/24 22:10:48 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/13 21:12:44 jlam Exp $
 
 DISTNAME=	kyahoo-0.7
-CATEGORIES=	chat
+CATEGORIES=	chat kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kyahoo/}
 EXTRACT_SUFX=	.tgz
 
@@ -10,22 +10,14 @@ HOMEPAGE=	http://kyahoo.sourceforge.net/
 COMMENT=	Yahoo! client for KDE
 
 USE_BUILDLINK_ONLY=	YES
+AUTOMAKE_OVERRIDE=	YES
+USE_GMAKE=              YES
 
-.include "../../x11/kde2/Makefile.part2"
-
+GNU_CONFIGURE=          YES
 CONFIGURE_ARGS+=	--with-libyahoo=${BUILDLINK_DIR}
 
-# Pass USER_LDFLAGS through MAKE_ENV as there doesn't seem to be a reliable
-# way to stop the configure script from running again during the build step,
-# and we need USER_LDFLAGS to be set to LDFLAGS by the configure script in
-# accordance with the buildlink strategy outlined in kde2/Makefile.part2.
-#
-MAKE_ENV+=		USER_LDFLAGS="${LDFLAGS}"
-
-pre-build:
-	${CHMOD} +x ${WRKSRC}/missing
-
 .include "../../chat/libyahoo/buildlink.mk"
+.include "../../x11/kde2/buildlink.mk"
 .include "../../x11/kdebase2/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/kyahoo/distinfo b/chat/kyahoo/distinfo
index a161de7cc1e..aa065107bee 100644
--- a/chat/kyahoo/distinfo
+++ b/chat/kyahoo/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/08/01 07:33:42 skrll Exp $
+$NetBSD: distinfo,v 1.2 2001/11/13 21:12:44 jlam Exp $
 
 SHA1 (kyahoo-0.7.tgz) = 1532583531e5d4bc12a868d3fa7411be22ead5d3
 Size (kyahoo-0.7.tgz) = 409401 bytes
-SHA1 (patch-aa) = 8a6221c0e7e11a00b18f5c81b4c0b3bd58c3152f
+SHA1 (patch-aa) = c08c84981fedd956c82069014a37e82f610b9b36
 SHA1 (patch-ab) = 4c4cbdeb8353053fa21e478da6d48da239fb8a45
+SHA1 (patch-ac) = 9e241402b1ef74781ed205b8546dff26d04ec081
diff --git a/chat/kyahoo/patches/patch-aa b/chat/kyahoo/patches/patch-aa
index a33ebe548fe..a1c5d173b3e 100644
--- a/chat/kyahoo/patches/patch-aa
+++ b/chat/kyahoo/patches/patch-aa
@@ -1,8 +1,20 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/01 07:33:43 skrll Exp $
+$NetBSD: patch-aa,v 1.2 2001/11/13 21:12:44 jlam Exp $
 
---- configure.orig	Thu Jul  5 10:12:12 2001
-+++ configure	Thu Jul  5 10:12:59 2001
-@@ -4558,7 +4558,7 @@
+--- configure.orig	Sun Apr  8 22:51:03 2001
++++ configure
+@@ -3520,6 +3520,11 @@
+   kde_x_includes=$ac_x_includes
+ fi
+ 
++# for --x-libraries too
++if test "${x_libraries+set}" = "set"; then
++  ac_x_libraries=$x_libraries
++fi
++
+ if test "$kde_x_includes" = NO; then
+   { echo "configure: error: Can't find X includes. Please check your installation and add the correct paths!" 1>&2; exit 1; }
+ fi
+@@ -4558,7 +4563,7 @@
  if test $kde_qtver = 2; then
  
    
diff --git a/chat/kyahoo/patches/patch-ac b/chat/kyahoo/patches/patch-ac
new file mode 100644
index 00000000000..859001eb921
--- /dev/null
+++ b/chat/kyahoo/patches/patch-ac
@@ -0,0 +1,19 @@
+$NetBSD: patch-ac,v 1.1 2001/11/13 21:12:44 jlam Exp $
+
+--- kyahoo/Makefile.in.orig	Tue May  8 23:10:49 2001
++++ kyahoo/Makefile.in
+@@ -221,12 +221,12 @@
+ # kde_wallpaperdir  Where general wallpapers should go to.
+ 
+ # set the include path for X, qt and KDE
+-INCLUDES = $(all_includes) $(PATH_LIBYAHOO_INC)
++INCLUDES = $(all_includes) -I$(PATH_LIBYAHOO_INC)
+ 
+ #>- kyahoo_METASOURCES = AUTO 
+ 
+ # the library search path. 
+-kyahoo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(PATH_LIBYAHOO_LIB)
++kyahoo_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(PATH_LIBYAHOO_LIB)
+ 
+ # them while "make clean", use CLEANFILES
+ DISTCLEANFILES = $(kyahoo_METASOURCES)