Update the port to a current snapshot.

The firefox plugin now actually works, though it's quite unstable.

PR:		ports/95605
Submitted by:	maintainer

6 files changed, 121 insertions, 103 deletions

diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 6a07b6711d1a..3d86423e952b 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -7,100 +7,43 @@
 
 PORTNAME=	gnash
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.gnu.org/software/gnash/releases/
-DISTNAME=	${PORTNAME}-20051226
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	ale
+DISTNAME=	${PORTNAME}-20060422
 
 MAINTAINER=	amdmi3@mail.ru
 COMMENT=	GNU Flash movie player
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		ogg.5:${PORTSDIR}/audio/libogg \
+		gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext
 
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomehier
-USE_SDL=	sdl mixer
 USE_BZIP2=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
-#INSTALLS_OMF=	yes
+USE_GNOME=	gnomehier gtk20 glib20 atk pango pkgconfig libxml2
+USE_SDL=	sdl mixer
+USE_X_PREFIX=	yes
 USE_GCC=	3.4+
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.7
-
-CPPFLAGS=	`${SDL_CONFIG} --cflags` -I${X11BASE}/include
-LDFLAGS=	`${SDL_CONFIG} --libs` -L${X11BASE}/lib -Wl,--rpath,${PREFIX}/lib/gnash
-
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--program-prefix=''
+USE_AUTOTOOLS=	aclocal:19 autoheader:259 automake:19 autoconf:259
+ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${WRKSRC}/macros
 
-INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/gnash
+PLUGIN_DIR=	${PREFIX}/lib/browser_plugins
 
-MAN1=		gnash.1
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -Wl,--rpath,${PREFIX}/lib/gnash"
 
-# As the project was just recently announced, firefox plugin doesn't work
-# correctly yet. You can still try it with specifying WITH_FIREFOX=yes as
-# make parameter - feel free to mail reports (preferrably of success) and
-# your ideas to port maintainer.
-# See also http://lists.gnu.org/archive/html/gnash/
+CONFIGURE_ARGS=	--libdir="${PREFIX}/lib/gnash" \
+		--with-plugindir=${PLUGIN_DIR}
 
-OPTIONS=	XML "Enable support for xml and xmlsocket" off
-#		FIREFOX "Build firefox plugin" off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_FIREFOX)
-BUILD_DEPENDS+=		${X11BASE}/bin/firefox-config:${PORTSDIR}/www/firefox
-CONFIGURE_ARGS+=	--enable-plugin
-CPPFLAGS+=		`firefox-config --cflags`
-LDFLAGS+=		`firefox-config --libs`
-PLIST_SUB=		PLUGIN:=""
-.else
-CONFIGURE_ARGS+=	--disable-reader
-PLIST_SUB=		PLUGIN:="@comment "
-.endif
-
-.if defined(WITH_XML)
-BUILD_DEPENDS+=		${LOCALBASE}/bin/xml2-config:${PORTSDIR}/textproc/libxml2
-CPPFLAGS+=		`xml2-config --cflags`
-LDFLAGS+=		`xml2-config --libs`
-.else
-CONFIGURE_ARGS+=	--disable-xml
-.endif
-
-post-extract:
-	@${FIND} ${WRKSRC} -name "*.cpp" -o -name "*.h" | \
-		${XARGS} ${REINPLACE_CMD} -e "s|$$(${PRINTF} '\r')||g"
+WRKSRC=		${WRKDIR}/${PORTNAME}-20060422
 
 post-patch:
-	@${REINPLACE_CMD} -e '/INCLUDES/ s|$$(srcdir)||' ${WRKSRC}/libgeometry/Makefile.in ${WRKSRC}/libbase/Makefile.in
-	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/libbase/dlmalloc.c ${WRKSRC}/libbase/dlmalloc.h
-	@${REINPLACE_CMD} -e '/APPLE_CC/ s|^.*$$|#if 0|' ${WRKSRC}/libbase/utility.cpp
-	@${REINPLACE_CMD} -e '/cd doc/ s|^.*$$|	@true|; /DIRS/ s/ doc//' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e '/^include_HEADERS/ s|^|#|' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e '/FIREFOX_PLUGINS=.*FIREFOX_LIBS/ s|^.*$$|FIREFOX_PLUGINS=${X11BASE}/lib/browser_plugins|' ${WRKSRC}/configure
-.if !defined(WITH_FIREFOX)
-	@${REINPLACE_CMD} -e 's|firefox-config|firefox-config1|g' ${WRKSRC}/configure
-.endif
-
-.if defined(WITH_FIREFOX)
-pre-install:
-	${MKDIR} ${PREFIX}/lib/browser_plugins
-.endif
-
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/C/gnash.1 ${PREFIX}/man/man1
-	${MKDIR} ${PREFIX}/share/gnome/omf/gnash
-	${INSTALL_DATA} ${WRKSRC}/doc/C/gnash.omf ${PREFIX}/share/gnome/omf/gnash
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}/images
-.for i in gnash.html gnash.pdf gnash.xml legal.xml
-	${INSTALL_DATA} ${WRKSRC}/doc/C/${i} ${DOCSDIR}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/doc/C/images/* ${DOCSDIR}/images
-.endif
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/macros/*.m4
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/macros/*.m4
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/macros/*.m4
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/gnash/distinfo b/graphics/gnash/distinfo
index 92645f83de1f..5c88ee6d5292 100644
--- a/graphics/gnash/distinfo
+++ b/graphics/gnash/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnash-20051226.tar.bz2) = 16d3261d0ec22be7cc738e30b42dc9ac
-SHA256 (gnash-20051226.tar.bz2) = 49a1e958d1cf62e8cda1605abeb61b7924f3f0bb5978f78ff08d657243263350
-SIZE (gnash-20051226.tar.bz2) = 742001
+MD5 (gnash-20060422.tar.bz2) = d9332c78458a0998a2574385f15f886a
+SHA256 (gnash-20060422.tar.bz2) = 5ea45388159c6a231386b073d72076b5d76dda0319518b5a328ebf6fbbd5fdc2
+SIZE (gnash-20060422.tar.bz2) = 3140402
diff --git a/graphics/gnash/files/patch-macros_gtkglext.m4 b/graphics/gnash/files/patch-macros_gtkglext.m4
new file mode 100644
index 000000000000..c7a642a15137
--- /dev/null
+++ b/graphics/gnash/files/patch-macros_gtkglext.m4
@@ -0,0 +1,11 @@
+--- macros/gtkglext.m4.orig	Sat Apr 22 11:45:05 2006
++++ macros/gtkglext.m4	Sat Apr 22 11:38:54 2006
+@@ -132,7 +132,7 @@
+           for i in $libslist; do
+ 	    if test -f $i/libgtkglext-x11-${version}.a -o -f $i/libgtkglext-x11-${version}.so; then
+ 	      if test x"$i" != x"/usr/lib"; then
+-	        ac_cv_path_glext_lib="$i"
++	        ac_cv_path_glext_lib="-L$i -lgtkglext-x11-${version} -lgdkglext-x11-${version}"
+ 	        break
+               fi
+ 	    else
diff --git a/graphics/gnash/files/patch-macros_pango.m4 b/graphics/gnash/files/patch-macros_pango.m4
new file mode 100644
index 000000000000..5c81a4fff43b
--- /dev/null
+++ b/graphics/gnash/files/patch-macros_pango.m4
@@ -0,0 +1,29 @@
+--- macros/pango.m4.orig	Sat Apr 22 10:10:07 2006
++++ macros/pango.m4	Sat Apr 22 11:34:01 2006
+@@ -56,7 +56,7 @@
+     dnl doesn't seem to get a directory that is unversioned.
+     if test x"${ac_cv_path_pango_incl}" = x; then
+       AC_MSG_CHECKING([for the Pango Version])
+-        pathlist="/sw/include /usr/local/include /home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
++        pathlist="${prefix}/include /sw/include /usr/local/include /home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+ 
+         topdir=""
+         version=""
+@@ -82,7 +82,7 @@
+         AC_CHECK_HEADERS(pango/pango.h, [ac_cv_path_pango_incl=""],[
+           if test x"${ac_cv_path_pango_incl}" = x; then
+             AC_MSG_CHECKING([for libpango header])
+-            incllist="/sw/include /usr/local/include /home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
++            incllist="${prefix}/include /sw/include /usr/local/include /home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+ 
+             for i in $incllist; do
+ 	      if test -f $i/pango/pango.h; then
+@@ -122,7 +122,7 @@
+       if test x"${ac_cv_path_pango_incl}" != x; then
+         AC_CHECK_LIB(pango-${version}, pango_engine_shape_class_init, [ac_cv_path_pango_lib="-lpango-${version}"],[
+           AC_MSG_CHECKING([for libpango library])
+-          libslist="/usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
++          libslist="${prefix}/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+           for i in $libslist; do
+ 	    if test -f $i/libpango-${version}.a -o -f $i/libpango-${version}.so; then
+ 	      if test x"$i" != x"/usr/lib"; then
diff --git a/graphics/gnash/files/patch-macros_sdl.m4 b/graphics/gnash/files/patch-macros_sdl.m4
new file mode 100644
index 000000000000..ce7b199a2fed
--- /dev/null
+++ b/graphics/gnash/files/patch-macros_sdl.m4
@@ -0,0 +1,35 @@
+--- macros/sdl.m4.orig	Sat Apr 22 11:10:23 2006
++++ macros/sdl.m4	Sat Apr 22 11:03:46 2006
+@@ -59,8 +59,8 @@
+         ac_cv_path_sdl_incl=$i/SDL/include
+         break
+       fi
+-      if test -f $i/include/SDL/SDL.h; then
+-        ac_cv_path_sdl_incl=$i/include/SDL
++      if test -f $i/include/SDL11/SDL.h; then
++        ac_cv_path_sdl_incl=$i/include/SDL11
+         break
+       fi
+     done
+@@ -94,17 +94,17 @@
+ 
+   SDL_LIBS=""
+   if test x"${ac_cv_path_sdl_lib}" = x ; then
+-    AC_CHECK_LIB(SDL, SDL_Init, [ac_cv_path_sdl_lib="-lSDL"],[
++    AC_CHECK_LIB(SDL-1.1, SDL_Init, [ac_cv_path_sdl_lib="-lSDL-1.1"],[
+       AC_MSG_CHECKING([for SDL library])
+       liblist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /usr/pkg/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib.. ../.."
+       for i in $liblist; do
+-        if test -f $i/libSDL.a -o -f $i/libSDl.so; then
++        if test -f $i/libSDL-1.1.a -o -f $i/libSDL-1.1.so; then
+           if test x"$i" != x"/usr/lib"; then
+-            ac_cv_path_sdl_lib="-L$i -lSDL"
++            ac_cv_path_sdl_lib="-L$i -lSDL-1.1"
+             AC_MSG_RESULT(${ac_cv_path_sdl_lib})
+             break
+           else
+-            ac_cv_path_sdl_lib="-lSDL"
++            ac_cv_path_sdl_lib="-lSDL-1.1"
+             AC_MSG_RESULT([yes])
+ 	    has_sdl=yes
+             break
diff --git a/graphics/gnash/pkg-plist b/graphics/gnash/pkg-plist
index bc462a826d0c..c39a355e0291 100644
--- a/graphics/gnash/pkg-plist
+++ b/graphics/gnash/pkg-plist
@@ -1,26 +1,26 @@
 bin/gnash
 bin/gparser
 bin/gprocessor
-lib/gnash/libbase.a
-lib/gnash/libbase.la
-lib/gnash/libbase.so
-lib/gnash/libbase.so.0
-lib/gnash/libgeometry.a
-lib/gnash/libgeometry.la
-lib/gnash/libgeometry.so
-lib/gnash/libgeometry.so.0
-lib/gnash/libserver.a
-lib/gnash/libserver.la
-lib/gnash/libserver.so
-lib/gnash/libserver.so.0
-%%PLUGIN:%%lib/browser_plugins/libgnash.so
-share/gnome/omf/gnash/gnash.omf
-%%PORTDOCS%%%%DOCSDIR%%/gnash.html
-%%PORTDOCS%%%%DOCSDIR%%/gnash.pdf
-%%PORTDOCS%%%%DOCSDIR%%/gnash.xml
-%%PORTDOCS%%%%DOCSDIR%%/legal.xml
-%%PORTDOCS%%%%DOCSDIR%%/images/car_crash.png
+lib/browser_plugins/libgnashplugin.so
+lib/gnash/libgnashasobjs.a
+lib/gnash/libgnashasobjs.la
+lib/gnash/libgnashasobjs.so
+lib/gnash/libgnashasobjs.so.0
+lib/gnash/libgnashbackend.a
+lib/gnash/libgnashbackend.la
+lib/gnash/libgnashbackend.so
+lib/gnash/libgnashbackend.so.0
+lib/gnash/libgnashbase.a
+lib/gnash/libgnashbase.la
+lib/gnash/libgnashbase.so
+lib/gnash/libgnashbase.so.0
+lib/gnash/libgnashgeo.a
+lib/gnash/libgnashgeo.la
+lib/gnash/libgnashgeo.so
+lib/gnash/libgnashgeo.so.0
+lib/gnash/libgnashserver.a
+lib/gnash/libgnashserver.la
+lib/gnash/libgnashserver.so
+lib/gnash/libgnashserver.so.0
 @dirrm lib/gnash
-@dirrm share/gnome/omf/gnash
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry lib/browser_plugins