buildlink1 -> buildlink2

3 files changed, 19 insertions, 18 deletions

diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index da6a990c56b..96749c7418f 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2002/03/13 17:37:18 fredb Exp $
+# $NetBSD: Makefile,v 1.32 2002/10/08 13:24:22 jlam Exp $
 #
 
 DISTNAME=		xfig.3.2.3d.full
@@ -15,13 +15,13 @@ COMMENT=		CAD-like 2D drawing tool, good for colorful scale drawings & ISOs
 
 DEPENDS+=		transfig>=3.2.3.4:../../print/transfig
 
+USE_BUILDLINK2=		YES
 USE_IMAKE=		YES
 XAW_TYPE?=		3d
 
 NO_INSTALL_MANPAGES=	YES	# install.all does install.man
 INSTALL_TARGET=		install install.all
-CFLAGS+=		-I${BUILDLINK_DIR}/include/X11
-MAKE_ENV+=		X11PREFIX=${X11PREFIX}
+CFLAGS+=		-I${X11PREFIX}/include/X11
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -44,8 +44,9 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Examples/*.xpm ${XFIGEXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/Doc/FORMAT* ${XFIGDOCDIR}
 
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/xaw.buildlink.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../mk/xaw.buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xfig/distinfo b/graphics/xfig/distinfo
index 0c971f695ac..e9e39f70942 100644
--- a/graphics/xfig/distinfo
+++ b/graphics/xfig/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2001/08/23 04:26:54 jlam Exp $
+$NetBSD: distinfo,v 1.6 2002/10/08 13:24:22 jlam Exp $
 
 SHA1 (xfig.3.2.3d.full.tar.gz) = 49806d4e081c722bb35e335b3d34a8ad9f7d78af
 Size (xfig.3.2.3d.full.tar.gz) = 2846844 bytes
 SHA1 (patch-aa) = dd528f771d7b30a7f2504d2e9043cdce7a98f0c1
-SHA1 (patch-ab) = b47e24ce46894e8c7aa710e3cae8c2559b9676ec
+SHA1 (patch-ab) = f6262c528440dc38a1877da704320cf9e70ad89e
 SHA1 (patch-ac) = 1d18e319873a4aa20d60b477318fd05c951c6b16
diff --git a/graphics/xfig/patches/patch-ab b/graphics/xfig/patches/patch-ab
index 1ebb7117d29..c82ea98ba22 100644
--- a/graphics/xfig/patches/patch-ab
+++ b/graphics/xfig/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2001/08/23 04:26:54 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2002/10/08 13:24:22 jlam Exp $
 
 --- Imakefile.orig	Tue May 29 14:32:11 2001
 +++ Imakefile
@@ -8,8 +8,8 @@ $NetBSD: patch-ab,v 1.5 2001/08/23 04:26:54 jlam Exp $
  #ifdef USEINSTALLEDJPEG
 -JPEGLIBDIR = /usr/local/lib
 -JPEGINCDIR = /usr/include/X11
-+JPEGLIBDIR = $(BUILDLINK_DIR)/lib
-+JPEGINCDIR = $(BUILDLINK_DIR)/include
++JPEGLIBDIR = $(LOCALBASE)/lib
++JPEGINCDIR = $(LOCALBASE)/include
  #else
  JPEGLIBDIR = ../jpeg
  JPEGINCDIR = $(JPEGLIBDIR)
@@ -18,8 +18,8 @@ $NetBSD: patch-ab,v 1.5 2001/08/23 04:26:54 jlam Exp $
  #define USEPNG
  
 +#ifdef USEPNG
-+PNGLIBDIR = $(BUILDLINK_DIR)/lib
-+PNGINC = -I$(BUILDLINK_DIR)/include
++PNGLIBDIR = $(LOCALBASE)/lib
++PNGINC = -I$(LOCALBASE)/include
 +#endif
 +
  XCOMM Uncomment the #define for USEXPM if you want to use the XPM
@@ -37,8 +37,8 @@ $NetBSD: patch-ab,v 1.5 2001/08/23 04:26:54 jlam Exp $
  #ifdef USEXPM
 -XPMLIBDIR = $(USRLIBDIR)
 -XPMINC = -I/usr/include/X11
-+XPMLIBDIR = $(BUILDLINK_DIR)/lib
-+XPMINC = -I$(BUILDLINK_DIR)/include/X11
++XPMLIBDIR = $(LOCALBASE)/lib
++XPMINC = -I$(LOCALBASE)/include/X11
  #endif
  
  XCOMM Uncomment the following definiton if you want to use the small icons
@@ -47,7 +47,7 @@ $NetBSD: patch-ab,v 1.5 2001/08/23 04:26:54 jlam Exp $
  
  #ifdef XAW3D
 -XAW3DINC = -I/usr/include/X11/Xaw3d
-+XAW3DINC = -I$(BUILDLINK_DIR)/include/X11/Xaw3d
++XAW3DINC = -I$(LOCALBASE)/include/X11/Xaw3d
  DUSEXAW3D = -DXAW3D
  XAWLIB = -lXaw3d
  #endif
@@ -100,7 +100,7 @@ $NetBSD: patch-ab,v 1.5 2001/08/23 04:26:54 jlam Exp $
  #ifdef USEXPM
  DUSEXPM = -DUSE_XPM
 -XPMLIBS = -L$(XPMLIBDIR) -lXpm
-+XPMLIBS = -Wl,-R$(X11PREFIX)/lib -L$(XPMLIBDIR) -lXpm
++XPMLIBS = -Wl,-R$(LOCALBASE)/lib -L$(XPMLIBDIR) -lXpm
  READXPMS = f_readxpm.c
  READXPMO = f_readxpm.o
  #ifdef USEXPM_ICON