3 files changed, 14 insertions, 41 deletions

diff --git a/graphics/lightspark-devel/Makefile b/graphics/lightspark-devel/Makefile
index 847d6342fc9c..b4d1b9c8c11c 100644
--- a/graphics/lightspark-devel/Makefile
+++ b/graphics/lightspark-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lightspark
-DISTVERSION=	r20100518
-PORTREVISION=	1
+DISTVERSION=	r20100520
 CATEGORIES=	graphics
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
 PKGNAMESUFFIX=	-devel
@@ -24,8 +23,13 @@ LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
 		ftgl.2:${PORTSDIR}/graphics/ftgl \
 		avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 
+ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS_REASON=	Uses assembly code
+
 USE_BZIP2=	yes
 USE_CMAKE=	yes
+CMAKE_ARGS=	-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib" \
+		-DCMAKE_SHARED_LINKER_FLAGS="-L${LOCALBASE}/lib"
 USE_SDL=	sdl
 USE_GL=		gl glew
 MAKE_JOBS_SAFE=	yes
@@ -46,7 +50,6 @@ BROKEN=		Does not compile on 6.x
 .endif
 
 .if defined(WITH_PLUGIN)
-CMAKE_ARGS+=	-DCOMPILE_PLUGIN:BOOL=ON
 USE_GNOME+=	gtk20
 LIB_DEPENDS+=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
 USE_WEBPLUGINS=	native
@@ -58,32 +61,27 @@ BUILD_DEPENDS+=	${LOCALBASE}/include/firefox3/npfunctions.h:${PORTSDIR}/www/fire
 RUN_DEPENDS+=	${LOCALBASE}/include/firefox3/npfunctions.h:${PORTSDIR}/www/firefox \
 		${LOCALBASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/libxul
 PLIST_SUB+=	PLUGIN=""
+CMAKE_ARGS+=	-DCOMPILE_PLUGIN:BOOL=ON \
+		-DPLUGIN_DIRECTORY:STRING="${WEBPLUGINS_DIR}"
 .else
-CMAKE_ARGS+=	-DCOMPILE_PLUGIN:BOOL=OFF
 PLIST_SUB+=	PLUGIN="@comment "
+CMAKE_ARGS+=	-DCOMPILE_PLUGIN:BOOL=OFF
 .endif
 
 .if defined(WITH_PLUGIN)
 pre-everything::
 	@${ECHO_CMD} "Lightspark is currently in pre-alpha state, so only use its plugin"
 	@${ECHO_CMD} "if you know what you are doing; otherwise, expect browser crashes and hangs"
+	@${ECHO_CMD} "Also, you'll probably need to edit kernel source and bump SEM_MAX from 30"
+	@${ECHO_CMD} "to something much higher (1024 or so) to make the plugin work.. for some time"
 	@sleep 3
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|x86_64|amd64|' ${WRKSRC}/CMakeLists.txt \
-		${WRKSRC}/plugin-dir/CMakeLists.txt
-	@${TOUCH} ${WRKSRC}/conf/CMakeDetermineASM-NASMCompiler.cmake
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|/usr.*/LiberationSerif-Regular.ttf|${LOCALBASE}/lib/X11/fonts/Liberation/LiberationSerif-Regular.ttf|' \
 		${WRKSRC}/swf.cpp
-.if defined(WITH_PLUGIN)
-	@${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${WEBPLUGINS_DIR}|' \
-		${WRKSRC}/plugin-dir/CMakeLists.txt
-.endif
 
 post-install:
-	${CHMOD} a+x ${PREFIX}/bin/lightspark
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
diff --git a/graphics/lightspark-devel/distinfo b/graphics/lightspark-devel/distinfo
index 493f49450674..f4f96ad73bd1 100644
--- a/graphics/lightspark-devel/distinfo
+++ b/graphics/lightspark-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (lightspark-r20100518.tar.bz2) = 1b50fd853280c48f670b48121d2d23a2
-SHA256 (lightspark-r20100518.tar.bz2) = b5d299635112b05a8d655f71570d8c9018b3bc17da6f090f9842821839e16723
-SIZE (lightspark-r20100518.tar.bz2) = 177305
+MD5 (lightspark-r20100520.tar.bz2) = f95f0cbad8f4005d143abbf574a19cdd
+SHA256 (lightspark-r20100520.tar.bz2) = 430b2059af82e022eba5f2c9a36fbf084a4e6aef273c599b27f0b2f50cb0de28
+SIZE (lightspark-r20100520.tar.bz2) = 163343
diff --git a/graphics/lightspark-devel/files/patch-CMakeLists.txt b/graphics/lightspark-devel/files/patch-CMakeLists.txt
deleted file mode 100644
index d0db787f5929..000000000000
--- a/graphics/lightspark-devel/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
---- CMakeLists.txt.orig	2010-05-17 21:55:09.000000000 +0400
-+++ CMakeLists.txt	2010-05-18 21:56:10.000000000 +0400
-@@ -55,21 +55,12 @@
- LINK_LIBRARIES(${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT})
- LINK_LIBRARIES(${SDL_LIBRARY})
- LINK_LIBRARIES(${CURL_LIBRARIES})
-+LINK_DIRECTORIES(/usr/local/lib)
- 
- ENABLE_LANGUAGE(ASM-NASM)
- 
--SET(CMAKE_CXX_FLAGS "-Wall -Wnon-virtual-dtor -Woverloaded-virtual -pipe -lrt -ldl")
--SET(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -D_GLIBCXX_NO_DEBUG")
--SET(CMAKE_CXX_FLAGS_PROFILE "-g -pg -O2 -DNDEBUG")
--SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
--SET(CMAKE_CXX_FLAGS_DEBIAN "-O2 -DNDEBUG")
--
- ADD_DEFINITIONS(-DDATADIR="${CMAKE_INSTALL_PREFIX}/share/lightspark")
- 
--IF(NOT CMAKE_BUILD_TYPE)
--	SET(CMAKE_BUILD_TYPE "Debug")
--ENDIF()
--
- 
- SET(LIBSPARK_SOURCES swf.cpp swftypes.cpp tags.cpp geometry.cpp actions.cpp frame.cpp input.cpp streams.cpp tags_stub.cpp logger.cpp vm.cpp asobjects.cpp abc.cpp abc_codesynt.cpp abc_opcodes.cpp flashdisplay.cpp flashevents.cpp textfile.cpp thread_pool.cpp flashgeom.cpp flashnet.cpp flashsystem.cpp flashutils.cpp compat.cpp abc_interpreter.cpp flashexternal.cpp flashtext.cpp flashmedia.cpp flv.cpp netutils.cpp timer.cpp decoder.cpp threading.cpp flashxml.cpp)
- IF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "i[3-6]86")