diff --git a/src/darwinports1.0/darwinports.tcl b/src/darwinports1.0/darwinports.tcl index 04592fd37..fa2a34e7d 100644 --- a/src/darwinports1.0/darwinports.tcl +++ b/src/darwinports1.0/darwinports.tcl @@ -8,19 +8,6 @@ set bootstrap_options "sysportpath libpath auto_path" set portinterp_options "sysportpath portpath auto_path portconf" set uniqid 0 -# XXX not portable -proc ccextension {file} { - if {[regexp {([A-Za-z]+).c} [file tail $file] match name] == 1} { - set objfile [file join [file dirname $file] $name.dylib] - if {[file exists $objfile]} { - if {[file mtime $file] <= [file mtime $objfile]} { - return - } - } - exec cc -dynamiclib $file -o $objfile -ltcl - } -} - proc init {args} { global auto_path env bootstrap_options sysportpath portconf @@ -46,19 +33,11 @@ proc init {args} { } if ![info exists libpath] { - set libpath [file join $sysportpath Tcl] + set libpath /usr/local/share/darwinports/Tcl } if [file isdirectory $libpath] { lappend auto_path $libpath - foreach dir [glob -nocomplain -directory $libpath -types d *] { - if [file isdirectory $dir] { - foreach srcfile [glob -nocomplain -directory $dir -types f *.c] { - ccextension $srcfile - } - catch {pkg_mkIndex $dir *.tcl *.so *.dylib} result - } - } } else { return -code error "Library directory '$libpath' must exist" } diff --git a/src/pextlib1.0/Makefile b/src/pextlib1.0/Makefile index 7ff745c44..a807faf66 100644 --- a/src/pextlib1.0/Makefile +++ b/src/pextlib1.0/Makefile @@ -9,6 +9,7 @@ install: mkdir -p ${INSTALLDIR} ${.CURDIR}/../pkg_mkindex.tcl ${.CURDIR} ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${SHLIB_NAME} ${INSTALLDIR} + ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} pkgIndex.tcl ${INSTALLDIR} afterclean: rm -f pkgIndex.tcl diff --git a/src/port1.0/Makefile b/src/port1.0/Makefile index 4fce73665..38e72dc41 100644 --- a/src/port1.0/Makefile +++ b/src/port1.0/Makefile @@ -8,6 +8,7 @@ clean: install: mkdir -p ${INSTALLDIR} ${.CURDIR}/../pkg_mkindex.tcl ${.CURDIR} + ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} pkgIndex.tcl ${INSTALLDIR} ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} port.tcl ${INSTALLDIR} ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} portchecksum.tcl ${INSTALLDIR} ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} portconfigure.tcl ${INSTALLDIR}