Changeset 53746


Ignore:
Timestamp:
Jul 13, 2009, 6:52:32 AM (10 years ago)
Author:
blb@…
Message:

Merge from trunk

Location:
branches/images-and-archives/base
Files:
2 deleted
9 edited
2 copied

Legend:

Unmodified
Added
Removed
  • branches/images-and-archives/base

  • branches/images-and-archives/base/configure

    r53504 r53746  
    77987798# Check for paths
    77997799
     7800if test x$prefix = x/usr/local; then
     7801    { { $as_echo "$as_me:$LINENO: error: Installing MacPorts into /usr/local is not supported" >&5
     7802$as_echo "$as_me: error: Installing MacPorts into /usr/local is not supported" >&2;}
     7803   { (exit 1); exit 1; }; }
     7804fi
    78007805
    78017806
  • branches/images-and-archives/base/configure.ac

    r53504 r53746  
    166166# Check for paths
    167167AC_PREFIX_DEFAULT(/opt/local)
     168if test x$prefix = x/usr/local; then
     169    AC_MSG_ERROR([Installing MacPorts into /usr/local is not supported])
     170fi
    168171MP_PATH_PORTSDIR([$PORTS_DIR_DEFAULT])
    169172MP_PATH_MPCONFIGDIR
  • branches/images-and-archives/base/src/macports1.0/Makefile

    r51437 r53746  
    11SRCS=           macports.tcl macports_dlist.tcl macports_util.tcl \
    22                macports_autoconf.tcl macports_index.tcl macports_fastload.tcl
    3 OBJS=           macports.o
     3OBJS=           macports.o get_systemconfiguration_proxies.o
    44SHLIB_NAME=     MacPorts${SHLIB_SUFFIX}
    55
     
    88include ../../Mk/macports.autoconf.mk
    99include ../../Mk/macports.tea.mk
     10
     11ifeq ($(OBJC_RUNTIME), APPLE_RUNTIME)
     12        LIBS+= -framework CoreFoundation -framework SystemConfiguration
     13endif
    1014
    1115test::
  • branches/images-and-archives/base/src/macports1.0/macports.c

    r51437 r53746  
    3838#include <tcl.h>
    3939
     40#include "get_systemconfiguration_proxies.h"
     41
    4042static int
    4143macports__version(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[])
     
    5557                return TCL_ERROR;
    5658        Tcl_CreateObjCommand(interp, "macports::version", macports__version, NULL, NULL);
     59        Tcl_CreateObjCommand(interp, "get_systemconfiguration_proxies", GetSystemConfigurationProxiesCmd, NULL, NULL);
    5760        if (Tcl_PkgProvide(interp, "macports", "1.0") != TCL_OK)
    5861                return TCL_ERROR;
  • branches/images-and-archives/base/src/macports1.0/macports.tcl

    r53715 r53746  
    976976            set proposedpath [file normalize [file join [getportdir $url] .. ..]]
    977977        }
     978        default {
     979            set proposedpath [getsourcepath $url]
     980        }
    978981    }
    979982
     
    16361639                    set indexfile [macports::getindex $source]
    16371640                    file mkdir [file dirname $indexfile]
    1638                     curl $source/PortIndex $indexfile
     1641                    curl fetch ${source}/PortIndex $indexfile
     1642                    curl fetch ${source}/PortIndex.quick ${indexfile}.quick
    16391643                }
    16401644            }
  • branches/images-and-archives/base/src/pextlib1.0/Makefile

    r53504 r53746  
    22                fs-traverse.o strcasecmp.o vercomp.o filemap.o \
    33                sha1cmd.o curl.o rmd160cmd.o readline.o uid.o\
    4                 tracelib.o tty.o get_systemconfiguration_proxies.o\
    5                 sysctl.o readdir.o pipe.o
     4                tracelib.o tty.o sysctl.o readdir.o pipe.o
    65SHLIB_NAME=     Pextlib${SHLIB_SUFFIX}
    76INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/pextlib1.0
     
    1211CFLAGS+= ${CURL_CFLAGS} ${MD5_CFLAGS} ${READLINE_CFLAGS}
    1312LIBS+= ${CURL_LIBS} ${MD5_LIBS} ${READLINE_LIBS}
    14 ifeq ($(OBJC_RUNTIME), APPLE_RUNTIME)
    15    LIBS+= -framework CoreFoundation -framework SystemConfiguration
    16 endif
    1713
    1814.PHONY: test
  • branches/images-and-archives/base/src/pextlib1.0/Pextlib.c

    r53504 r53746  
    105105#include "tracelib.h"
    106106#include "tty.h"
    107 #include "get_systemconfiguration_proxies.h"
    108107#include "sysctl.h"
    109108#include "strsed.h"
     
    949948        Tcl_CreateObjCommand(interp, "isatty", IsattyCmd, NULL, NULL);
    950949        Tcl_CreateObjCommand(interp, "term_get_size", TermGetSizeCmd, NULL, NULL);
    951         Tcl_CreateObjCommand(interp, "get_systemconfiguration_proxies", GetSystemConfigurationProxiesCmd, NULL, NULL);
    952950
    953951        if (Tcl_PkgProvide(interp, "Pextlib", "1.0") != TCL_OK)
  • branches/images-and-archives/base/src/port/portindex.tcl

    r51815 r53746  
    6161            cd [file join $directory [file dirname $portinfo(portdir)]]
    6262            puts "Archiving port $portinfo(name) to [file join $outdir $portinfo(portarchive)]"
    63             set tar [findBinary tar $macports::autoconf::tar_path]
    64             set gzip [findBinary gzip $macports::autoconf::gzip_path]
     63            set tar [macports::findBinary tar $macports::autoconf::tar_path]
     64            set gzip [macports::findBinary gzip $macports::autoconf::gzip_path]
    6565            if {[catch {exec $tar -cf - [file tail $portdir] | $gzip -c >[file join $outdir $portinfo(portarchive)]} result]} {
    6666                puts stderr "Failed to create port archive $portinfo(portarchive): $result"
     
    6969        }
    7070
    71         set keepkeys {categories depends_fetch depends_extract depends_build depends_lib depends_run description epoch homepage long_description maintainers name platforms revision variants version portdir}
     71        set keepkeys {categories depends_fetch depends_extract depends_build depends_lib depends_run description epoch homepage long_description maintainers name platforms revision variants version portdir portarchive}
    7272        foreach availkey [array names portinfo] {
    7373            if {[lsearch -exact ${keepkeys} $availkey] == -1} {
Note: See TracChangeset for help on using the changeset viewer.