Fix for Darwin and Prefix, marked *-macos, bug #355373

(Portage version: 2.2.01.18826-prefix/cvs/Darwin powerpc)

3 files changed, 98 insertions, 7 deletions

diff --git a/dev-tcltk/blt/ChangeLog b/dev-tcltk/blt/ChangeLog
index 686d45ae48f6..43c8ac961a90 100644
--- a/dev-tcltk/blt/ChangeLog
+++ b/dev-tcltk/blt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/blt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.42 2011/06/13 12:38:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.43 2011/06/27 17:22:24 grobian Exp $
+
+  27 Jun 2011; Fabian Groffen <grobian@gentoo.org> blt-2.4z-r8.ebuild,
+  +files/blt-2.4z-darwin.patch:
+  Fix for Darwin and Prefix, marked *-macos, bug #355373
 
   13 Jun 2011; Justin Lecher <jlec@gentoo.org> blt-2.4z-r8.ebuild:
   Fix compilation under et_EE locale, #367539
diff --git a/dev-tcltk/blt/blt-2.4z-r8.ebuild b/dev-tcltk/blt/blt-2.4z-r8.ebuild
index 84a33f975a71..535b4749b2e7 100644
--- a/dev-tcltk/blt/blt-2.4z-r8.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild,v 1.8 2011/06/13 12:38:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild,v 1.9 2011/06/27 17:22:24 grobian Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc co
 IUSE="jpeg X"
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="
 	dev-lang/tk
@@ -44,6 +44,7 @@ src_prepare() {
 		Makefile.in demos/Makefile.in || die "sed Makefile.in failed"
 
 	epatch "${FILESDIR}"/${P}-linking.patch
+	epatch "${FILESDIR}"/${P}-darwin.patch
 }
 
 src_configure() {
@@ -75,8 +76,8 @@ src_compile() {
 
 src_install() {
 	sed \
-		-e "s:../src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
-		-e "s:../bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+		-e "s:\.\./src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+		-e "s:\.\./bltwish:${EPREFIX}/usr/bin/bltwish:g" \
 		-e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
 		-e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \
 		-i demos/{,scripts/}*.tcl || die
@@ -98,6 +99,6 @@ src_install() {
 	cp "${FILESDIR}"/pkgIndex.tcl "${ED}"/usr/$(get_libdir)/blt2.4/pkgIndex.tcl
 
 	# fix for linking against shared lib with -lBLT or -lBLTlite
-	dosym libBLT24.so /usr/$(get_libdir)/libBLT.so || die
-	dosym libBLTlite24.so /usr/$(get_libdir)/libBLTlite.so || die
+	dosym libBLT24$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname) || die
+	dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname) || die
 }
diff --git a/dev-tcltk/blt/files/blt-2.4z-darwin.patch b/dev-tcltk/blt/files/blt-2.4z-darwin.patch
new file mode 100644
index 000000000000..1922e3e4db65
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-darwin.patch
@@ -0,0 +1,86 @@
+--- configure.in
++++ configure.in
+@@ -183,9 +183,6 @@
+       blt_lib_prefix=""
+     fi
+     ;;
+-  *-*-macosx)
+-    blt_platform="macosx"
+-    ;;
+   *)
+     blt_platform="unix"
+     ;;
+@@ -728,6 +725,9 @@
+   *-hpux*)
+     SHLIB_SUFFIX="sl"
+     ;;
++  *-darwin*)
++    SHLIB_SUFFIX="dylib"
++    ;;
+   *)
+     SHLIB_SUFFIX="so"
+     ;;
+@@ -1053,7 +1053,6 @@
+ SHLIB_LD_FLAGS="$TCL_LD_FLAGS"
+ SHLIB_RUNPATH="$TCL_LD_SEARCH_FLAGS"
+ 
+-SHLIB_SUFFIX=".so"
+ SHLIB_TARGET=""
+ SHLIB_CFLAGS=""
+ SHLIB_LIB_SPECS="${JPEG_LIB_SPEC}"
+@@ -1145,6 +1145,12 @@
+     LDFLAGS=""
+     ;;
+ 
++  *-darwin*)
++    SHLIB_CFLAGS=""
++    SHLIB_LD="${CC}"
++    SHLIB_LD_FLAGS='-dynamiclib -install_name $(libdir)/$@'
++    ;;
++
+   *-dgux*)
+     SHLIB_CFLAGS="-K PIC"
+     SHLIB_LD="cc"
+--- configure
++++ configure
+@@ -1279,9 +1279,6 @@
+       blt_lib_prefix=""
+     fi
+     ;;
+-  *-*-macosx)
+-    blt_platform="macosx"
+-    ;;
+   *)
+     blt_platform="unix"
+     ;;
+@@ -3396,6 +3393,9 @@
+   *-hpux*)
+     SHLIB_SUFFIX="sl"
+     ;;
++  *-darwin*)
++    SHLIB_SUFFIX="dylib"
++    ;;
+   *)
+     SHLIB_SUFFIX="so"
+     ;;
+@@ -3853,7 +3853,6 @@
+ SHLIB_LD_FLAGS="$TCL_LD_FLAGS"
+ SHLIB_RUNPATH="$TCL_LD_SEARCH_FLAGS"
+ 
+-SHLIB_SUFFIX=".so"
+ SHLIB_TARGET=""
+ SHLIB_CFLAGS=""
+ SHLIB_LIB_SPECS="${JPEG_LIB_SPEC}"
+@@ -3943,6 +3943,12 @@
+     LDFLAGS=""
+     ;;
+ 
++  *-darwin*)
++    SHLIB_CFLAGS=""
++    SHLIB_LD="${CC}"
++    SHLIB_LD_FLAGS='-dynamiclib -install_name $(libdir)/$@'
++    ;;
++
+   *-dgux*)
+     SHLIB_CFLAGS="-K PIC"
+     SHLIB_LD="cc"