- Update to r20110309, unbreak build

- Drop maintainership
- Use new way of depending on Firefox (1)

Submitted by:	beat (1)

9 files changed, 155 insertions, 71 deletions

diff --git a/graphics/lightspark-devel/Makefile b/graphics/lightspark-devel/Makefile
index 57ca6c9e6aed..289e2dc58e82 100644
--- a/graphics/lightspark-devel/Makefile
+++ b/graphics/lightspark-devel/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	lightspark
-DISTVERSION=	r20100625
-PORTREVISION=	1
+DISTVERSION=	r20110309
 CATEGORIES=	graphics
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
 PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	amdmi3@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An alternative Flash Player implementation
 
 BUILD_DEPENDS=	${LOCALBASE}/include/llvm/Support/DataFlow.h:${PORTSDIR}/devel/llvm \
@@ -23,13 +22,15 @@ LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
 		pcrecpp.0:${PORTSDIR}/devel/pcre \
 		ftgl.2:${PORTSDIR}/graphics/ftgl \
 		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
-		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
+		boost_system:${PORTSDIR}/devel/boost-libs \
+		rtmp.0:${PORTSDIR}/multimedia/rtmpdump \
+		xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26 \
+		pulse.0:${PORTSDIR}/audio/pulseaudio
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	Uses assembly code
 
-BROKEN=		does not compile
-
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 CMAKE_ARGS=	-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib" \
@@ -39,22 +40,19 @@ USE_GL=		gl glew
 MAKE_JOBS_SAFE=	yes
 USE_PERL5_BUILD=yes # for llvm-config; see ports/146711
 USE_LDCONFIG=	yes
-
-CXXFLAGS+=	-fpermissive
+USE_GETTEXT=	yes
+USE_GCC=	4.4+
 
 PORTDOCS=	*
 
+MAN1=		lightspark.1
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS=	PLUGIN	"Enable browser plugin" off \
-		SOUND	"Enable sound (requires libpulse)" on
+OPTIONS=	PLUGIN	"Enable browser plugin" off
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 700042
-BROKEN=		Does not compile on 6.x
-.endif
-
 .if defined(WITH_PLUGIN)
 USE_GNOME+=	gtk20
 LIB_DEPENDS+=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
@@ -62,10 +60,9 @@ USE_WEBPLUGINS=	native
 WEBPLUGINS_FILES=liblightsparkplugin.so
 .include "${PORTSDIR}/www/firefox/Makefile.webplugins"
 CXXFLAGS+=	-I${LOCALBASE}/include/firefox3
-BUILD_DEPENDS+=	${LOCALBASE}/include/firefox3/npfunctions.h:${PORTSDIR}/www/firefox \
-		${LOCALBASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/libxul
-RUN_DEPENDS+=	${LOCALBASE}/include/firefox3/npfunctions.h:${PORTSDIR}/www/firefox \
-		${LOCALBASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/libxul
+USE_FIREFOX_BUILD=	36
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/libxul
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/libxul
 PLIST_SUB+=	PLUGIN=""
 CMAKE_ARGS+=	-DCOMPILE_PLUGIN:BOOL=ON \
 		-DPLUGIN_DIRECTORY:STRING="${WEBPLUGINS_DIR}"
@@ -74,25 +71,11 @@ 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"
-	@${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..."
-	@sleep 3
-.endif
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
+	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
 .include <bsd.port.mk>
diff --git a/graphics/lightspark-devel/distinfo b/graphics/lightspark-devel/distinfo
index cb319f1fc42c..4d62aa63d7c3 100644
--- a/graphics/lightspark-devel/distinfo
+++ b/graphics/lightspark-devel/distinfo
@@ -1,3 +1,2 @@
-MD5 (lightspark-r20100625.tar.bz2) = 91c3b30332855c4e9d8b9a67e122912c
-SHA256 (lightspark-r20100625.tar.bz2) = 5dad9ad16e6132662f745496b162c71831725c40399cdc1827603bb4b28a9c74
-SIZE (lightspark-r20100625.tar.bz2) = 205321
+SHA256 (lightspark-r20110309.tar.bz2) = 77dbd8e40be2078d0e59e7ab6da9ee4107eb1ef0a06c6dca18ee8ce9c3142679
+SIZE (lightspark-r20110309.tar.bz2) = 407846
diff --git a/graphics/lightspark-devel/files/patch-CMakeLists.txt b/graphics/lightspark-devel/files/patch-CMakeLists.txt
index a986f8ab5668..83f8881be51b 100644
--- a/graphics/lightspark-devel/files/patch-CMakeLists.txt
+++ b/graphics/lightspark-devel/files/patch-CMakeLists.txt
@@ -1,32 +1,29 @@
---- 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}")
+--- CMakeLists.txt.orig	2011-03-07 07:10:16.000000000 +0300
++++ CMakeLists.txt	2011-03-09 01:26:56.000000000 +0300
+@@ -101,7 +101,7 @@
  
- # 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)
+ # Using relative folders, cmake happens by itself CMAKE_INSTALL_PREFIX
+ IF(UNIX)
+-	 SET(ETCDIR "/etc") #Using absolute folder
++	 SET(ETCDIR "etc")
+    SET(BINDIR "bin")
+    SET(DATADIR "${CMAKE_INSTALL_PREFIX}/share")
+    SET(LIBDIR "lib${LIB_SUFFIX}")
+@@ -142,7 +142,7 @@
+ INCLUDE(FindGLEW REQUIRED)
+ IF(UNIX)
+   INCLUDE(FindPkgConfig REQUIRED)
+-	pkg_check_modules(XMLPP REQUIRED libxml++-2.6>=2.33.1)
++	pkg_check_modules(XMLPP REQUIRED libxml++-2.6>=0)
+ ENDIF(UNIX)
  
- # 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)
+ if(WIN32)
+@@ -371,7 +371,7 @@
+     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lightspark.frag DESTINATION ${DATADIR}/lightspark)
+     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lightspark.vert DESTINATION ${DATADIR}/lightspark)
+     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lightspark-blitter.vert DESTINATION ${DATADIR}/lightspark)
+-    INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/docs/man/lightspark.1 DESTINATION share/man/man1)
++    INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/docs/man/lightspark.1 DESTINATION man/man1)
+     INSTALL(TARGETS lightspark RUNTIME DESTINATION ${BINDIR})
+   ENDIF(UNIX)
+ ENDIF(COMPILE_LIGHTSPARK)
diff --git a/graphics/lightspark-devel/files/patch-compat.cpp b/graphics/lightspark-devel/files/patch-compat.cpp
new file mode 100644
index 000000000000..921ebc94392b
--- /dev/null
+++ b/graphics/lightspark-devel/files/patch-compat.cpp
@@ -0,0 +1,10 @@
+--- compat.cpp.orig	2010-08-04 21:11:54.000000000 +0400
++++ compat.cpp	2010-08-04 23:26:15.000000000 +0400
+@@ -21,6 +21,7 @@
+ #include <unistd.h>
+ #include <time.h>
+ #include <sys/wait.h>
++#include <signal.h>
+ #endif
+ 
+ #include "compat.h"
diff --git a/graphics/lightspark-devel/files/patch-main.cpp b/graphics/lightspark-devel/files/patch-main.cpp
new file mode 100644
index 000000000000..7538a740013d
--- /dev/null
+++ b/graphics/lightspark-devel/files/patch-main.cpp
@@ -0,0 +1,13 @@
+--- main.cpp.orig	2010-09-09 17:10:38.000000000 +0400
++++ main.cpp	2010-09-16 00:15:03.000000000 +0400
+@@ -182,7 +182,9 @@
+ 	//When running in a local sandbox, set the root URL to the current working dir
+ 	else if(sandboxType != Security::REMOTE)
+ 	{
+-		char * cwd = get_current_dir_name();
++		char cwd[1024];
++		if (getcwd(cwd, 1024) == NULL)
++			exit(-1);
+ 		tiny_string cwdStr = tiny_string("file://") + tiny_string(cwd, true);
+ 		free(cwd);
+ 		cwdStr += "/";
diff --git a/graphics/lightspark-devel/files/patch-swf.cpp b/graphics/lightspark-devel/files/patch-swf.cpp
new file mode 100644
index 000000000000..e6b5a2e916c9
--- /dev/null
+++ b/graphics/lightspark-devel/files/patch-swf.cpp
@@ -0,0 +1,11 @@
+--- swf.cpp.orig	2011-03-07 07:10:16.000000000 +0300
++++ swf.cpp	2011-03-09 01:20:14.000000000 +0300
+@@ -39,6 +39,8 @@
+ 
+ #include "compat.h"
+ 
++extern char **environ;
++
+ #ifdef ENABLE_LIBAVCODEC
+ extern "C" {
+ #include <libavcodec/avcodec.h>
diff --git a/graphics/lightspark-devel/files/patch-swftypes.h b/graphics/lightspark-devel/files/patch-swftypes.h
new file mode 100644
index 000000000000..74d64b8d0227
--- /dev/null
+++ b/graphics/lightspark-devel/files/patch-swftypes.h
@@ -0,0 +1,11 @@
+--- swftypes.h.orig	2011-03-07 07:10:16.000000000 +0300
++++ swftypes.h	2011-03-09 01:19:26.000000000 +0300
+@@ -40,7 +40,7 @@
+  // TODO: Proper CMake check
+  #include <arpa/inet.h>
+ #endif
+-#include <endian.h>
++#include <sys/endian.h>
+ 
+ #ifdef BIG_ENDIAN
+ #include <algorithm>
diff --git a/graphics/lightspark-devel/pkg-message b/graphics/lightspark-devel/pkg-message
new file mode 100644
index 000000000000..53003ce71b8c
--- /dev/null
+++ b/graphics/lightspark-devel/pkg-message
@@ -0,0 +1,5 @@
+To use lightpark, you'll need maximum number of POSIX 1003.1B
+semaphores bumped from default 30 to something much higher (>2048).
+On FreeBSD >= 8.1 you can do that via p1003_1b.sem_nsems_max sysctl,
+on earlier versions you'll have to edit kernel source to bump SEM_MAX
+and recompile the kernel.
diff --git a/graphics/lightspark-devel/pkg-plist b/graphics/lightspark-devel/pkg-plist
index d7cbd3da5152..7d1a57bafec3 100644
--- a/graphics/lightspark-devel/pkg-plist
+++ b/graphics/lightspark-devel/pkg-plist
@@ -1,10 +1,65 @@
 bin/lightspark
 bin/tightspark
-lib/liblightspark.so
-lib/liblightspark.so.0.5
-lib/liblightspark.so.0.5.0
+etc/xdg/lightspark.conf
+%%PLUGIN%%%%WEBPLUGINS_DIR%%/liblightsparkplugin.so
+lib/lightspark/liblightspark.so
+lib/lightspark/liblightspark.so.0.4
+lib/lightspark/liblightspark.so.0.4.5
+lib/lightspark/plugins/liblightsparkpulseplugin.so
+share/applications/lightspark.desktop
+share/icons/hicolor/128x128/apps/lightspark.png
+share/icons/hicolor/16x16/apps/lightspark.png
+share/icons/hicolor/192x192/apps/lightspark.png
+share/icons/hicolor/20x20/apps/lightspark.png
+share/icons/hicolor/22x22/apps/lightspark.png
+share/icons/hicolor/24x24/apps/lightspark.png
+share/icons/hicolor/256x256/apps/lightspark.png
+share/icons/hicolor/32x32/apps/lightspark.png
+share/icons/hicolor/36x36/apps/lightspark.png
+share/icons/hicolor/48x48/apps/lightspark.png
+share/icons/hicolor/64x64/apps/lightspark.png
+share/icons/hicolor/72x72/apps/lightspark.png
+share/icons/hicolor/96x96/apps/lightspark.png
+share/icons/hicolor/scalable/apps/lightspark.svg
+%%DATADIR%%/lightspark-blitter.vert
 %%DATADIR%%/lightspark.frag
 %%DATADIR%%/lightspark.vert
-%%PLUGIN%%%%WEBPLUGINS_DIR%%/liblightsparkplugin.so
-%%PLUGIN%%@dirrm %%WEBPLUGINS_DIR%%
+share/locale/fr/LC_MESSAGES/lightspark.mo
+share/locale/pl/LC_MESSAGES/lightspark.mo
+share/locale/zh_CN/LC_MESSAGES/lightspark.mo
 @dirrm %%DATADIR%%
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/96x96/apps
+@dirrmtry share/icons/hicolor/96x96
+@dirrmtry share/icons/hicolor/72x72/apps
+@dirrmtry share/icons/hicolor/72x72
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/36x36/apps
+@dirrmtry share/icons/hicolor/36x36
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/256x256/apps
+@dirrmtry share/icons/hicolor/256x256
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/20x20/apps
+@dirrmtry share/icons/hicolor/20x20
+@dirrmtry share/icons/hicolor/192x192/apps
+@dirrmtry share/icons/hicolor/192x192
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/applications
+@dirrm lib/lightspark/plugins
+@dirrm lib/lightspark
+%%PLUGIN%%@dirrmtry %%WEBPLUGINS_DIR%%
+@dirrmtry etc/xdg