[109992] branches/larryv-mpvim-rewrite/syntax/portfile.vim

larryv at macports.org larryv at macports.org
Fri Aug 23 08:37:50 PDT 2013


Revision: 109992
          https://trac.macports.org/changeset/109992
Author:   larryv at macports.org
Date:     2013-08-23 08:37:50 -0700 (Fri, 23 Aug 2013)
Log Message:
-----------
Rewrite options for main, checksum, livecheck.

Modified Paths:
--------------
    branches/larryv-mpvim-rewrite/syntax/portfile.vim

Modified: branches/larryv-mpvim-rewrite/syntax/portfile.vim
===================================================================
--- branches/larryv-mpvim-rewrite/syntax/portfile.vim	2013-08-23 15:01:47 UTC (rev 109991)
+++ branches/larryv-mpvim-rewrite/syntax/portfile.vim	2013-08-23 15:37:50 UTC (rev 109992)
@@ -32,43 +32,47 @@
 syn match PortfileGroup         "{.\+}" contained
 syn match PortfileYesNo         "\<\%(yes\|no\)\>" contained
 
-syn keyword PortfileRequired    PortSystem name version maintainers
-syn keyword PortfileRequired    homepage platforms
-syn match PortfileRequired      "\<categories\%(-append\|-delete\)\?\>"
-syn match PortfileRequired      "\<\%(long_\)\?description\%(-append\)\?\>" nextgroup=PortfileDescription skipwhite
-syn region PortfileDescription  matchgroup=Normal start="" skip="\\$" end="$" contained
+syn keyword PortfileRequired    PortSystem
+syn keyword PortfileOptional    PortGroup
 
-syn keyword PortfileOptional    PortGroup epoch revision
-syn keyword PortfileOptional    license conflicts license_noconflict
-syn keyword PortfileOptional    replaced_by supported_archs
+" Main options (from port1.0/portmain.tcl)
+call extend(s:portfile_options,
+            \ 'add_users', 'altprefix', 'categories', 'conflicts',
+            \ 'copy_log_files', 'default_variants', 'depends_skip_archcheck',
+            \ 'description', 'distname', 'distpath', 'epoch', 'filesdir',
+            \ 'homepage', 'installs_libs', 'libpath', 'license',
+            \ 'license_noconflict', 'long_description',
+            \ 'macosx_deployment_target', 'maintainers', 'name', 'notes',
+            \ 'platforms', 'portdbpath', 'prefix', 'provides', 'replaced_by',
+            \ 'revision', 'sources_conf', 'supported_archs',
+            \ 'universal_variant', 'version', 'worksrcdir',
+            \ 'compiler\.\%(cpath\|library_path\)',
+            \ 'install\.\%(group\|user\)',
+            \ 'os\.\%(arch\|endian\|major\|platform\|subplatform\)', 
+            \ 'os\.\%(universal_supported\|version\)',
+            \])
 
-syn keyword PortfileOptional    distname worksrcdir
-
-syn keyword PortfileOptional    installs_libs nextgroup=PortfileYesNo skipwhite
-syn match PortfileOptional      "\<depends_skip_archcheck\%(-append\|-delete\)\?\>"
-
-syn match PortfileOptional      "\<checksums\%(-append\|-delete\)\?\>" nextgroup=PortfileChecksums skipwhite
-syn region PortfileChecksums    matchgroup=Normal start="" skip="\\$" end="$" contained contains=PortfileChecksumsType
-syn keyword PortfileChecksumsType md5 sha1 rmd160 sha256 contained
-
 syn match PortfilePhases        "\<\%(pre-\|post-\)\?\%(fetch\|checksum\|extract\|patch\|configure\|build\|test\|destroot\|archive\|install\|activate\|deactivate\)\>" contains=PortfilePrePost
 
 " Fetch phase options (from port1.0/portfetch.tcl)
 call extend(s:portfile_commands, ['bzr', 'cvs', 'svn'])
 call extend(s:portfile_options, [
-            \ '\%(master\|patch\)_sites\%(\.mirror_subdir\)\?',
-            \ '\%(dist\|patch\)files',
-            \ 'dist_subdir',
-            \ 'use_\%(7z\|bzip2\|dmg\|lzma\|xz\|zip\)',
+            \ 'bzr\.\%(revision\|url\)',
+            \ 'cvs\.\%(date\|method\|module\|password\|root\|tag\)',
+            \ 'dist_subdir', 'distfiles',
             \ 'extract\.suffix',
             \ 'fetch\.\%(ignore_sslcert\|password\|use_epsv\|user\)',
-            \ 'bzr\.\%(revision\|url\)',
-            \ 'cvs\.\%(date\|method\|module\|password\|root\|tag\)',
             \ 'git\.\%(branch\|cmd\|url\)',
             \ 'hg\.\%(cmd\|tag\|url\)',
+            \ '\%(master\|patch\)_sites\%(\.mirror_subdir\)\?',
+            \ 'patchfiles',
             \ 'svn\.\%(method\|revision\|url\)',
+            \ 'use_\%(7z\|bzip2\|dmg\|lzma\|xz\|zip\)',
             \ ])
 
+" Checksum phase options (from port1.0/portchecksum.tcl)
+call extend(s:portfile_options, ['checksums\%(\.skip\)\?'])
+
 " Extract phase options (from port1.0/portextract.tcl)
 call extend(s:portfile_commands, ['extract'])
 call extend(s:portfile_options, ['extract\.\%(asroot\|mkdir\|only\)'])
@@ -84,7 +88,8 @@
             \ 'configure\.\%(m32\|m64\|march\|mtune\)',
             \ 'configure\.\%(c\|cpp\|cxx\|f\|f90\|fc\|ld\|objc\|objcxx\)flags',
             \ 'configure\.\%(classpath\|libs\)',
-            \ 'configure\.\%(awk\|bison\|install\|perl\|pkg_config\%(_path\)\?\|python\|ruby\)',
+            \ 'configure\.\%(awk\|bison\|install\|pkg_config\%(_path\)\?\)',
+            \ 'configure\.\%(perl\|python\|ruby\)',
             \ 'configure\.\%(build_arch\|sdkroot\)',
             \ 'configure\.\%(cc\|cxx\|f77\|f90\|fc\|ld\|objc\|objcxx\)_archflags',
             \ 'configure\.universal_\%(archs\|args\)',
@@ -147,12 +152,12 @@
 syn match PortfileDependsEntry      "\<\%(port\|bin\|path\|lib\):" contained
 
 " Livecheck / Distcheck
-syn match PortfileOptional      "\<livecheck\.\%(type\|name\|distname\|version\|url\|regex\|md5\)\>"
-syn keyword PortfileOptional    distcheck.check
+call extend(s:portfile_options, [
+            \ 'distcheck\.check',
+            \ 'livecheck\.\%(distname\|ignore_sslcert\|md5\|name\)',
+            \ 'livecheck\.\$(regex\|type\|url\|version\)',
+            \])
 
-" Notes
-syn keyword PortfilePhases  notes
-
 " Port Groups
 
 " App
@@ -304,7 +309,6 @@
 hi def link PortfileRequired            Keyword
 hi def link PortfileOptional            Keyword
 hi def link PortfileDescription         String
-hi def link PortfileChecksumsType       Special
 
 hi def link PortfilePhases              Keyword
 hi def link PortfilePhasesAA            Keyword
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130823/330f9a15/attachment.html>


More information about the macports-changes mailing list