Index: head/graphics/goom/Makefile
===================================================================
--- head/graphics/goom/Makefile	(revision 425489)
+++ head/graphics/goom/Makefile	(revision 425490)
@@ -1,43 +1,36 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	goom
 PORTVERSION=	2k4.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}2k4/0
 DISTNAME=	${PORTNAME}-${PORTVERSION:S|.|-|}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Visual effects library
 
+LICENSE=	LGPL20
+
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:S|.|-|}
-USES=		pathfix libtool
+USES=		pathfix libtool localbase
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-sdltest --enable-static
+CONFIGURE_ENV=	ac_cv_path_SDL_CONFIG="no"
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-.if exists(${X11R6}/bin/xmms) || defined(WITH_XMMS)
-LIB_DEPENDS+=	libxmms.so:multimedia/xmms
-PLIST_SUB+=	XMMS=""
-.else
-PLIST_SUB+=	XMMS="@comment "
-.endif
+BROKEN_powerpc=	Does not build
 
-pre-everything::
-.if !defined(WITH_XMMS)
-	@${ECHO} ""
-	@${ECHO} "Define WITH_XMMS to build goom xmms visualization plugin"
-	@${ECHO} ""
-.endif
+OPTIONS_DEFINE=	XMMS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.pre.mk>
+XMMS_DESC=		Build XMMS visualization plugin
+XMMS_LIB_DEPENDS=	libxmms.so:multimedia/xmms
+XMMS_USES=		gettext-runtime
+XMMS_USE=		GNOME=glib12,gtk12 \
+			XORG=x11,xext,xi
+XMMS_CONFIGURE_ENV_OFF=	ac_cv_path_XMMS_CONFIG="no"
 
-.if ${ARCH} == "powerpc"
-BROKEN=		Does not compile on powerpc
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/graphics/goom/files/patch-src-mmx.h
===================================================================
--- head/graphics/goom/files/patch-src-mmx.h	(revision 425489)
+++ head/graphics/goom/files/patch-src-mmx.h	(nonexistent)
@@ -1,18 +0,0 @@
---- src/mmx.h.orig
-+++ src/mmx.h
-@@ -715,13 +715,13 @@ void zoom_filter_xmmx (int prevX, int pr
- 	{ \
- 		printf("emms()\n"); \
- 		__asm__ __volatile__ ("emms" \
--                        "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)"); \
-+                        "st","st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)"); \
- 	}
- 
- #else
- 
- #define	emms() __asm__ __volatile__ ("emms"::: \
--                      "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)")
-+                      "st","st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)")
- 
- #endif
- 

Property changes on: head/graphics/goom/files/patch-src-mmx.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/graphics/goom/files/patch-src_mmx.h
===================================================================
--- head/graphics/goom/files/patch-src_mmx.h	(nonexistent)
+++ head/graphics/goom/files/patch-src_mmx.h	(revision 425490)
@@ -0,0 +1,18 @@
+--- src/mmx.h.orig	2005-02-07 13:46:41 UTC
++++ src/mmx.h
+@@ -715,13 +715,13 @@ void zoom_filter_xmmx (int prevX, int pr
+ 	{ \
+ 		printf("emms()\n"); \
+ 		__asm__ __volatile__ ("emms" \
+-                        "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)"); \
++                        "st","st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)"); \
+ 	}
+ 
+ #else
+ 
+ #define	emms() __asm__ __volatile__ ("emms"::: \
+-                      "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)")
++                      "st","st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)")
+ 
+ #endif
+ 

Property changes on: head/graphics/goom/files/patch-src_mmx.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/graphics/goom/pkg-plist
===================================================================
--- head/graphics/goom/pkg-plist	(revision 425489)
+++ head/graphics/goom/pkg-plist	(revision 425490)
@@ -1,18 +1,19 @@
 include/goom/goom.h
 include/goom/goom_config.h
 include/goom/goom_config_param.h
 include/goom/goom_filters.h
 include/goom/goom_graphic.h
 include/goom/goom_plugin_info.h
 include/goom/goom_tools.h
 include/goom/goom_typedefs.h
 include/goom/goom_visual_fx.h
 include/goom/goomsl.h
 include/goom/goomsl_hash.h
 include/goom/goomsl_heap.h
 lib/libgoom2.a
 lib/libgoom2.so
 lib/libgoom2.so.0
 lib/libgoom2.so.0.0.0
 libdata/pkgconfig/libgoom2.pc
+%%XMMS%%lib/xmms/Visualization/libxmmsgoom2.a
 %%XMMS%%lib/xmms/Visualization/libxmmsgoom2.so