From f657dcb9d40d75572cc4d6babcbb719f9616f545 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sat, 21 Sep 2002 23:46:45 +0000
Subject: Strip the ".buildlink" from the names of the python application and
 extension Makefile fragments, because they really don't have anything to do
 with the buildlink[12] frameworks.  Change all the Makefiles that use
 application.buildlink.mk and extension.buildlink.mk to use application.mk and
 extension.mk instead.

---
 chat/fugu/Makefile         |  4 ++--
 chat/xchat/Makefile.common | 26 ++++++++++++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'chat')

diff --git a/chat/fugu/Makefile b/chat/fugu/Makefile
index 68dd0a7b59d..7bd8193d396 100644
--- a/chat/fugu/Makefile
+++ b/chat/fugu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/01/29 11:33:54 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/21 23:46:46 jlam Exp $
 #
 
 DISTNAME=	fugu-1.0
@@ -17,6 +17,6 @@ CONFIGURE_ENV+=	vi_cv_path_python=${PYTHONBIN}
 LDFLAGS+=	-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/rsaref
 
-.include "../../lang/python/application.buildlink.mk"
+.include "../../lang/python/application.mk"
 .include "../../x11/py-Pmw/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index 992cf838da3..7dce3461f0d 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2002/09/12 12:34:00 tron Exp $
+# $NetBSD: Makefile.common,v 1.4 2002/09/21 23:46:46 jlam Exp $
 
 DISTNAME=	xchat-1.8.10
 CATEGORIES=	chat x11
@@ -15,17 +15,19 @@ PATCHDIR=	${.CURDIR}/../xchat/patches
 PKGDIR=		${.CURDIR}/../xchat
 PLIST_SRC=	${.CURDIR}/../xchat/PLIST
 
-USE_GMAKE=	YES
-USE_PERL5=	YES
-USE_X11BASE=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ENV+=	ac_cv_lib_intl_bindtextdomain='yes'
-CONFIGURE_ENV+=	pythonpath=${PYTHONBIN}
-MAKE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}"
+USE_BUILDLINK2=		YES
+USE_X11BASE=		YES
+USE_GMAKE=		YES
+USE_PERL5=		YES
 USE_GNU_GETTEXT=	YES
 BUILD_USES_MSGFMT=	YES
 
-BUILD_DEFS+=	USE_INET6 USE_SOCKS
+BUILD_DEFS+=		USE_INET6 USE_SOCKS
+MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
+
+GNU_CONFIGURE=		YES
+CONFIGURE_ENV+=		ac_cv_lib_intl_bindtextdomain='yes'
+CONFIGURE_ENV+=		pythonpath=${PYTHONBIN}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -49,6 +51,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/xchat
 
-.include "../../devel/glib/buildlink.mk"
-.include "../../lang/perl5/buildlink.mk"
-.include "../../lang/python/application.buildlink.mk"
+.include "../../devel/glib/buildlink2.mk"
+.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/python/application.mk"
-- 
cgit v1.2.3