svn commit: r315661 - in head: databases/mysql-workbench51 graphics/gimp-focusblur-plugin net-im/farsight2 textproc/wv2 x11-themes/gtk-murrine-engine

[Koop Mast]

Author: kwm
Date: Tue Apr  2 09:27:05 2013
New Revision: 315661
URL: http://svnweb.freebsd.org/changeset/ports/315661

Log:
  fix build with glib 2.34: wv2, gimp-focusblur-plugin, gtk-murrine-engine
  Fix up botched variable in mysql-workbench51 that prevents patching.
  Correct farsight2 master_site and add mirror.
  
  Submitted by:	pointyhat via miwi
  Approved by:	portmgr (miwi)

Modified:
  head/databases/mysql-workbench51/Makefile
  head/graphics/gimp-focusblur-plugin/Makefile
  head/net-im/farsight2/Makefile
  head/textproc/wv2/Makefile
  head/x11-themes/gtk-murrine-engine/Makefile

Modified: head/databases/mysql-workbench51/Makefile
==============================================================================
--- head/databases/mysql-workbench51/Makefile	Tue Apr  2 04:42:52 2013	(r315660)
+++ head/databases/mysql-workbench51/Makefile	Tue Apr  2 09:27:05 2013	(r315661)
@@ -73,8 +73,8 @@ post-patch:
 		${WRKSRC}/library/canvas/src/mdc_canvas_view.h \
 		${WRKSRC}/library/canvas/src/mdc_canvas_view_printing.cpp \
 		${WRKSRC}/modules/wb.mysql.import/src/stdafx.h \
-		${WKRSRC}/modules/db.mysql.sqlparser/src/stdafx.h \
-		${WKRSRC}/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp \
+		${WRKSRC}/modules/db.mysql.sqlparser/src/stdafx.h \
+		${WRKSRC}/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp \
 		${WRKSRC}/plugins/wb.printing/backend/stdafx.h \
 		${WRKSRC}/plugins/db.mysql/backend/db_plugin_be.cpp
 

Modified: head/graphics/gimp-focusblur-plugin/Makefile
==============================================================================
--- head/graphics/gimp-focusblur-plugin/Makefile	Tue Apr  2 04:42:52 2013	(r315660)
+++ head/graphics/gimp-focusblur-plugin/Makefile	Tue Apr  2 09:27:05 2013	(r315661)
@@ -44,5 +44,7 @@ PLIST_SUB+=	NLS="@comment "
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^bindir = .*|bindir = ${PREFIX}/${PLUGIN_DIR}|g' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|glib/.*\.h|glib.h|g' \
+		${WRKSRC}/src/*.[ch]
 
 .include <bsd.port.mk>

Modified: head/net-im/farsight2/Makefile
==============================================================================
--- head/net-im/farsight2/Makefile	Tue Apr  2 04:42:52 2013	(r315660)
+++ head/net-im/farsight2/Makefile	Tue Apr  2 09:27:05 2013	(r315661)
@@ -5,7 +5,8 @@
 PORTNAME=	farsight2
 PORTVERSION=	0.0.31
 CATEGORIES=	net-im devel
-MASTER_SITES=	http://farsight.freedesktop.org/releases/farsight2/
+MASTER_SITES=	http://www.freedesktop.org/software/farstream/releases/farsight2/ \
+		http://miwibox.org/distfiles/
 
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	Collection of GStreamer modules and libraries for videoconferencing
@@ -14,7 +15,6 @@ LIB_DEPENDS=	nice:${PORTSDIR}/net-im/lib
 
 CONFLICTS=	farstream-[0-9]*
 
-FETCH_ARGS=	-Fpr
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes

Modified: head/textproc/wv2/Makefile
==============================================================================
--- head/textproc/wv2/Makefile	Tue Apr  2 04:42:52 2013	(r315660)
+++ head/textproc/wv2/Makefile	Tue Apr  2 09:27:05 2013	(r315661)
@@ -20,4 +20,8 @@ USE_BZIP2=	yes
 USES=		cmake
 USE_LDCONFIG=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|glib/giochannel.h|glib.h|g' \
+		${WRKSRC}/src/olestream.h
+
 .include <bsd.port.mk>

Modified: head/x11-themes/gtk-murrine-engine/Makefile
==============================================================================
--- head/x11-themes/gtk-murrine-engine/Makefile	Tue Apr  2 04:42:52 2013	(r315660)
+++ head/x11-themes/gtk-murrine-engine/Makefile	Tue Apr  2 09:27:05 2013	(r315661)
@@ -32,4 +32,8 @@ ANIMATION_DESC=	Animation support
 CONFIGURE_ARGS+=--enable-animation
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|glib/gtimer.h|glib.h|g' \
+		${WRKSRC}/src/animation.c
+
 .include <bsd.port.mk>