summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2013-04-02 09:27:05 +0000
committerKoop Mast <kwm@FreeBSD.org>2013-04-02 09:27:05 +0000
commitd4dc90dad1dce1adb2aea9038bef9905888b5ba6 (patch)
tree1c528603784473266e22ebce9f37eed14503479e
parent- Fix fetch (diff)
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)
Notes
Notes: svn path=/head/; revision=315661
-rw-r--r--databases/mysql-workbench51/Makefile4
-rw-r--r--graphics/gimp-focusblur-plugin/Makefile2
-rw-r--r--net-im/farsight2/Makefile4
-rw-r--r--textproc/wv2/Makefile4
-rw-r--r--x11-themes/gtk-murrine-engine/Makefile4
5 files changed, 14 insertions, 4 deletions
diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile
index cf7838c533a4..32841e9cc5a8 100644
--- a/databases/mysql-workbench51/Makefile
+++ b/databases/mysql-workbench51/Makefile
@@ -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
diff --git a/graphics/gimp-focusblur-plugin/Makefile b/graphics/gimp-focusblur-plugin/Makefile
index a4ea08a49654..4fceee4a8406 100644
--- a/graphics/gimp-focusblur-plugin/Makefile
+++ b/graphics/gimp-focusblur-plugin/Makefile
@@ -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>
diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile
index 1f5ee13c4744..746c0e528689 100644
--- a/net-im/farsight2/Makefile
+++ b/net-im/farsight2/Makefile
@@ -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/libnice
CONFLICTS= farstream-[0-9]*
-FETCH_ARGS= -Fpr
USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
diff --git a/textproc/wv2/Makefile b/textproc/wv2/Makefile
index adde29e3e8b6..a7115df87219 100644
--- a/textproc/wv2/Makefile
+++ b/textproc/wv2/Makefile
@@ -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>
diff --git a/x11-themes/gtk-murrine-engine/Makefile b/x11-themes/gtk-murrine-engine/Makefile
index dff75ee0a244..5d220c344d8d 100644
--- a/x11-themes/gtk-murrine-engine/Makefile
+++ b/x11-themes/gtk-murrine-engine/Makefile
@@ -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>