From owner-svn-ports-head@FreeBSD.ORG Tue Apr 2 09:27:07 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CD89B484; Tue, 2 Apr 2013 09:27:07 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B18EE340; Tue, 2 Apr 2013 09:27:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r329R7Le031113; Tue, 2 Apr 2013 09:27:07 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r329R68S031105; Tue, 2 Apr 2013 09:27:06 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201304020927.r329R68S031105@svn.freebsd.org> From: Koop Mast Date: Tue, 2 Apr 2013 09:27:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315661 - in head: databases/mysql-workbench51 graphics/gimp-focusblur-plugin net-im/farsight2 textproc/wv2 x11-themes/gtk-murrine-engine X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Apr 2013 09:27:07 -0000 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 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@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 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