From ecfea64acd8c7e5986b6ef43688eeb79e3693e68 Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Thu, 17 Sep 1998 22:31:35 +0000
Subject: Make this build in an ELF world.

---
 x11-toolkits/tk80/Makefile  | 14 +++++++++++---
 x11-toolkits/tk80/pkg-plist |  5 +++--
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'x11-toolkits/tk80')

diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index 25d6b897ccd0..baee62cf8e8d 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.10 1998/07/27 21:36:06 hoek Exp $
+# $Id: Makefile,v 1.11 1998/08/07 22:56:46 asami Exp $
 #
 
 DISTNAME=	tk8.0p2
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
 
 MAINTAINER=	jkh@Freebsd.ORG
 
-LIB_DEPENDS=	tcl80\\.1\\.2:${PORTSDIR}/lang/tcl80
+LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80
 
 WRKSRC=		${WRKDIR}/tk8.0/unix
 GNU_CONFIGURE=	yes
@@ -23,6 +23,7 @@ CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 SHLIB_MAJOR=    1
 SHLIB_MINOR=    2
 MAKEFILE=       makefile
+TK_LIB=		libtk80.so
 
 post-configure:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
@@ -33,7 +34,8 @@ pre-build:
 	    SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR}
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib
+	${LN} -sf ${TK_LIB_FILE} ${PREFIX}/lib/${TK_LIB}
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PKGDIR}/INSTALL.wish)
 	${SH} ${PKGDIR}/INSTALL.wish
 .endif
@@ -44,3 +46,9 @@ test:
 .include <bsd.port.mk>
 
 PKG_ARGS+=	-i ${PKGDIR}/INSTALL.wish
+
+.if ${PORTOBJFORMAT} == "elf"
+TK_LIB_FILE=  ${TK_LIB}.${SHLIB_MAJOR}
+.else
+TK_LIB_FILE=  ${TK_LIB}.${SHLIB_MAJOR}.${SHLIB_MINOR}
+.endif
diff --git a/x11-toolkits/tk80/pkg-plist b/x11-toolkits/tk80/pkg-plist
index 5ebe73a5be8c..be18c23b24a7 100644
--- a/x11-toolkits/tk80/pkg-plist
+++ b/x11-toolkits/tk80/pkg-plist
@@ -243,9 +243,10 @@ lib/tk8.0/images/pwrdLogo75.gif
 lib/tk8.0/safetk.tcl
 lib/tk8.0/tkConfig.sh
 lib/libtk80.a
+lib/libtk80.so
 lib/libtk80.so.1.2
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm lib/tk8.0/demos/images
 @dirrm lib/tk8.0/demos
 @dirrm lib/tk8.0/images
-- 
cgit v1.2.3