- Update to r20100625

Feature safe:	yes

4 files changed, 51 insertions, 10 deletions

diff --git a/graphics/lightspark-devel/Makefile b/graphics/lightspark-devel/Makefile
index 331171a3f26b..011e6cff637a 100644
--- a/graphics/lightspark-devel/Makefile
+++ b/graphics/lightspark-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lightspark
-DISTVERSION=	r20100528
+DISTVERSION=	r20100625
 CATEGORIES=	graphics
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
 PKGNAMESUFFIX=	-devel
@@ -21,7 +21,8 @@ RUN_DEPENDS=	${LOCALBASE}/include/llvm/Support/DataFlow.h:${PORTSDIR}/devel/llvm
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
 		pcrecpp.0:${PORTSDIR}/devel/pcre \
 		ftgl.2:${PORTSDIR}/graphics/ftgl \
-		avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	Uses assembly code
@@ -34,6 +35,7 @@ USE_SDL=	sdl
 USE_GL=		gl glew
 MAKE_JOBS_SAFE=	yes
 USE_PERL5_BUILD=yes # for llvm-config; see ports/146711
+USE_LDCONFIG=	yes
 
 CXXFLAGS+=	-fpermissive
 
@@ -41,7 +43,8 @@ PORTDOCS=	*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS=	PLUGIN     "Enable browser plugin" off
+OPTIONS=	PLUGIN	"Enable browser plugin" off \
+		SOUND	"Enable sound (requires libpulse)" on
 
 .include <bsd.port.options.mk>
 
@@ -68,6 +71,12 @@ PLIST_SUB+=	PLUGIN="@comment "
 CMAKE_ARGS+=	-DCOMPILE_PLUGIN:BOOL=OFF
 .endif
 
+.if defined(WITH_SOUND)
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+.else
+CMAKE_ARGS+=	-DENABLE_SOUND:BOOL=OFF
+.endif
+
 .if defined(WITH_PLUGIN)
 pre-everything::
 	@${ECHO_CMD} "Lightspark is currently in pre-alpha state, so only use its plugin"
@@ -77,10 +86,6 @@ pre-everything::
 	@sleep 3
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr.*/LiberationSerif-Regular.ttf|${LOCALBASE}/lib/X11/fonts/Liberation/LiberationSerif-Regular.ttf|' \
-		${WRKSRC}/swf.cpp
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/graphics/lightspark-devel/distinfo b/graphics/lightspark-devel/distinfo
index 22599fe0750d..cb319f1fc42c 100644
--- a/graphics/lightspark-devel/distinfo
+++ b/graphics/lightspark-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (lightspark-r20100528.tar.bz2) = aaf1247ce0c81b4a4cb296893165c03a
-SHA256 (lightspark-r20100528.tar.bz2) = 01a83cccb20877c5fbcb8f1fd1a2bfe309a276ca3b9d4293fb7f8495046ac0e3
-SIZE (lightspark-r20100528.tar.bz2) = 165609
+MD5 (lightspark-r20100625.tar.bz2) = 91c3b30332855c4e9d8b9a67e122912c
+SHA256 (lightspark-r20100625.tar.bz2) = 5dad9ad16e6132662f745496b162c71831725c40399cdc1827603bb4b28a9c74
+SIZE (lightspark-r20100625.tar.bz2) = 205321
diff --git a/graphics/lightspark-devel/files/patch-CMakeLists.txt b/graphics/lightspark-devel/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..a986f8ab5668
--- /dev/null
+++ b/graphics/lightspark-devel/files/patch-CMakeLists.txt
@@ -0,0 +1,32 @@
+--- CMakeLists.txt.orig	2010-06-24 19:55:35.000000000 +0400
++++ CMakeLists.txt	2010-06-25 17:48:47.000000000 +0400
+@@ -50,17 +50,12 @@
+ SET(LIBDIR "lib${LIB_SUFFIX}")
+ 
+ # Setting variables
+-SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install prefix" FORCE)
++SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install prefix")
+ SET(COMPILE_LIGHTSPARK TRUE CACHE BOOL "Compile Lightspark?")
+ SET(COMPILE_TIGHTSPARK TRUE CACHE BOOL "Compile Tightspark?")
+ SET(COMPILE_PLUGIN FALSE CACHE BOOL "Compile the Firefox Plugin?")
+ SET(ENABLE_SOUND TRUE CACHE BOOL "Enable sound?")
+ SET(PLUGIN_DIRECTORY "${LIBDIR}/mozilla/plugins" CACHE STRING "Directory to install Firefox plugin to")
+-IF(NOT CMAKE_BUILD_TYPE)
+-  SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
+-      "Choose the type of build, options are: None Debug Release RelWithDebInfo Profile Debian"
+-      FORCE)
+-ENDIF(NOT CMAKE_BUILD_TYPE)
+ 
+ # Some directory shortcuts
+ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/conf)
+@@ -110,8 +105,8 @@
+ INCLUDE_DIRECTORIES(${LIBAVCODEC_INCLUDE_DIRS})
+ INCLUDE_DIRECTORIES(${SOUND_LIBS_INCLUDE_DIRS})
+ 
+-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--no-undefined")
+-SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed")
++SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed -Wl,--no-undefined")
++SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+ 
+ IF(COMPILE_PLUGIN)
+ 	pkg_check_modules(GTK REQUIRED gtk+-2.0 gtkglext-1.0)
diff --git a/graphics/lightspark-devel/pkg-plist b/graphics/lightspark-devel/pkg-plist
index 734159178e11..d7cbd3da5152 100644
--- a/graphics/lightspark-devel/pkg-plist
+++ b/graphics/lightspark-devel/pkg-plist
@@ -1,4 +1,8 @@
 bin/lightspark
+bin/tightspark
+lib/liblightspark.so
+lib/liblightspark.so.0.5
+lib/liblightspark.so.0.5.0
 %%DATADIR%%/lightspark.frag
 %%DATADIR%%/lightspark.vert
 %%PLUGIN%%%%WEBPLUGINS_DIR%%/liblightsparkplugin.so