Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Nov 2016 13:27:16 +0000 (UTC)
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r425490 - in head/graphics/goom: . files
Message-ID:  <201611061327.uA6DRGnC067130@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhale
Date: Sun Nov  6 13:27:16 2016
New Revision: 425490
URL: https://svnweb.freebsd.org/changeset/ports/425490

Log:
  Add LICENSE (LGPL20)
  Convert knobs to options
  Convert to USES=localbase
  Specifically disable SDL or it will not build when SDL is installed
  Simplify BROKEN
  Add missing file to pkg-plist
  Regenerate/rename patches
  Bump PORTREVISION

Added:
  head/graphics/goom/files/patch-src_mmx.h
     - copied, changed from r425489, head/graphics/goom/files/patch-src-mmx.h
Deleted:
  head/graphics/goom/files/patch-src-mmx.h
Modified:
  head/graphics/goom/Makefile
  head/graphics/goom/pkg-plist

Modified: head/graphics/goom/Makefile
==============================================================================
--- head/graphics/goom/Makefile	Sun Nov  6 13:08:30 2016	(r425489)
+++ head/graphics/goom/Makefile	Sun Nov  6 13:27:16 2016	(r425490)
@@ -3,7 +3,7 @@
 
 PORTNAME=	goom
 PORTVERSION=	2k4.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}2k4/0
 DISTNAME=	${PORTNAME}-${PORTVERSION:S|.|-|}-src
@@ -11,33 +11,26 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S|.|
 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
-
-pre-everything::
-.if !defined(WITH_XMMS)
-	@${ECHO} ""
-	@${ECHO} "Define WITH_XMMS to build goom xmms visualization plugin"
-	@${ECHO} ""
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "powerpc"
-BROKEN=		Does not compile on powerpc
-.endif
+BROKEN_powerpc=	Does not build
+
+OPTIONS_DEFINE=	XMMS
+OPTIONS_SUB=	yes
+
+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"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Copied and modified: head/graphics/goom/files/patch-src_mmx.h (from r425489, head/graphics/goom/files/patch-src-mmx.h)
==============================================================================
--- head/graphics/goom/files/patch-src-mmx.h	Sun Nov  6 13:08:30 2016	(r425489, copy source)
+++ head/graphics/goom/files/patch-src_mmx.h	Sun Nov  6 13:27:16 2016	(r425490)
@@ -1,4 +1,4 @@
---- src/mmx.h.orig
+--- 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
  	{ \

Modified: head/graphics/goom/pkg-plist
==============================================================================
--- head/graphics/goom/pkg-plist	Sun Nov  6 13:08:30 2016	(r425489)
+++ head/graphics/goom/pkg-plist	Sun Nov  6 13:27:16 2016	(r425490)
@@ -15,4 +15,5 @@ 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611061327.uA6DRGnC067130>