[51384] branches/gsoc09-logging/base
enl at macports.org
enl at macports.org
Sat May 23 13:29:46 PDT 2009
Revision: 51384
http://trac.macports.org/changeset/51384
Author: enl at macports.org
Date: 2009-05-23 13:29:46 -0700 (Sat, 23 May 2009)
Log Message:
-----------
Merge from trunk
Modified Paths:
--------------
branches/gsoc09-logging/base/Mk/macports.tea.mk
branches/gsoc09-logging/base/configure
branches/gsoc09-logging/base/configure.ac
branches/gsoc09-logging/base/doc/macports.conf.5
branches/gsoc09-logging/base/doc/macports.conf.in
branches/gsoc09-logging/base/src/Makefile.in
branches/gsoc09-logging/base/src/config.h.in
branches/gsoc09-logging/base/src/darwintracelib1.0/Makefile
branches/gsoc09-logging/base/src/macports1.0/Makefile
branches/gsoc09-logging/base/src/macports1.0/macports.tcl
branches/gsoc09-logging/base/src/package1.0/Makefile
branches/gsoc09-logging/base/src/package1.0/portarchive.tcl
branches/gsoc09-logging/base/src/package1.0/portunarchive.tcl
branches/gsoc09-logging/base/src/pextlib1.0/Pextlib.c
branches/gsoc09-logging/base/src/pextlib1.0/curl.c
branches/gsoc09-logging/base/src/pextlib1.0/fgetln.c
branches/gsoc09-logging/base/src/pextlib1.0/filemap.c
branches/gsoc09-logging/base/src/pextlib1.0/fs-traverse.c
branches/gsoc09-logging/base/src/pextlib1.0/md5cmd.c
branches/gsoc09-logging/base/src/pextlib1.0/readline.c
branches/gsoc09-logging/base/src/pextlib1.0/rmd160cmd.c
branches/gsoc09-logging/base/src/pextlib1.0/sha1cmd.c
branches/gsoc09-logging/base/src/pextlib1.0/strcasecmp.c
branches/gsoc09-logging/base/src/pextlib1.0/tty.c
branches/gsoc09-logging/base/src/pextlib1.0/tty.h
branches/gsoc09-logging/base/src/pextlib1.0/uid.c
branches/gsoc09-logging/base/src/pextlib1.0/vercomp.c
branches/gsoc09-logging/base/src/pextlib1.0/xinstall.c
branches/gsoc09-logging/base/src/port1.0/Makefile
branches/gsoc09-logging/base/src/port1.0/portconfigure.tcl
branches/gsoc09-logging/base/src/port1.0/portutil.tcl
branches/gsoc09-logging/base/src/programs/Makefile.in
branches/gsoc09-logging/base/src/registry1.0/Makefile
branches/gsoc09-logging/base/src/registry2.0/Makefile
Added Paths:
-----------
branches/gsoc09-logging/base/src/pkg_mkindex.sh.in
Removed Paths:
-------------
branches/gsoc09-logging/base/src/pkg_mkindex.tcl
Property Changed:
----------------
branches/gsoc09-logging/base/
branches/gsoc09-logging/base/src/
branches/gsoc09-logging/base/src/macports1.0/
branches/gsoc09-logging/base/src/package1.0/
branches/gsoc09-logging/base/src/pextlib1.0/
branches/gsoc09-logging/base/src/port1.0/
branches/gsoc09-logging/base/src/registry1.0/
branches/gsoc09-logging/base/src/registry2.0/
Property changes on: branches/gsoc09-logging/base
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base:37343-46937
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:51231-51382
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/gsoc09-logging/base/Mk/macports.tea.mk
===================================================================
--- branches/gsoc09-logging/base/Mk/macports.tea.mk 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/Mk/macports.tea.mk 2009-05-23 20:29:46 UTC (rev 51384)
@@ -8,17 +8,20 @@
.c.o:
${CC} -c -DUSE_TCL_STUBS -DTCL_NO_DEPRECATED ${CFLAGS} ${SHLIB_CFLAGS} $< -o $@
+all:: ${SHLIB_NAME} pkgIndex.tcl
+
$(SHLIB_NAME):: ${OBJS}
${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${TCL_STUB_LIB_SPEC} ${SHLIB_LDFLAGS} ${LIBS}
-all:: ${SHLIB_NAME}
+pkgIndex.tcl:
+ $(SILENT) ../pkg_mkindex.sh .
clean::
- rm -f ${OBJS} ${SHLIB_NAME} so_locations
+ rm -f ${OBJS} ${SHLIB_NAME} so_locations pkgIndex.tcl
distclean:: clean
install:: all
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
- $(SILENT) $(TCLSH) ../pkg_mkindex.tcl ${INSTALLDIR}
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
Modified: branches/gsoc09-logging/base/configure
===================================================================
--- branches/gsoc09-logging/base/configure 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/configure 2009-05-23 20:29:46 UTC (rev 51384)
@@ -645,7 +645,6 @@
MPCONFIGDIR_EXPANDED
prefix_expanded
OUR_INCLUDED_PACKAGES
-CONDITIONAL_PACKAGES
TCL_CC
TCL_DEFS
SHLIB_SUFFIX
@@ -689,7 +688,6 @@
MPCONFIGDIR
PORTSDIR
EXTRA_PROGS
-REPLACEMENT_PROGS
HAVE_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER
HAVE_FRAMEWORK_IOKIT
HAVE_FRAMEWORK_SYSTEMCONFIGURATION
@@ -2331,7 +2329,7 @@
{ $as_echo "$as_me:$LINENO: WARNING: Please upgrade at http://store.apple.com/" >&5
$as_echo "$as_me: WARNING: Please upgrade at http://store.apple.com/" >&2;}
;;
- 10.1.[0-4]|10.2.[0-7]|10.3.[0-8]|10.4.[0-9]|10.4.10|10.5.[0-5])
+ 10.1.[0-4]|10.2.[0-7]|10.3.[0-8]|10.4.[0-9]|10.4.10|10.5.[0-6])
{ $as_echo "$as_me:$LINENO: WARNING: This version of Mac OS X is out of date" >&5
$as_echo "$as_me: WARNING: This version of Mac OS X is out of date" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: Please run Software Update to update it" >&5
@@ -4981,9 +4979,6 @@
-# Determine if we want to install conditional packages
-CONDITIONAL_PACKAGES=
-
# Foundation checks
@@ -6864,12 +6859,7 @@
-# tclobjc requires objc (runtime and foundation) support
-if test x$OBJC_RUNTIME != xnone -a x$OBJC_FOUNDATION != xnone; then
- CONDITIONAL_PACKAGES="tclobjc1.0 $CONDITIONAL_PACKAGES"
-fi
-
FRAMEWORK_LIBS="-framework CoreFoundation"
{ $as_echo "$as_me:$LINENO: checking for CoreFoundation framework" >&5
@@ -7261,7 +7251,6 @@
-
# set default ports-directory
PORTS_DIR_DEFAULT=`pwd | sed -e "s/base/ports/"`
@@ -10276,82 +10265,6 @@
-# Do we have curl_easy_strerror?
-
-
-{ $as_echo "$as_me:$LINENO: checking for curl_easy_strerror in -lcurl" >&5
-$as_echo_n "checking for curl_easy_strerror in -lcurl... " >&6; }
-if test "${ac_cv_lib_curl_curl_easy_strerror+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcurl $LDFLAGS_LIBCURL $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char curl_easy_strerror ();
-int
-main ()
-{
-return curl_easy_strerror ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_curl_curl_easy_strerror=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_curl_curl_easy_strerror=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_curl_curl_easy_strerror" >&5
-$as_echo "$ac_cv_lib_curl_curl_easy_strerror" >&6; }
-if test "x$ac_cv_lib_curl_curl_easy_strerror" = x""yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_CURL_EASY_STRERROR 1
-_ACEOF
-
-fi
-
-
# Determine if we need to install some bundled packages
OUR_INCLUDED_PACKAGES=
@@ -10595,7 +10508,6 @@
-
# misc variables that need to be expanded for substitution into tcl
oldprefix=$prefix
@@ -10617,9 +10529,12 @@
# Output
-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"
+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/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl setupenv.bash"
+ac_config_files="$ac_config_files src/pkg_mkindex.sh"
+
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -11226,12 +11141,12 @@
"portmgr/fedora/macports.spec") CONFIG_FILES="$CONFIG_FILES portmgr/fedora/macports.spec" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/macports1.0/macports_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_autoconf.tcl" ;;
- "src/tclobjc1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/tclobjc1.0/Makefile" ;;
"src/port1.0/port_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/port1.0/port_autoconf.tcl" ;;
"src/registry1.0/registry_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/registry1.0/registry_autoconf.tcl" ;;
"src/programs/Makefile") CONFIG_FILES="$CONFIG_FILES src/programs/Makefile" ;;
"src/macports1.0/macports_fastload.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_fastload.tcl" ;;
"setupenv.bash") CONFIG_FILES="$CONFIG_FILES setupenv.bash" ;;
+ "src/pkg_mkindex.sh") CONFIG_FILES="$CONFIG_FILES src/pkg_mkindex.sh" ;;
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -11842,6 +11757,11 @@
esac
+
+ case $ac_file$ac_mode in
+ "src/pkg_mkindex.sh":F) chmod +x src/pkg_mkindex.sh ;;
+
+ esac
done # for ac_tag
Modified: branches/gsoc09-logging/base/configure.ac
===================================================================
--- branches/gsoc09-logging/base/configure.ac 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/configure.ac 2009-05-23 20:29:46 UTC (rev 51384)
@@ -32,7 +32,7 @@
AC_MSG_WARN([This version of Mac OS X is not supported])
AC_MSG_WARN([Please upgrade at http://store.apple.com/])
;;
- 10.1.[[0-4]]|10.2.[[0-7]]|10.3.[[0-8]]|10.4.[[0-9]]|10.4.10|10.5.[[0-5]])
+ 10.1.[[0-4]]|10.2.[[0-7]]|10.3.[[0-8]]|10.4.[[0-9]]|10.4.10|10.5.[[0-6]])
AC_MSG_WARN([This version of Mac OS X is out of date])
AC_MSG_WARN([Please run Software Update to update it])
;;
@@ -134,22 +134,13 @@
MP_COMPILER_ATTRIBUTE_UNUSED
MP_COMPILER_ATTRIBUTE_LF_PRIVATE
-# Determine if we want to install conditional packages
-CONDITIONAL_PACKAGES=
-
# Foundation checks
ACX_PTHREAD
MP_OBJC_RUNTIME
MP_OBJC_FOUNDATION
-# tclobjc requires objc (runtime and foundation) support
-if test x$OBJC_RUNTIME != xnone -a x$OBJC_FOUNDATION != xnone; then
- CONDITIONAL_PACKAGES="tclobjc1.0 $CONDITIONAL_PACKAGES"
-fi
-
MP_PROG_DAEMONDO
-AC_SUBST(REPLACEMENT_PROGS)
AC_SUBST(EXTRA_PROGS)
# set default ports-directory
@@ -235,13 +226,6 @@
## libcurl
MP_LIBCURL_FLAGS
-# Do we have curl_easy_strerror?
-AH_TEMPLATE([HAVE_CURL_EASY_STRERROR],
- [Define to 1 if you have the curl_easy_strerror function.])
-AC_CHECK_LIB([curl], [curl_easy_strerror],
- [AC_DEFINE([HAVE_CURL_EASY_STRERROR])],[],
- [$LDFLAGS_LIBCURL])
-
# Determine if we need to install some bundled packages
OUR_INCLUDED_PACKAGES=
@@ -352,7 +336,6 @@
AC_SUBST(TCL_DEFS)
AC_SUBST(TCL_STUB_LIB_SPEC)
AC_SUBST(TCL_CC)
-AC_SUBST(CONDITIONAL_PACKAGES)
AC_SUBST(OUR_INCLUDED_PACKAGES)
# misc variables that need to be expanded for substitution into tcl
@@ -390,7 +373,6 @@
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
@@ -398,4 +380,6 @@
setupenv.bash
])
+AC_CONFIG_FILES([src/pkg_mkindex.sh], [chmod +x src/pkg_mkindex.sh])
+
AC_OUTPUT
Modified: branches/gsoc09-logging/base/doc/macports.conf.5
===================================================================
--- branches/gsoc09-logging/base/doc/macports.conf.5 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/doc/macports.conf.5 2009-05-23 20:29:46 UTC (rev 51384)
@@ -127,7 +127,7 @@
specified types in one step. Unarchive uses multiple types as a search list to locate any existing archive,
with the first found match being used.
.br
-Supported types are: tgz, tar, tbz, tbz2, tlz, xar, zip, cpgz, cpio
+Supported types are: tgz, tar, tbz, tbz2, tlz, txz, xar, zip, cpgz, cpio
.br
.Ic Default:
tgz
Modified: branches/gsoc09-logging/base/doc/macports.conf.in
===================================================================
--- branches/gsoc09-logging/base/doc/macports.conf.in 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/doc/macports.conf.in 2009-05-23 20:29:46 UTC (rev 51384)
@@ -47,7 +47,7 @@
# Unarchive uses multiple types as a search list to locate the archive,
# first archive to match one of the specified types in order is used.
#
-# Supported types: tgz (default), tar, tbz, tbz2, tlz, xar, zip, cpgz, cpio
+# Supported types: tgz (default), tar, tbz, tbz2, tlz, txz, xar, zip, cpgz, cpio
portarchivetype tgz
# Use ccache (C/C++ compiler cache) - see http://ccache.samba.org/
Property changes on: branches/gsoc09-logging/base/src
___________________________________________________________________
Modified: svn:ignore
- config.h
Makefile
+ config.h
Makefile
pkg_mkindex.sh
Modified: branches/gsoc09-logging/base/src/Makefile.in
===================================================================
--- branches/gsoc09-logging/base/src/Makefile.in 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/Makefile.in 2009-05-23 20:29:46 UTC (rev 51384)
@@ -6,8 +6,7 @@
pextlib1.0 \
registry1.0 \
registry2.0 \
- darwintracelib1.0 \
- @CONDITIONAL_PACKAGES@
+ darwintracelib1.0
SUBDIR= ${TCLPKG} port programs
all::
Modified: branches/gsoc09-logging/base/src/config.h.in
===================================================================
--- branches/gsoc09-logging/base/src/config.h.in 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/config.h.in 2009-05-23 20:29:46 UTC (rev 51384)
@@ -24,9 +24,6 @@
/* Define to 1 if you have the <crt_externs.h> header file. */
#undef HAVE_CRT_EXTERNS_H
-/* Define to 1 if you have the curl_easy_strerror function. */
-#undef HAVE_CURL_EASY_STRERROR
-
/* Define to 1 if you have the declaration of `completion_matches', and to 0
if you don't. */
#undef HAVE_DECL_COMPLETION_MATCHES
Modified: branches/gsoc09-logging/base/src/darwintracelib1.0/Makefile
===================================================================
--- branches/gsoc09-logging/base/src/darwintracelib1.0/Makefile 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/darwintracelib1.0/Makefile 2009-05-23 20:29:46 UTC (rev 51384)
@@ -1,8 +1,19 @@
OBJS= darwintrace.o
SHLIB_NAME= darwintrace${SHLIB_SUFFIX}
-INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/darwintrace1.0
+INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/darwintrace1.0
-test::
+include ../../Mk/macports.autoconf.mk
-include ../../Mk/macports.autoconf.mk
-include ../../Mk/macports.tea.mk
+all:: ${SHLIB_NAME}
+
+$(SHLIB_NAME):: ${OBJS}
+ ${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${SHLIB_LDFLAGS} ${LIBS}
+
+clean::
+ rm -f ${OBJS} ${SHLIB_NAME} so_locations
+
+distclean:: clean
+
+install:: all
+ $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
Property changes on: branches/gsoc09-logging/base/src/macports1.0
___________________________________________________________________
Modified: svn:ignore
- *.dylib
macports_autoconf.tcl
macports_fastload.tcl
+ *.dylib
macports_autoconf.tcl
macports_fastload.tcl
pkgIndex.tcl
Modified: branches/gsoc09-logging/base/src/macports1.0/Makefile
===================================================================
--- branches/gsoc09-logging/base/src/macports1.0/Makefile 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/macports1.0/Makefile 2009-05-23 20:29:46 UTC (rev 51384)
@@ -24,4 +24,4 @@
echo "${TCL_PACKAGE_DIR}" > ${DESTDIR}${prefix}/var/macports/.tclpackage
- $(SILENT) $(TCLSH) ../pkg_mkindex.tcl ${INSTALLDIR}
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
Modified: branches/gsoc09-logging/base/src/macports1.0/macports.tcl
===================================================================
--- branches/gsoc09-logging/base/src/macports1.0/macports.tcl 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/macports1.0/macports.tcl 2009-05-23 20:29:46 UTC (rev 51384)
@@ -19,7 +19,7 @@
# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -55,14 +55,14 @@
rsync_options rsync_dir startupitem_type place_worksymlink \
mp_remote_url mp_remote_submit_url configureccache configuredistcc configurepipe buildnicevalue buildmakejobs \
applications_dir frameworks_dir universal_target universal_sysroot universal_archs $user_options"
-
+
# deferred options are only computed when needed.
# they are not exported to the trace thread.
# they are not exported to the interpreter in system_options array.
variable portinterp_deferred_options "xcodeversion xcodebuildcmd"
-
+
variable open_mports {}
-
+
variable ui_priorities "debug info msg error warn"
}
@@ -115,12 +115,20 @@
return $::debuglog
}
-
+proc ui_message {priority args} {
+ global macports::channels
+ foreach chan {$macports::channels} {
+ if {\[lindex \$args 0\] == "-nonewline"} {
+ puts -nonewline \$chan "$prefix\[lindex \$args 1\]"
+ } else {
+ puts \$chan "$prefix\[lindex \$args 0\]"
+ }
+}
proc macports::ui_init {priority args} {
global macports::channels
set default_channel [macports::ui_channels_default $priority]
set logging_file [init_logging]
-
+ puts "$portname"
# Get the list of channels.
try {
set channels [concat [ui_channels $priority] $logging_file]
@@ -140,16 +148,7 @@
try {
eval ::ui_init $priority $prefix $channels $args
} catch * {
- proc ::ui_$priority {args} [subst {
- global macports::channels
- foreach chan {$macports::channels} {
- if {\[lindex \$args 0\] == "-nonewline"} {
- puts -nonewline \$chan "$prefix\[lindex \$args 1\]"
- } else {
- puts \$chan "$prefix\[lindex \$args 0\]"
- }
- }
- }]
+ interp alias {} ui_$priority {} ui_message $priority
}
# Call ui_$priority
@@ -171,7 +170,7 @@
}
default {
return ""
- }
+ }
}
}
@@ -198,7 +197,7 @@
msg {
if {[ui_isset ports_quiet]} {
return {}
- } else {
+ } else {
return {stdout}
}
}
@@ -258,7 +257,7 @@
proc macports::setxcodeinfo {name1 name2 op} {
global macports::xcodeversion
global macports::xcodebuildcmd
-
+
trace remove variable macports::xcodeversion read macports::setxcodeinfo
trace remove variable macports::xcodebuildcmd read macports::setxcodeinfo
@@ -280,7 +279,7 @@
set macports::xcodeversion "2.0orlower"
}
}
-
+
if {![info exists xcodebuildcmd]} {
set macports::xcodebuildcmd "xcodebuild"
}
@@ -319,7 +318,7 @@
} else {
upvar $up_variations variations
}
-
+
global auto_path env
global macports::autoconf::macports_conf_path
global macports::macports_user_dir
@@ -365,7 +364,7 @@
# Otherwise define the user directory as a direcotory that will never exist
set macports::macports_user_dir "/dev/null/NO_HOME_DIR"
}
-
+
# Configure the search path for configuration files
set conf_files ""
lappend conf_files "${macports_conf_path}/macports.conf"
@@ -376,7 +375,7 @@
set PORTSRC $env(PORTSRC)
lappend conf_files ${PORTSRC}
}
-
+
# Process the first configuration file we find on conf_files list
foreach file $conf_files {
if [file exists $file] {
@@ -393,7 +392,7 @@
close $fd
}
}
-
+
# Process per-user only settings
set per_user "${macports_user_dir}/user.conf"
if [file exists $per_user] {
@@ -408,7 +407,7 @@
}
close $fd
}
-
+
if {![info exists sources_conf]} {
return -code error "sources_conf must be set in ${macports_conf_path}/macports.conf or in your ${macports_user_dir}/macports.conf file"
}
@@ -494,7 +493,7 @@
if {[info exists portdbformat]} {
if { $portdbformat == "sqlite" } {
return -code error "SQLite is not yet supported for registry storage."
- }
+ }
set registry.format receipt_${portdbformat}
} else {
set registry.format receipt_flat
@@ -506,7 +505,7 @@
} else {
set registry.installtype image
}
-
+
# Autoclean mode, whether to automatically call clean after "install"
if {![info exists portautoclean]} {
set macports::portautoclean "yes"
@@ -598,7 +597,7 @@
if {![file isdirectory $portsharepath]} {
return -code error "Data files directory '$portsharepath' must exist"
}
-
+
if {![info exists libpath]} {
set libpath "${prefix}/share/macports/Tcl"
}
@@ -608,7 +607,7 @@
} else {
set env(PATH) "$binpath"
}
-
+
# Set startupitem default type (can be overridden by portfile)
if {![info exists macports::startupitem_type]} {
set macports::startupitem_type "default"
@@ -626,7 +625,7 @@
if {![info exists macports::mp_remote_submit_url]} {
set macports::mp_remote_submit_url "${macports::mp_remote_url}/submit"
}
-
+
# Default mp configure options
if {![info exists macports::configureccache]} {
set macports::configureccache no
@@ -664,7 +663,7 @@
if {![info exists macports::universal_archs]} {
set macports::universal_archs {ppc i386}
}
-
+
# ENV cleanup.
set keepenvkeys {
DISPLAY DYLD_FALLBACK_FRAMEWORK_PATH
@@ -679,7 +678,7 @@
if {[info exists extra_env]} {
set keepenvkeys [concat ${keepenvkeys} ${extra_env}]
}
-
+
foreach envkey [array names env] {
if {[lsearch $keepenvkeys $envkey] == -1} {
array unset env $envkey
@@ -720,7 +719,7 @@
unsetenv $envkey
}
}
-
+
# Proxy handling (done this late since Pextlib is needed)
if {![info exists proxy_override_env] } {
set proxy_override_env "no"
@@ -791,7 +790,6 @@
$workername alias mport_exec mportexec
$workername alias mport_open mportopen
$workername alias mport_close mportclose
- $workername alias mport_search mportsearch
$workername alias mport_lookup mportlookup
# instantiate the UI call-backs
@@ -800,7 +798,7 @@
}
$workername alias ui_prefix ui_prefix
$workername alias ui_channels ui_channels
-
+
# Export some utility functions defined here.
$workername alias macports_create_thread macports::create_thread
$workername alias getportworkpath_from_buildpath macports::getportworkpath_from_buildpath
@@ -838,7 +836,7 @@
$workername eval set $opt \{[set $opt]\}
}
}
-
+
foreach opt $portinterp_deferred_options {
global macports::$opt
# define the trace hook.
@@ -852,7 +850,7 @@
$workername eval "trace add variable ::$opt read ::trace_$opt"
# define some value now
$workername eval set $opt "?"
- }
+ }
foreach {opt val} $options {
$workername eval set user_options($opt) $val
@@ -900,7 +898,7 @@
thread::send -async $result "set macports::$opt \"$val\""
}
}
-
+
return $result
}
@@ -1085,7 +1083,7 @@
macports::worker_init $workername $portpath $porturl [macports::getportbuildpath $portpath] $options $filteredvariations
$workername eval source Portfile
-
+
# add the default universal variant, but only if
# it will work and another one isn't already present
if {[$workername eval default_universal_variant_allowed]} {
@@ -1115,7 +1113,7 @@
proc mporttraverse {func {root .}} {
# Save the current directory
set pwd [pwd]
-
+
# Join the root.
set pathToRoot [file join $pwd $root]
@@ -1133,7 +1131,7 @@
[file exists [file join $pathToPort "Portfile"]]} {
# Call the function.
$func [file join $category $port]
-
+
# Restore the current directory because some
# functions changes it.
cd $pathToRoot
@@ -1141,7 +1139,7 @@
}
}
}
-
+
# Restore the current directory.
cd $pwd
}
@@ -1191,7 +1189,7 @@
set depline [lindex [split $depspec :] 1]
set prefix [_mportkey $mport prefix]
set frameworks_dir [_mportkey $mport frameworks_dir]
-
+
if {[info exists env(DYLD_FRAMEWORK_PATH)]} {
lappend search_path $env(DYLD_FRAMEWORK_PATH)
} else {
@@ -1227,12 +1225,12 @@
proc _bintest {mport depspec} {
global env
set depregex [lindex [split $depspec :] 1]
- set prefix [_mportkey $mport prefix]
-
+ set prefix [_mportkey $mport prefix]
+
set search_path [split $env(PATH) :]
-
+
set depregex \^$depregex\$
-
+
return [_mportsearchpath $depregex $search_path 1]
}
@@ -1241,8 +1239,8 @@
proc _pathtest {mport depspec} {
global env
set depregex [lindex [split $depspec :] 1]
- set prefix [_mportkey $mport prefix]
-
+ set prefix [_mportkey $mport prefix]
+
# separate directory from regex
set fullname $depregex
@@ -1354,7 +1352,7 @@
if {[$workername eval check_variants variations $target] != 0} {
return 1
}
-
+
# Before we build the port, we must build its dependencies.
# XXX: need a more general way of comparing against targets
set dlist {}
@@ -1364,7 +1362,7 @@
|| $target == "archive"
|| $target == "dmg" || $target == "mdmg"
|| $target == "pkg" || $target == "mpkg"
- || $target == "rpm" || $target == "dpkg"
+ || $target == "rpm" || $target == "dpkg"
|| $target == "srpm"|| $target == "portpkg" } {
ui_msg -nonewline "---> Computing dependencies for [_mportkey $mport name]"
@@ -1376,11 +1374,11 @@
return 1
}
ui_msg ""
-
+
# Select out the dependents along the critical path,
# but exclude this mport, we might not be installing it.
set dlist [dlist_append_dependents $macports::open_mports $mport {}]
-
+
dlist_delete dlist $mport
# install them
@@ -1391,7 +1389,7 @@
} else {
set result [dlist_eval $dlist _mportinstalled [list _mportexec "install"]]
}
-
+
if {$result != {}} {
set errstring "The following dependencies failed to build:"
foreach ditem $result {
@@ -1400,7 +1398,7 @@
ui_error $errstring
return 1
}
-
+
# Close the dependencies, we're done installing them.
foreach ditem $dlist {
mportclose $ditem
@@ -1418,7 +1416,7 @@
if { [string equal ${macports::registry.installtype} "image"] && [string equal $target "install"] } {
set target activate
}
-
+
# Build this port with the specified target
set result [$workername eval eval_targets $target]
@@ -1631,7 +1629,7 @@
global macports::portdbpath macports::sources
set matches [list]
set easy [expr { $field == "name" }]
-
+
set found 0
foreach source $sources {
set flags [lrange $source 1 end]
@@ -1651,7 +1649,7 @@
set name [lindex $line 0]
set len [lindex $line 1]
set line [read $fd $len]
-
+
if {$easy} {
set target $name
} else {
@@ -1659,7 +1657,7 @@
if {![info exists portinfo($field)]} continue
set target $portinfo($field)
}
-
+
switch $matchstyle {
exact {
set matchres [expr 0 == ( {$case_sensitive == "yes"} ? [string compare $pattern $target] : [string compare -nocase $pattern $target] )]
@@ -1672,7 +1670,7 @@
set matchres [expr {$case_sensitive == "yes"} ? [regexp -- $pattern $target] : [regexp -nocase -- $pattern $target]]
}
}
-
+
if {$matchres == 1} {
if {$easy} {
array set portinfo $line
@@ -1733,7 +1731,7 @@
# the use of the quick index.
proc mportlookup {name} {
global macports::portdbpath macports::sources
-
+
set sourceno 0
set matches [list]
foreach source $sources {
@@ -1758,7 +1756,7 @@
set name [lindex $line 0]
set len [lindex $line 1]
set line [read $fd $len]
-
+
array set portinfo $line
switch -regexp -- [macports::getprotocol ${source}] {
@@ -1818,7 +1816,7 @@
# it first if necessary.
proc _mports_load_quickindex {args} {
global macports::sources macports::quick_index
-
+
set sourceno 0
foreach source $sources {
unset -nocomplain quicklist
@@ -1945,18 +1943,18 @@
} else {
upvar accDeps accDeps
}
-
+
# progress indicator
if {![macports::ui_isset ports_debug]} {
ui_info -nonewline "."
flush stdout
}
-
+
# Determine deptypes to look for based on target
switch $target {
configure -
build { set deptypes "depends_lib depends_build" }
-
+
test -
destroot -
install -
@@ -1971,7 +1969,7 @@
dpkg -
"" { set deptypes "depends_lib depends_build depends_run" }
}
-
+
# Gather the dependencies for deptypes
foreach deptype $deptypes {
# Add to the list of dependencies if the option exists and isn't empty.
@@ -1981,11 +1979,11 @@
}
set subPorts {}
-
+
foreach depspec $depends {
# grab the portname portion of the depspec
set dep_portname [lindex [split $depspec :] end]
-
+
# Find the porturl
if {[catch {set res [mportlookup $dep_portname]} error]} {
global errorInfo
@@ -1993,7 +1991,7 @@
ui_error "Internal error: port lookup failed: $error"
return 1
}
-
+
array unset portinfo
array set portinfo [lindex $res 1]
if {[info exists portinfo(porturl)]} {
@@ -2006,7 +2004,7 @@
set options [ditem_key $mport options]
set variations [ditem_key $mport variations]
- # Figure out the subport.
+ # Figure out the subport.
set subport [mportopen $porturl $options $variations]
# Is that dependency satisfied or this port installed?
@@ -2014,7 +2012,7 @@
if {!$skipSatisfied || ![_mportispresent $subport $depspec]} {
# Append the sub-port's provides to the port's requirements list.
ditem_append_unique $mport requires "[ditem_key $subport provides]"
-
+
if {$recurseDeps} {
# Skip the port if it's already in the accumulated list.
if {![info exists accDeps($dep_portname)]} {
@@ -2038,7 +2036,7 @@
}
}
}
-
+
return 0
}
@@ -2047,7 +2045,7 @@
global macports::prefix macports::portdbpath macports::libpath macports::rsync_server macports::rsync_dir macports::rsync_options
global macports::autoconf::macports_version macports::autoconf::rsync_path
array set options $optionslist
-
+
# syncing ports tree.
if {![info exists options(ports_selfupdate_nosync)] || $options(ports_selfupdate_nosync) != "yes"} {
ui_msg "---> Updating the ports tree"
@@ -2055,14 +2053,14 @@
return -code error "Couldn't sync the ports tree: $result"
}
}
-
+
# create the path to the to be downloaded sources if it doesn't exist
set mp_source_path [file join $portdbpath sources ${rsync_server} ${rsync_dir}/]
if {![file exists $mp_source_path]} {
file mkdir $mp_source_path
}
ui_debug "MacPorts sources location: $mp_source_path"
-
+
# sync the MacPorts sources
ui_msg "---> Updating MacPorts base sources using rsync"
if { [catch { system "$rsync_path $rsync_options rsync://${rsync_server}/${rsync_dir} $mp_source_path" } result ] } {
@@ -2120,7 +2118,7 @@
} else {
set tclpackage $libpath
}
-
+
set configure_args "--prefix=$prefix --with-tclpackage=$tclpackage --with-install-user=$owner --with-install-group=$group --with-directory-mode=$perms"
# too many users have an incompatible readline in /usr/local, see ticket #10651
if {$tcl_platform(os) != "Darwin" || $prefix == "/usr/local"
@@ -2129,7 +2127,7 @@
} else {
ui_warn "Disabling readline support due to readline in /usr/local"
}
-
+
# do the actual configure, build and installation of new base
ui_msg "Installing new MacPorts release in $prefix as $owner:$group; permissions $perms; Tcl-Package in $tclpackage\n"
if { [catch { system "cd $mp_source_path && ./configure $configure_args && make && make install" } result] } {
@@ -2239,10 +2237,12 @@
global errorInfo
ui_debug "$errorInfo"
ui_error "Unable to exec port: $result"
+ catch {mportclose $workername}
return 1
}
if {$result > 0} {
ui_error "Problem while installing $portname"
+ catch {mportclose $workername}
return $result
}
# we just installed it, so mark it done in the cache
@@ -2256,6 +2256,7 @@
}
# the rest of the proc doesn't matter for a port that is freshly
# installed or not installed
+ mportclose $workername
return 0
} else {
ui_error "Checking installed version failed: $result"
@@ -2404,7 +2405,7 @@
}
}
}
-
+ mportclose $workername
return 0
} else {
set epoch_override 1
@@ -2427,6 +2428,7 @@
global errorInfo
ui_debug "$errorInfo"
ui_error "Unable to upgrade port: $result"
+ catch {mportclose $workername}
return 1
}
}
@@ -2444,6 +2446,7 @@
global errorInfo
ui_debug "$errorInfo"
ui_error "Uninstall $portname ${version_installed}_${revision_installed}${variant_installed} failed: $result"
+ catch {mportclose $workername}
return 1
}
if {!$force_cur} {
@@ -2462,6 +2465,7 @@
global errorInfo
ui_debug "$errorInfo"
ui_error "Uninstall $portname ${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants) failed: $result"
+ catch {mportclose $workername}
return 1
}
if {!$force_cur} {
@@ -2480,6 +2484,7 @@
global errorInfo
ui_debug "$errorInfo"
ui_error "Deactivating $portname ${version_active}_${revision_active} failed: $result"
+ catch {mportclose $workername}
return 1
}
}
@@ -2496,9 +2501,10 @@
global errorInfo
ui_debug "$errorInfo"
ui_error "Couldn't activate $portname ${version_in_tree}_${revision_in_tree}: $result"
+ catch {mportclose $workername}
return 1
}
-
+
if {[info exists uninstall_later] && $uninstall_later == yes} {
foreach i $ilist {
set version [lindex $i 1]
@@ -2514,6 +2520,7 @@
global errorInfo
ui_debug "$errorInfo"
ui_error "Uninstall $portname @${version}_${revision}${variant} failed: $result"
+ catch {mportclose $workername}
return 1
}
}
@@ -2537,7 +2544,7 @@
}
}
-
+
# close the port handle
mportclose $workername
}
@@ -2549,19 +2556,19 @@
upvar $portinfoname portinfo $depscachename depscache \
$globalvarlistname globalvarlist $variationslistname variationslist \
$optionsname options
-
+
# If we're following dependents, we only want to follow this port's
# dependents, not those of all its dependencies. Otherwise, we would
# end up processing this port's dependents n+1 times (recursively!),
# where n is the number of dependencies this port has, since this port
# is of course a dependent of each of its dependencies. Plus the
# dependencies could have any number of unrelated dependents.
-
+
# So we save whether we're following dependents, unset the option
# while doing the dependencies, and restore it afterwards.
set saved_do_dependents [info exists options(ports_do_dependents)]
unset -nocomplain options(ports_do_dependents)
-
+
# each dep type is upgraded
foreach dtype {depends_build depends_lib depends_run} {
if {[info exists portinfo($dtype)]} {
@@ -2569,7 +2576,7 @@
set d [lindex [split $i :] end]
if {![llength [array get depscache port:${d}]] && ![llength [array get depscache $i]]} {
upgrade $d $i $globalvarlist $variationslist [array get options] depscache
- }
+ }
}
}
}
@@ -2669,7 +2676,7 @@
if {[file exists $selected_version]} {
file delete $selected_version
}
- symlink $version $selected_version
+ symlink $version $selected_version
return
}
show {
Property changes on: branches/gsoc09-logging/base/src/package1.0
___________________________________________________________________
Added: svn:ignore
+ pkgIndex.tcl
Modified: branches/gsoc09-logging/base/src/package1.0/Makefile
===================================================================
--- branches/gsoc09-logging/base/src/package1.0/Makefile 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/package1.0/Makefile 2009-05-23 20:29:46 UTC (rev 51384)
@@ -5,9 +5,13 @@
include ../../Mk/macports.autoconf.mk
-all::
+all:: pkgIndex.tcl
+pkgIndex.tcl:
+ $(SILENT) ../pkg_mkindex.sh .
+
clean::
+ rm -f pkgIndex.tcl
distclean::
@@ -18,4 +22,4 @@
$(SILENT)set -x; for file in ${SRCS}; do \
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
done
- $(SILENT) $(TCLSH) ../pkg_mkindex.tcl ${INSTALLDIR}
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
Modified: branches/gsoc09-logging/base/src/package1.0/portarchive.tcl
===================================================================
--- branches/gsoc09-logging/base/src/package1.0/portarchive.tcl 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/package1.0/portarchive.tcl 2009-05-23 20:29:46 UTC (rev 51384)
@@ -192,7 +192,7 @@
return -code error "No '$pax' was found on this system!"
}
}
- t(ar|bz|lz|gz) {
+ t(ar|bz|lz|xz|gz) {
set tar "tar"
if {[catch {set tar [findBinary $tar ${portutil::autoconf::tar_path}]} errmsg] == 0} {
ui_debug "Using $tar"
@@ -205,6 +205,9 @@
} elseif {[regexp {lz$} ${archive.type}]} {
set gzip "lzma"
set level 7
+ } elseif {[regexp {xz$} ${archive.type}]} {
+ set gzip "xz"
+ set level 6
} else {
set gzip "gzip"
set level 9
Modified: branches/gsoc09-logging/base/src/package1.0/portunarchive.tcl
===================================================================
--- branches/gsoc09-logging/base/src/package1.0/portunarchive.tcl 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/package1.0/portunarchive.tcl 2009-05-23 20:29:46 UTC (rev 51384)
@@ -196,7 +196,7 @@
return -code error "No '$pax' was found on this system!"
}
}
- t(ar|bz|lz|gz) {
+ t(ar|bz|lz|xz|gz) {
set tar "tar"
if {[catch {set tar [findBinary $tar ${portutil::autoconf::tar_path}]} errmsg] == 0} {
ui_debug "Using $tar"
@@ -208,6 +208,8 @@
set gzip "bzip2"
} elseif {[regexp {lz$} ${unarchive.type}]} {
set gzip "lzma"
+ } elseif {[regexp {xz$} ${unarchive.type}]} {
+ set gzip "xz"
} else {
set gzip "gzip"
}
Property changes on: branches/gsoc09-logging/base/src/pextlib1.0
___________________________________________________________________
Modified: svn:ignore
- *.dylib
+ *.dylib
pkgIndex.tcl
Modified: branches/gsoc09-logging/base/src/pextlib1.0/Pextlib.c
===================================================================
--- branches/gsoc09-logging/base/src/pextlib1.0/Pextlib.c 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/pextlib1.0/Pextlib.c 2009-05-23 20:29:46 UTC (rev 51384)
@@ -36,16 +36,13 @@
#include <config.h>
#endif
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
#include <grp.h>
-
-#if HAVE_STRING_H
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
-#endif
#if HAVE_STRINGS_H
#include <strings.h>
@@ -136,7 +133,8 @@
#define CBUFSIZ 30
-char *ui_escape(const char *source)
+static char *
+ui_escape(const char *source)
{
char *d, *dest;
const char *s;
@@ -173,7 +171,8 @@
return dest;
}
-int ui_info(Tcl_Interp *interp, char *mesg)
+int
+ui_info(Tcl_Interp *interp, char *mesg)
{
const char ui_proc_start[] = "ui_info [subst -nocommands -novariables {";
const char ui_proc_end[] = "}]";
Modified: branches/gsoc09-logging/base/src/pextlib1.0/curl.c
===================================================================
--- branches/gsoc09-logging/base/src/pextlib1.0/curl.c 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/pextlib1.0/curl.c 2009-05-23 20:29:46 UTC (rev 51384)
@@ -34,14 +34,11 @@
#include <config.h>
#endif
-#include <stdio.h>
-#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
-
-#if HAVE_STRING_H
+#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
-#endif
#ifdef HAVE_UTIME_H
#include <utime.h>
@@ -50,18 +47,9 @@
#include <curl/curl.h>
#include <tcl.h>
-#include <tclDecls.h>
#include "curl.h"
-/* Avoid a warning with Tcl < 8.4, even if Tcl_GetIndexFromObj's tablePtr
-probably isn't modified. */
-#if (TCL_MAJOR_VERSION > 8) || (TCL_MINOR_VERSION >= 4)
-typedef CONST char* tableEntryString;
-#else
-typedef char* tableEntryString;
-#endif
-
/*
* Some compiled-in constants that we may wish to change later, given more
* empirical data. These represent "best guess" values for now.
@@ -81,6 +69,7 @@
int SetResultFromCurlErrorCode(Tcl_Interp* interp, CURLcode inErrorCode);
int CurlFetchCmd(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]);
int CurlIsNewerCmd(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]);
+int CurlGetSizeCmd(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]);
/* ========================================================================= **
* Entry points
@@ -108,18 +97,16 @@
theResult = TCL_OK;
break;
- default:
-#ifdef HAVE_CURL_EASY_STRERROR
- Tcl_SetResult(interp, (char*) curl_easy_strerror(inErrorCode), TCL_VOLATILE);
+ default: {
+#if LIBCURL_VERSION_NUM >= 0x070c00 /* 7.12.0 */
+ Tcl_SetResult(interp, (char *)curl_easy_strerror(inErrorCode), TCL_VOLATILE);
#else
- {
- char theErrorString[512];
- (void) snprintf(theErrorString, sizeof(theErrorString),
- "curl error %i", inErrorCode);
- Tcl_SetResult(interp, theErrorString, TCL_VOLATILE);
- }
+ char theErrorString[512];
+ (void)snprintf(theErrorString, sizeof(theErrorString), "curl error %i", inErrorCode);
+ Tcl_SetResult(interp, theErrorString, TCL_VOLATILE);
#endif
theResult = TCL_ERROR;
+ }
}
return theResult;
@@ -829,7 +816,7 @@
kCurlGetSize
} EOption;
- static tableEntryString options[] = {
+ static const char *options[] = {
"fetch", "isnewer", "getsize", NULL
};
int theResult = TCL_OK;
Modified: branches/gsoc09-logging/base/src/pextlib1.0/fgetln.c
===================================================================
--- branches/gsoc09-logging/base/src/pextlib1.0/fgetln.c 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/pextlib1.0/fgetln.c 2009-05-23 20:29:46 UTC (rev 51384)
@@ -35,10 +35,7 @@
#if !HAVE_FGETLN
#include <stdio.h>
#include <stdlib.h>
-
-#if HAVE_STRING_H
#include <string.h>
-#endif
#define BUFCHUNKS BUFSIZ
Modified: branches/gsoc09-logging/base/src/pextlib1.0/filemap.c
===================================================================
--- branches/gsoc09-logging/base/src/pextlib1.0/filemap.c 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/pextlib1.0/filemap.c 2009-05-23 20:29:46 UTC (rev 51384)
@@ -34,15 +34,12 @@
#include <config.h>
#endif
-#include <stdio.h>
-#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
#include <grp.h>
-
-#if HAVE_STRING_H
+#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
-#endif
#if HAVE_STRINGS_H
#include <strings.h>
@@ -222,6 +219,7 @@
int SetResultFromErrorCode(Tcl_Interp* interp, int inErrorCode);
SFilemapObject* GetObjectFromVarName(Tcl_Interp* interp, Tcl_Obj* inVarName);
int FilemapCloseCmd(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]);
+int FilemapCreateCmd(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]);
int FilemapExistsCmd(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]);
int FilemapGetCmd(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]);
int FilemapIsReadOnlyCmd(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]);
Modified: branches/gsoc09-logging/base/src/pextlib1.0/fs-traverse.c
===================================================================
--- branches/gsoc09-logging/base/src/pextlib1.0/fs-traverse.c 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/pextlib1.0/fs-traverse.c 2009-05-23 20:29:46 UTC (rev 51384)
@@ -58,6 +58,8 @@
#include <tcl.h>
+#include "fs-traverse.h"
+
static int do_traverse(Tcl_Interp *interp, int flags, char * CONST *targets, Tcl_Obj *varname, Tcl_Obj *body);
#define F_DEPTH 0x1
Modified: branches/gsoc09-logging/base/src/pextlib1.0/md5cmd.c
===================================================================
--- branches/gsoc09-logging/base/src/pextlib1.0/md5cmd.c 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/pextlib1.0/md5cmd.c 2009-05-23 20:29:46 UTC (rev 51384)
@@ -34,12 +34,10 @@
#include <config.h>
#endif
-#include <tcl.h>
-
-#if HAVE_STRING_H
#include <string.h>
-#endif
+#include <tcl.h>
+
#if defined(HAVE_LIBCRYPTO) && !defined(HAVE_LIBMD)
/* Minimal wrapper around OpenSSL's libcrypto, as a compatibility
Modified: branches/gsoc09-logging/base/src/pextlib1.0/readline.c
===================================================================
--- branches/gsoc09-logging/base/src/pextlib1.0/readline.c 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/pextlib1.0/readline.c 2009-05-23 20:29:46 UTC (rev 51384)
@@ -12,16 +12,13 @@
#include <config.h>
#endif
+#include <stdio.h>
+#include <string.h>
+
#if HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#if HAVE_STRING_H
-#include <string.h>
-#endif
-
-#include <stdio.h>
-
#if HAVE_READLINE_READLINE_H
#include <readline/readline.h>
#endif
@@ -31,9 +28,9 @@
#endif
#include <tcl.h>
+
#include "readline.h"
-
/* Globals */
#if HAVE_READLINE_READLINE_H
Tcl_Interp* completion_interp = NULL;
Modified: branches/gsoc09-logging/base/src/pextlib1.0/rmd160cmd.c
===================================================================
--- branches/gsoc09-logging/base/src/pextlib1.0/rmd160cmd.c 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/pextlib1.0/rmd160cmd.c 2009-05-23 20:29:46 UTC (rev 51384)
@@ -34,12 +34,10 @@
#include <config.h>
#endif
-#include <tcl.h>
-
-#if HAVE_STRING_H
#include <string.h>
-#endif
+#include <tcl.h>
+
#if !defined(HAVE_LIBMD)
/* We do not have libmd.
Modified: branches/gsoc09-logging/base/src/pextlib1.0/sha1cmd.c
===================================================================
--- branches/gsoc09-logging/base/src/pextlib1.0/sha1cmd.c 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/pextlib1.0/sha1cmd.c 2009-05-23 20:29:46 UTC (rev 51384)
@@ -35,12 +35,10 @@
#include <config.h>
#endif
-#include <tcl.h>
-
-#if HAVE_STRING_H
#include <string.h>
-#endif
+#include <tcl.h>
+
#if defined(HAVE_LIBCRYPTO) && !defined(HAVE_LIBMD)
/* Minimal wrapper around OpenSSL's libcrypto, as a compatibility
Modified: branches/gsoc09-logging/base/src/pextlib1.0/strcasecmp.c
===================================================================
--- branches/gsoc09-logging/base/src/pextlib1.0/strcasecmp.c 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/pextlib1.0/strcasecmp.c 2009-05-23 20:29:46 UTC (rev 51384)
@@ -30,9 +30,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include <ctype.h>
#include <string.h>
-#include <ctype.h>
+#include "strcasecmp.h"
+
/* ------------------------------------------------------------------------- **
* xstrcasecmp
* ------------------------------------------------------------------------- */
Modified: branches/gsoc09-logging/base/src/pextlib1.0/tty.c
===================================================================
--- branches/gsoc09-logging/base/src/pextlib1.0/tty.c 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/pextlib1.0/tty.c 2009-05-23 20:29:46 UTC (rev 51384)
@@ -45,6 +45,8 @@
#include <tcl.h>
+#include "tty.h"
+
int IsattyCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
{
Tcl_Obj *tcl_result;
Modified: branches/gsoc09-logging/base/src/pextlib1.0/tty.h
===================================================================
--- branches/gsoc09-logging/base/src/pextlib1.0/tty.h 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/pextlib1.0/tty.h 2009-05-23 20:29:46 UTC (rev 51384)
@@ -36,8 +36,6 @@
#ifndef _PEXTLIB_TTY_H
#define _PEXTLIB_TTY_H
-#include <tcl.h>
-
/**
* A wrapper for isatty(3)
*/
Modified: branches/gsoc09-logging/base/src/pextlib1.0/uid.c
===================================================================
--- branches/gsoc09-logging/base/src/pextlib1.0/uid.c 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/pextlib1.0/uid.c 2009-05-23 20:29:46 UTC (rev 51384)
@@ -8,21 +8,17 @@
*
*/
-#include "uid.h"
-#include "grp.h"
-
#if HAVE_CONFIG_H
#include <config.h>
#endif
+#include <grp.h>
+#include <string.h>
+
#if HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#if HAVE_STRING_H
-#include <string.h>
-#endif
-
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -41,6 +37,8 @@
#include <tcl.h>
+#include "uid.h"
+
/*
getuid
Modified: branches/gsoc09-logging/base/src/pextlib1.0/vercomp.c
===================================================================
--- branches/gsoc09-logging/base/src/pextlib1.0/vercomp.c 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/pextlib1.0/vercomp.c 2009-05-23 20:29:46 UTC (rev 51384)
@@ -38,18 +38,13 @@
#include <config.h>
#endif
-#include <stdlib.h>
#include <ctype.h>
-#include <tcl.h>
-
-#if HAVE_STRING_H
#include <string.h>
-#endif
-#if HAVE_STRINGS_H
-#include <strings.h>
-#endif
+#include <tcl.h>
+#include "vercomp.h"
+
/*
* If A is newer than B, return an integer > 0
* If A and B are equal, return 0
Modified: branches/gsoc09-logging/base/src/pextlib1.0/xinstall.c
===================================================================
--- branches/gsoc09-logging/base/src/pextlib1.0/xinstall.c 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/pextlib1.0/xinstall.c 2009-05-23 20:29:46 UTC (rev 51384)
@@ -78,6 +78,8 @@
#define _PATH_DEVNULL "/dev/null"
#endif
+#include "xinstall.h"
+
#ifndef MAXBSIZE
#define MAXBSIZE 65536
#endif
Copied: branches/gsoc09-logging/base/src/pkg_mkindex.sh.in (from rev 51382, trunk/base/src/pkg_mkindex.sh.in)
===================================================================
--- branches/gsoc09-logging/base/src/pkg_mkindex.sh.in (rev 0)
+++ branches/gsoc09-logging/base/src/pkg_mkindex.sh.in 2009-05-23 20:29:46 UTC (rev 51384)
@@ -0,0 +1,44 @@
+#!/bin/bash
+# pkg_mkindex.sh
+#
+# Copyright (c) 2009 The MacPorts Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+TCLSH=@TCLSH@
+GREP=@GREP@
+
+if [ $# = 0 ]; then
+ echo "Usage: $0 <directory list>"
+ exit 1
+fi
+
+for dir in $@; do
+ echo "pkg_mkIndex -verbose -- $dir *.tcl *.dylib *.so" | $TCLSH 2>&1 \
+ | $GREP "^warning: " && exit 1
+done
+
+exit 0
Deleted: branches/gsoc09-logging/base/src/pkg_mkindex.tcl
===================================================================
--- branches/gsoc09-logging/base/src/pkg_mkindex.tcl 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/pkg_mkindex.tcl 2009-05-23 20:29:46 UTC (rev 51384)
@@ -1,37 +0,0 @@
-#!/usr/bin/env tclsh
-# pkg_mkindex.tcl
-#
-# Copyright (c) 2002 Apple Computer, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
-# may be used to endorse or promote products derived from this software
-# without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-if {$argc < 1} {
- puts "Usage: $argv0 <directory list>"
- exit
-}
-foreach dir $argv {
- pkg_mkIndex -verbose -- $dir *.tcl *.dylib *.so
-}
Property changes on: branches/gsoc09-logging/base/src/port1.0
___________________________________________________________________
Modified: svn:ignore
- port_autoconf.tcl
+ port_autoconf.tcl
pkgIndex.tcl
Modified: branches/gsoc09-logging/base/src/port1.0/Makefile
===================================================================
--- branches/gsoc09-logging/base/src/port1.0/Makefile 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/port1.0/Makefile 2009-05-23 20:29:46 UTC (rev 51384)
@@ -13,9 +13,13 @@
.PHONY: test
-all::
+all:: pkgIndex.tcl
+pkgIndex.tcl:
+ $(SILENT) ../pkg_mkindex.sh .
+
clean::
+ rm -f pkgIndex.tcl
distclean::
rm -f port_autoconf.tcl
@@ -25,7 +29,7 @@
$(SILENT)set -x; for file in ${SRCS}; do \
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
done
- $(SILENT) $(TCLSH) ../pkg_mkindex.tcl ${INSTALLDIR}
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
test::
${TCLSH} tests/portutil.tcl
Modified: branches/gsoc09-logging/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/gsoc09-logging/base/src/port1.0/portconfigure.tcl 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/port1.0/portconfigure.tcl 2009-05-23 20:29:46 UTC (rev 51384)
@@ -302,7 +302,6 @@
cc { set ret /usr/bin/gcc-4.2 }
objc { set ret /usr/bin/gcc-4.2 }
cxx { set ret /usr/bin/g++-4.2 }
- cpp { set ret /usr/bin/cpp-4.2 }
}
}
llvm-gcc-4.2 {
Modified: branches/gsoc09-logging/base/src/port1.0/portutil.tcl
===================================================================
--- branches/gsoc09-logging/base/src/port1.0/portutil.tcl 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/port1.0/portutil.tcl 2009-05-23 20:29:46 UTC (rev 51384)
@@ -2048,52 +2048,6 @@
}
}
-
-# builds the specified port (looked up in the index) to the specified target
-# doesn't yet support options or variants...
-# newworkpath defines the port's workpath - useful for when one port relies
-# on the source, etc, of another
-proc portexec_int {portname target {newworkpath ""}} {
- ui_debug "Executing $target ($portname)"
- set variations [list]
- if {$newworkpath == ""} {
- array set options [list]
- } else {
- set options(workpath) ${newworkpath}
- }
-
- set res [mport_lookup $portname]
- if {[llength $res] < 2} {
- ui_error "Dependency $portname not found"
- return -1
- }
-
- array set portinfo [lindex $res 1]
- set porturl $portinfo(porturl)
- if {[catch {set worker [mport_open $porturl [array get options] $variations]} result]} {
- global errorInfo
- ui_debug "$errorInfo"
- ui_error "Opening $portname $target failed: $result"
- return -1
- }
- if {[catch {mport_exec $worker $target} result] || $result != 0} {
- global errorInfo
- ui_debug "$errorInfo"
- ui_error "Execution $portname $target failed: $result"
- mport_close $worker
- return -1
- }
- mport_close $worker
-
- return 0
-}
-
-# portfile primitive that calls portexec_int with newworkpath == ${workpath}
-proc portexec {portname target} {
- global workpath
- return [portexec_int $portname $target $workpath]
-}
-
proc adduser {name args} {
global os.platform
set passwd {*}
@@ -2245,7 +2199,7 @@
}
}
}
- t(ar|bz|lz|gz) {
+ t(ar|bz|lz|xz|gz) {
set tar "tar"
if {[catch {set tar [findBinary $tar ${portutil::autoconf::tar_path}]} errmsg] == 0} {
if {[regexp {z2?$} $type]} {
@@ -2253,6 +2207,8 @@
set gzip "bzip2"
} elseif {[regexp {lz$} $type]} {
set gzip "lzma"
+ } elseif {[regexp {xz$} $type]} {
+ set gzip "xz"
} else {
set gzip "gzip"
}
Modified: branches/gsoc09-logging/base/src/programs/Makefile.in
===================================================================
--- branches/gsoc09-logging/base/src/programs/Makefile.in 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/programs/Makefile.in 2009-05-23 20:29:46 UTC (rev 51384)
@@ -1,6 +1,6 @@
# $Id$
-SUBDIR= @REPLACEMENT_PROGS@ @EXTRA_PROGS@
+SUBDIR= @EXTRA_PROGS@
include ../../Mk/macports.subdir.mk
Property changes on: branches/gsoc09-logging/base/src/registry1.0
___________________________________________________________________
Modified: svn:ignore
- registry_autoconf.tcl
+ registry_autoconf.tcl
pkgIndex.tcl
Modified: branches/gsoc09-logging/base/src/registry1.0/Makefile
===================================================================
--- branches/gsoc09-logging/base/src/registry1.0/Makefile 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/registry1.0/Makefile 2009-05-23 20:29:46 UTC (rev 51384)
@@ -4,9 +4,13 @@
include ../../Mk/macports.autoconf.mk
-all::
+all:: pkgIndex.tcl
+pkgIndex.tcl:
+ $(SILENT) ../pkg_mkindex.sh .
+
clean::
+ rm -f pkgIndex.tcl
distclean:: clean
rm -f registry_autoconf.tcl
@@ -16,6 +20,6 @@
$(SILENT)set -x; for file in ${SRCS}; do \
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
done
- $(SILENT) $(TCLSH) ../pkg_mkindex.tcl ${INSTALLDIR}
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
test::
Property changes on: branches/gsoc09-logging/base/src/registry2.0
___________________________________________________________________
Modified: svn:ignore
- registry.dylib
+ registry.dylib
pkgIndex.tcl
Modified: branches/gsoc09-logging/base/src/registry2.0/Makefile
===================================================================
--- branches/gsoc09-logging/base/src/registry2.0/Makefile 2009-05-23 20:27:47 UTC (rev 51383)
+++ branches/gsoc09-logging/base/src/registry2.0/Makefile 2009-05-23 20:29:46 UTC (rev 51384)
@@ -25,4 +25,4 @@
$(SILENT) set -x; for file in ${SRCS}; do \
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}/$$file; \
done
- $(SILENT) $(TCLSH) ../pkg_mkindex.tcl ${INSTALLDIR}
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090523/0a483570/attachment-0001.html>
More information about the macports-changes
mailing list