Changeset 2941


Ignore:
Timestamp:
Jun 21, 2003, 9:47:49 PM (17 years ago)
Author:
ssen
Message:

Merge from ssen-platform-1

Location:
trunk/base
Files:
41 added
17 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/Makefile.in

    r2804 r2941  
    77clean::
    88
    9 distclean:: clean
     9distclean::
    1010        rm -f config.log config.status
    1111        rm -rf autom4te.cache
  • trunk/base/Mk/dports.autoconf.mk.in

    r2818 r2941  
    2121INSTALL                 = @INSTALL@
    2222MD5                     = @MD5@
     23MTREE                   = @MTREE@
    2324
    2425TCL_PACKAGE_DIR         = @TCL_PACKAGE_DIR@
  • trunk/base/Mk/dports.tea.mk

    r2837 r2941  
    88
    99clean::
    10         rm -f ${OBJS} ${SHLIB_NAME}
     10        rm -f ${OBJS} ${SHLIB_NAME} so_locations
    1111
    1212distclean:: clean
  • trunk/base/aclocal.m4

    r2839 r2941  
    113113AC_DEFUN([OD_PROG_MD5],[
    114114
    115         AC_PATH_PROG([MD5], [md5], ,  [ $PATH:/usr/bin:/bin ])
     115        AC_PATH_PROG([MD5], [md5], ,  [/usr/bin:/usr/sbin:/bin:/sbin])
    116116
    117117        if test "x$MD5" = "x" ; then
    118                 AC_PATH_PROG([OPENSSL], [openssl],
    119                         [AC_MSG_ERROR([No suitable md5 program found])],
    120                         [ $PATH:/usr/local/openssl/bin:/usr/bin:/bin ])
    121 
    122                 MD5="$OPENSSL md5"
     118                AC_CONFIG_SUBDIRS([src/programs/md5])
     119                MD5='${prefix}/bin/md5'
     120                REPLACEMENT_PROGS="$REPLACEMENT_PROGS md5"
    123121        fi
    124122
    125123        AC_SUBST(MD5)
    126124])
     125
     126# OD_PROG_MTREE
     127#---------------------------------------
     128AC_DEFUN([OD_PROG_MTREE],[
     129
     130        AC_PATH_PROG([MTREE], [mtree], ,  [/usr/bin:/usr/sbin:/bin:/sbin])
     131
     132        if test "x$MTREE" = "x" ; then
     133                AC_CONFIG_SUBDIRS([src/programs/mtree])
     134                MTREE='$(TOPSRCDIR)/src/programs/mtree/mtree'
     135#               MTREE='${prefix}/bin/mtree'
     136                REPLACEMENT_PROGS="$REPLACEMENT_PROGS mtree"
     137        fi
     138
     139        AC_SUBST(MTREE)
     140])
  • trunk/base/configure.ac

    r2843 r2941  
    1212
    1313OD_PROG_MD5
     14OD_PROG_MTREE
     15
     16AC_SUBST(REPLACEMENT_PROGS)
    1417
    1518# Check for paths
     
    100103
    101104AC_CONFIG_FILES([Makefile Mk/dports.autoconf.mk doc/prefix.mtree
    102                 doc/ports.conf src/darwinports1.0/darwinports_autoconf.tcl])
     105                doc/ports.conf src/darwinports1.0/darwinports_autoconf.tcl
     106                src/programs/Makefile])
    103107AC_OUTPUT
  • trunk/base/doc/Makefile

    r2816 r2941  
    11MAN7=           portfile.7 portstyle.7
    22INSTALLDIR=     ${DESTDIR}${prefix}
     3TOPSRCDIR=      ..
    34
    45include ../Mk/dports.autoconf.mk
     
    1516        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} ${DESTDIR}${portconfigdir}
    1617
    17         cat prefix.mtree | mtree -U -d -e -p ${INSTALLDIR} > /dev/null
     18        cat prefix.mtree | $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
    1819        $(SILENT)if test ! -e ${DESTDIR}/${portconfigdir}/ports.conf ; then \
    1920                set -x; \
  • trunk/base/src/Makefile

    r1924 r2941  
    11TCLPKG=         darwinports1.0 port1.0 pextlib1.0
    2 SUBDIR=         ${TCLPKG} port
     2SUBDIR=         ${TCLPKG} port programs
    33
    44include ../Mk/dports.subdir.mk
  • trunk/base/src/darwinports1.0/darwinports.tcl

    r2827 r2941  
    9999            while {[gets $fd line] >= 0} {
    100100                foreach option $bootstrap_options {
    101                     if {[regexp "^$option\[ \t\]+(\[A-Za-z0-9\./\]+$)" $line match val] == 1} {
     101                    if {[regexp "^$option\[ \t\]+(\[A-Za-z0-9_\./\]+$)" $line match val] == 1} {
    102102                        set darwinports::$option $val
    103103                        global darwinports::$option
  • trunk/base/src/pextlib1.0/Makefile

    r2809 r2941  
    1 OBJS=           Pextlib.o strsed.o
     1OBJS=           Pextlib.o strsed.o fgetln.o
    22SHLIB_NAME=     Pextlib${SHLIB_SUFFIX}
    33INSTALLDIR= ${DESTDIR}${datadir}/darwinports/Tcl/pextlib1.0
  • trunk/base/src/pextlib1.0/Pextlib.c

    r2841 r2941  
    9797#endif
    9898
     99#if !HAVE_FGETLN
     100char *fgetln(FILE *stream, size_t *len);
     101#endif
     102
    99103#define CBUFSIZ 30
    100104
     
    277281                else {
    278282                        /* Copy the contents of the circular buffer to errbuf */
     283                        Tcl_Obj* errorCode;
    279284                        errbuf = Tcl_NewStringObj(NULL, 0);
    280285                        for (fline = pos; pos < fline + CBUFSIZ; pos++) {
     
    291296
    292297                        /* set errorCode [list CHILDSTATUS <pid> <code>] */
    293                         Tcl_Obj* errorCode = Tcl_NewListObj(0, NULL);
     298                        errorCode = Tcl_NewListObj(0, NULL);
    294299                        Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewStringObj("CHILDSTATUS", -1));
    295300                        Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewIntObj(pid));
  • trunk/base/src/pextlib1.0/strsed.c

    r922 r2941  
    3232/*
    3333 * $Log: strsed.c,v $
     34 * Revision 1.9  2003/06/21 21:45:21  ssen
     35 * Merge from ssen-platform-1
     36 *
     37 * Revision 1.8.6.1  2003/06/18 23:14:49  ssen
     38 * don't do extern char *strdup, since linux doesn't like that
     39 *
    3440 * Revision 1.8  2002/10/04 07:12:21  jkh
    3541 * Remove some gratuitous externs
     
    248254int *range;
    249255{
    250     extern char *strdup();
    251256
    252257#ifdef GNU_REGEX
  • trunk/base/src/port/Makefile

    r2809 r2941  
    11MAN1=           port.1
    22INSTALLDIR=     ${DESTDIR}${prefix}
     3TOPSRCDIR=      ../..
    34
    45include ../../Mk/dports.autoconf.mk
    56
    67mkdirs:
    7         cat ../../doc/prefix.mtree | mtree -U -d -e -p ${INSTALLDIR} > /dev/null
     8        cat ../../doc/prefix.mtree | $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
    89
    910all:
  • trunk/base/src/port1.0/Makefile

    r2809 r2941  
    1616clean::
    1717
    18 distclean:: clean
     18distclean::
    1919
    2020install::
  • trunk/base/src/port1.0/portchecksum.tcl

    r2118 r2941  
    4646    global distpath UI_PREFIX
    4747
    48     set md5regex "^(MD5)\[ \]\\((.+)\\)\[ \]=\[ \](\[A-Za-z0-9\]+)\n$"
     48    set md5regex "^(MD5)\[ \]?\\((.+)\\)\[ \]?=\[ \](\[A-Za-z0-9\]+)\n$"
    4949    if {[catch {set pipe [open "|md5 \"${file}\"" r]} result]} {
    5050        return -code error "[format [msgcat::mc "Unable to parse checksum: %s"] $result]"
  • trunk/base/src/port1.0/portinstall.tcl

    r2792 r2941  
    5555
    5656proc install_start {args} {
    57     global UI_PREFIX prefix portname destroot portresourcepath
     57    global UI_PREFIX prefix portname destroot portresourcepath os.platform
    5858
    5959    ui_msg "$UI_PREFIX [format [msgcat::mc "Installing %s"] ${portname}]"
     
    6464
    6565        file mkdir "${destroot}"
    66         system "cd \"${destroot}\" && mtree -d -e -U -f ${portresourcepath}/install/macosx.mtree"
     66        if { ${os.platform} == "darwin" } {
     67                system "cd \"${destroot}\" && mtree -d -e -U -f ${portresourcepath}/install/macosx.mtree"
     68        }
    6769        file mkdir "${destroot}/${prefix}"
    6870        system "cd \"${destroot}/${prefix}\" && mtree -d -e -U -f ${portresourcepath}/install/prefix.mtree"
  • trunk/base/src/port1.0/resources/package/Makefile

    r2809 r2941  
    88clean:
    99
    10 distclean: clean
     10distclean:
    1111
    1212install:
  • trunk/base/src/port1.0/resources/sitelists/Makefile

    r2809 r2941  
    99clean:
    1010
    11 distclean: clean
     11distclean:
    1212
    1313install:
Note: See TracChangeset for help on using the changeset viewer.