[106643] trunk/base/src

[jmr at macports.org]

Revision: 106643
          https://trac.macports.org/changeset/106643
Author:   jmr at macports.org
Date:     2013-06-03 01:11:09 -0700 (Mon, 03 Jun 2013)
Log Message:
-----------
combine multiple adjacent calls to options

Modified Paths:
--------------
    trunk/base/src/package1.0/portdpkg.tcl
    trunk/base/src/package1.0/portrpm.tcl
    trunk/base/src/port1.0/portbuild.tcl
    trunk/base/src/port1.0/portconfigure.tcl
    trunk/base/src/port1.0/portdestroot.tcl

Modified: trunk/base/src/package1.0/portdpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portdpkg.tcl	2013-06-03 07:48:38 UTC (rev 106642)
+++ trunk/base/src/package1.0/portdpkg.tcl	2013-06-03 08:11:09 UTC (rev 106643)
@@ -44,8 +44,8 @@
 }
 
 # Options
-options dpkg.asroot
-options package.destpath
+options dpkg.asroot \
+        package.destpath
 
 # Set up defaults
 default dpkg.asroot yes

Modified: trunk/base/src/package1.0/portrpm.tcl
===================================================================
--- trunk/base/src/package1.0/portrpm.tcl	2013-06-03 07:48:38 UTC (rev 106642)
+++ trunk/base/src/package1.0/portrpm.tcl	2013-06-03 08:11:09 UTC (rev 106643)
@@ -43,8 +43,8 @@
 }
 
 # Options
-options rpm.asroot
-options package.destpath
+options rpm.asroot \
+        package.destpath
 
 # Set up defaults
 default rpm.asroot yes

Modified: trunk/base/src/port1.0/portbuild.tcl
===================================================================
--- trunk/base/src/port1.0/portbuild.tcl	2013-06-03 07:48:38 UTC (rev 106642)
+++ trunk/base/src/port1.0/portbuild.tcl	2013-06-03 08:11:09 UTC (rev 106643)
@@ -43,11 +43,11 @@
 }
 
 # define options
-options build.asroot
-options build.jobs
-options build.target
-options build.type
-options use_parallel_build
+options build.asroot \
+        build.jobs \
+        build.target \
+        build.type \
+        use_parallel_build
 commands build
 # defaults
 default build.asroot no

Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl	2013-06-03 07:48:38 UTC (rev 106642)
+++ trunk/base/src/port1.0/portconfigure.tcl	2013-06-03 08:11:09 UTC (rev 106643)
@@ -127,11 +127,11 @@
 default configure.march     {}
 default configure.mtune     {}
 # We could have debug/optimizations be global configurable at some point.
-options configure.optflags
-options configure.cflags configure.cxxflags configure.objcflags
-options configure.cppflags configure.ldflags configure.libs
-options configure.fflags configure.f90flags configure.fcflags
-options configure.classpath
+options configure.optflags \
+        configure.cflags configure.cxxflags configure.objcflags \
+        configure.cppflags configure.ldflags configure.libs \
+        configure.fflags configure.f90flags configure.fcflags \
+        configure.classpath
 # compiler flags section
 default configure.optflags  {-Os}
 default configure.cflags    {${configure.optflags}}
@@ -146,9 +146,9 @@
 default configure.classpath {}
 
 # tools section
-options configure.perl configure.python configure.ruby
-options configure.install configure.awk configure.bison
-options configure.pkg_config configure.pkg_config_path
+options configure.perl configure.python configure.ruby \
+        configure.install configure.awk configure.bison \
+        configure.pkg_config configure.pkg_config_path
 default configure.perl              {}
 default configure.python            {}
 default configure.ruby              {}
@@ -167,9 +167,9 @@
     default configure.${tool}_archflags  "\[portconfigure::configure_get_archflags $tool\]"
 }
 
-options configure.universal_archs configure.universal_args
-options configure.universal_cflags configure.universal_cxxflags
-options configure.universal_cppflags configure.universal_ldflags
+options configure.universal_archs configure.universal_args \
+        configure.universal_cflags configure.universal_cxxflags \
+        configure.universal_cppflags configure.universal_ldflags
 default configure.universal_archs       {[portconfigure::choose_supported_archs ${universal_archs}]}
 default configure.universal_args        {--disable-dependency-tracking}
 default configure.universal_cflags      {[portconfigure::configure_get_universal_cflags]}

Modified: trunk/base/src/port1.0/portdestroot.tcl
===================================================================
--- trunk/base/src/port1.0/portdestroot.tcl	2013-06-03 07:48:38 UTC (rev 106642)
+++ trunk/base/src/port1.0/portdestroot.tcl	2013-06-03 08:11:09 UTC (rev 106643)
@@ -47,13 +47,13 @@
 }
 
 # define options
-options destroot.target destroot.destdir destroot.clean destroot.keepdirs destroot.umask
-options destroot.violate_mtree destroot.asroot destroot.delete_la_files
-options startupitem.create startupitem.requires startupitem.init
-options startupitem.name startupitem.start startupitem.stop startupitem.restart
-options startupitem.type startupitem.executable
-options startupitem.pidfile startupitem.logfile startupitem.logevents startupitem.netchange
-options startupitem.uniquename startupitem.plist startupitem.location startupitem.install
+options destroot.target destroot.destdir destroot.clean destroot.keepdirs destroot.umask \
+        destroot.violate_mtree destroot.asroot destroot.delete_la_files \
+        startupitem.create startupitem.requires startupitem.init \
+        startupitem.name startupitem.start startupitem.stop startupitem.restart \
+        startupitem.type startupitem.executable \
+        startupitem.pidfile startupitem.logfile startupitem.logevents startupitem.netchange \
+        startupitem.uniquename startupitem.plist startupitem.location startupitem.install
 commands destroot
 
 # Set defaults
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130603/b63126bb/attachment.html>