Changeset 2426


Ignore:
Timestamp:
Apr 9, 2003, 4:53:53 AM (17 years ago)
Author:
landonf (Landon Fuller)
Message:

Allow DarwinPorts to build out of the box on newer Darwin releases with Tcl 8.4

  • Remove references to 'tclsh8.3', replacing them with 'tclsh'. This will work everywhere except FreeBSD
  • Remove compile.sh, link.sh, and tcldir.sh, replacing them with config.sh. config.sh references the config data provided by TEA and allows us to steer clear of autoconf.
  • Modify all Makefiles to use config.sh
Location:
trunk/base
Files:
1 added
3 deleted
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/cflib1.0/Makefile

    r2379 r2426  
    33LDADD+=         -ltcl
    44INSTALLDIR= ${DESTDIR}${PREFIX}/share/darwinports/Tcl/cflib1.0
    5 LINK=           ../../scripts/link.sh
    6 COMPILE=        ../../scripts/compile.sh
     5LINK=           ../../scripts/config.sh link
     6COMPILE=        ../../scripts/config.sh compile
     7SHLIB_SO=       `../../scripts/config.sh shlibname ${SHLIB_NAME}`
    78
    89.c.o:
     
    1011
    1112CFLib.dylib: ${OBJS}
    12         @${LINK} ${SHLIB_NAME} ${OBJS}
     13        ${LINK} ${SHLIB_NAME} ${OBJS} -framework CoreFoundation
    1314
    1415all: CFLib.dylib
    1516
    1617clean:
    17         rm -f ${OBJS} `${LINK} -n ${SHLIB_NAME}`
     18        rm -f ${OBJS} ${SHLIB_SO}
    1819
    1920install: all
    2021        mkdir -p ${INSTALLDIR}
    21         install -c -o "${DSTUSR}" -g "${DSTGRP}" -m 444 `${LINK} -n ${SHLIB_NAME}` ${INSTALLDIR}
     22        install -c -o "${DSTUSR}" -g "${DSTGRP}" -m 444 ${SHLIB_SO} ${INSTALLDIR}
    2223        ../pkg_mkindex.tcl ${INSTALLDIR}
    2324
  • trunk/base/src/darwinports1.0/Makefile

    r2379 r2426  
    11SRCS=           darwinports.tcl darwinports_dlist.tcl
     2INSTALLDIR=     ${DESTDIR}`../../scripts/config.sh installdir`
    23
    34all:
     
    67
    78install:
    8         @mkdir -p ${DESTDIR}`../../scripts/tcldir.sh`
     9        @mkdir -p ${INSTALLDIR}
    910        @set -x; for file in ${SRCS}; do \
    10                 install -c -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${DESTDIR}`../../scripts/tcldir.sh`; \
     11                install -c -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
    1112        done
    12         @../pkg_mkindex.tcl ${DESTDIR}`../../scripts/tcldir.sh`
     13        @../pkg_mkindex.tcl ${INSTALLDIR}
    1314
    1415include ../../Mk/dports.mk
  • trunk/base/src/darwinports1.0/darwinports.tcl

    r2358 r2426  
    1 #!/usr/bin/env tclsh8.3
    21# darwinports.tcl
    32#
  • trunk/base/src/darwinports1.0/darwinports_dlist.tcl

    r2084 r2426  
    1 #!/usr/bin/env tclsh8.3
    21# darwinports1.0/darwinports_dlist.tcl
    32#
  • trunk/base/src/darwinports1.0/test_dlist.tcl

    r2083 r2426  
    1 #!/usr/bin/env tclsh8.3
     1#!/usr/bin/env tclsh
    22# darwinports1.0/test_dlist.tcl
    33#
  • trunk/base/src/pextlib1.0/Makefile

    r2379 r2426  
    11OBJS=           Pextlib.o strsed.o
    22SHLIB_NAME=     Pextlib
    3 LDADD+=         -ltcl
    43INSTALLDIR= ${DESTDIR}${PREFIX}/share/darwinports/Tcl/pextlib1.0
    5 COMPILE=        ../../scripts/compile.sh
    6 LINK=           ../../scripts/link.sh
    7 
     4COMPILE=        ../../scripts/config.sh compile
     5LINK=           ../../scripts/config.sh link
     6SHLIB_SO=       `../../scripts/config.sh shlibname ${SHLIB_NAME}`
    87
    98.c.o:
     
    1110
    1211Pextlib.dylib: ${OBJS}
    13         @${LINK} ${SHLIB_NAME} ${OBJS}
     12        ${LINK} ${SHLIB_NAME} ${OBJS}
    1413
    1514all: Pextlib.dylib
    1615
    1716clean:
    18         rm -f ${OBJS} `${LINK} -n ${SHLIB_NAME}`
     17        rm -f ${OBJS} ${SHLIB_SO}
    1918
    2019install: all
    2120        mkdir -p ${INSTALLDIR}
    22         install -c -o "${DSTUSR}" -g "${DSTGRP}" -m 444 `${LINK} -n ${SHLIB_NAME}` ${INSTALLDIR}
     21        install -c -o "${DSTUSR}" -g "${DSTGRP}" -m 444 ${SHLIB_SO} ${INSTALLDIR}
    2322        ../pkg_mkindex.tcl ${INSTALLDIR}
    2423
  • trunk/base/src/pkg_mkindex.tcl

    r1500 r2426  
    1 #!/usr/bin/env tclsh8.3
     1#!/usr/bin/env tclsh
    22# pkg_mkindex.tcl
    33#
  • trunk/base/src/port/port.tcl

    r2287 r2426  
    1 #!/usr/bin/env tclsh8.3
     1#!/usr/bin/env tclsh
    22# port.tcl
    33#
  • trunk/base/src/port/portall.tcl

    r1532 r2426  
    1 #!/usr/bin/env tclsh8.3
     1#!/usr/bin/env tclsh
    22# Traverse through all ports running the supplied target.  If target is
    33# "index" then just print some useful information about each port.
  • trunk/base/src/port/portindex.tcl

    r1500 r2426  
    1 #!/usr/bin/env tclsh8.3
     1#!/usr/bin/env tclsh
    22# Traverse through all ports, creating an index and archiving port directories
    33# if requested
  • trunk/base/src/portmgr/mpkgall.tcl

    r2391 r2426  
    1 #!/usr/bin/env tclsh8.3
     1#!/usr/bin/env tclsh
    22# mpkgall.tcl
    33#
  • trunk/base/src/portmgr/packageall.tcl

    r2213 r2426  
    1 #!/usr/bin/env tclsh8.3
     1#!/usr/bin/env tclsh
    22# packageall.tcl
    33#
Note: See TracChangeset for help on using the changeset viewer.