From 818730a50ff6fa3f8c4601316a6bdbb0ebaacffb Mon Sep 17 00:00:00 2001
From: Rong-En Fan <rafan@FreeBSD.org>
Date: Tue, 13 Feb 2007 10:43:35 +0000
Subject: [PATCH] - Fix build after objformat is gone

PR:		ports/108958
Submitted by:	CHAO Shin <quakelee at cn.freebsd.org>
Approved by:	Kenjiro Cho <kjc at iijlab.net> (maintainer)
---
 x11-toolkits/blt/Makefile       |  4 +++-
 x11-toolkits/blt/files/patch-aa | 16 +++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index dec9dd59dfba..8d60a904f3ab 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -22,6 +22,9 @@ PATCH_DIST_STRIP= -p1
 MAINTAINER=	kjc@iijlab.net
 COMMENT=	A Tk extension (with shared libs)
 
+USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	libtool:15
+
 LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 
 WRKSRC=		${WRKDIR}/blt2.4z
@@ -36,7 +39,6 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-tkincls=${LOCALBASE}/include/tk${TK_VER} \
 		--x-libraries=${X11BASE}/lib \
 		--x-includes=${X11BASE}/include
-INSTALLS_SHLIB=	yes
 
 TK_VER?=	8.4
 
diff --git a/x11-toolkits/blt/files/patch-aa b/x11-toolkits/blt/files/patch-aa
index 6d169b341160..4a54dc32633e 100644
--- a/x11-toolkits/blt/files/patch-aa
+++ b/x11-toolkits/blt/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.orig	Thu Aug 28 15:41:03 2003
-+++ configure	Thu Aug 28 15:49:25 2003
+--- configure.orig	Fri Oct  4 13:33:59 2002
++++ configure	Tue Feb 13 16:39:48 2007
 @@ -1202,7 +1202,7 @@
  #
  #  1. command line (--with-cflags)
@@ -43,19 +43,13 @@
      TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
      TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
      ;;
-@@ -4111,7 +4113,14 @@
+@@ -4111,7 +4113,8 @@
      if test "$test_ok" = yes; then
        SHLIB_CFLAGS="-fpic"
        SHLIB_LD="ld"
 -      SHLIB_LD_FLAGS="-Bshareable -x"
-+      if test `objformat` = "elf"; then
-+        SHLIB_LD_FLAGS="-Bshareable -x -soname \$@"
-+        SHLIB_SUFFIX=".so.3"
-+      else
-+        SHLIB_LD_FLAGS="-Bshareable -x"
-+        SHLIB_SUFFIX=".so.3.0"
-+      fi
-+
++      SHLIB_LD_FLAGS="-Bshareable -x -soname \$@"
++      SHLIB_SUFFIX=".so.3"
      fi
      ;;