[66309] branches/xterm-titles/base

[raimue at macports.org]

Revision: 66309
          http://trac.macports.org/changeset/66309
Author:   raimue at macports.org
Date:     2010-04-08 17:34:13 -0700 (Thu, 08 Apr 2010)
Log Message:
-----------
Merge from trunk

Modified Paths:
--------------
    branches/xterm-titles/base/Mk/macports.tea.mk
    branches/xterm-titles/base/src/port1.0/Makefile
    branches/xterm-titles/base/src/port1.0/portmain.tcl

Property Changed:
----------------
    branches/xterm-titles/base/


Property changes on: branches/xterm-titles/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/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/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:66302-66308
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/xterm-titles/base/Mk/macports.tea.mk
===================================================================
--- branches/xterm-titles/base/Mk/macports.tea.mk	2010-04-09 00:32:16 UTC (rev 66308)
+++ branches/xterm-titles/base/Mk/macports.tea.mk	2010-04-09 00:34:13 UTC (rev 66309)
@@ -14,7 +14,7 @@
 	${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${TCL_STUB_LIB_SPEC} ${SHLIB_LDFLAGS} ${LIBS}
 
 pkgIndex.tcl: $(SHLIB_NAME)
-	$(SILENT) ../pkg_mkindex.sh .
+	$(SILENT) ../pkg_mkindex.sh . || ( rm -rf $@ && exit 1 )
 
 clean::
 	rm -f ${OBJS} ${SHLIB_NAME} so_locations pkgIndex.tcl

Modified: branches/xterm-titles/base/src/port1.0/Makefile
===================================================================
--- branches/xterm-titles/base/src/port1.0/Makefile	2010-04-09 00:32:16 UTC (rev 66308)
+++ branches/xterm-titles/base/src/port1.0/Makefile	2010-04-09 00:34:13 UTC (rev 66309)
@@ -16,7 +16,7 @@
 all:: pkgIndex.tcl
 
 pkgIndex.tcl:
-	$(SILENT) ../pkg_mkindex.sh .
+	$(SILENT) ../pkg_mkindex.sh . || ( rm -rf $@ && exit 1 )
 
 clean::
 	rm -f pkgIndex.tcl

Modified: branches/xterm-titles/base/src/port1.0/portmain.tcl
===================================================================
--- branches/xterm-titles/base/src/port1.0/portmain.tcl	2010-04-09 00:32:16 UTC (rev 66308)
+++ branches/xterm-titles/base/src/port1.0/portmain.tcl	2010-04-09 00:34:13 UTC (rev 66309)
@@ -112,7 +112,7 @@
 default universal_variant yes
 
 # sub-platforms of darwin
-if {${os.platform} == "darwin"} {
+if {[option os.platform] == "darwin"} {
     if {[file isdirectory /System/Library/Frameworks/Carbon.framework]} {
         default os.subplatform macosx
     } else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100408/70c7cb0d/attachment.html>