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.

1 files changed, 25 insertions, 42 deletions

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
  #