diff --git a/packages/gettext_tiny.rb b/packages/gettext_tiny.rb index 83ded445a..7566834cc 100644 --- a/packages/gettext_tiny.rb +++ b/packages/gettext_tiny.rb @@ -17,9 +17,7 @@ class Gettext_tiny < Package x86_64: '9435867e7adfa4f9906a89de80288cc59d014ee7dab19ef764ce18c2a7ad7fcd' }) - def self.preinstall - abort 'gettext already installed. gettext_tiny conflicts with gettext.'.lightred if File.exist? "#{CREW_PREFIX}/bin/msgcomm" - end + conflicts_with 'gettext' def self.build system 'make', 'LIBINTL=NONE' diff --git a/packages/gvim.rb b/packages/gvim.rb index 261e575cb..b57c4d280 100644 --- a/packages/gvim.rb +++ b/packages/gvim.rb @@ -38,10 +38,7 @@ class Gvim < Autotools ignore_updater - def self.preflight - vim = `which #{CREW_PREFIX}/bin/vim 2> /dev/null`.chomp - abort "vim version #{version} already installed.".lightgreen unless vim.to_s == '' - end + conflicts_with 'vim' def self.patch # set the system-wide vimrc path diff --git a/packages/vim.rb b/packages/vim.rb index 7d698c726..aa90660c3 100644 --- a/packages/vim.rb +++ b/packages/vim.rb @@ -27,10 +27,7 @@ class Vim < Autotools ignore_updater - def self.preflight - gvim = `which #{CREW_PREFIX}/bin/gvim 2> /dev/null`.chomp - abort "gvim version #{version} already installed.".lightgreen unless gvim.to_s == '' - end + conflicts_with 'gvim' def self.patch # set the system-wide vimrc path