Convert to ELF.

svn path=/head/; revision=14091

x11-toolkits/blt/Makefile

@@ -3,7 +3,7 @@
 # Date created:		22 September 1998
 # Whom:			Kenjiro Cho <kjc@csl.sony.co.jp>
 #
-# $Id: Makefile,v 1.21 1998/09/25 10:05:13 asami Exp $
+# $Id: Makefile,v 1.22 1998/10/14 03:00:44 jseger Exp $
 #
 
 DISTNAME=	BLT2.4f
@@ -13,8 +13,6 @@ MASTER_SITES=	ftp://ftp.tcltk.com/pub/blt/
 
 MAINTAINER=	kjc@csl.sony.co.jp
 
-BROKEN_ELF=	library version numbers
-
 LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
 
 WRKSRC=		${WRKDIR}/blt2.4f
@@ -25,6 +23,13 @@ MANN=		BLT.n barchart.n bgexec.n bitmap.n bltdebug.n busy.n \
 		beep.n cutbuffer.n
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib
+	${LN} -sf libBLT.so.${SO_VERSION} ${PREFIX}/lib/libBLT.so
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+SO_VERSION=	2
+.else
+SO_VERSION=	2.4
+.endif

x11-toolkits/blt/files/patch-aa

@@ -1,5 +1,5 @@
---- configure.orig	Wed Aug 19 11:10:09 1998
-+++ configure	Tue Sep 22 15:56:11 1998
+--- configure.orig	Tue Aug 18 21:10:09 1998
++++ configure	Wed Oct 14 00:04:15 1998
 @@ -2298,6 +2298,9 @@
   $blt_ckcmd_tcl_home \
   $blt_ckcmd_tcl_home/lib \
@@ -43,12 +43,19 @@
      tclLib="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${itclSuffix}"
      tkLib="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${itclSuffix}"
      ;;
-@@ -3170,7 +3183,7 @@
+@@ -3169,8 +3182,13 @@
+     if test "$test_ok" = yes; then
        SHLIB_CFLAGS="-fpic"
        SHLIB_LD="ld"
-       SHLIB_LD_FLAGS="-Bshareable -x"
+-      SHLIB_LD_FLAGS="-Bshared -x"
 -      SHLIB_SUFFIX=".so"
-+      SHLIB_SUFFIX=".so.${bltMajor}.${bltMinor}"
++      if test `objformat` = "elf"; then
++        SHLIB_LD_FLAGS="-Bshareable -x -soname \$@"
++        SHLIB_SUFFIX=".so.${bltMajor}"
++      else
++        SHLIB_LD_FLAGS="-Bshareable -x"
++        SHLIB_SUFFIX=".so.${bltMajor}.${bltMinor}"
++      fi
      fi
      ;;
  

x11-toolkits/blt/pkg-plist

@@ -2,8 +2,10 @@ bin/bltwish
 bin/bltwish2.4
 include/blt.h
 lib/libBLT.a
+lib/libBLT.so
 lib/libBLT.so.2.4
-@exec /sbin/ldconfig -m %D/lib
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/blt2.4/bltCanvEps.pro
 lib/blt2.4/bltDnd.tcl
 lib/blt2.4/bltGraph.pro