Changeset 51384


Ignore:
Timestamp:
May 23, 2009, 8:29:46 PM (11 years ago)
Author:
enl@…
Message:

Merge from trunk

Location:
branches/gsoc09-logging/base
Files:
1 deleted
42 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/gsoc09-logging/base

  • branches/gsoc09-logging/base/Mk/macports.tea.mk

    r47700 r51384  
    99        ${CC} -c -DUSE_TCL_STUBS -DTCL_NO_DEPRECATED ${CFLAGS} ${SHLIB_CFLAGS} $< -o $@
    1010
     11all:: ${SHLIB_NAME} pkgIndex.tcl
     12
    1113$(SHLIB_NAME):: ${OBJS}
    1214        ${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${TCL_STUB_LIB_SPEC} ${SHLIB_LDFLAGS} ${LIBS}
    1315
    14 all:: ${SHLIB_NAME}
     16pkgIndex.tcl:
     17        $(SILENT) ../pkg_mkindex.sh .
    1518
    1619clean::
    17         rm -f ${OBJS} ${SHLIB_NAME} so_locations
     20        rm -f ${OBJS} ${SHLIB_NAME} so_locations pkgIndex.tcl
    1821
    1922distclean:: clean
     
    2225        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
    2326        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
    24         $(SILENT) $(TCLSH) ../pkg_mkindex.tcl ${INSTALLDIR}
     27        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
  • branches/gsoc09-logging/base/configure

    r51135 r51384  
    646646prefix_expanded
    647647OUR_INCLUDED_PACKAGES
    648 CONDITIONAL_PACKAGES
    649648TCL_CC
    650649TCL_DEFS
     
    690689PORTSDIR
    691690EXTRA_PROGS
    692 REPLACEMENT_PROGS
    693691HAVE_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER
    694692HAVE_FRAMEWORK_IOKIT
     
    23322330$as_echo "$as_me: WARNING: Please upgrade at http://store.apple.com/" >&2;}
    23332331    ;;
    2334   10.1.[0-4]|10.2.[0-7]|10.3.[0-8]|10.4.[0-9]|10.4.10|10.5.[0-5])
     2332  10.1.[0-4]|10.2.[0-7]|10.3.[0-8]|10.4.[0-9]|10.4.10|10.5.[0-6])
    23352333    { $as_echo "$as_me:$LINENO: WARNING: This version of Mac OS X is out of date" >&5
    23362334$as_echo "$as_me: WARNING: This version of Mac OS X is out of date" >&2;}
     
    49824980
    49834981
    4984 # Determine if we want to install conditional packages
    4985 CONDITIONAL_PACKAGES=
    4986 
    49874982# Foundation checks
    49884983
     
    68656860
    68666861
    6867 # tclobjc requires objc (runtime and foundation) support
    6868 if test x$OBJC_RUNTIME != xnone -a x$OBJC_FOUNDATION != xnone; then
    6869         CONDITIONAL_PACKAGES="tclobjc1.0 $CONDITIONAL_PACKAGES"
    6870 fi
    6871 
    68726862
    68736863        FRAMEWORK_LIBS="-framework CoreFoundation"
     
    72587248        { $as_echo "$as_me:$LINENO: result: ${result}" >&5
    72597249$as_echo "${result}" >&6; }
    7260 
    72617250
    72627251
     
    1027710266
    1027810267
    10279 # Do we have curl_easy_strerror?
    10280 
    10281 
    10282 { $as_echo "$as_me:$LINENO: checking for curl_easy_strerror in -lcurl" >&5
    10283 $as_echo_n "checking for curl_easy_strerror in -lcurl... " >&6; }
    10284 if test "${ac_cv_lib_curl_curl_easy_strerror+set}" = set; then
    10285   $as_echo_n "(cached) " >&6
    10286 else
    10287   ac_check_lib_save_LIBS=$LIBS
    10288 LIBS="-lcurl $LDFLAGS_LIBCURL $LIBS"
    10289 cat >conftest.$ac_ext <<_ACEOF
    10290 /* confdefs.h.  */
    10291 _ACEOF
    10292 cat confdefs.h >>conftest.$ac_ext
    10293 cat >>conftest.$ac_ext <<_ACEOF
    10294 /* end confdefs.h.  */
    10295 
    10296 /* Override any GCC internal prototype to avoid an error.
    10297    Use char because int might match the return type of a GCC
    10298    builtin and then its argument prototype would still apply.  */
    10299 #ifdef __cplusplus
    10300 extern "C"
    10301 #endif
    10302 char curl_easy_strerror ();
    10303 int
    10304 main ()
    10305 {
    10306 return curl_easy_strerror ();
    10307   ;
    10308   return 0;
    10309 }
    10310 _ACEOF
    10311 rm -f conftest.$ac_objext conftest$ac_exeext
    10312 if { (ac_try="$ac_link"
    10313 case "(($ac_try" in
    10314   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    10315   *) ac_try_echo=$ac_try;;
    10316 esac
    10317 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
    10318 $as_echo "$ac_try_echo") >&5
    10319   (eval "$ac_link") 2>conftest.er1
    10320   ac_status=$?
    10321   grep -v '^ *+' conftest.er1 >conftest.err
    10322   rm -f conftest.er1
    10323   cat conftest.err >&5
    10324   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    10325   (exit $ac_status); } && {
    10326          test -z "$ac_c_werror_flag" ||
    10327          test ! -s conftest.err
    10328        } && test -s conftest$ac_exeext && {
    10329          test "$cross_compiling" = yes ||
    10330          $as_test_x conftest$ac_exeext
    10331        }; then
    10332   ac_cv_lib_curl_curl_easy_strerror=yes
    10333 else
    10334   $as_echo "$as_me: failed program was:" >&5
    10335 sed 's/^/| /' conftest.$ac_ext >&5
    10336 
    10337         ac_cv_lib_curl_curl_easy_strerror=no
    10338 fi
    10339 
    10340 rm -rf conftest.dSYM
    10341 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
    10342       conftest$ac_exeext conftest.$ac_ext
    10343 LIBS=$ac_check_lib_save_LIBS
    10344 fi
    10345 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_curl_curl_easy_strerror" >&5
    10346 $as_echo "$ac_cv_lib_curl_curl_easy_strerror" >&6; }
    10347 if test "x$ac_cv_lib_curl_curl_easy_strerror" = x""yes; then
    10348   cat >>confdefs.h <<\_ACEOF
    10349 #define HAVE_CURL_EASY_STRERROR 1
    10350 _ACEOF
    10351 
    10352 fi
    10353 
    10354 
    1035510268# Determine if we need to install some bundled packages
    1035610269OUR_INCLUDED_PACKAGES=
     
    1059610509
    1059710510
    10598 
    1059910511# misc variables that need to be expanded for substitution into tcl
    1060010512
     
    1061810530
    1061910531# Output
    10620 ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf portmgr/freebsd/Makefile portmgr/fedora/macports.spec src/Makefile src/macports1.0/macports_autoconf.tcl src/tclobjc1.0/Makefile src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl setupenv.bash"
     10532ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf portmgr/freebsd/Makefile portmgr/fedora/macports.spec src/Makefile src/macports1.0/macports_autoconf.tcl src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl setupenv.bash"
     10533
     10534
     10535ac_config_files="$ac_config_files src/pkg_mkindex.sh"
    1062110536
    1062210537
     
    1122711142    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
    1122811143    "src/macports1.0/macports_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_autoconf.tcl" ;;
    11229     "src/tclobjc1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/tclobjc1.0/Makefile" ;;
    1123011144    "src/port1.0/port_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/port1.0/port_autoconf.tcl" ;;
    1123111145    "src/registry1.0/registry_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/registry1.0/registry_autoconf.tcl" ;;
     
    1123311147    "src/macports1.0/macports_fastload.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_fastload.tcl" ;;
    1123411148    "setupenv.bash") CONFIG_FILES="$CONFIG_FILES setupenv.bash" ;;
     11149    "src/pkg_mkindex.sh") CONFIG_FILES="$CONFIG_FILES src/pkg_mkindex.sh" ;;
    1123511150
    1123611151  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
     
    1184311758  esac
    1184411759
     11760
     11761  case $ac_file$ac_mode in
     11762    "src/pkg_mkindex.sh":F) chmod +x src/pkg_mkindex.sh ;;
     11763
     11764  esac
    1184511765done # for ac_tag
    1184611766
  • branches/gsoc09-logging/base/configure.ac

    r51135 r51384  
    3333    AC_MSG_WARN([Please upgrade at http://store.apple.com/])
    3434    ;;
    35   10.1.[[0-4]]|10.2.[[0-7]]|10.3.[[0-8]]|10.4.[[0-9]]|10.4.10|10.5.[[0-5]])
     35  10.1.[[0-4]]|10.2.[[0-7]]|10.3.[[0-8]]|10.4.[[0-9]]|10.4.10|10.5.[[0-6]])
    3636    AC_MSG_WARN([This version of Mac OS X is out of date])
    3737    AC_MSG_WARN([Please run Software Update to update it])
     
    135135MP_COMPILER_ATTRIBUTE_LF_PRIVATE
    136136
    137 # Determine if we want to install conditional packages
    138 CONDITIONAL_PACKAGES=
    139 
    140137# Foundation checks
    141138ACX_PTHREAD
     
    143140MP_OBJC_FOUNDATION
    144141
    145 # tclobjc requires objc (runtime and foundation) support
    146 if test x$OBJC_RUNTIME != xnone -a x$OBJC_FOUNDATION != xnone; then
    147         CONDITIONAL_PACKAGES="tclobjc1.0 $CONDITIONAL_PACKAGES"
    148 fi
    149 
    150142MP_PROG_DAEMONDO
    151143
    152 AC_SUBST(REPLACEMENT_PROGS)
    153144AC_SUBST(EXTRA_PROGS)
    154145
     
    235226## libcurl
    236227MP_LIBCURL_FLAGS
    237 
    238 # Do we have curl_easy_strerror?
    239 AH_TEMPLATE([HAVE_CURL_EASY_STRERROR],
    240                [Define to 1 if you have the curl_easy_strerror function.])
    241 AC_CHECK_LIB([curl], [curl_easy_strerror],
    242         [AC_DEFINE([HAVE_CURL_EASY_STRERROR])],[],
    243         [$LDFLAGS_LIBCURL])
    244228
    245229# Determine if we need to install some bundled packages
     
    353337AC_SUBST(TCL_STUB_LIB_SPEC)
    354338AC_SUBST(TCL_CC)
    355 AC_SUBST(CONDITIONAL_PACKAGES)
    356339AC_SUBST(OUR_INCLUDED_PACKAGES)
    357340
     
    391374        src/Makefile
    392375        src/macports1.0/macports_autoconf.tcl
    393         src/tclobjc1.0/Makefile
    394376        src/port1.0/port_autoconf.tcl
    395377        src/registry1.0/registry_autoconf.tcl
     
    399381])
    400382
     383AC_CONFIG_FILES([src/pkg_mkindex.sh], [chmod +x src/pkg_mkindex.sh])
     384
    401385AC_OUTPUT
  • branches/gsoc09-logging/base/doc/macports.conf.5

    r48206 r51384  
    128128with the first found match being used.
    129129.br
    130 Supported types are: tgz, tar, tbz, tbz2, tlz, xar, zip, cpgz, cpio
     130Supported types are: tgz, tar, tbz, tbz2, tlz, txz, xar, zip, cpgz, cpio
    131131.br
    132132.Ic Default:
  • branches/gsoc09-logging/base/doc/macports.conf.in

    r50722 r51384  
    4848# first archive to match one of the specified types in order is used.
    4949#
    50 # Supported types: tgz (default), tar, tbz, tbz2, tlz, xar, zip, cpgz, cpio
     50# Supported types: tgz (default), tar, tbz, tbz2, tlz, txz, xar, zip, cpgz, cpio
    5151portarchivetype         tgz
    5252
  • branches/gsoc09-logging/base/src

    • Property svn:ignore
      •  

        old new  
        11config.h
        22Makefile
         3pkg_mkindex.sh
  • branches/gsoc09-logging/base/src/Makefile.in

    r44763 r51384  
    77                        registry1.0 \
    88                        registry2.0 \
    9                         darwintracelib1.0 \
    10                         @CONDITIONAL_PACKAGES@
     9                        darwintracelib1.0
    1110SUBDIR=         ${TCLPKG} port programs
    1211
  • branches/gsoc09-logging/base/src/config.h.in

    r50732 r51384  
    2424/* Define to 1 if you have the <crt_externs.h> header file. */
    2525#undef HAVE_CRT_EXTERNS_H
    26 
    27 /* Define to 1 if you have the curl_easy_strerror function. */
    28 #undef HAVE_CURL_EASY_STRERROR
    2926
    3027/* Define to 1 if you have the declaration of `completion_matches', and to 0
  • branches/gsoc09-logging/base/src/darwintracelib1.0/Makefile

    r26177 r51384  
    11OBJS=           darwintrace.o
    22SHLIB_NAME=     darwintrace${SHLIB_SUFFIX}
    3 INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/darwintrace1.0
    4 
    5 test::
     3INSTALLDIR=     ${DESTDIR}${datadir}/macports/Tcl/darwintrace1.0
    64
    75include ../../Mk/macports.autoconf.mk
    8 include ../../Mk/macports.tea.mk
     6
     7all:: ${SHLIB_NAME}
     8
     9$(SHLIB_NAME):: ${OBJS}
     10        ${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${SHLIB_LDFLAGS} ${LIBS}
     11
     12clean::
     13        rm -f ${OBJS} ${SHLIB_NAME} so_locations
     14
     15distclean:: clean
     16
     17install:: all
     18        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
     19        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
  • branches/gsoc09-logging/base/src/macports1.0

    • Property svn:ignore
      •  

        old new  
        22macports_autoconf.tcl
        33macports_fastload.tcl
         4pkgIndex.tcl
  • branches/gsoc09-logging/base/src/macports1.0/Makefile

    r49029 r51384  
    2525        echo "${TCL_PACKAGE_DIR}" > ${DESTDIR}${prefix}/var/macports/.tclpackage
    2626
    27         $(SILENT) $(TCLSH) ../pkg_mkindex.tcl ${INSTALLDIR}
     27        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
  • branches/gsoc09-logging/base/src/macports1.0/macports.tcl

    r51378 r51384  
    2020#    may be used to endorse or promote products derived from this software
    2121#    without specific prior written permission.
    22 # 
     22#
    2323# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
    2424# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     
    5656        mp_remote_url mp_remote_submit_url configureccache configuredistcc configurepipe buildnicevalue buildmakejobs \
    5757        applications_dir frameworks_dir universal_target universal_sysroot universal_archs $user_options"
    58    
     58
    5959    # deferred options are only computed when needed.
    6060    # they are not exported to the trace thread.
    6161    # they are not exported to the interpreter in system_options array.
    6262    variable portinterp_deferred_options "xcodeversion xcodebuildcmd"
    63    
     63
    6464    variable open_mports {}
    65    
     65
    6666    variable ui_priorities "debug info msg error warn"
    6767}
     
    116116}
    117117
    118 
     118proc ui_message {priority args} {
     119    global macports::channels
     120    foreach chan {$macports::channels} {
     121    if {\[lindex \$args 0\] == "-nonewline"} {
     122        puts -nonewline \$chan "$prefix\[lindex \$args 1\]"
     123    } else {
     124        puts \$chan "$prefix\[lindex \$args 0\]"
     125    }
     126}
    119127proc macports::ui_init {priority args} {
    120128    global macports::channels
    121129    set default_channel [macports::ui_channels_default $priority]
    122130    set logging_file [init_logging]
    123 
     131    puts "$portname"
    124132    # Get the list of channels.
    125133    try {
     
    141149            eval ::ui_init $priority $prefix $channels $args
    142150        } catch * {
    143             proc ::ui_$priority {args} [subst {
    144                 global macports::channels
    145                 foreach chan {$macports::channels} {
    146                     if {\[lindex \$args 0\] == "-nonewline"} {
    147                         puts -nonewline \$chan "$prefix\[lindex \$args 1\]"
    148                     } else {
    149                         puts \$chan "$prefix\[lindex \$args 0\]"
    150                     }
    151                 }
    152             }]
     151            interp alias {} ui_$priority {} ui_message $priority
    153152        }
    154153
     
    172171        default {
    173172            return ""
    174         } 
     173        }
    175174    }
    176175}
     
    199198            if {[ui_isset ports_quiet]} {
    200199                return {}
    201             } else {   
     200            } else {
    202201                return {stdout}
    203202            }
     
    259258    global macports::xcodeversion
    260259    global macports::xcodebuildcmd
    261    
     260
    262261    trace remove variable macports::xcodeversion read macports::setxcodeinfo
    263262    trace remove variable macports::xcodebuildcmd read macports::setxcodeinfo
     
    281280            }
    282281        }
    283        
     282
    284283        if {![info exists xcodebuildcmd]} {
    285284            set macports::xcodebuildcmd "xcodebuild"
     
    320319        upvar $up_variations variations
    321320    }
    322    
     321
    323322    global auto_path env
    324323    global macports::autoconf::macports_conf_path
     
    366365        set macports::macports_user_dir "/dev/null/NO_HOME_DIR"
    367366    }
    368    
     367
    369368    # Configure the search path for configuration files
    370369    set conf_files ""
     
    377376        lappend conf_files ${PORTSRC}
    378377    }
    379    
     378
    380379    # Process the first configuration file we find on conf_files list
    381380    foreach file $conf_files {
     
    394393        }
    395394    }
    396    
     395
    397396    # Process per-user only settings
    398397    set per_user "${macports_user_dir}/user.conf"
     
    409408        close $fd
    410409    }
    411    
     410
    412411    if {![info exists sources_conf]} {
    413412        return -code error "sources_conf must be set in ${macports_conf_path}/macports.conf or in your ${macports_user_dir}/macports.conf file"
     
    495494        if { $portdbformat == "sqlite" } {
    496495            return -code error "SQLite is not yet supported for registry storage."
    497         } 
     496        }
    498497        set registry.format receipt_${portdbformat}
    499498    } else {
     
    507506        set registry.installtype image
    508507    }
    509    
     508
    510509    # Autoclean mode, whether to automatically call clean after "install"
    511510    if {![info exists portautoclean]} {
     
    599598        return -code error "Data files directory '$portsharepath' must exist"
    600599    }
    601    
     600
    602601    if {![info exists libpath]} {
    603602        set libpath "${prefix}/share/macports/Tcl"
     
    609608        set env(PATH) "$binpath"
    610609    }
    611    
     610
    612611    # Set startupitem default type (can be overridden by portfile)
    613612    if {![info exists macports::startupitem_type]} {
     
    627626        set macports::mp_remote_submit_url "${macports::mp_remote_url}/submit"
    628627    }
    629    
     628
    630629    # Default mp configure options
    631630    if {![info exists macports::configureccache]} {
     
    665664        set macports::universal_archs {ppc i386}
    666665    }
    667    
     666
    668667    # ENV cleanup.
    669668    set keepenvkeys {
     
    680679        set keepenvkeys [concat ${keepenvkeys} ${extra_env}]
    681680    }
    682    
     681
    683682    foreach envkey [array names env] {
    684683        if {[lsearch $keepenvkeys $envkey] == -1} {
     
    721720        }
    722721    }
    723    
     722
    724723    # Proxy handling (done this late since Pextlib is needed)
    725724    if {![info exists proxy_override_env] } {
     
    792791    $workername alias mport_open mportopen
    793792    $workername alias mport_close mportclose
    794     $workername alias mport_search mportsearch
    795793    $workername alias mport_lookup mportlookup
    796794
     
    801799    $workername alias ui_prefix ui_prefix
    802800    $workername alias ui_channels ui_channels
    803    
     801
    804802    # Export some utility functions defined here.
    805803    $workername alias macports_create_thread macports::create_thread
     
    839837        }
    840838    }
    841    
     839
    842840    foreach opt $portinterp_deferred_options {
    843841        global macports::$opt
     
    853851        # define some value now
    854852        $workername eval set $opt "?"
    855     }       
     853    }
    856854
    857855    foreach {opt val} $options {
     
    901899        }
    902900    }
    903    
     901
    904902    return $result
    905903}
     
    10861084
    10871085    $workername eval source Portfile
    1088    
     1086
    10891087    # add the default universal variant, but only if
    10901088    # it will work and another one isn't already present
     
    11161114    # Save the current directory
    11171115    set pwd [pwd]
    1118    
     1116
    11191117    # Join the root.
    11201118    set pathToRoot [file join $pwd $root]
     
    11341132                    # Call the function.
    11351133                    $func [file join $category $port]
    1136                    
     1134
    11371135                    # Restore the current directory because some
    11381136                    # functions changes it.
     
    11421140        }
    11431141    }
    1144    
     1142
    11451143    # Restore the current directory.
    11461144    cd $pwd
     
    11921190    set prefix [_mportkey $mport prefix]
    11931191    set frameworks_dir [_mportkey $mport frameworks_dir]
    1194    
     1192
    11951193    if {[info exists env(DYLD_FRAMEWORK_PATH)]} {
    11961194        lappend search_path $env(DYLD_FRAMEWORK_PATH)
     
    12281226    global env
    12291227    set depregex [lindex [split $depspec :] 1]
    1230     set prefix [_mportkey $mport prefix] 
    1231    
     1228    set prefix [_mportkey $mport prefix]
     1229
    12321230    set search_path [split $env(PATH) :]
    1233    
     1231
    12341232    set depregex \^$depregex\$
    1235    
     1233
    12361234    return [_mportsearchpath $depregex $search_path 1]
    12371235}
     
    12421240    global env
    12431241    set depregex [lindex [split $depspec :] 1]
    1244     set prefix [_mportkey $mport prefix] 
    1245    
     1242    set prefix [_mportkey $mport prefix]
     1243
    12461244    # separate directory from regex
    12471245    set fullname $depregex
     
    13551353        return 1
    13561354    }
    1357    
     1355
    13581356    # Before we build the port, we must build its dependencies.
    13591357    # XXX: need a more general way of comparing against targets
     
    13651363        || $target == "dmg" || $target == "mdmg"
    13661364        || $target == "pkg" || $target == "mpkg"
    1367         || $target == "rpm" || $target == "dpkg" 
     1365        || $target == "rpm" || $target == "dpkg"
    13681366        || $target == "srpm"|| $target == "portpkg" } {
    13691367
     
    13771375        }
    13781376        ui_msg ""
    1379        
     1377
    13801378        # Select out the dependents along the critical path,
    13811379        # but exclude this mport, we might not be installing it.
    13821380        set dlist [dlist_append_dependents $macports::open_mports $mport {}]
    1383        
     1381
    13841382        dlist_delete dlist $mport
    13851383
     
    13921390            set result [dlist_eval $dlist _mportinstalled [list _mportexec "install"]]
    13931391        }
    1394        
     1392
    13951393        if {$result != {}} {
    13961394            set errstring "The following dependencies failed to build:"
     
    14011399            return 1
    14021400        }
    1403        
     1401
    14041402        # Close the dependencies, we're done installing them.
    14051403        foreach ditem $dlist {
     
    14191417        set target activate
    14201418    }
    1421    
     1419
    14221420    # Build this port with the specified target
    14231421    set result [$workername eval eval_targets $target]
     
    16321630    set matches [list]
    16331631    set easy [expr { $field == "name" }]
    1634    
     1632
    16351633    set found 0
    16361634    foreach source $sources {
     
    16521650                        set len [lindex $line 1]
    16531651                        set line [read $fd $len]
    1654                        
     1652
    16551653                        if {$easy} {
    16561654                            set target $name
     
    16601658                            set target $portinfo($field)
    16611659                        }
    1662                        
     1660
    16631661                        switch $matchstyle {
    16641662                            exact {
     
    16731671                            }
    16741672                        }
    1675                        
     1673
    16761674                        if {$matchres == 1} {
    16771675                            if {$easy} {
     
    17341732proc mportlookup {name} {
    17351733    global macports::portdbpath macports::sources
    1736    
     1734
    17371735    set sourceno 0
    17381736    set matches [list]
     
    17591757                    set len [lindex $line 1]
    17601758                    set line [read $fd $len]
    1761                        
     1759
    17621760                    array set portinfo $line
    17631761
     
    18191817proc _mports_load_quickindex {args} {
    18201818    global macports::sources macports::quick_index
    1821    
     1819
    18221820    set sourceno 0
    18231821    foreach source $sources {
     
    19461944        upvar accDeps accDeps
    19471945    }
    1948    
     1946
    19491947    # progress indicator
    19501948    if {![macports::ui_isset ports_debug]} {
     
    19521950        flush stdout
    19531951    }
    1954        
     1952
    19551953    # Determine deptypes to look for based on target
    19561954    switch $target {
    19571955        configure   -
    19581956        build       { set deptypes "depends_lib depends_build" }
    1959        
     1957
    19601958        test        -
    19611959        destroot    -
     
    19721970        ""          { set deptypes "depends_lib depends_build depends_run" }
    19731971    }
    1974    
     1972
    19751973    # Gather the dependencies for deptypes
    19761974    foreach deptype $deptypes {
     
    19821980
    19831981    set subPorts {}
    1984    
     1982
    19851983    foreach depspec $depends {
    19861984        # grab the portname portion of the depspec
    19871985        set dep_portname [lindex [split $depspec :] end]
    1988        
     1986
    19891987        # Find the porturl
    19901988        if {[catch {set res [mportlookup $dep_portname]} error]} {
     
    19941992            return 1
    19951993        }
    1996        
     1994
    19971995        array unset portinfo
    19981996        array set portinfo [lindex $res 1]
     
    20072005        set variations [ditem_key $mport variations]
    20082006
    2009         # Figure out the subport.   
     2007        # Figure out the subport.
    20102008        set subport [mportopen $porturl $options $variations]
    20112009
     
    20152013            # Append the sub-port's provides to the port's requirements list.
    20162014            ditem_append_unique $mport requires "[ditem_key $subport provides]"
    2017    
     2015
    20182016            if {$recurseDeps} {
    20192017                # Skip the port if it's already in the accumulated list.
     
    20392037        }
    20402038    }
    2041    
     2039
    20422040    return 0
    20432041}
     
    20482046    global macports::autoconf::macports_version macports::autoconf::rsync_path
    20492047    array set options $optionslist
    2050    
     2048
    20512049    # syncing ports tree.
    20522050    if {![info exists options(ports_selfupdate_nosync)] || $options(ports_selfupdate_nosync) != "yes"} {
     
    20562054        }
    20572055    }
    2058    
     2056
    20592057    # create the path to the to be downloaded sources if it doesn't exist
    20602058    set mp_source_path [file join $portdbpath sources ${rsync_server} ${rsync_dir}/]
     
    20632061    }
    20642062    ui_debug "MacPorts sources location: $mp_source_path"
    2065    
     2063
    20662064    # sync the MacPorts sources
    20672065    ui_msg "--->  Updating MacPorts base sources using rsync"
     
    21212119                set tclpackage $libpath
    21222120            }
    2123            
     2121
    21242122            set configure_args "--prefix=$prefix --with-tclpackage=$tclpackage --with-install-user=$owner --with-install-group=$group --with-directory-mode=$perms"
    21252123            # too many users have an incompatible readline in /usr/local, see ticket #10651
     
    21302128                ui_warn "Disabling readline support due to readline in /usr/local"
    21312129            }
    2132            
     2130
    21332131            # do the actual configure, build and installation of new base
    21342132            ui_msg "Installing new MacPorts release in $prefix as $owner:$group; permissions $perms; Tcl-Package in $tclpackage\n"
     
    22402238                    ui_debug "$errorInfo"
    22412239                    ui_error "Unable to exec port: $result"
     2240                    catch {mportclose $workername}
    22422241                    return 1
    22432242                }
    22442243                if {$result > 0} {
    22452244                    ui_error "Problem while installing $portname"
     2245                    catch {mportclose $workername}
    22462246                    return $result
    22472247                }
     
    22572257            # the rest of the proc doesn't matter for a port that is freshly
    22582258            # installed or not installed
     2259            mportclose $workername
    22592260            return 0
    22602261        } else {
     
    24052406                }
    24062407            }
    2407 
     2408            mportclose $workername
    24082409            return 0
    24092410        } else {
     
    24282429            ui_debug "$errorInfo"
    24292430            ui_error "Unable to upgrade port: $result"
     2431            catch {mportclose $workername}
    24302432            return 1
    24312433        }
     
    24452447            ui_debug "$errorInfo"
    24462448            ui_error "Uninstall $portname ${version_installed}_${revision_installed}${variant_installed} failed: $result"
     2449            catch {mportclose $workername}
    24472450            return 1
    24482451        }
     
    24632466                ui_debug "$errorInfo"
    24642467                ui_error "Uninstall $portname ${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants) failed: $result"
     2468                catch {mportclose $workername}
    24652469                return 1
    24662470            }
     
    24812485                ui_debug "$errorInfo"
    24822486                ui_error "Deactivating $portname ${version_active}_${revision_active} failed: $result"
     2487                catch {mportclose $workername}
    24832488                return 1
    24842489            }
     
    24972502        ui_debug "$errorInfo"
    24982503        ui_error "Couldn't activate $portname ${version_in_tree}_${revision_in_tree}: $result"
     2504        catch {mportclose $workername}
    24992505        return 1
    25002506    }
    2501    
     2507
    25022508    if {[info exists uninstall_later] && $uninstall_later == yes} {
    25032509        foreach i $ilist {
     
    25152521                ui_debug "$errorInfo"
    25162522                ui_error "Uninstall $portname @${version}_${revision}${variant} failed: $result"
     2523                catch {mportclose $workername}
    25172524                return 1
    25182525            }
     
    25382545    }
    25392546
    2540    
     2547
    25412548    # close the port handle
    25422549    mportclose $workername
     
    25502557          $globalvarlistname globalvarlist $variationslistname variationslist \
    25512558          $optionsname options
    2552    
     2559
    25532560    # If we're following dependents, we only want to follow this port's
    25542561    # dependents, not those of all its dependencies. Otherwise, we would
     
    25572564    # is of course a dependent of each of its dependencies. Plus the
    25582565    # dependencies could have any number of unrelated dependents.
    2559        
     2566
    25602567    # So we save whether we're following dependents, unset the option
    25612568    # while doing the dependencies, and restore it afterwards.
    25622569    set saved_do_dependents [info exists options(ports_do_dependents)]
    25632570    unset -nocomplain options(ports_do_dependents)
    2564    
     2571
    25652572    # each dep type is upgraded
    25662573    foreach dtype {depends_build depends_lib depends_run} {
     
    25702577                if {![llength [array get depscache port:${d}]] && ![llength [array get depscache $i]]} {
    25712578                    upgrade $d $i $globalvarlist $variationslist [array get options] depscache
    2572                 } 
     2579                }
    25732580            }
    25742581        }
     
    26702677                file delete $selected_version
    26712678            }
    2672             symlink $version $selected_version 
     2679            symlink $version $selected_version
    26732680            return
    26742681        }
  • branches/gsoc09-logging/base/src/package1.0

    • Property svn:ignore set to
      pkgIndex.tcl
  • branches/gsoc09-logging/base/src/package1.0/Makefile

    r43959 r51384  
    66include ../../Mk/macports.autoconf.mk
    77
    8 all::
     8all:: pkgIndex.tcl
     9
     10pkgIndex.tcl:
     11        $(SILENT) ../pkg_mkindex.sh .
    912
    1013clean::
     14        rm -f pkgIndex.tcl
    1115
    1216distclean::
     
    1923                $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
    2024        done
    21         $(SILENT) $(TCLSH) ../pkg_mkindex.tcl ${INSTALLDIR}
     25        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
  • branches/gsoc09-logging/base/src/package1.0/portarchive.tcl

    r51135 r51384  
    193193                        }
    194194                }
    195                 t(ar|bz|lz|gz) {
     195                t(ar|bz|lz|xz|gz) {
    196196                        set tar "tar"
    197197                        if {[catch {set tar [findBinary $tar ${portutil::autoconf::tar_path}]} errmsg] == 0} {
     
    206206                                                set gzip "lzma"
    207207                                                set level 7
     208                                        } elseif {[regexp {xz$} ${archive.type}]} {
     209                                                set gzip "xz"
     210                                                set level 6
    208211                                        } else {
    209212                                                set gzip "gzip"
  • branches/gsoc09-logging/base/src/package1.0/portunarchive.tcl

    r51135 r51384  
    197197                        }
    198198                }
    199                 t(ar|bz|lz|gz) {
     199                t(ar|bz|lz|xz|gz) {
    200200                        set tar "tar"
    201201                        if {[catch {set tar [findBinary $tar ${portutil::autoconf::tar_path}]} errmsg] == 0} {
     
    209209                                        } elseif {[regexp {lz$} ${unarchive.type}]} {
    210210                                                set gzip "lzma"
     211                                        } elseif {[regexp {xz$} ${unarchive.type}]} {
     212                                                set gzip "xz"
    211213                                        } else {
    212214                                                set gzip "gzip"
  • branches/gsoc09-logging/base/src/pextlib1.0

    • Property svn:ignore
      •  

        old new  
        11*.dylib
         2pkgIndex.tcl
  • branches/gsoc09-logging/base/src/pextlib1.0/Pextlib.c

    r51121 r51384  
    3737#endif
    3838
     39#include <ctype.h>
     40#include <errno.h>
     41#include <grp.h>
    3942#include <stdint.h>
    4043#include <stdio.h>
    4144#include <stdlib.h>
    42 #include <ctype.h>
    43 #include <errno.h>
    44 #include <grp.h>
    45 
    46 #if HAVE_STRING_H
    4745#include <string.h>
    48 #endif
    4946
    5047#if HAVE_STRINGS_H
     
    137134#define CBUFSIZ 30
    138135
    139 char *ui_escape(const char *source)
     136static char *
     137ui_escape(const char *source)
    140138{
    141139        char *d, *dest;
     
    174172}
    175173
    176 int ui_info(Tcl_Interp *interp, char *mesg)
     174int
     175ui_info(Tcl_Interp *interp, char *mesg)
    177176{
    178177        const char ui_proc_start[] = "ui_info [subst -nocommands -novariables {";
  • branches/gsoc09-logging/base/src/pextlib1.0/curl.c

    r47795 r51384  
    3535#endif
    3636
     37#include <ctype.h>
     38#include <errno.h>
    3739#include <stdio.h>
    3840#include <stdlib.h>
    39 #include <ctype.h>
    40 #include <errno.h>
    41 
    42 #if HAVE_STRING_H
    4341#include <string.h>
    44 #endif
    4542
    4643#ifdef HAVE_UTIME_H
     
    5148
    5249#include <tcl.h>
    53 #include <tclDecls.h>
    5450
    5551#include "curl.h"
    56 
    57 /* Avoid a warning with Tcl < 8.4, even if Tcl_GetIndexFromObj's tablePtr
    58 probably isn't modified. */
    59 #if (TCL_MAJOR_VERSION > 8) || (TCL_MINOR_VERSION >= 4)
    60 typedef CONST char* tableEntryString;
    61 #else
    62 typedef char* tableEntryString;
    63 #endif
    6452
    6553/*
     
    8270int CurlFetchCmd(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]);
    8371int CurlIsNewerCmd(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]);
     72int CurlGetSizeCmd(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]);
    8473
    8574/* ========================================================================= **
     
    10998                        break;
    11099               
    111                 default:
    112 #ifdef HAVE_CURL_EASY_STRERROR
    113                         Tcl_SetResult(interp, (char*) curl_easy_strerror(inErrorCode), TCL_VOLATILE);
     100                default: {
     101#if LIBCURL_VERSION_NUM >= 0x070c00 /* 7.12.0 */
     102                        Tcl_SetResult(interp, (char *)curl_easy_strerror(inErrorCode), TCL_VOLATILE);
    114103#else
    115                         {
    116                                 char theErrorString[512];
    117                                 (void) snprintf(theErrorString, sizeof(theErrorString),
    118                                         "curl error %i", inErrorCode);
    119                                 Tcl_SetResult(interp, theErrorString, TCL_VOLATILE);                           
    120                         }
     104                        char theErrorString[512];
     105                        (void)snprintf(theErrorString, sizeof(theErrorString), "curl error %i", inErrorCode);
     106                        Tcl_SetResult(interp, theErrorString, TCL_VOLATILE);
    121107#endif
    122108                        theResult = TCL_ERROR;
     109                }
    123110        }
    124111       
     
    830817    } EOption;
    831818   
    832         static tableEntryString options[] = {
     819        static const char *options[] = {
    833820                "fetch", "isnewer", "getsize", NULL
    834821        };
  • branches/gsoc09-logging/base/src/pextlib1.0/fgetln.c

    r19376 r51384  
    3636#include <stdio.h>
    3737#include <stdlib.h>
    38 
    39 #if HAVE_STRING_H
    4038#include <string.h>
    41 #endif
    4239
    4340#define BUFCHUNKS       BUFSIZ
  • branches/gsoc09-logging/base/src/pextlib1.0/filemap.c

    r47795 r51384  
    3535#endif
    3636
    37 #include <stdio.h>
    38 #include <stdlib.h>
    3937#include <ctype.h>
    4038#include <errno.h>
    4139#include <grp.h>
    42 
    43 #if HAVE_STRING_H
     40#include <stdio.h>
     41#include <stdlib.h>
    4442#include <string.h>
    45 #endif
    4643
    4744#if HAVE_STRINGS_H
     
    223220SFilemapObject* GetObjectFromVarName(Tcl_Interp* interp, Tcl_Obj* inVarName);
    224221int FilemapCloseCmd(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]);
     222int FilemapCreateCmd(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]);
    225223int FilemapExistsCmd(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]);
    226224int FilemapGetCmd(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]);
  • branches/gsoc09-logging/base/src/pextlib1.0/fs-traverse.c

    r29412 r51384  
    5959#include <tcl.h>
    6060
     61#include "fs-traverse.h"
     62
    6163static int do_traverse(Tcl_Interp *interp, int flags, char * CONST *targets, Tcl_Obj *varname, Tcl_Obj *body);
    6264
  • branches/gsoc09-logging/base/src/pextlib1.0/md5cmd.c

    r19376 r51384  
    3535#endif
    3636
     37#include <string.h>
     38
    3739#include <tcl.h>
    38 
    39 #if HAVE_STRING_H
    40 #include <string.h>
    41 #endif
    4240
    4341#if defined(HAVE_LIBCRYPTO) && !defined(HAVE_LIBMD)
  • branches/gsoc09-logging/base/src/pextlib1.0/readline.c

    r40061 r51384  
    1313#endif
    1414
     15#include <stdio.h>
     16#include <string.h>
     17
    1518#if HAVE_STDLIB_H
    1619#include <stdlib.h>
    1720#endif
    1821
    19 #if HAVE_STRING_H
    20 #include <string.h>
    21 #endif
    22 
    23 #include <stdio.h>
    24 
    2522#if HAVE_READLINE_READLINE_H
    2623#include <readline/readline.h>
     
    3229
    3330#include <tcl.h>
     31
    3432#include "readline.h"
    35 
    3633
    3734/* Globals */
  • branches/gsoc09-logging/base/src/pextlib1.0/rmd160cmd.c

    r19376 r51384  
    3535#endif
    3636
     37#include <string.h>
     38
    3739#include <tcl.h>
    38 
    39 #if HAVE_STRING_H
    40 #include <string.h>
    41 #endif
    4240
    4341#if !defined(HAVE_LIBMD)
  • branches/gsoc09-logging/base/src/pextlib1.0/sha1cmd.c

    r19376 r51384  
    3636#endif
    3737
     38#include <string.h>
     39
    3840#include <tcl.h>
    39 
    40 #if HAVE_STRING_H
    41 #include <string.h>
    42 #endif
    4341
    4442#if defined(HAVE_LIBCRYPTO) && !defined(HAVE_LIBMD)
  • branches/gsoc09-logging/base/src/pextlib1.0/strcasecmp.c

    r30972 r51384  
    3131 */
    3232
     33#include <ctype.h>
    3334#include <string.h>
    34 #include <ctype.h>
     35
     36#include "strcasecmp.h"
    3537
    3638/* ------------------------------------------------------------------------- **
  • branches/gsoc09-logging/base/src/pextlib1.0/tty.c

    r48817 r51384  
    4545
    4646#include <tcl.h>
     47
     48#include "tty.h"
    4749
    4850int IsattyCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
  • branches/gsoc09-logging/base/src/pextlib1.0/tty.h

    r38940 r51384  
    3737#define _PEXTLIB_TTY_H
    3838
    39 #include <tcl.h>
    40 
    4139/**
    4240 * A wrapper for isatty(3)
  • branches/gsoc09-logging/base/src/pextlib1.0/uid.c

    r26177 r51384  
    99 */
    1010 
    11 #include "uid.h"
    12 #include "grp.h"
    13 
    1411#if HAVE_CONFIG_H
    1512#include <config.h>
    1613#endif
    1714
     15#include <grp.h>
     16#include <string.h>
     17
    1818#if HAVE_STDLIB_H
    1919#include <stdlib.h>
    2020#endif
    2121
    22 #if HAVE_STRING_H
    23 #include <string.h>
    24 #endif
    25 
    2622#if HAVE_UNISTD_H
    2723#include <unistd.h>
     
    4137
    4238#include <tcl.h>
     39
     40#include "uid.h"
    4341
    4442/*
  • branches/gsoc09-logging/base/src/pextlib1.0/vercomp.c

    r26177 r51384  
    3939#endif
    4040
    41 #include <stdlib.h>
    4241#include <ctype.h>
     42#include <string.h>
     43
    4344#include <tcl.h>
    4445
    45 #if HAVE_STRING_H
    46 #include <string.h>
    47 #endif
    48 
    49 #if HAVE_STRINGS_H
    50 #include <strings.h>
    51 #endif
     46#include "vercomp.h"
    5247
    5348/*
  • branches/gsoc09-logging/base/src/pextlib1.0/xinstall.c

    r35030 r51384  
    7979#endif
    8080
     81#include "xinstall.h"
     82
    8183#ifndef MAXBSIZE
    8284#define MAXBSIZE 65536
  • branches/gsoc09-logging/base/src/port1.0

    • Property svn:ignore
      •  

        old new  
        11port_autoconf.tcl
         2pkgIndex.tcl
  • branches/gsoc09-logging/base/src/port1.0/Makefile

    r42662 r51384  
    1414.PHONY: test
    1515
    16 all::
     16all:: pkgIndex.tcl
     17
     18pkgIndex.tcl:
     19        $(SILENT) ../pkg_mkindex.sh .
    1720
    1821clean::
     22        rm -f pkgIndex.tcl
    1923
    2024distclean::
     
    2630                $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
    2731        done
    28         $(SILENT) $(TCLSH) ../pkg_mkindex.tcl ${INSTALLDIR}
     32        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
    2933
    3034test::
  • branches/gsoc09-logging/base/src/port1.0/portconfigure.tcl

    r50934 r51384  
    303303                objc { set ret /usr/bin/gcc-4.2 }
    304304                cxx  { set ret /usr/bin/g++-4.2 }
    305                 cpp  { set ret /usr/bin/cpp-4.2 }
    306305            }
    307306        }
  • branches/gsoc09-logging/base/src/port1.0/portutil.tcl

    r51135 r51384  
    20492049}
    20502050
    2051 
    2052 # builds the specified port (looked up in the index) to the specified target
    2053 # doesn't yet support options or variants...
    2054 # newworkpath defines the port's workpath - useful for when one port relies
    2055 # on the source, etc, of another
    2056 proc portexec_int {portname target {newworkpath ""}} {
    2057     ui_debug "Executing $target ($portname)"
    2058     set variations [list]
    2059     if {$newworkpath == ""} {
    2060         array set options [list]
    2061     } else {
    2062         set options(workpath) ${newworkpath}
    2063     }
    2064 
    2065     set res [mport_lookup $portname]
    2066     if {[llength $res] < 2} {
    2067         ui_error "Dependency $portname not found"
    2068         return -1
    2069     }
    2070 
    2071     array set portinfo [lindex $res 1]
    2072     set porturl $portinfo(porturl)
    2073     if {[catch {set worker [mport_open $porturl [array get options] $variations]} result]} {
    2074         global errorInfo
    2075         ui_debug "$errorInfo"
    2076         ui_error "Opening $portname $target failed: $result"
    2077         return -1
    2078     }
    2079     if {[catch {mport_exec $worker $target} result] || $result != 0} {
    2080         global errorInfo
    2081         ui_debug "$errorInfo"
    2082         ui_error "Execution $portname $target failed: $result"
    2083         mport_close $worker
    2084         return -1
    2085     }
    2086     mport_close $worker
    2087 
    2088     return 0
    2089 }
    2090 
    2091 # portfile primitive that calls portexec_int with newworkpath == ${workpath}
    2092 proc portexec {portname target} {
    2093     global workpath
    2094     return [portexec_int $portname $target $workpath]
    2095 }
    2096 
    20972051proc adduser {name args} {
    20982052    global os.platform
     
    22462200            }
    22472201        }
    2248         t(ar|bz|lz|gz) {
     2202        t(ar|bz|lz|xz|gz) {
    22492203            set tar "tar"
    22502204            if {[catch {set tar [findBinary $tar ${portutil::autoconf::tar_path}]} errmsg] == 0} {
     
    22542208                    } elseif {[regexp {lz$} $type]} {
    22552209                        set gzip "lzma"
     2210                    } elseif {[regexp {xz$} $type]} {
     2211                        set gzip "xz"
    22562212                    } else {
    22572213                        set gzip "gzip"
  • branches/gsoc09-logging/base/src/programs/Makefile.in

    r26177 r51384  
    11# $Id$
    22
    3 SUBDIR= @REPLACEMENT_PROGS@ @EXTRA_PROGS@
     3SUBDIR= @EXTRA_PROGS@
    44
    55include ../../Mk/macports.subdir.mk
  • branches/gsoc09-logging/base/src/registry1.0

    • Property svn:ignore
      •  

        old new  
        11registry_autoconf.tcl
         2pkgIndex.tcl
  • branches/gsoc09-logging/base/src/registry1.0/Makefile

    r26177 r51384  
    55include ../../Mk/macports.autoconf.mk
    66
    7 all::
     7all:: pkgIndex.tcl
     8
     9pkgIndex.tcl:
     10        $(SILENT) ../pkg_mkindex.sh .
    811
    912clean::
     13        rm -f pkgIndex.tcl
    1014
    1115distclean:: clean
     
    1721                $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
    1822        done
    19         $(SILENT) $(TCLSH) ../pkg_mkindex.tcl ${INSTALLDIR}
     23        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
    2024
    2125test::
  • branches/gsoc09-logging/base/src/registry2.0

    • Property svn:ignore
      •  

        old new  
        11registry.dylib
         2pkgIndex.tcl
  • branches/gsoc09-logging/base/src/registry2.0/Makefile

    r40056 r51384  
    2626                $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}/$$file; \
    2727        done
    28         $(SILENT) $(TCLSH) ../pkg_mkindex.tcl ${INSTALLDIR}
     28        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
Note: See TracChangeset for help on using the changeset viewer.