buildlink1 -> buildlink2

3 files changed, 16 insertions, 20 deletions

diff --git a/math/pari/Makefile b/math/pari/Makefile
index 77dd25546f1..2382683dc13 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:24 fredb Exp $
+# $NetBSD: Makefile,v 1.11 2002/09/23 22:24:16 jlam Exp $
 
 DISTNAME=		pari-2.1.1
 PKGREVISION=		1
@@ -13,23 +13,19 @@ COMMENT=		software package for computer-aided number theory
 BUILD_DEPENDS+= 	teTeX-[0-9]*:../../print/teTeX
 BUILD_DEPENDS+= 	emacs-[0-9]*:../../editors/emacs
 
-USE_PERL5=		yes
+USE_BUILDLINK2=		yes
+USE_X11=		yes
+USE_GNU_READLINE=	# rl_save_prompt
 
-USE_BUILDLINK_ONLY=	yes
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	${WRKSRC}/Configure
-
-# rl_save_prompt
-USE_GNU_READLINE=	yes
-
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --share-prefix=${PREFIX}/share
-
+CONFIGURE_ARGS+=	--graphic=X11
 CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
-CONFIGURE_ENV+=		BUILDLINK_DIR=${BUILDLINK_DIR}
+CONFIGURE_ENV+=		X11BASE=${X11BASE}
 
-CONFIGURE_ARGS+=	--graphic=X11
+.include "../../devel/ncurses/buildlink2.mk"
+.include "../../devel/readline/buildlink2.mk"
+.include "../../lang/perl5/buildlink2.mk"
 
-.include "../../devel/ncurses/buildlink.mk"
-.include "../../devel/readline/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/pari/distinfo b/math/pari/distinfo
index 2cb6e0cf9c6..db09901d7e6 100644
--- a/math/pari/distinfo
+++ b/math/pari/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2002/07/02 12:59:18 wiz Exp $
+$NetBSD: distinfo,v 1.8 2002/09/23 22:24:16 jlam Exp $
 
 SHA1 (pari-2.1.1.tar.gz) = 358e90e2caf1afbd4440e3a43af827feec019b8d
 Size (pari-2.1.1.tar.gz) = 1530823 bytes
-SHA1 (patch-aa) = a6ead8ee4468396d19e75d7a8367f9c171de82c9
+SHA1 (patch-aa) = e6f0e39f6d3fb18032626dcc6e497be2ff355992
 SHA1 (patch-ab) = 97951552f9b9836d0375fd41c7abd18a5ce90238
 SHA1 (patch-ac) = 84af235f319ae108aadeedea5a25e005540160ac
 SHA1 (patch-ad) = 82c0532ba6bc23b1c91865591c2bdfbee144bcf9
diff --git a/math/pari/patches/patch-aa b/math/pari/patches/patch-aa
index 90e77156812..cc822d2b446 100644
--- a/math/pari/patches/patch-aa
+++ b/math/pari/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2002/03/31 16:24:29 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.7 2002/09/23 22:24:16 jlam Exp $
 
 --- Configure.orig	Fri Apr 27 09:51:44 2001
 +++ Configure
@@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.6 2002/03/31 16:24:29 dmcmahill Exp $
 -  /usr/libexec\
 -  /usr/openwin/bin\
 -  /usr/local/bin\
-+  $BUILDLINK_DIR/lib\
++  $LOCALBASE/lib\
  "
  # /usr/openwin/bin added for xmkmf
  
@@ -85,7 +85,7 @@ $NetBSD: patch-aa,v 1.6 2002/03/31 16:24:29 dmcmahill Exp $
 - 	/usr/ccs/lib\
 - 	/usc/ucblib\
 - 	/usr/shlib\
-+        $BUILDLINK_DIR/lib\
++        $LOCALBASE/lib\
   	.\
       ";;
       esac
@@ -104,7 +104,7 @@ $NetBSD: patch-aa,v 1.6 2002/03/31 16:24:29 dmcmahill Exp $
 -      /opt/include\
 -      /opt/local/include\
 -      /opt/gnu/include\
-+      $BUILDLINK_DIR/include\
++      $LOCALBASE/include\
      ";;
      esac
      pth="$readline_add $incpth"
@@ -153,7 +153,7 @@ $NetBSD: patch-aa,v 1.6 2002/03/31 16:24:29 dmcmahill Exp $
 -          /usr/athena/lib\
 -          /usr/local/x11r5/lib\
 -          /usr/lpp/Xamples/lib\
-+          $BUILDLINK_DIR/lib\
++          $X11BASE/lib\
          ";
          pth=`echo $x11pth | s,/lib,/include,g`
          x=`./locate X11/Xos.h '' $pth`