Various bits to get this working.

Buildlinkify against tcl/tk/x11

This configure is kinda brain dead so just keep the configure.in patches (which
were reversed anyways from the configure patches) and depend on autoconf
to force a correct configure. Also pass X11BASE along to configure's env
so the right -R flags end up in the libs/binaries.

4 files changed, 22 insertions, 61 deletions

diff --git a/x11/blt/Makefile b/x11/blt/Makefile
index 27ad50329da..cb03f0d698a 100644
--- a/x11/blt/Makefile
+++ b/x11/blt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/05/05 19:51:19 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/12/16 07:39:10 jmc Exp $
 #
 
 DISTNAME=	BLT2.4o
@@ -10,13 +10,19 @@ MAINTAINER=	brook@nmsu.edu
 HOMEPAGE=	http://www.tcltk.com/blt/index.html
 COMMENT=	extension to Tcl/Tk
 
-DEPENDS+=	tk>=8.3.2:../../x11/tk
+BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf
 
 GNU_CONFIGURE=	YES
-
-CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib
-CONFIGURE_ARGS+=	--with-tk=${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_DIR}/lib
+CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_DIR}/lib
+CONFIGURE_ENV+=		X11BASE=${X11BASE}
 
 WRKSRC=		${WRKDIR}/blt2.4o
 
+pre-configure:
+	cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf --force
+
+.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 af6fdca1ebf..b892cfc5640 100644
--- a/x11/blt/distinfo
+++ b/x11/blt/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:36 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/12/16 07:39:10 jmc Exp $
 
 SHA1 (BLT2.4o.tar.gz) = bcec9ec0ddcf9f49d8f6de6f02e86988af41d2d2
 Size (BLT2.4o.tar.gz) = 1779872 bytes
-SHA1 (patch-aa) = 544b1b3399d4f0d5e56f2648b4fc8cd7c86f701a
-SHA1 (patch-ab) = b928b533c98921c7a001a66b64a3017e525d418a
+SHA1 (patch-aa) = bf5c376b509038037edaf1a756e95876004fdacd
 SHA1 (patch-ac) = 04f4866afc7677fd146fa91e278bf873616d57f4
 SHA1 (patch-ad) = 6a9d78ab895f6ef7625b50a869c11a05c4e2aba6
 SHA1 (patch-ae) = cf881e793e8a9aa385bab39b13bef3a76d0ac092
diff --git a/x11/blt/patches/patch-aa b/x11/blt/patches/patch-aa
index cb2a8a6b163..6696321b5a8 100644
--- a/x11/blt/patches/patch-aa
+++ b/x11/blt/patches/patch-aa
@@ -1,28 +1,25 @@
-$NetBSD: patch-aa,v 1.5 2000/09/08 02:48:05 jwise Exp $
---- configure.in.orig	Wed Jan 12 15:15:36 2000
-+++ configure.in	Thu Sep  7 21:56:11 2000
-@@ -580,9 +580,9 @@
+$NetBSD: patch-aa,v 1.6 2001/12/16 07:39:11 jmc Exp $
+
+--- configure.in.orig	Wed Jan 12 20:15:36 2000
++++ configure.in	Sun Dec 16 07:16:49 2001
+@@ -580,7 +580,7 @@
  TK_LIB_DIR=${TK_EXEC_PREFIX}/lib
  
  case $target in
 -  *-sunos4*|NetBSD-*|FreeBSD-*|OpenBSD-*)
--    TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
--    TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
 +  *-sunos4*|*-*-netbsd|FreeBSD-*|OpenBSD-*)
-+    TCL_LIB_SPEC="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
-+    TK_LIB_SPEC="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+     TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
+     TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
      ;;
-   *)
-     TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
 @@ -933,9 +933,10 @@
      # Not available on all versions:  check for include file.
      AC_CHECK_HEADER(dlfcn.h, test_ok=yes, test_ok=no)
      if test "$test_ok" = yes; then
-+      LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib"
++      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"
++      SHLIB_LD_FLAGS="-Bshareable -x -R${prefix}/lib -R${X11BASE}/lib"
      fi
      ;;
  
diff --git a/x11/blt/patches/patch-ab b/x11/blt/patches/patch-ab
deleted file mode 100644
index a2c474d38fb..00000000000
--- a/x11/blt/patches/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2000/09/08 02:48:05 jwise Exp $
---- configure.orig	Wed Jan 12 15:15:36 2000
-+++ configure	Thu Sep  7 21:55:22 2000
-@@ -2694,13 +2694,13 @@
- 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}"
-     ;;
-   *)
--    TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
--    TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
-+    TCL_LIB_SPEC="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
-+    TK_LIB_SPEC="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
-     ;;
- esac
- 
-@@ -3391,9 +3391,10 @@
- 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 @@
- #	Propagate prefix argument as installation directory.
- #--------------------------------------------------------------------
- 
--BLT_LIBRARY="${prefix}/lib/blt${BLT_VERSION}"
-+BLT_LIBRARY="${prefix}/lib/tcl/blt${BLT_VERSION}"
- 
- 
- #--------------------------------------------------------------------