diff options
| author | Dominyk Tiller | 2014-09-15 15:38:39 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2014-09-16 14:08:14 +0100 |
| commit | 1fed4927d2fdcee279d8d2c4abb98146b9ada3c7 (patch) | |
| tree | e40c306b659886e78fe49712db223893cbb65f70 | |
| parent | 466e83f7c5c919a91b5ec3bd3e47b1af585f1e86 (diff) | |
| download | homebrew-1fed4927d2fdcee279d8d2c4abb98146b9ada3c7.tar.bz2 | |
lua: upgrade to 5.2.
Merges Lua52 into the Master branch as the new ‘Lua’ whilst
transitioning the old Lua formula to ‘Lua51’, running the two
side-by-side in a non-conflicting way.
29 files changed, 352 insertions, 160 deletions
diff --git a/Library/Formula/cardpeek.rb b/Library/Formula/cardpeek.rb index a1035ce0a..fa1f51749 100644 --- a/Library/Formula/cardpeek.rb +++ b/Library/Formula/cardpeek.rb @@ -1,27 +1,21 @@ require 'formula' class Cardpeek < Formula - homepage 'https://cardpeek.googlecode.com' - url 'https://cardpeek.googlecode.com/files/cardpeek-0.7.2.tar.gz' - sha1 '9f774140bbfea2ebdd25f38146d7ebe3b1c0d871' + homepage "http://pannetrat.com/Cardpeek/" + url "http://downloads.pannetrat.com/get/302b8a00996e9f4180ad/cardpeek-0.8.3.tar.gz" + mirror "https://raw.githubusercontent.com/DomT4/LibreMirror/master/Cardpeek/cardpeek-0.8.3.tar.gz" + sha1 "8cc9c0652f0214ec06badb5b86974c66ca035a43" - head 'http://cardpeek.googlecode.com/svn/trunk/' + head "http://cardpeek.googlecode.com/svn/trunk/" - depends_on 'pkg-config' => :build + depends_on "pkg-config" => :build + depends_on "glib" depends_on :autoconf depends_on :automake depends_on :x11 - depends_on 'gtk+' - depends_on 'lua' - - def patches - # Required for 0.7.2, fixed in HEAD. See: - # https://code.google.com/p/cardpeek/issues/detail?id=24 - {:p0 => [ - "https://cardpeek.googlecode.com/issues/attachment?aid=240000000&name=cardpeek-svn-osx.diff&token=JGVrSd-7Wcyfo98Lny3Y4NVUBcU%3A1373645845242", - "https://cardpeek.googlecode.com/issues/attachment?aid=240001000&name=extra_patch.diff&token=mQZWOOGcuPxufd414OgwQjJ505I%3A1373645845242" - ]} unless build.head? - end + depends_on "openssl" + depends_on "gtk+3" + depends_on "lua" def install # always run autoreconf, neeeded to generate configure for --HEAD, diff --git a/Library/Formula/fceux.rb b/Library/Formula/fceux.rb index 25b468c4a..ee97b5147 100644 --- a/Library/Formula/fceux.rb +++ b/Library/Formula/fceux.rb @@ -4,6 +4,7 @@ class Fceux < Formula homepage 'http://fceux.com' url 'https://downloads.sourceforge.net/project/fceultra/Source%20Code/2.2.2%20src/fceux-2.2.2.src.tar.gz' sha1 'ec50d8eae04794ba10f441a26cdb410c1cf6832b' + revision 1 option 'no-gtk', "Build without Gtk+ support" @@ -12,11 +13,12 @@ class Fceux < Formula depends_on 'sdl' depends_on 'libzip' depends_on 'gtk+' unless build.include? "no-gtk" - depends_on 'lua' depends_on :x11 # Make scons honor PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR # Reported upstream: https://sourceforge.net/p/fceultra/bugs/625 + # Also temporarily kill Lua support pending further investigation as to build failures. + # It is listed as 'Optional' in the build docs, but will be reinstated asap. patch :DATA def install @@ -60,6 +62,19 @@ index 4d5b446..36be2c4 100644 env.ParseConfig(config_string) env.Append(CPPDEFINES=["_GTK3"]) env.Append(CCFLAGS = ["-D_GTK"]) +diff --git a/SConstruct b/SConstruct +index dc6698e..a23350a 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -18,7 +18,7 @@ opts.AddVariables( + BoolVariable('RELEASE', 'Set to 1 to build for release', 1), + BoolVariable('FRAMESKIP', 'Enable frameskipping', 1), + BoolVariable('OPENGL', 'Enable OpenGL support', 1), +- BoolVariable('LUA', 'Enable Lua support', 1), ++ BoolVariable('LUA', 'Enable Lua support', 0), + BoolVariable('GTK', 'Enable GTK2 GUI (SDL only)', 1), + BoolVariable('GTK3', 'Enable GTK3 GUI (SDL only)', 0), + BoolVariable('NEWPPU', 'Enable new PPU core', 1), diff --git a/src/drivers/sdl/SConscript b/src/drivers/sdl/SConscript index 7a53b07..23e11b9 100644 --- a/src/drivers/sdl/SConscript diff --git a/Library/Formula/gnuplot.rb b/Library/Formula/gnuplot.rb index 59b7153e5..5484f4f06 100644 --- a/Library/Formula/gnuplot.rb +++ b/Library/Formula/gnuplot.rb @@ -10,6 +10,7 @@ class Gnuplot < Formula homepage 'http://www.gnuplot.info' url 'https://downloads.sourceforge.net/project/gnuplot/gnuplot/4.6.5/gnuplot-4.6.5.tar.gz' sha256 'e550f030c7d04570e89c3d4e3f6e82296816508419c86ab46c4dd73156519a2d' + revision 1 bottle do revision 1 diff --git a/Library/Formula/highlight.rb b/Library/Formula/highlight.rb index 29fbe0d48..8ca4c0b55 100644 --- a/Library/Formula/highlight.rb +++ b/Library/Formula/highlight.rb @@ -4,17 +4,13 @@ class Highlight < Formula homepage 'http://www.andre-simon.de/doku/highlight/en/highlight.html' url 'http://www.andre-simon.de/zip/highlight-3.18.tar.bz2' sha1 '985d0a3c707e3251fe50ffff66e11a8563777202' + revision 1 depends_on 'pkg-config' => :build depends_on 'boost' depends_on 'lua' def install - inreplace "src/makefile" do |s| - s.change_make_var! "CXX", ENV.cxx - s.gsub! /-DUSE_LUA52/, "" - end - conf_dir = etc+'highlight/' # highlight needs a final / for conf_dir system "make", "PREFIX=#{prefix}", "conf_dir=#{conf_dir}" system "make", "PREFIX=#{prefix}", "conf_dir=#{conf_dir}", "install" diff --git a/Library/Formula/imapfilter.rb b/Library/Formula/imapfilter.rb index 29671a907..7d814a965 100644 --- a/Library/Formula/imapfilter.rb +++ b/Library/Formula/imapfilter.rb @@ -4,7 +4,7 @@ class Imapfilter < Formula homepage "https://github.com/lefcha/imapfilter/" url "https://github.com/lefcha/imapfilter/archive/v2.5.6.tar.gz" sha1 "49ac7b7fb937b40eb42a162314de4f8866e33c11" - revision 1 + revision 2 bottle do revision 1 diff --git a/Library/Formula/ipe.rb b/Library/Formula/ipe.rb index acf634cac..b4ea968a8 100644 --- a/Library/Formula/ipe.rb +++ b/Library/Formula/ipe.rb @@ -2,14 +2,17 @@ require 'formula' class Ipe < Formula homepage 'http://ipe7.sourceforge.net' - url 'https://downloads.sourceforge.net/project/ipe7/ipe/7.1/ipe-7.1.3-src.tar.gz' - sha1 '7999a85d902fbe3952664dea86c2c0a1aaed40d6' + url 'https://downloads.sourceforge.net/project/ipe7/ipe/7.1/ipe-7.1.5-src.tar.gz' + mirror 'https://raw.githubusercontent.com/DomT4/LibreMirror/master/Ipe/ipe-7.1.5-src.tar.gz' + sha1 'a30257e3026f936d550cf950f6dfcc980cf42bf4' depends_on 'pkg-config' => :build depends_on 'makeicns' => :build depends_on 'lua' depends_on 'qt' - depends_on :x11 + depends_on 'cairo' + depends_on 'jpeg-turbo' + depends_on 'freetype' # configure library paths using pkg-config # because ipe assumes that Qt and other libs are installed in @@ -43,38 +46,26 @@ class Ipe < Formula end __END__ ---- a/src/config.mak 2012-01-15 13:19:25.000000000 +0100 -+++ b/src/config.mak 2012-04-01 15:15:07.000000000 +0200 -@@ -39,6 +39,7 @@ - # directly. You don't have to worry about the UI libraries you - # haven't selected above. - # -+ - ZLIB_CFLAGS ?= - ZLIB_LIBS ?= -lz - FREETYPE_CFLAGS ?= $(shell pkg-config --cflags freetype2) -@@ -58,6 +59,7 @@ - GTK_LIBS ?= $(shell pkg-config --libs gtk+-2.0) - QT_CFLAGS ?= $(shell pkg-config --cflags QtGui QtCore) - QT_LIBS ?= $(shell pkg-config --libs QtGui QtCore) -+ - # - # MOC is the Qt meta-object compiler. On Debian/Ubuntu, it is - # installed as "moc-qt4" to resolve the name conflict with Qt3's -@@ -69,25 +71,49 @@ +--- a/src/config.mak 2014-05-07 03:28:31.000000000 -0400 ++++ b/src/config.mak 2014-05-14 10:09:51.000000000 -0400 +@@ -61,28 +61,45 @@ # else # -# Settings for Mac OS 10.6 -+# Settings for Mac OS 10.6 and 10.7 ++# Settings for Mac OS 10.9 +# +# Use pkg-config if available (typically installed by homebrew or macports) +# +HAVE_PKG_CONFIG=$(shell which pkg-config > /dev/null && echo 1) # CONFIG += x86_64 + DL_LIBS ?= -ldl ZLIB_CFLAGS ?= ZLIB_LIBS ?= -lz ++# The jpeg-turbo package doesn't seem to have a pkg-config file + JPEG_CFLAGS ?= + JPEG_LIBS ?= -lturbojpeg -FREETYPE_CFLAGS ?= -I/usr/X11/include/freetype2 -I/usr/X11/include -FREETYPE_LIBS ?= -L/usr/X11/lib -lfreetype -CAIRO_CFLAGS ?= -I/usr/X11/include/cairo -I/usr/X11/include/pixman-1 \ @@ -82,31 +73,24 @@ __END__ - -I/usr/X11/include/libpng12 -CAIRO_LIBS ?= -L/usr/X11/lib -lcairo -LUA_CFLAGS ?= -I/usr/local/include --LUA_LIBS ?= -L/usr/local/lib -llua5.1 -lm +-LUA_LIBS ?= -L/usr/local/lib -llua52 -lm -QT_CFLAGS ?= -I/Library/Frameworks/QtCore.framework/Versions/4/Headers \ - -I/Library/Frameworks/QtGui.framework/Versions/4/Headers -QT_LIBS ?= -F/Library/Frameworks -L/Library/Frameworks \ - -framework QtCore -framework ApplicationServices \ - -framework QtGui -framework AppKit -framework Cocoa -lz -lm -MOC ?= moc ++LUA_CFLAGS ?= ++LUA_LIBS ?= -llua -lm +ifeq "$(HAVE_PKG_CONFIG)" "1" + FREETYPE_CFLAGS ?= $(shell pkg-config --cflags freetype2) -+ FREETYPE_LIBS ?= $(shell pkg-config --libs freetype2) -+ CAIRO_CFLAGS ?= $(shell pkg-config --cflags cairo) -+ CAIRO_LIBS ?= $(shell pkg-config --libs cairo) -+ # The lua package might be called "lua" or "lua5.1" -+ luatest = $(shell pkg-config --modversion --silence-errors lua) -+ ifneq "$(luatest)" "" -+ LUA_CFLAGS ?= $(shell pkg-config --cflags lua) -+ LUA_LIBS ?= $(shell pkg-config --libs lua) -+ else -+ LUA_CFLAGS ?= $(shell pkg-config --cflags lua5.1) -+ LUA_LIBS ?= $(shell pkg-config --libs lua5.1) -+ endif -+ GTK_CFLAGS ?= $(shell pkg-config --cflags gtk+-2.0) -+ GTK_LIBS ?= $(shell pkg-config --libs gtk+-2.0) -+ QT_CFLAGS ?= $(shell pkg-config --cflags QtGui QtCore) -+ QT_LIBS ?= $(shell pkg-config --libs QtGui QtCore) ++ FREETYPE_LIBS ?= $(shell pkg-config --libs freetype2) ++ CAIRO_CFLAGS ?= $(shell pkg-config --cflags cairo) ++ CAIRO_LIBS ?= $(shell pkg-config --libs cairo) ++ GTK_CFLAGS ?= $(shell pkg-config --cflags gtk+-2.0) ++ GTK_LIBS ?= $(shell pkg-config --libs gtk+-2.0) ++ QT_CFLAGS ?= $(shell pkg-config --cflags QtGui QtCore) ++ QT_LIBS ?= $(shell pkg-config --libs QtGui QtCore) +else + FREETYPE_CFLAGS ?= -I/usr/X11/include/freetype2 -I/usr/X11/include + FREETYPE_LIBS ?= -L/usr/X11/lib -lfreetype @@ -114,14 +98,13 @@ __END__ + -I/usr/X11/include/freetype2 -I/usr/X11/include \ + -I/usr/X11/include/libpng12 + CAIRO_LIBS ?= -L/usr/X11/lib -lcairo -+ LUA_CFLAGS ?= -I/usr/local/include -+ LUA_LIBS ?= -L/usr/local/lib -llua5.1 -lm + QT_CFLAGS ?= -I/Library/Frameworks/QtCore.framework/Versions/4/Headers \ + -I/Library/Frameworks/QtGui.framework/Versions/4/Headers + QT_LIBS ?= -F/Library/Frameworks -L/Library/Frameworks \ + -framework QtCore -framework ApplicationServices \ + -framework QtGui -framework AppKit -framework Cocoa -lz -lm +endif ++ +MOC ?= moc endif # diff --git a/Library/Formula/kyoto-tycoon.rb b/Library/Formula/kyoto-tycoon.rb index abdc87419..321a911cc 100644 --- a/Library/Formula/kyoto-tycoon.rb +++ b/Library/Formula/kyoto-tycoon.rb @@ -4,6 +4,7 @@ class KyotoTycoon < Formula homepage "http://fallabs.com/kyototycoon/" url "http://fallabs.com/kyototycoon/pkg/kyototycoon-0.9.56.tar.gz" sha1 "e5433833e681f8755ff6b9f7209029ec23914ce6" + revision 1 depends_on "lua" => :recommended depends_on "kyoto-cabinet" diff --git a/Library/Formula/libquvi.rb b/Library/Formula/libquvi.rb index 5cea424c9..bdc2e70a4 100644 --- a/Library/Formula/libquvi.rb +++ b/Library/Formula/libquvi.rb @@ -4,6 +4,7 @@ class Libquvi < Formula homepage 'http://quvi.sourceforge.net/' url 'https://downloads.sourceforge.net/project/quvi/0.4/libquvi/libquvi-0.4.1.tar.bz2' sha1 'b7ac371185c35a1a9a2135ef4ee61c86c48f78f4' + revision 1 bottle do sha1 "0c7f04198c8ab41523ecf276654f1dc7d27ef4ed" => :mavericks diff --git a/Library/Formula/lighttpd.rb b/Library/Formula/lighttpd.rb index 63145f8a6..c4551a9e0 100644 --- a/Library/Formula/lighttpd.rb +++ b/Library/Formula/lighttpd.rb @@ -4,6 +4,7 @@ class Lighttpd < Formula homepage 'http://www.lighttpd.net/' url 'http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.35.tar.bz2' sha256 '4a71c1f6d8af41ed894b507720c4c17184dc320590013881d5170ca7f15c5bf7' + revision 1 bottle do sha1 "39d57cd89e0b885ce706b4a39fe14a25a33929e9" => :mavericks @@ -18,7 +19,7 @@ class Lighttpd < Formula depends_on 'automake' => :build depends_on 'libtool' => :build depends_on 'pcre' - depends_on 'lua' => :optional + depends_on 'lua51' => :optional depends_on 'libev' => :optional # default max. file descriptors; this option will be ignored if the server is not started as root diff --git a/Library/Formula/lsyncd.rb b/Library/Formula/lsyncd.rb index 530a06d6c..b6bd42a6d 100644 --- a/Library/Formula/lsyncd.rb +++ b/Library/Formula/lsyncd.rb @@ -4,6 +4,7 @@ class Lsyncd < Formula homepage "https://github.com/axkibe/lsyncd" url "https://github.com/axkibe/lsyncd/archive/release-2.1.5.tar.gz" sha1 "2b8eb169365edc54488a97435bbd39ae4a6731b8" + revision 1 depends_on "autoconf" => :build depends_on "automake" => :build diff --git a/Library/Formula/lua.rb b/Library/Formula/lua.rb index 6de54f804..16dec015b 100644 --- a/Library/Formula/lua.rb +++ b/Library/Formula/lua.rb @@ -1,18 +1,10 @@ require 'formula' class Lua < Formula - # 5.2 is not fully backwards compatible, and breaks e.g. luarocks. - # It is available in Homebrew-versions for the time being. homepage 'http://www.lua.org/' - url 'http://www.lua.org/ftp/lua-5.1.5.tar.gz' - sha1 'b3882111ad02ecc6b972f8c1241647905cb2e3fc' - - bottle do - cellar :any - sha1 "dcc3b430fd59fd3c16774ecc159d82256ac587db" => :mavericks - sha1 "4ddadaaeaca408964255de43761a7f12b7457bb5" => :mountain_lion - sha1 "212b1a9a5822afd9796fefb42bab63c6466e6faa" => :lion - end + url 'http://www.lua.org/ftp/lua-5.2.3.tar.gz' + sha1 '926b7907bc8d274e063d42804666b40a3f3c124c' + revision 1 fails_with :llvm do build 2326 @@ -20,122 +12,119 @@ class Lua < Formula end option :universal - option 'with-completion', 'Enables advanced readline support' - option 'without-sigaction', 'Revert to ANSI signal instead of improved POSIX sigaction' # Be sure to build a dylib, or else runtime modules will pull in another static copy of liblua = crashy # See: https://github.com/Homebrew/homebrew/pull/5043 patch :DATA - # sigaction provided by posix signalling power patch from - # http://lua-users.org/wiki/LuaPowerPatches - patch do - url "http://lua-users.org/files/wiki_insecure/power_patches/5.1/sig_catch.patch" - sha1 "19f361f0c590f80fccd033486cbee6c9dc8616c8" - end if build.with? "sigaction" - - # completion provided by advanced readline power patch from - # http://lua-users.org/wiki/LuaPowerPatches - patch do - url "http://luajit.org/patches/lua-5.1.4-advanced_readline.patch" - sha1 "3cfe2eb027b51202923d20042ae37f3249508664" - end if build.with? "completion" - def install - ENV.universal_binary if build.universal? - # Use our CC/CFLAGS to compile. inreplace 'src/Makefile' do |s| s.remove_make_var! 'CC' - s.change_make_var! 'CFLAGS', "#{ENV.cflags} $(MYCFLAGS)" + s.change_make_var! 'CFLAGS', "#{ENV.cflags} -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)" s.change_make_var! 'MYLDFLAGS', ENV.ldflags - s.sub! 'MYCFLAGS_VAL', "-fno-common -DLUA_USE_LINUX" end # Fix path in the config header inreplace 'src/luaconf.h', '/usr/local', HOMEBREW_PREFIX - # Fix paths in the .pc - inreplace 'etc/lua.pc' do |s| - s.gsub! "prefix= /usr/local", "prefix=#{HOMEBREW_PREFIX}" - s.gsub! "INSTALL_MAN= ${prefix}/man/man1", "INSTALL_MAN= ${prefix}/share/man/man1" - end - - # this ensures that this symlinking for lua starts at lib/lua/5.1 and not - # below that, thus making luarocks work - (HOMEBREW_PREFIX/"lib/lua"/version.to_s.split('.')[0..1].join('.')).mkpath - + # We ship our own pkg-config file as Lua no longer provide them upstream. system "make", "macosx", "INSTALL_TOP=#{prefix}", "INSTALL_MAN=#{man1}" system "make", "install", "INSTALL_TOP=#{prefix}", "INSTALL_MAN=#{man1}" - - (lib+"pkgconfig").install 'etc/lua.pc' + (lib+"pkgconfig/lua.pc").write pc_file + + # Fix some software potentially hunting for different pc names. + ln_s "#{bin}/lua", "#{bin}/lua5.2" + ln_s "#{bin}/lua", "#{bin}/lua-5.2" + ln_s "#{bin}/luac", "#{bin}/luac5.2" + ln_s "#{bin}/luac", "#{bin}/luac-5.2" + ln_s "#{include}", "#{include}/lua5.2" + ln_s "#{lib}/pkgconfig/lua.pc", "#{lib}/pkgconfig/lua5.2.pc" + ln_s "#{lib}/pkgconfig/lua.pc", "#{lib}/pkgconfig/lua-5.2.pc" end - test do - output = `#{bin}/lua -e "for i=0,9 do io.write(i) end"` - assert_equal "0123456789", output - assert_equal 0, $?.exitstatus + def pc_file; <<-EOS.undent + V= 5.2 + R= 5.2.3 + prefix=#{HOMEBREW_PREFIX} + INSTALL_BIN= ${prefix}/bin + INSTALL_INC= ${prefix}/include + INSTALL_LIB= ${prefix}/lib + INSTALL_MAN= ${prefix}/share/man/man1 + INSTALL_LMOD= ${prefix}/share/lua/${V} + INSTALL_CMOD= ${prefix}/lib/lua/${V} + exec_prefix=${prefix} + libdir=${exec_prefix}/lib + includedir=${prefix}/include + + Name: Lua + Description: An Extensible Extension Language + Version: 5.2.3 + Requires: + Libs: -L${libdir} -llua -lm + Cflags: -I${includedir} + EOS end end __END__ diff --git a/Makefile b/Makefile -index 209a132..9387b09 100644 +index bd9515f..5940ba9 100644 --- a/Makefile +++ b/Makefile -@@ -43,7 +43,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris +@@ -41,7 +41,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris # What to install. TO_BIN= lua luac - TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp + TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp -TO_LIB= liblua.a -+TO_LIB= liblua.5.1.5.dylib ++TO_LIB= liblua.5.2.3.dylib TO_MAN= lua.1 luac.1 # Lua version and release. -@@ -64,6 +64,8 @@ install: dummy - cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) - cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) - cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) -+ ln -s -f liblua.5.1.5.dylib $(INSTALL_LIB)/liblua.5.1.dylib -+ ln -s -f liblua.5.1.dylib $(INSTALL_LIB)/liblua.dylib - - ranlib: - cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB) +@@ -63,6 +63,8 @@ install: dummy + cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) + cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) + cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) ++ ln -s -f liblua.5.2.3.dylib $(INSTALL_LIB)/liblua.5.2.dylib ++ ln -s -f liblua.5.2.dylib $(INSTALL_LIB)/liblua.dylib + + uninstall: + cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN) diff --git a/src/Makefile b/src/Makefile -index e0d4c9f..4477d7b 100644 +index 8c9ee67..7f92407 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -22,7 +22,7 @@ MYLIBS= +@@ -28,7 +28,7 @@ MYOBJS= PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris -LUA_A= liblua.a -+LUA_A= liblua.5.1.5.dylib - CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ - lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ - lundump.o lvm.o lzio.o -@@ -48,11 +48,13 @@ o: $(ALL_O) ++LUA_A= liblua.5.2.3.dylib + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ + lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ + ltm.o lundump.o lvm.o lzio.o +@@ -56,11 +56,12 @@ o: $(ALL_O) a: $(ALL_A) - $(LUA_A): $(CORE_O) $(LIB_O) -- $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files + $(LUA_A): $(BASE_O) +- $(AR) $@ $(BASE_O) - $(RANLIB) $@ -+ $(CC) -dynamiclib -install_name HOMEBREW_PREFIX/lib/liblua.5.1.dylib \ -+ -compatibility_version 5.1 -current_version 5.1.5 \ -+ -o liblua.5.1.5.dylib $^ ++ $(CC) -dynamiclib -install_name HOMEBREW_PREFIX/lib/liblua.5.2.dylib \ ++ -compatibility_version 5.2 -current_version 5.2.3 \ ++ -o liblua.5.2.3.dylib $^ $(LUA_T): $(LUA_O) $(LUA_A) -- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) -+ $(CC) -fno-common $(MYLDFLAGS) \ -+ -o $@ $(LUA_O) $(LUA_A) -L. -llua.5.1.5 $(LIBS) +- $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) ++ $(CC) -fno-common $(MYLDFLAGS) -o $@ $(LUA_O) $(LUA_A) -L. -llua.5.2.3 $(LIBS) $(LUAC_T): $(LUAC_O) $(LUA_A) - $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) -@@ -99,7 +101,7 @@ linux: - $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" + $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) +@@ -106,7 +107,7 @@ linux: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline" macosx: -- $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline" -+ $(MAKE) all MYCFLAGS="MYCFLAGS_VAL" MYLIBS="-lreadline" - # use this on Mac OS X 10.3- - # $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX +- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" CC=cc ++ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX -fno-common" SYSLIBS="-lreadline" CC=cc + + mingw: + $(MAKE) "LUA_A=lua52.dll" "LUA_T=lua.exe" \ diff --git a/Library/Formula/lua51.rb b/Library/Formula/lua51.rb new file mode 100644 index 000000000..854a4d84b --- /dev/null +++ b/Library/Formula/lua51.rb @@ -0,0 +1,154 @@ +require 'formula' + +class Lua51 < Formula + # 5.2 is not fully backwards compatible so we must retain 2 Luas for now. + # The transition has begun. Lua will now become Lua51, and Lua52 will become Lua. + homepage 'http://www.lua.org/' + url 'http://www.lua.org/ftp/lua-5.1.5.tar.gz' + sha1 'b3882111ad02ecc6b972f8c1241647905cb2e3fc' + + bottle do + cellar :any + sha1 "dcc3b430fd59fd3c16774ecc159d82256ac587db" => :mavericks + sha1 "4ddadaaeaca408964255de43761a7f12b7457bb5" => :mountain_lion + sha1 "212b1a9a5822afd9796fefb42bab63c6466e6faa" => :lion + end + + fails_with :llvm do + build 2326 + cause "Lua itself compiles with LLVM, but may fail when other software tries to link." + end + + option :universal + option 'with-completion', 'Enables advanced readline support' + option 'without-sigaction', 'Revert to ANSI signal instead of improved POSIX sigaction' + + # Be sure to build a dylib, or else runtime modules will pull in another static copy of liblua = crashy + # See: https://github.com/Homebrew/homebrew/pull/5043 + patch :DATA + + # sigaction provided by posix signalling power patch from + # http://lua-users.org/wiki/LuaPowerPatches + patch do + url "http://lua-users.org/files/wiki_insecure/power_patches/5.1/sig_catch.patch" + sha1 "19f361f0c590f80fccd033486cbee6c9dc8616c8" + end if build.with? "sigaction" + + # completion provided by advanced readline power patch from + # http://lua-users.org/wiki/LuaPowerPatches + patch do + url "http://luajit.org/patches/lua-5.1.4-advanced_readline.patch" + sha1 "3cfe2eb027b51202923d20042ae37f3249508664" + end if build.with? "completion" + + def install + ENV.universal_binary if build.universal? + + # Use our CC/CFLAGS to compile. + inreplace 'src/Makefile' do |s| + s.remove_make_var! 'CC' + s.change_make_var! 'CFLAGS', "#{ENV.cflags} $(MYCFLAGS)" + s.change_make_var! 'MYLDFLAGS', ENV.ldflags + s.sub! 'MYCFLAGS_VAL', "-fno-common -DLUA_USE_LINUX" + end + + # Fix path in the config header + inreplace 'src/luaconf.h', '/usr/local', HOMEBREW_PREFIX + + # Fix paths in the .pc + inreplace 'etc/lua.pc' do |s| + s.gsub! "prefix= /usr/local", "prefix=#{HOMEBREW_PREFIX}" + s.gsub! "INSTALL_MAN= ${prefix}/man/man1", "INSTALL_MAN= ${prefix}/share/man/man1" + s.gsub! "INSTALL_INC= ${prefix}/include", "INSTALL_INC= ${prefix}/include/lua-5.1" + s.gsub! "includedir=${prefix}/include", "includedir=${prefix}/include/lua-5.1" + s.gsub! "Libs: -L${libdir} -llua -lm", "Libs: -L${libdir} -llua5.1 -lm" + end + + system "make", "macosx", "INSTALL_TOP=#{prefix}", "INSTALL_MAN=#{man1}", "INSTALL_INC=#{include}/lua-5.1" + system "make", "install", "INSTALL_TOP=#{prefix}", "INSTALL_MAN=#{man1}", "INSTALL_INC=#{include}/lua-5.1" + + (lib+"pkgconfig").install 'etc/lua.pc' + + # Renaming from Lua to Lua51. + # Note that the naming must be both lua-version & lua.version. + # Software can't find the libraries without supporting both the hyphen or full stop. + + mv "#{bin}/lua", "#{bin}/lua-5.1" + mv "#{bin}/luac", "#{bin}/luac-5.1" + mv "#{man1}/lua.1", "#{man1}/lua-5.1.1" + mv "#{man1}/luac.1", "#{man1}/luac-5.1.1" + mv "#{lib}/pkgconfig/lua.pc", "#{lib}/pkgconfig/lua5.1.pc" + ln_s "#{lib}/pkgconfig/lua5.1.pc", "#{lib}/pkgconfig/lua-5.1.pc" + ln_s "#{include}/lua-5.1", "#{include}/lua5.1" + ln_s "#{bin}/lua-5.1", "#{bin}/lua5.1" + ln_s "#{bin}/luac-5.1", "#{bin}/luac5.1" + end + + test do + output = `#{bin}/lua-5.1 -e "for i=0,9 do io.write(i) end"` + assert_equal "0123456789", output + assert_equal 0, $?.exitstatus + end +end + +__END__ +diff --git a/Makefile b/Makefile +index 209a132..9387b09 100644 +--- a/Makefile ++++ b/Makefile +@@ -43,7 +43,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + # What to install. + TO_BIN= lua luac + TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp +-TO_LIB= liblua.a ++TO_LIB= liblua.5.1.5.dylib + TO_MAN= lua.1 luac.1 + + # Lua version and release. +@@ -64,6 +64,8 @@ install: dummy + cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) + cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) + cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) ++ ln -s -f liblua.5.1.5.dylib $(INSTALL_LIB)/liblua.5.1.dylib ++ ln -s -f liblua.5.1.dylib $(INSTALL_LIB)/liblua5.1.dylib + + ranlib: + cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB) +diff --git a/src/Makefile b/src/Makefile +index e0d4c9f..4477d7b 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -22,7 +22,7 @@ MYLIBS= + + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + +-LUA_A= liblua.a ++LUA_A= liblua.5.1.5.dylib + CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ + lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ + lundump.o lvm.o lzio.o +@@ -48,11 +48,13 @@ o: $(ALL_O) + a: $(ALL_A) + + $(LUA_A): $(CORE_O) $(LIB_O) +- $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files +- $(RANLIB) $@ ++ $(CC) -dynamiclib -install_name HOMEBREW_PREFIX/lib/liblua.5.1.dylib \ ++ -compatibility_version 5.1 -current_version 5.1.5 \ ++ -o liblua.5.1.5.dylib $^ + + $(LUA_T): $(LUA_O) $(LUA_A) +- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) ++ $(CC) -fno-common $(MYLDFLAGS) \ ++ -o $@ $(LUA_O) $(LUA_A) -L. -llua.5.1.5 $(LIBS) + + $(LUAC_T): $(LUAC_O) $(LUA_A) + $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) +@@ -99,7 +101,7 @@ linux: + $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" + + macosx: +- $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline" ++ $(MAKE) all MYCFLAGS="MYCFLAGS_VAL" MYLIBS="-lreadline" + # use this on Mac OS X 10.3- + # $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX diff --git a/Library/Formula/luabind.rb b/Library/Formula/luabind.rb index 8077cf8b4..d7b959b8c 100644 --- a/Library/Formula/luabind.rb +++ b/Library/Formula/luabind.rb @@ -4,8 +4,9 @@ class Luabind < Formula homepage 'http://www.rasterbar.com/products/luabind.html' url 'https://downloads.sourceforge.net/project/luabind/luabind/0.9.1/luabind-0.9.1.tar.gz' sha1 '2e92a18b8156d2e2948951d429cd3482e7347550' + revision 1 - depends_on 'lua' + depends_on 'lua51' depends_on 'boost' depends_on 'boost-build' => :build @@ -29,7 +30,7 @@ class Luabind < Formula end if MacOS.version >= :mavericks def install - ENV["LUA_PATH"] = Formula["lua"].opt_prefix + ENV["LUA_PATH"] = Formula["lua51"].opt_prefix args = [ "release", "install", diff --git a/Library/Formula/luajit.rb b/Library/Formula/luajit.rb index ac44b3654..8d67d1616 100644 --- a/Library/Formula/luajit.rb +++ b/Library/Formula/luajit.rb @@ -5,6 +5,7 @@ class Luajit < Formula url 'http://luajit.org/download/LuaJIT-2.0.3.tar.gz' sha1 '2db39e7d1264918c2266b0436c313fbd12da4ceb' head 'http://luajit.org/git/luajit-2.0.git' + revision 1 skip_clean 'lib/lua/5.1', 'share/lua/5.1' @@ -28,6 +29,9 @@ class Luajit < Formula system 'make', 'amalg', *args system 'make', 'install', *args + # Having an empty Lua dir in Lib can screw with the new Lua setup. + rm_rf prefix/'lib/lua' + rm_rf prefix/'share/lua' end test do diff --git a/Library/Formula/luarocks.rb b/Library/Formula/luarocks.rb index 2d581eeaf..8ac77a7d3 100644 --- a/Library/Formula/luarocks.rb +++ b/Library/Formula/luarocks.rb @@ -2,6 +2,7 @@ require 'formula' class Luarocks < Formula homepage 'http://luarocks.org' + revision 1 stable do url 'http://luarocks.org/releases/luarocks-2.1.2.tar.gz' @@ -18,15 +19,15 @@ class Luarocks < Formula head 'https://github.com/keplerproject/luarocks.git' option 'with-luajit', 'Use LuaJIT instead of the stock Lua' - option 'with-lua52', 'Use Lua 5.2 instead of the stock Lua' + option 'with-lua51', 'Use Lua 5.1 instead of the stock Lua' if build.with? "luajit" depends_on 'luajit' # luajit depends internally on lua being installed # and is only 5.1 compatible, see #25954 - depends_on 'lua' - elsif build.with? "lua52" - depends_on 'lua52' + depends_on 'lua51' + elsif build.with? "lua51" + depends_on 'lua51' else depends_on 'lua' end diff --git a/Library/Formula/macvim.rb b/Library/Formula/macvim.rb index 126aeee23..3ef0178e5 100644 --- a/Library/Formula/macvim.rb +++ b/Library/Formula/macvim.rb @@ -6,6 +6,7 @@ class Macvim < Formula url 'https://github.com/b4winckler/macvim/archive/snapshot-73.tar.gz' version '7.4-73' sha1 'b87e37fecb305a99bc268becca39f8854e3ff9f0' + revision 1 head 'https://github.com/b4winckler/macvim.git', :branch => 'master' diff --git a/Library/Formula/metalua.rb b/Library/Formula/metalua.rb index 3c91ed5f9..0d5e52872 100644 --- a/Library/Formula/metalua.rb +++ b/Library/Formula/metalua.rb @@ -5,10 +5,11 @@ class Metalua < Formula url 'https://github.com/fab13n/metalua/archive/0.5-rc2.tar.gz' version '0.5-rc2' sha1 'ee28c801e9673cc11d1cecd0a9fda87e7d21fd6d' + revision 1 head 'https://github.com/fab13n/metalua.git' - depends_on 'lua' + depends_on 'lua51' def install cd "src" do diff --git a/Library/Formula/monotone.rb b/Library/Formula/monotone.rb index 733037171..3bb8c30a5 100644 --- a/Library/Formula/monotone.rb +++ b/Library/Formula/monotone.rb @@ -4,6 +4,7 @@ class Monotone < Formula homepage "http://monotone.ca/" url "http://www.monotone.ca/downloads/1.1/monotone-1.1.tar.bz2" sha1 "2b97559b252decaee3a374b81bf714cf33441ba3" + revision 1 bottle do revision 1 diff --git a/Library/Formula/mysql-proxy.rb b/Library/Formula/mysql-proxy.rb index 635aa1eb3..e75947057 100644 --- a/Library/Formula/mysql-proxy.rb +++ b/Library/Formula/mysql-proxy.rb @@ -2,14 +2,15 @@ require "formula" class MysqlProxy < Formula homepage "http://dev.mysql.com/doc/refman/5.6/en/mysql-proxy.html" - url "http://cdn.mysql.com/Downloads/MySQL-Proxy/mysql-proxy-0.8.4.tar.gz" - sha1 "626cea599306f6cfb3a632a024ed034df08cf1b9" + url "https://cdn.mysql.com/Downloads/MySQL-Proxy/mysql-proxy-0.8.5.tar.gz" + sha1 "e8599ef16bc7d16daffa654368e02ba73182bfbc" depends_on :mysql depends_on "pkg-config" => :build depends_on "glib" + depends_on "flex" depends_on "libevent" - depends_on "lua" + depends_on "lua51" def install system "./configure", "--disable-dependency-tracking", diff --git a/Library/Formula/pdns.rb b/Library/Formula/pdns.rb index c2ee00681..11b5837dc 100644 --- a/Library/Formula/pdns.rb +++ b/Library/Formula/pdns.rb @@ -5,6 +5,7 @@ class Pdns < Formula head 'https://github.com/powerdns/pdns.git' url 'http://downloads.powerdns.com/releases/pdns-3.3.1.tar.gz' sha1 '555862bf9635d1dcab2c4f3b7569bdd8212ef67f' + revision 1 option 'pgsql', 'Enable the PostgreSQL backend' diff --git a/Library/Formula/pdnsrec.rb b/Library/Formula/pdnsrec.rb index 9ead6be8f..b65e5a5f9 100644 --- a/Library/Formula/pdnsrec.rb +++ b/Library/Formula/pdnsrec.rb @@ -4,6 +4,7 @@ class Pdnsrec < Formula homepage "http://wiki.powerdns.com" url "http://downloads.powerdns.com/releases/pdns-recursor-3.6.1.tar.bz2" sha1 "b77befa0a20d9822523dec44c2559ffda4ea689d" + revision 1 bottle do cellar :any diff --git a/Library/Formula/radare2.rb b/Library/Formula/radare2.rb index 34f1169c8..a04e57b02 100644 --- a/Library/Formula/radare2.rb +++ b/Library/Formula/radare2.rb @@ -4,6 +4,7 @@ class Radare2 < Formula homepage 'http://radare.org' url 'http://radare.org/get/radare2-0.9.7.tar.xz' sha1 '34af6c6ba53ac08c852b4e110ac6908054616b9d' + revision 1 head 'http://radare.org/hg/radare2', :using => :hg diff --git a/Library/Formula/rrdtool.rb b/Library/Formula/rrdtool.rb index fd38977d3..be317db25 100644 --- a/Library/Formula/rrdtool.rb +++ b/Library/Formula/rrdtool.rb @@ -4,6 +4,7 @@ class Rrdtool < Formula homepage 'http://oss.oetiker.ch/rrdtool/index.en.html' url 'http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.8.tar.gz' sha1 '56d68857f39e70bfa32360947614d8220702ed02' + revision 1 depends_on 'pkg-config' => :build depends_on 'glib' diff --git a/Library/Formula/tokyo-tyrant.rb b/Library/Formula/tokyo-tyrant.rb index 9afc9e46d..7816a0ede 100644 --- a/Library/Formula/tokyo-tyrant.rb +++ b/Library/Formula/tokyo-tyrant.rb @@ -4,11 +4,16 @@ class TokyoTyrant < Formula homepage 'http://fallabs.com/tokyotyrant/' url 'http://fallabs.com/tokyotyrant/tokyotyrant-1.1.41.tar.gz' sha1 '060ac946a9ac902c1d244ffafd444f0e5840c0ce' + revision 1 option "no-lua", "Disable Lua support" depends_on 'tokyo-cabinet' - depends_on 'lua' unless build.include? "no-lua" + depends_on 'lua51' unless build.include? "no-lua" + + unless build.include? "no-lua" + patch :DATA + end def install args = ["--prefix=#{prefix}"] @@ -19,3 +24,35 @@ class TokyoTyrant < Formula system "make install" end end + +__END__ +diff --git a/configure b/configure +index cd249dc..6e12141 100755 +--- a/configure ++++ b/configure +@@ -2153,17 +2153,16 @@ fi + if test "$enable_lua" = "yes" + then + enables="$enables (lua)" +- luaver=`lua -e 'v = string.gsub(_VERSION, ".* ", ""); print(v)'` +- MYCPPFLAGS="$MYCPPFLAGS -I/usr/include/lua$luaver -I/usr/local/include/lua$luaver" +- MYCPPFLAGS="$MYCPPFLAGS -I/usr/include/lua -I/usr/local/include/lua -D_MYLUA" +- MYLDFLAGS="$MYLDFLAGS -L/usr/include/lua$luaver -L/usr/local/include/lua$luaver" +- MYLDFLAGS="$MYLDFLAGS -L/usr/include/lua -L/usr/local/include/lua" +- CPATH="$CPATH:/usr/include/lua$luaver:/usr/local/include/lua$luaver" +- CPATH="$CPATH:/usr/include/lua:/usr/local/include/lua" +- LIBRARY_PATH="$LIBRARY_PATH:/usr/lib/lua$luaver:/usr/local/lib/lua$luaver" +- LIBRARY_PATH="$LIBRARY_PATH:/usr/lib/lua:/usr/local/lib/lua" +- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/include/lua$luaver:/usr/local/include/lua$luaver" +- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/include/lua:/usr/local/include/lua" ++ MYCPPFLAGS="$MYCPPFLAGS -I/usr/include/lua -I/usr/local/include/lua5.1" ++ MYCPPFLAGS="$MYCPPFLAGS -I/usr/include/lua -I/usr/local/include/lua5.1" ++ MYLDFLAGS="$MYLDFLAGS -L/usr/include/lua -L/usr/local/include/lua5.1" ++ MYLDFLAGS="$MYLDFLAGS -L/usr/include/lua -L/usr/local/include/lua5.1" ++ CPATH="$CPATH:/usr/include/lua:/usr/local/include/lua5.1" ++ CPATH="$CPATH:/usr/include/lua:/usr/local/include/lua5.1" ++ LIBRARY_PATH="$LIBRARY_PATH:/usr/lib/lua:/usr/local/lib/lua5.1" ++ LIBRARY_PATH="$LIBRARY_PATH:/usr/lib/lua:/usr/local/lib/lua5.1" ++ LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/include/lua:/usr/local/include/lua5.1" ++ LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/include/lua:/usr/local/include/lua5.1" + fi diff --git a/Library/Formula/tracebox.rb b/Library/Formula/tracebox.rb index 981f5c87d..3beba7ffb 100644 --- a/Library/Formula/tracebox.rb +++ b/Library/Formula/tracebox.rb @@ -4,6 +4,7 @@ class Tracebox < Formula homepage 'http://www.tracebox.org/' head 'https://github.com/tracebox/tracebox.git' url 'https://github.com/tracebox/tracebox.git', :tag => 'v0.2' + revision 1 bottle do cellar :any diff --git a/Library/Formula/uwsgi.rb b/Library/Formula/uwsgi.rb index 717120ebc..1eb86caa1 100644 --- a/Library/Formula/uwsgi.rb +++ b/Library/Formula/uwsgi.rb @@ -4,6 +4,7 @@ class Uwsgi < Formula homepage "http://projects.unbit.it/uwsgi/" url "http://projects.unbit.it/downloads/uwsgi-2.0.6.tar.gz" sha1 "5e0fc187ea10366153a1f800c0e7e80940188837" + revision 1 bottle do revision 1 @@ -24,7 +25,7 @@ class Uwsgi < Formula depends_on "libffi" => :optional depends_on "libxslt" => :optional depends_on "libyaml" => :optional - depends_on "lua" => :optional + depends_on "lua51" => :optional depends_on "mongodb" => :optional depends_on "mongrel2" => :optional depends_on "nagios" => :optional diff --git a/Library/Formula/vim.rb b/Library/Formula/vim.rb index 319ed3286..a9a05e1f6 100644 --- a/Library/Formula/vim.rb +++ b/Library/Formula/vim.rb @@ -6,6 +6,7 @@ class Vim < Formula # This package tracks debian-unstable: http://packages.debian.org/unstable/vim url 'http://ftp.debian.org/debian/pool/main/v/vim/vim_7.4.430.orig.tar.gz' sha1 '63f558c3cf7461d16f1c587000ad2311500e6372' + revision 1 # We only have special support for finding depends_on :python, but not yet for # :ruby, :perl etc., so we use the standard environment that leaves the diff --git a/Library/Formula/weechat.rb b/Library/Formula/weechat.rb index 9457b544e..04f387f8e 100644 --- a/Library/Formula/weechat.rb +++ b/Library/Formula/weechat.rb @@ -4,6 +4,7 @@ class Weechat < Formula homepage 'http://www.weechat.org' url 'http://weechat.org/files/src/weechat-1.0.tar.bz2' sha1 'd3070ffde05cb706d615144e71f933153871894d' + revision 1 head 'https://github.com/weechat/weechat.git' diff --git a/Library/Formula/wireshark.rb b/Library/Formula/wireshark.rb index 15b431515..da4f86d93 100644 --- a/Library/Formula/wireshark.rb +++ b/Library/Formula/wireshark.rb @@ -2,6 +2,7 @@ require "formula" class Wireshark < Formula homepage "http://www.wireshark.org" + revision 1 stable do url "http://wiresharkdownloads.riverbed.com/wireshark/src/all-versions/wireshark-1.12.0.tar.bz2" |