Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Mar 2018 12:47:38 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r465887 - in head/games/monkeybubble: . files
Message-ID:  <201803291247.w2TClcwR073615@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Thu Mar 29 12:47:38 2018
New Revision: 465887
URL: https://svnweb.freebsd.org/changeset/ports/465887

Log:
  games/monkeybubble: Remove esound dependency
  
  - Monkeybubble includes esd.h without actually needing it for
    anything
  - Depend on the right GStreamer plugins to get music working on a
    fresh install

Added:
  head/games/monkeybubble/files/patch-src_ui_main.c   (contents, props changed)
Modified:
  head/games/monkeybubble/Makefile

Modified: head/games/monkeybubble/Makefile
==============================================================================
--- head/games/monkeybubble/Makefile	Thu Mar 29 11:55:47 2018	(r465886)
+++ head/games/monkeybubble/Makefile	Thu Mar 29 12:47:38 2018	(r465887)
@@ -3,7 +3,7 @@
 
 PORTNAME=	monkeybubble
 PORTVERSION=	0.4.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	games gnome
 MASTER_SITES=	http://home.gna.org/monkeybubble/downloads/
 DISTNAME=	monkey-bubble-${PORTVERSION}
@@ -14,13 +14,11 @@ COMMENT=	GTK2 Puzzle Bobble clone with monkeys
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake libtool pathfix pkgconfig
-USE_GNOME=	gnomedocutils gnomeprefix intlhack \
-		librsvg2 libgnomeui esound
-USE_GSTREAMER=	yes
+USES=		gmake libtool localbase pathfix pkgconfig
+USE_GNOME=	gnomedocutils gnomeprefix intlhack librsvg2 libgnomeui
+USE_GSTREAMER=	good vorbis
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib -lm
+LIBS+=		-lm
 INSTALLS_OMF=	yes
 
 GCONF_SCHEMAS=	monkey-bubble.schemas
@@ -31,7 +29,6 @@ post-patch:
 		 s|-Werror||g'
 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
 		${WRKSRC}/src/net/message-handler.c \
-		${WRKSRC}/src/net/simple-server.c \
-		${WRKSRC}/src/ui/main.c
+		${WRKSRC}/src/net/simple-server.c
 
 .include <bsd.port.mk>

Added: head/games/monkeybubble/files/patch-src_ui_main.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/monkeybubble/files/patch-src_ui_main.c	Thu Mar 29 12:47:38 2018	(r465887)
@@ -0,0 +1,15 @@
+--- src/ui/main.c.orig	2004-12-03 07:05:59 UTC
++++ src/ui/main.c
+@@ -11,11 +11,10 @@
+ #include "ui-main.h"
+ #include "input-manager.h"
+ 
+-#include <esd.h>
+ #include <gtk/gtk.h>
+ #include <gst/gst.h>
+ #include <bonobo/bonobo-i18n.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <libgnomeui/gnome-ui-init.h>
+ 
+ #include <math.h>



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