From 32ad6cd96f56052ced15f15ca52cf1ea48d6c80c Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sat, 21 Sep 2002 00:24:03 +0000
Subject: buildlink1 -> buildlink2

---
 emulators/wine/Makefile | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

(limited to 'emulators')

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index b73f5dfdbb8..455fa582976 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/09/06 09:18:41 zuntum Exp $
+# $NetBSD: Makefile,v 1.33 2002/09/21 00:28:09 jlam Exp $
 
 DISTNAME=		Wine-20020804
 PKGNAME=		${DISTNAME:S/W/w/}
@@ -14,30 +14,29 @@ CONFLICTS=		rewind-[0-9]*
 
 ONLY_FOR_PLATFORM=	NetBSD-1.5Z*-i386 NetBSD-1.[6-9]*-i386
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 USE_GMAKE=		YES
+
 USE_PERL5=		run
+REPLACE_PERL=		tools/winedump/function_grep.pl tools/winemaker
+
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-curses
+CONFIGURE_ENV+=		ac_cv_path_ARTSCCONFIG=no
+CONFIGURE_ENV+=		ac_cv_prog_sane_devel=no
 
-REPLACE_PERL=		tools/winedump/function_grep.pl tools/winemaker
-
-# The Wine configure script has problems locating the freetype-config
-# script and the libraries in the buildlink directory, so explicitly
-# set the location of freetype-config and prepend all of the LDFLAGS
-# necessary to link against the libraries.
+# The Wine configure script has problems locating the libraries in the
+# buildlink directory, so prepend all of the LDFLAGS necessary to link
+# against the libraries.
 #
-CONFIGURE_ENV+=		ft_devel=${FREETYPE_CONFIG}
 CONFIGURE_ENV+=		X_LIBS="${LDFLAGS}"
 LIBS+=			${LDFLAGS}
 
-CONFIGURE_ENV+=		ac_cv_path_ARTSCCONFIG=no
-CONFIGURE_ENV+=		ac_cv_prog_sane_devel=no
-
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(USE_CUPS) && (${USE_CUPS} == YES)
-.include "../../print/cups/buildlink.mk"
+.  include "../../print/cups/buildlink2.mk"
 BUILD_DEFS+=		USE_CUPS
 .endif
 
@@ -50,8 +49,8 @@ post-install:
 	${INSTALL_DATA} generic.ppd ${EGDIR}/generic.ppd;		\
 	${INSTALL_DATA} system.ini ${EGDIR}/system.ini
 
-.include "../../graphics/Mesa/buildlink.mk"
-.include "../../graphics/freetype2/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3