From 5e365bb384904b3a7344c0d329106e657817c942 Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 21 Sep 2002 23:52:55 +0000 Subject: Finish incomplete buildlink1 -> buildlink2 conversion accidentally committed with the last set of changes. --- chat/xchat/Makefile | 8 ++++---- chat/xchat/Makefile.common | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile index 39997d2bc1a..ef9ece09d0c 100644 --- a/chat/xchat/Makefile +++ b/chat/xchat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2002/08/19 19:59:36 tron Exp $ +# $NetBSD: Makefile,v 1.25 2002/09/21 23:52:55 jlam Exp $ .include "Makefile.common" @@ -7,7 +7,7 @@ CONFIGURE_ARGS+= --disable-zvt CONFLICTS+= xchat-gnome-[0-9]* -.include "../../graphics/gdk-pixbuf/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/gdk-pixbuf/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common index 7dce3461f0d..4487ad3b608 100644 --- a/chat/xchat/Makefile.common +++ b/chat/xchat/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2002/09/21 23:46:46 jlam Exp $ +# $NetBSD: Makefile.common,v 1.5 2002/09/21 23:52:55 jlam Exp $ DISTNAME= xchat-1.8.10 CATEGORIES= chat x11 @@ -38,8 +38,8 @@ CONFIGURE_ARGS+= --enable-ipv6 # SSL support .if defined(XCHAT_USE_SSL) && ${XCHAT_USE_SSL} == "YES" -.include "../../security/openssl/buildlink.mk" -CONFIGURE_ARGS+= --enable-openssl=${BUILDLINK_DIR} +. include "../../security/openssl/buildlink2.mk" +CONFIGURE_ARGS+= --enable-openssl=${SSLBASE} .endif # Socks support -- cgit v1.2.3