vimpc: use new dsl

Formula/vimpc.rb

@@ -3,11 +3,11 @@ require 'formula'
 class Vimpc < Formula
   homepage 'http://sourceforge.net/projects/vimpc/'
   url 'http://downloads.sourceforge.net/project/vimpc/Release%200.05/vimpc-0.05.tar.gz'
-  md5 'f96cdc10827ddfbb53318e9ab4bab93b'
+  sha1 '7853b901eb3ef3748204e52ac6de973c43fa6ea3'
 
   head 'https://github.com/richo/vimpc.git'
 
-  if ARGV.build_head?
+  if build.head?
     depends_on :automake
     depends_on :libtool
   end
@@ -17,7 +17,7 @@ class Vimpc < Formula
   depends_on 'libmpdclient'
 
   def install
-    if ARGV.build_head?
+    if build.head?
       ENV['ACLOCAL_FLAGS'] = "-I #{HOMEBREW_PREFIX}/share/aclocal"
       system "./autogen.sh"
     end

Formula/vpnc.rb

@@ -1,8 +1,8 @@
 require 'formula'
 
 class Vpnc < Formula
-  url 'http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.5.3.tar.gz'
   homepage 'http://www.unix-ag.uni-kl.de/~massar/vpnc/'
+  url 'http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.5.3.tar.gz'
   sha256 '46cea3bd02f207c62c7c6f2f22133382602baeda1dc320747809e94881414884'
 
   depends_on 'libgcrypt'
@@ -12,9 +12,7 @@ class Vpnc < Formula
     build 2334
   end
 
-  def options
-    [["--hybrid", "Use vpnc hybrid authentication."]]
-  end
+  option "hybrid", "Use vpnc hybrid authentication"
 
   # Patch from user @Imagesafari to enable compilation on Lion
   def patches
@@ -37,7 +35,7 @@ class Vpnc < Formula
       s.change_make_var! "PREFIX", prefix
       s.change_make_var! "ETCDIR", (etc + 'vpnc')
 
-      s.gsub! /^#OPENSSL/, "OPENSSL" if ARGV.include? "--hybrid"
+      s.gsub! /^#OPENSSL/, "OPENSSL" if build.include? "hybrid"
     end
 
     inreplace "config.c" do |s|