Hi, the vim port ships a copy of the syntax file pf.vim into
share/vim/vimfiles. However, vim upstream already includes a newer copy
(under share/vim74), which does not get used at runtime due to the
former existing.

-- 
Lauri Tirkkonen | lotheac @ IRCnet
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/vim/Makefile,v
retrieving revision 1.141
diff -u -p -r1.141 Makefile
--- Makefile    16 Feb 2015 22:57:08 -0000      1.141
+++ Makefile    9 Apr 2015 13:46:07 -0000
@@ -162,7 +162,7 @@ post-configure:
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/vim/vimfiles/{doc,syntax}
-       ${INSTALL_DATA} ${FILESDIR}/pf.vim ${FILESDIR}/openbsd.vim \
+       ${INSTALL_DATA} ${FILESDIR}/openbsd.vim \
            ${PREFIX}/share/vim/vimfiles/syntax/
 
 .if ! ${FLAVOR:Mno_x11}
Index: files/pf.vim
===================================================================
RCS file: files/pf.vim
diff -N files/pf.vim
--- files/pf.vim        9 Sep 2010 22:29:29 -0000       1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,86 +0,0 @@
-" pf syntax file
-" Language:    OpenBSD packet filter configuration (pf.conf)
-" Maintainer:  Camiel Dobbelaar <c...@sentia.nl>
-" Last Change: 2003 Feb 24
-
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
-endif
-
-setlocal iskeyword+=$
-setlocal iskeyword+=-
-setlocal iskeyword+=.
-setlocal iskeyword+=/
-setlocal iskeyword+=:
-setlocal iskeyword+=<
-setlocal iskeyword+=>
-setlocal iskeyword+=_
-
-setlocal foldmethod=syntax
-syn sync fromstart
-
-syn cluster    pfNotLS         contains=pfComment,pfTodo,pfVarAssign
-syn keyword    pfCmd           altq antispoof binat binat-to block match nat
-syn keyword    pfCmd           nat-to pass queue rdr rdr-to scrub table set
-syn keyword    pfService       auth bgp domain finger ftp ftp-data http https
-syn keyword    pfService       ident imap irc isakmp kerberos mail nameserver
-syn keyword    pfService       nfs nntp ntp ospf pop3 portmap pptp rpcbind
-syn keyword    pfService       rsync smtp snmp snmp-trap snmptrap socks
-syn keyword    pfService       ssh sunrpc syslog telnet tftp www
-syn keyword    pfTodo          TODO XXX contained
-syn keyword    pfWildAddr      all any
-syn match      pfComment       /#.*$/ contains=pfTodo
-syn match      pfCont          /\\$/
-syn match      pfErrClose      /}/
-syn match      pfIPv4          /\<\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}\>/
-syn match      pfIPv4Masked    /\<[0-9.]\+\/\d\+\>/ contains=pfNetmask
-syn match      pfIPv6          /\<[a-fA-F0-9:]\+:[a-fA-F0-9:.]\+\>/
-syn match      pfNetmask       /\/\d\+\>/
-syn match      pfNum           /\<\d\+\>/
-syn match      pfTable         /\<<\s*[a-zA-Z][a-zA-Z0-9_]*\s*>\>/
-syn match      pfTodo          /\<TODO:/me=e-1 contained
-syn match      pfTodo          /\<XXX:/me=e-1 contained
-syn match      pfVar           /\<$[a-zA-Z][a-zA-Z0-9_]*\>/
-syn match      pfVarAssign     /^\s*[a-zA-Z][a-zA-Z0-9_]*\s*=/me=e-1
-syn region     pfFold1         start=/^#\{1}>/ end=/^#\{1,3}>/me=s-1 
transparent fold
-syn region     pfFold2         start=/^#\{2}>/ end=/^#\{2,3}>/me=s-1 
transparent fold
-syn region     pfFold3         start=/^#\{3}>/ end=/^#\{3}>/me=s-1 transparent 
fold
-syn region     pfList          start=/{/ end=/}/ transparent 
contains=ALLBUT,pfErrClose,@pfNotLS
-syn region     pfString        start=/"/ end=/"/ transparent 
contains=ALLBUT,pfString,@pfNotLS
-syn region     pfString        start=/'/ end=/'/ transparent 
contains=ALLBUT,pfString,@pfNotLS
-
-" Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_c_syn_inits")
-  if version < 508
-    let did_c_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink pfCmd         Statement
-  HiLink pfComment     Comment
-  HiLink pfCont                Statement
-  HiLink pfErrClose    Error
-  HiLink pfIPv4                Type
-  HiLink pfIPv4Masked  Type
-  HiLink pfIPv6                Type
-  HiLink pfNetmask     Constant
-  HiLink pfNum         Constant
-  HiLink pfService     Constant
-  HiLink pfTable       Identifier
-  HiLink pfTodo                Todo
-  HiLink pfVar         Identifier
-  HiLink pfVarAssign   Identifier
-  HiLink pfWildAddr    Type
-
-  delcommand HiLink
-endif
-
-let b:current_syntax = "pf"
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/editors/vim/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-main
--- pkg/PLIST-main      7 Sep 2014 19:24:48 -0000       1.10
+++ pkg/PLIST-main      9 Apr 2015 13:46:07 -0000
@@ -1379,5 +1379,4 @@ share/vim/vimfiles/
 share/vim/vimfiles/doc/
 share/vim/vimfiles/syntax/
 share/vim/vimfiles/syntax/openbsd.vim
-share/vim/vimfiles/syntax/pf.vim
 !%%no_x11%%

Reply via email to