[51503] branches/images-and-archives/base
blb at macports.org
blb at macports.org
Tue May 26 19:07:40 PDT 2009
Revision: 51503
http://trac.macports.org/changeset/51503
Author: blb at macports.org
Date: 2009-05-26 19:07:39 -0700 (Tue, 26 May 2009)
Log Message:
-----------
Merge from trunk
Modified Paths:
--------------
branches/images-and-archives/base/src/Makefile.in
branches/images-and-archives/base/src/pextlib1.0/filemap.c
branches/images-and-archives/base/src/pextlib1.0/tty.c
branches/images-and-archives/base/src/port1.0/portlivecheck.tcl
Property Changed:
----------------
branches/images-and-archives/base/
Property changes on: branches/images-and-archives/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
/trunk/base:50249-51433
/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:50249-51502
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/images-and-archives/base/src/Makefile.in
===================================================================
--- branches/images-and-archives/base/src/Makefile.in 2009-05-27 02:05:41 UTC (rev 51502)
+++ branches/images-and-archives/base/src/Makefile.in 2009-05-27 02:07:39 UTC (rev 51503)
@@ -14,6 +14,7 @@
distclean::
rm -f config.h
rm -f Makefile
+ rm -f pkg_mkindex.sh
test::
Modified: branches/images-and-archives/base/src/pextlib1.0/filemap.c
===================================================================
--- branches/images-and-archives/base/src/pextlib1.0/filemap.c 2009-05-27 02:05:41 UTC (rev 51502)
+++ branches/images-and-archives/base/src/pextlib1.0/filemap.c 2009-05-27 02:07:39 UTC (rev 51503)
@@ -92,7 +92,6 @@
#endif
#include <tcl.h>
-#include <tclDecls.h>
#include "filemap.h"
#include "strcasecmp.h"
Modified: branches/images-and-archives/base/src/pextlib1.0/tty.c
===================================================================
--- branches/images-and-archives/base/src/pextlib1.0/tty.c 2009-05-27 02:05:41 UTC (rev 51502)
+++ branches/images-and-archives/base/src/pextlib1.0/tty.c 2009-05-27 02:07:39 UTC (rev 51503)
@@ -47,80 +47,82 @@
#include "tty.h"
-int IsattyCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+int
+IsattyCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
{
- Tcl_Obj *tcl_result;
- Tcl_Channel chan;
- int dir;
- int fd;
- int rval;
+ Tcl_Obj *tcl_result;
+ Tcl_Channel chan;
+ int dir;
+ int fd;
+ int rval;
- if (objc != 2) {
- Tcl_WrongNumArgs(interp, 1, objv, "channel");
- return TCL_ERROR;
- }
+ if (objc != 2) {
+ Tcl_WrongNumArgs(interp, 1, objv, "channel");
+ return TCL_ERROR;
+ }
- chan = Tcl_GetChannel(interp, Tcl_GetString(objv[1]), &dir);
- if (chan == NULL) {
- Tcl_SetResult(interp, "no such channel", TCL_STATIC);
- return TCL_ERROR;
- }
+ chan = Tcl_GetChannel(interp, Tcl_GetString(objv[1]), &dir);
+ if (chan == NULL) {
+ Tcl_SetResult(interp, "no such channel", TCL_STATIC);
+ return TCL_ERROR;
+ }
- if (Tcl_GetChannelHandle(chan,
- dir & TCL_READABLE ? TCL_READABLE : TCL_WRITABLE,
- (ClientData*) &fd) == TCL_ERROR) {
- return TCL_ERROR;
- }
+ if (Tcl_GetChannelHandle(chan,
+ dir & TCL_READABLE ? TCL_READABLE : TCL_WRITABLE,
+ (ClientData*) &fd) == TCL_ERROR) {
+ return TCL_ERROR;
+ }
- rval = isatty(fd);
+ rval = isatty(fd);
- tcl_result = Tcl_NewIntObj(rval);
- Tcl_SetObjResult(interp, tcl_result);
+ tcl_result = Tcl_NewIntObj(rval);
+ Tcl_SetObjResult(interp, tcl_result);
- return TCL_OK;
+ return TCL_OK;
}
-int TermGetSizeCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+int
+TermGetSizeCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
{
- Tcl_Obj *tcl_result;
- Tcl_Channel chan;
- int dir;
- int fd;
- Tcl_Obj *robjv[2];
- struct winsize ws = {0, 0, 0, 0};
+ Tcl_Obj *tcl_result;
+ Tcl_Channel chan;
+ int dir;
+ int fd;
+ Tcl_Obj *robjv[2];
+ struct winsize ws = {0, 0, 0, 0};
- if (objc != 2) {
- Tcl_WrongNumArgs(interp, 1, objv, "channel");
- return TCL_ERROR;
- }
+ if (objc != 2) {
+ Tcl_WrongNumArgs(interp, 1, objv, "channel");
+ return TCL_ERROR;
+ }
- chan = Tcl_GetChannel(interp, Tcl_GetString(objv[1]), &dir);
- if (chan == NULL) {
- Tcl_SetResult(interp, "no such channel", TCL_STATIC);
- return TCL_ERROR;
- }
+ chan = Tcl_GetChannel(interp, Tcl_GetString(objv[1]), &dir);
+ if (chan == NULL) {
+ Tcl_SetResult(interp, "no such channel", TCL_STATIC);
+ return TCL_ERROR;
+ }
- if (Tcl_GetChannelHandle(chan,
- dir & TCL_READABLE ? TCL_READABLE : TCL_WRITABLE,
- (ClientData*) &fd) == TCL_ERROR) {
- return TCL_ERROR;
- }
+ if (Tcl_GetChannelHandle(chan,
+ dir & TCL_READABLE ? TCL_READABLE : TCL_WRITABLE,
+ (ClientData*) &fd) == TCL_ERROR) {
+ return TCL_ERROR;
+ }
- if (!isatty(fd)) {
- Tcl_SetResult(interp, "channel is not connected to a tty", TCL_STATIC);
- return TCL_ERROR;
- }
+ if (!isatty(fd)) {
+ Tcl_SetResult(interp, "channel is not connected to a tty", TCL_STATIC);
+ return TCL_ERROR;
+ }
- if (ioctl(fd, TIOCGWINSZ, &ws) == -1) {
- Tcl_SetResult(interp, "ioctl failed", TCL_STATIC);
- return TCL_ERROR;
- }
+ if (ioctl(fd, TIOCGWINSZ, &ws) == -1) {
+ Tcl_SetResult(interp, "ioctl failed", TCL_STATIC);
+ return TCL_ERROR;
+ }
- robjv[0] = Tcl_NewIntObj(ws.ws_row);
- robjv[1] = Tcl_NewIntObj(ws.ws_col);
+ robjv[0] = Tcl_NewIntObj(ws.ws_row);
+ robjv[1] = Tcl_NewIntObj(ws.ws_col);
- tcl_result = Tcl_NewListObj(2, robjv);
- Tcl_SetObjResult(interp, tcl_result);
+ tcl_result = Tcl_NewListObj(2, robjv);
+ Tcl_SetObjResult(interp, tcl_result);
- return TCL_OK;
+ return TCL_OK;
}
Modified: branches/images-and-archives/base/src/port1.0/portlivecheck.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portlivecheck.tcl 2009-05-27 02:05:41 UTC (rev 51502)
+++ branches/images-and-archives/base/src/port1.0/portlivecheck.tcl 2009-05-27 02:07:39 UTC (rev 51503)
@@ -113,7 +113,7 @@
}
}
# If the default type cannot be determined from the mirror, use the
- # fallback type (which is a symlink to one of the available types).
+ # fallback.
if {${livecheck.check} eq "default"} {
set livecheck.check "fallback"
}
@@ -121,7 +121,8 @@
if {${livecheck.name} eq "default"} {
set livecheck.name $name
}
-
+ }
+ if {[lsearch -exact [split $available_types "|"] ${livecheck.check}] != -1} {
# Load the defaults from _resources/port1.0/livecheck/${livecheck.check}.tcl.
set defaults_file "$types_dir/${livecheck.check}.tcl"
ui_debug "Loading the defaults from '$defaults_file'"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090526/637c940a/attachment.html>
More information about the macports-changes
mailing list