[32235] trunk/dports

[mww at macports.org]

Revision: 32235
          http://trac.macosforge.org/projects/macports/changeset/32235
Author:   mww at macports.org
Date:     2007-12-21 05:26:54 -0800 (Fri, 21 Dec 2007)

Log Message:
-----------
version 8.5.0

Modified Paths:
--------------
    trunk/dports/lang/tcl/Portfile
    trunk/dports/x11/tk/Portfile

Modified: trunk/dports/lang/tcl/Portfile
===================================================================
--- trunk/dports/lang/tcl/Portfile	2007-12-21 11:06:04 UTC (rev 32234)
+++ trunk/dports/lang/tcl/Portfile	2007-12-21 13:26:54 UTC (rev 32235)
@@ -1,8 +1,9 @@
 # $Id$
 
 PortSystem 1.0
+
 name          tcl
-version       8.4.16
+version       8.5.0
 # Tk (x11/tk) port depends on this version
 categories    lang
 maintainers   mww openmaintainer
@@ -11,40 +12,23 @@
 master_sites  sourceforge
 
 checksums \
-  md5 f1c783a49547778d160e10be2fb5d76f \
-  sha1 7edc6b8eb5f49980ba9b788e12c236501327c815 \
-  rmd160 8432aff66525a3c3f9dadb2bd8e32c28c539d14d
+  md5 d890c505465411b25050b6cd95971d2c \
+  sha1 d636d29f213533e8d32eb21f7cd7f8c7a5d76565 \
+  rmd160 f398a26ea7c8937507049a927f918d18c906f6e5
 
 dist_subdir     tcltk
 distname        ${name}${version}-src
 worksrcdir      ${name}${version}/unix
 configure.args  --mandir=${prefix}/share/man
 
-post-patch {
-  # To avoid using odcctools' broken headers.
-  fs-traverse f ${worksrcpath} {
-    if [string match "*.c" ${f}] {
-      reinplace "s|<\\(mach-o/\[^>\]*\\)>|\"/usr/include/\\1\"|" ${f}
-    }
-  }
-}
-
 destroot.destdir  INSTALL_ROOT=${destroot}
 post-destroot {
-  ln -s ${prefix}/bin/tclsh8.4 ${destroot}/${prefix}/bin/tclsh
-  ln -s ${prefix}/lib/libtcl8.4.dylib ${destroot}/${prefix}/lib/libtcl.dylib
+    ln -s ${prefix}/bin/tclsh8.5 ${destroot}/${prefix}/bin/tclsh
+    ln -s ${prefix}/lib/libtcl8.5.dylib ${destroot}/${prefix}/lib/libtcl.dylib
 }
 
 # Files with failing tests: socket.test
 test.run      yes
 
-platform darwin 8 {
-	configure.env	MACOSX_DEPLOYMENT_TARGET=10.4
-}
-
-platform darwin 9 {
-	configure.env	MACOSX_DEPLOYMENT_TARGET=10.5
-}
-
 livecheck.check	freshmeat
 livecheck.name	tcltk

Modified: trunk/dports/x11/tk/Portfile
===================================================================
--- trunk/dports/x11/tk/Portfile	2007-12-21 11:06:04 UTC (rev 32234)
+++ trunk/dports/x11/tk/Portfile	2007-12-21 13:26:54 UTC (rev 32235)
@@ -1,8 +1,9 @@
 # $Id$
 
 PortSystem      1.0
+
 name            tk
-version         8.4.16
+version         8.5.0
 categories      x11
 maintainers     mww openmaintainer
 description     Tcl Tool Kit
@@ -18,42 +19,40 @@
 worksrcdir      ${name}${version}/unix
 checksums \
   ${distname}${extract.suffix} \
-    md5 24d18fbebe3bb8853e418431be01bf2c \
-    sha1 464bd7e1411e247e365e4ff585900333b3f91f56 \
-    rmd160 8545933c172ffcd7024db91f7292190776d3a873
+    md5 bc217c45ed6b2f5b8d3120df63fa13bd \
+    sha1 289ca08c53b4719b03ae47a379b4b5a2f4d404ec \
+    rmd160 d2bcabd3a125f60842c322839a20bbdc074d0afc
 # suck in Tcl as well so we can use it internally.
 distfiles-append    tcl${version}-src${extract.suffix}
 checksums-append \
   tcl${version}-src${extract.suffix} \
-    md5 f1c783a49547778d160e10be2fb5d76f \
-    sha1 7edc6b8eb5f49980ba9b788e12c236501327c815 \
-    rmd160 8432aff66525a3c3f9dadb2bd8e32c28c539d14d
+    md5 d890c505465411b25050b6cd95971d2c \
+    sha1 d636d29f213533e8d32eb21f7cd7f8c7a5d76565 \
+    rmd160 f398a26ea7c8937507049a927f918d18c906f6e5
 
-destroot.destdir    INSTALL_ROOT=${destroot}
-configure.args      --mandir=${prefix}/share/man --with-tcl=${prefix}/lib
 # force usage of DP Tcl
 depends_lib         port:tcl lib:libX11.6:XFree86
 
-configure.cppflags-append \
-  -I${workpath}/tcl${version}/generic
-
-variant aqua {
-    configure.args-append   --enable-aqua
-}
-
 post-patch {
     reinplace s|@TCL_SRC_DIR@|${worksrcpath}/../../tcl${version}/|g ${worksrcpath}/Makefile.in
 }
 
+configure.args      --mandir=${prefix}/share/man --with-tcl=${prefix}/lib
+configure.cppflags-append \
+  -I${workpath}/tcl${version}/generic
+
+destroot.destdir    INSTALL_ROOT=${destroot}
 post-destroot {
-    ln -s ${prefix}/bin/wish8.4 ${destroot}${prefix}/bin/wish
-    ln -s ${prefix}/lib/libtk8.4.dylib ${destroot}${prefix}/lib/libtk.dylib
-    
-    # For some reason the aqua variant installs old X11 headers -> delete
-    if {[variant_isset aqua]} {
-        delete ${destroot}${prefix}/include/X11
-    }
+    ln -s ${prefix}/bin/wish8.5 ${destroot}${prefix}/bin/wish
+    ln -s ${prefix}/lib/libtk8.5.dylib ${destroot}${prefix}/lib/libtk.dylib
 }
 
+#variant quartz {
+#    configure.args-append   --enable-aqua
+#    post-destroot {
+#        delete ${destroot}${prefix}/include/X11
+#    }
+#}
+
 livecheck.check	freshmeat
 livecheck.name	tcltk

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071221/a6b7709c/attachment.html