buildlink1 -> buildlink2, and remove dependency on autoconf.

3 files changed, 44 insertions, 12 deletions

diff --git a/x11/blt/Makefile b/x11/blt/Makefile
index cb03f0d698a..67323196223 100644
--- a/x11/blt/Makefile
+++ b/x11/blt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/12/16 07:39:10 jmc Exp $
+# $NetBSD: Makefile,v 1.6 2002/09/23 22:39:22 jlam Exp $
 #
 
 DISTNAME=	BLT2.4o
@@ -10,19 +10,16 @@ MAINTAINER=	brook@nmsu.edu
 HOMEPAGE=	http://www.tcltk.com/blt/index.html
 COMMENT=	extension to Tcl/Tk
 
-BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf
-
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_DIR}/lib
-CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_DIR}/lib
+USE_BUILDLINK2=		YES
+USE_X11=		YES
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
+CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}/lib
 CONFIGURE_ENV+=		X11BASE=${X11BASE}
 
 WRKSRC=		${WRKDIR}/blt2.4o
 
-pre-configure:
-	cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf --force
+.include "../../lang/tcl/buildlink2.mk"
+.include "../../x11/tk/buildlink2.mk"
 
-.include "../../lang/tcl/buildlink.mk"
-.include "../../x11/tk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/blt/distinfo b/x11/blt/distinfo
index 174ce216aff..2dd29fe4aa9 100644
--- a/x11/blt/distinfo
+++ b/x11/blt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/03/31 14:37:30 abs Exp $
+$NetBSD: distinfo,v 1.5 2002/09/23 22:39:23 jlam Exp $
 
 SHA1 (BLT2.4o.tar.gz) = bcec9ec0ddcf9f49d8f6de6f02e86988af41d2d2
 Size (BLT2.4o.tar.gz) = 1779872 bytes
@@ -6,3 +6,4 @@ SHA1 (patch-aa) = 11e422d56a617d8782ff2279ce41ae128c675ea8
 SHA1 (patch-ab) = d197a96d4047b021d2c8117f39fd6334bbbe141c
 SHA1 (patch-ac) = f3f418a0481c20c707c1a8b58506049eecd3bb27
 SHA1 (patch-ad) = beb29451ddb9c84d723ad78a8728fdb867838a63
+SHA1 (patch-ae) = d812e88e1ed3f2fad67e092f1be1ed0e1664b745
diff --git a/x11/blt/patches/patch-ae b/x11/blt/patches/patch-ae
new file mode 100644
index 00000000000..9c1fa038659
--- /dev/null
+++ b/x11/blt/patches/patch-ae
@@ -0,0 +1,34 @@
+$NetBSD: patch-ae,v 1.3 2002/09/23 22:39:23 jlam Exp $
+
+--- configure.orig	Wed Jan 12 12:15:36 2000
++++ configure
+@@ -2694,7 +2694,7 @@ TCL_LIB_DIR=${TCL_EXEC_PREFIX}/lib
+ TK_LIB_DIR=${TK_EXEC_PREFIX}/lib
+ 
+ case $target in
+-  *-sunos4*|NetBSD-*|FreeBSD-*|OpenBSD-*)
++  *-sunos4*|*-*-netbsd*|FreeBSD-*|OpenBSD-*)
+     TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
+     TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+     ;;
+@@ -3391,9 +3391,10 @@ test_ok=no
+ fi
+ 
+     if test "$test_ok" = yes; then
++      LDFLAGS="-L${prefix}/lib -L${X11BASE}/lib -Wl,-R${prefix}/lib -Wl,-R${X11BASE}/lib"
+       SHLIB_CFLAGS="-fpic"
+       SHLIB_LD="ld"
+-      SHLIB_LD_FLAGS="-Bshareable -x"
++      SHLIB_LD_FLAGS="-Bshareable -x -R${prefix}/lib -R${X11BASE}/lib"
+     fi
+     ;;
+ 
+@@ -3542,7 +3543,7 @@ INCLUDES=${INC_SPECS}
+ #	Propagate prefix argument as installation directory.
+ #--------------------------------------------------------------------
+ 
+-BLT_LIBRARY="${prefix}/lib/blt${BLT_VERSION}"
++BLT_LIBRARY="${prefix}/lib/tcl/blt${BLT_VERSION}"
+ 
+ 
+ #--------------------------------------------------------------------