- Use lua on arch unsupported by luajit

- Bump PORTREVISION

2 files changed, 95 insertions, 87 deletions

diff --git a/devel/efl/Makefile b/devel/efl/Makefile
index 528a374ebb6b..8c53007cbdd3 100644
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	efl
 PORTVERSION=	1.12.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PORTNAME}/
 
@@ -20,7 +20,6 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libluajit-5.1.so:${PORTSDIR}/lang/luajit \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile
 
 DIST_SUBDIR=	enlightenment
@@ -136,6 +135,15 @@ CONFIGURE_ARGS+=		--disable-ibus --with-glib=no
 CONFIGURE_ARGS+=		--with-opengl=none
 .endif
 
+.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
+USES+=				lua
+CONFIGURE_ARGS+=		--enable-lua-old
+PLIST_SUB+=			ELUA="@comment "
+.else
+LIB_DEPENDS+=			libluajit-5.1.so:${PORTSDIR}/lang/luajit
+PLIST_SUB+=			ELUA=""
+.endif
+
 pre-patch:
 	@${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
diff --git a/devel/efl/pkg-plist b/devel/efl/pkg-plist
index a40a0a356d90..9007e9ed5f61 100644
--- a/devel/efl/pkg-plist
+++ b/devel/efl/pkg-plist
@@ -12,7 +12,7 @@ bin/eet
 bin/efreetd
 bin/eina-bench-cmp
 bin/eldbus-codegen
-bin/elua
+%%ELUA%%bin/elua
 bin/embryo_cc
 bin/eolian_cxx
 bin/eolian_gen
@@ -620,90 +620,90 @@ share/ecore_x/checkme
 share/edje/include/edje.inc
 share/eeze/checkme
 share/efreet/checkme
-share/elua/apps/lualian.lua
-share/elua/apps/xgettext.lua
-share/elua/core/gettext.lua
-share/elua/core/module.lua
-share/elua/core/util.lua
-share/elua/modules/benchmark.lua
-share/elua/modules/ecore/ecore_animator.eo.lua
-share/elua/modules/ecore/ecore_exe.eo.lua
-share/elua/modules/ecore/ecore_idle_enterer.eo.lua
-share/elua/modules/ecore/ecore_idle_exiter.eo.lua
-share/elua/modules/ecore/ecore_idler.eo.lua
-share/elua/modules/ecore/ecore_job.eo.lua
-share/elua/modules/ecore/ecore_mainloop.eo.lua
-share/elua/modules/ecore/ecore_parent.eo.lua
-share/elua/modules/ecore/ecore_poller.eo.lua
-share/elua/modules/ecore/ecore_timer.eo.lua
-%%AUDIO%%share/elua/modules/ecore_audio/ecore_audio.eo.lua
-%%AUDIO%%share/elua/modules/ecore_audio/ecore_audio_in.eo.lua
-%%AUDIO%%share/elua/modules/ecore_audio/ecore_audio_in_sndfile.eo.lua
-%%AUDIO%%share/elua/modules/ecore_audio/ecore_audio_in_tone.eo.lua
-%%AUDIO%%share/elua/modules/ecore_audio/ecore_audio_out.eo.lua
-%%PULSEAUDIO%%share/elua/modules/ecore_audio/ecore_audio_out_pulse.eo.lua
-%%AUDIO%%share/elua/modules/ecore_audio/ecore_audio_out_sndfile.eo.lua
-share/elua/modules/ecore_con/ecore_con_base.eo.lua
-share/elua/modules/ecore_con/ecore_con_client.eo.lua
-share/elua/modules/ecore_con/ecore_con_connector.eo.lua
-share/elua/modules/ecore_con/ecore_con_server.eo.lua
-share/elua/modules/ecore_con/ecore_con_url.eo.lua
-share/elua/modules/edje/edje_edit.eo.lua
-share/elua/modules/edje/edje_object.eo.lua
-share/elua/modules/efl/efl_control.eo.lua
-share/elua/modules/efl/efl_file.eo.lua
-share/elua/modules/efl/efl_image.eo.lua
-share/elua/modules/efl/efl_player.eo.lua
-share/elua/modules/efl/efl_text.eo.lua
-share/elua/modules/efl/efl_text_properties.eo.lua
-share/elua/modules/eina/accessor.lua
-share/elua/modules/eina/counter.lua
-share/elua/modules/eina/file.lua
-share/elua/modules/eina/hamster.lua
-share/elua/modules/eina/iterator.lua
-share/elua/modules/eina/list.lua
-share/elua/modules/eina/log.lua
-share/elua/modules/eina/rectangle.lua
-share/elua/modules/eina/tiler.lua
-share/elua/modules/eina/xattr.lua
-share/elua/modules/emotion/emotion_object.eo.lua
-share/elua/modules/eo.lua
-share/elua/modules/eolian.lua
-share/elua/modules/evas/evas_3d_camera.eo.lua
-share/elua/modules/evas/evas_3d_light.eo.lua
-share/elua/modules/evas/evas_3d_material.eo.lua
-share/elua/modules/evas/evas_3d_mesh.eo.lua
-share/elua/modules/evas/evas_3d_node.eo.lua
-share/elua/modules/evas/evas_3d_object.eo.lua
-share/elua/modules/evas/evas_3d_scene.eo.lua
-share/elua/modules/evas/evas_3d_texture.eo.lua
-share/elua/modules/evas/evas_box.eo.lua
-share/elua/modules/evas/evas_canvas.eo.lua
-share/elua/modules/evas/evas_clickable_interface.eo.lua
-share/elua/modules/evas/evas_common_interface.eo.lua
-share/elua/modules/evas/evas_draggable_interface.eo.lua
-share/elua/modules/evas/evas_grid.eo.lua
-share/elua/modules/evas/evas_image.eo.lua
-share/elua/modules/evas/evas_line.eo.lua
-share/elua/modules/evas/evas_object.eo.lua
-share/elua/modules/evas/evas_object_smart.eo.lua
-share/elua/modules/evas/evas_out.eo.lua
-share/elua/modules/evas/evas_polygon.eo.lua
-share/elua/modules/evas/evas_rectangle.eo.lua
-share/elua/modules/evas/evas_scrollable_interface.eo.lua
-share/elua/modules/evas/evas_selectable_interface.eo.lua
-share/elua/modules/evas/evas_signal_interface.eo.lua
-share/elua/modules/evas/evas_smart_clipped.eo.lua
-share/elua/modules/evas/evas_table.eo.lua
-share/elua/modules/evas/evas_text.eo.lua
-share/elua/modules/evas/evas_textblock.eo.lua
-share/elua/modules/evas/evas_textgrid.eo.lua
-share/elua/modules/evas/evas_zoomable_interface.eo.lua
-share/elua/modules/getopt.lua
-share/elua/modules/lualian.lua
-share/elua/modules/xgettext/generator.lua
-share/elua/modules/xgettext/lexer.lua
-share/elua/modules/xgettext/parser.lua
+%%ELUA%%share/elua/apps/lualian.lua
+%%ELUA%%share/elua/apps/xgettext.lua
+%%ELUA%%share/elua/core/gettext.lua
+%%ELUA%%share/elua/core/module.lua
+%%ELUA%%share/elua/core/util.lua
+%%ELUA%%share/elua/modules/benchmark.lua
+%%ELUA%%share/elua/modules/ecore/ecore_animator.eo.lua
+%%ELUA%%share/elua/modules/ecore/ecore_exe.eo.lua
+%%ELUA%%share/elua/modules/ecore/ecore_idle_enterer.eo.lua
+%%ELUA%%share/elua/modules/ecore/ecore_idle_exiter.eo.lua
+%%ELUA%%share/elua/modules/ecore/ecore_idler.eo.lua
+%%ELUA%%share/elua/modules/ecore/ecore_job.eo.lua
+%%ELUA%%share/elua/modules/ecore/ecore_mainloop.eo.lua
+%%ELUA%%share/elua/modules/ecore/ecore_parent.eo.lua
+%%ELUA%%share/elua/modules/ecore/ecore_poller.eo.lua
+%%ELUA%%share/elua/modules/ecore/ecore_timer.eo.lua
+%%ELUA%%%%AUDIO%%share/elua/modules/ecore_audio/ecore_audio.eo.lua
+%%ELUA%%%%AUDIO%%share/elua/modules/ecore_audio/ecore_audio_in.eo.lua
+%%ELUA%%%%AUDIO%%share/elua/modules/ecore_audio/ecore_audio_in_sndfile.eo.lua
+%%ELUA%%%%AUDIO%%share/elua/modules/ecore_audio/ecore_audio_in_tone.eo.lua
+%%ELUA%%%%AUDIO%%share/elua/modules/ecore_audio/ecore_audio_out.eo.lua
+%%ELUA%%%%PULSEAUDIO%%share/elua/modules/ecore_audio/ecore_audio_out_pulse.eo.lua
+%%ELUA%%%%AUDIO%%share/elua/modules/ecore_audio/ecore_audio_out_sndfile.eo.lua
+%%ELUA%%share/elua/modules/ecore_con/ecore_con_base.eo.lua
+%%ELUA%%share/elua/modules/ecore_con/ecore_con_client.eo.lua
+%%ELUA%%share/elua/modules/ecore_con/ecore_con_connector.eo.lua
+%%ELUA%%share/elua/modules/ecore_con/ecore_con_server.eo.lua
+%%ELUA%%share/elua/modules/ecore_con/ecore_con_url.eo.lua
+%%ELUA%%share/elua/modules/edje/edje_edit.eo.lua
+%%ELUA%%share/elua/modules/edje/edje_object.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_control.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_file.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_image.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_player.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_text.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_text_properties.eo.lua
+%%ELUA%%share/elua/modules/eina/accessor.lua
+%%ELUA%%share/elua/modules/eina/counter.lua
+%%ELUA%%share/elua/modules/eina/file.lua
+%%ELUA%%share/elua/modules/eina/hamster.lua
+%%ELUA%%share/elua/modules/eina/iterator.lua
+%%ELUA%%share/elua/modules/eina/list.lua
+%%ELUA%%share/elua/modules/eina/log.lua
+%%ELUA%%share/elua/modules/eina/rectangle.lua
+%%ELUA%%share/elua/modules/eina/tiler.lua
+%%ELUA%%share/elua/modules/eina/xattr.lua
+%%ELUA%%share/elua/modules/emotion/emotion_object.eo.lua
+%%ELUA%%share/elua/modules/eo.lua
+%%ELUA%%share/elua/modules/eolian.lua
+%%ELUA%%share/elua/modules/evas/evas_3d_camera.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_3d_light.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_3d_material.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_3d_mesh.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_3d_node.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_3d_object.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_3d_scene.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_3d_texture.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_box.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_canvas.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_clickable_interface.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_common_interface.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_draggable_interface.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_grid.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_image.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_line.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_object.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_object_smart.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_out.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_polygon.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_rectangle.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_scrollable_interface.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_selectable_interface.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_signal_interface.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_smart_clipped.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_table.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_text.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_textblock.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_textgrid.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_zoomable_interface.eo.lua
+%%ELUA%%share/elua/modules/getopt.lua
+%%ELUA%%share/elua/modules/lualian.lua
+%%ELUA%%share/elua/modules/xgettext/generator.lua
+%%ELUA%%share/elua/modules/xgettext/lexer.lua
+%%ELUA%%share/elua/modules/xgettext/parser.lua
 share/embryo/include/default.inc
 share/emotion/checkme
 share/eo/gdb/eo_gdb.py