Revision: 100816 https://trac.macports.org/changeset/100816 Author: ryandesign@macports.org Date: 2012-12-27 01:39:40 -0800 (Thu, 27 Dec 2012) Log Message: ----------- tk: fix install_name of libtk8.6.dylib when +x11 variant is used (#37395) Modified Paths: -------------- trunk/dports/x11/tk/Portfile Added Paths: ----------- trunk/dports/x11/tk/files/ trunk/dports/x11/tk/files/patch-unix-Makefile.in.diff Modified: trunk/dports/x11/tk/Portfile =================================================================== --- trunk/dports/x11/tk/Portfile 2012-12-27 06:12:20 UTC (rev 100815) +++ trunk/dports/x11/tk/Portfile 2012-12-27 09:39:40 UTC (rev 100816) @@ -4,6 +4,7 @@ name tk version 8.6.0 +revision 1 categories x11 license Tcl/Tk maintainers mww openmaintainer @@ -41,8 +42,11 @@ worksrcdir ${name}${version}/unix +patch.dir ${workpath}/${name}${version} +patchfiles patch-unix-Makefile.in.diff + post-patch { - reinplace s|@TCL_SRC_DIR@|${worksrcpath}/../../tcl${version}/|g ${worksrcpath}/Makefile.in + reinplace s|@TCL_SRC_DIR@|${workpath}/tcl${version}/|g ${worksrcpath}/Makefile.in } configure.args --mandir=${prefix}/share/man --with-tcl=${prefix}/lib Added: trunk/dports/x11/tk/files/patch-unix-Makefile.in.diff =================================================================== --- trunk/dports/x11/tk/files/patch-unix-Makefile.in.diff (rev 0) +++ trunk/dports/x11/tk/files/patch-unix-Makefile.in.diff 2012-12-27 09:39:40 UTC (rev 100816) @@ -0,0 +1,11 @@ +--- unix/Makefile.in.orig 2012-12-27 00:11:45.000000000 -0600 ++++ unix/Makefile.in 2012-12-27 03:27:36.000000000 -0600 +@@ -283,7 +283,7 @@ + LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ + + # support for embedded libraries on Darwin / Mac OS X +-DYLIB_INSTALL_DIR = ${LIB_RUNTIME_DIR} ++DYLIB_INSTALL_DIR = $(libdir) + + # support for building the Aqua resource file + TK_RSRC_FILE = @TK_RSRC_FILE@