1 files changed, 21 insertions, 78 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>