diff options
| author | Steve Price <steve@FreeBSD.org> | 1998-10-20 01:24:34 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1998-10-20 01:24:34 +0000 |
| commit | 485bf1ebd4247f6f1f9fd178677f7c6a7b0a66a9 (patch) | |
| tree | acd0ab9e521fe2d89bc35f7342257b53517eb2b9 /x11-toolkits/blt | |
| parent | Convert to ELF. (diff) | |
Convert to ELF.
Notes
Notes:
svn path=/head/; revision=14091
Diffstat (limited to 'x11-toolkits/blt')
| -rw-r--r-- | x11-toolkits/blt/Makefile | 13 | ||||
| -rw-r--r-- | x11-toolkits/blt/files/patch-aa | 17 | ||||
| -rw-r--r-- | x11-toolkits/blt/pkg-plist | 4 |
3 files changed, 24 insertions, 10 deletions
diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile index 8afd1335bee4..8086dd61c78d 100644 --- a/x11-toolkits/blt/Makefile +++ b/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 diff --git a/x11-toolkits/blt/files/patch-aa b/x11-toolkits/blt/files/patch-aa index f2dc73f66d7f..24f5221bbd6f 100644 --- a/x11-toolkits/blt/files/patch-aa +++ b/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 ;; diff --git a/x11-toolkits/blt/pkg-plist b/x11-toolkits/blt/pkg-plist index 622360596094..bf321c1b8709 100644 --- a/x11-toolkits/blt/pkg-plist +++ b/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 |