7 files changed, 32 insertions, 4 deletions

diff --git a/devel/acovea-gtk/Makefile b/devel/acovea-gtk/Makefile
index 4b6cc814af3b..e291b754f79a 100644
--- a/devel/acovea-gtk/Makefile
+++ b/devel/acovea-gtk/Makefile
@@ -24,9 +24,12 @@ USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	CPPFLAGS=-I${PREFIX}/include/ LDFLAGS=-L${PREFIX}/lib/
 
-.include <bsd.port.pre.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's|connect(SigC::slot|connect(sigc::mem_fun|g ; \
+		s|#include <sigc++\/compatibility\.h>||g' \
+			${WRKSRC}/src/*.cc
 
 pre-install:
 	${CHMOD} 755 ${WRKSRC}/install-sh
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/libYGP/Makefile b/devel/libYGP/Makefile
index 91ba3f015e07..3b299eb75189 100644
--- a/devel/libYGP/Makefile
+++ b/devel/libYGP/Makefile
@@ -43,6 +43,8 @@ post-patch:
 	@${REINPLACE_CMD} -e '/^#include/s|malloc.h|stdlib.h|' ${WRKSRC}/XGP/GTKViewer.c
 	@${REINPLACE_CMD} -e '/^typedef int socklen_t;/d' ${WRKSRC}/YGP/Socket.cpp
 	@${REINPLACE_CMD} -e '/^#.*define sleep/d' ${WRKSRC}/YGP/Tests/Thread.cpp
+	@${REINPLACE_CMD} -e 's|SigC::Connection|sigc::connection|g' \
+		${WRKSRC}/XGP/MessageDlg.h
 .if ${PORTNAME:M*XGP}
 	@${FIND} ${WRKSRC} -type f -print0 | \
 		${XARGS} -0 ${REINPLACE_CMD} -e 's/ygp-cfg/xgp-cfg/g'
diff --git a/games/cheech/Makefile b/games/cheech/Makefile
index fff537868800..5edae9aec7ab 100644
--- a/games/cheech/Makefile
+++ b/games/cheech/Makefile
@@ -36,6 +36,9 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|doc/cheech|share/doc/cheech|g" \
 		-e "s|: install-cheechdocDATA|:|g" \
 		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|connect(SigC::slot|connect(sigc::mem_fun|g ; \
+		s|#include <sigc++\/compatibility\.h>||g' \
+			${WRKSRC}/src/*.cc
 
 pre-configure:
 	@${LN} -sf ${AUTOMAKE_DIR}/install-sh ${WRKSRC}
diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile
index 777eb5e63ecf..46838e121218 100644
--- a/graphics/synfigstudio/Makefile
+++ b/graphics/synfigstudio/Makefile
@@ -30,6 +30,11 @@ PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 post-patch:
 	@${REINPLACE_CMD} 's|TARGET_MNG="no"|TARGET_MNG="yes"|' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} 's|#include <sigc++\/compatibility\.h>||g ; \
+		s|SigC::Connection|sigc::connection|g ; \
+		s|SigC::slot|sigc::ptr_fun|g ; \
+		s|namespace SigC|namespace sigc|g' \
+			${WRKSRC}/src/gtkmm/*.*
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 0b23368bf615..92eab87004d7 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -105,6 +105,8 @@ post-patch:
 	@${REINPLACE_CMD} -E -e \
 		's|(icon-filename=).+(gcdmaster-doc.png)|\1${LOCALBASE}\/share\/pixmaps\/document-icons\/\2|g' \
 		${WRKSRC}/xdao/gcdmaster.keys
+	@${REINPLACE_CMD} -e 's|connect(SigC::slot|connect(sigc::ptr_fun|g' \
+		${WRKSRC}/xdao/xcdrdao.cc
 .else
 .for i in cdrdao.man main.cc
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/dao/${i}
diff --git a/x11-wm/gcompmgr/Makefile b/x11-wm/gcompmgr/Makefile
index 65dcd1c5bdb8..090d301f7370 100644
--- a/x11-wm/gcompmgr/Makefile
+++ b/x11-wm/gcompmgr/Makefile
@@ -28,11 +28,13 @@ DESKTOP_ENTRIES="gcompmgr" \
 		"Application;Settings;" \
 		true
 
-.include <bsd.port.pre.mk>
 
 post-patch:
 .for file in depcomp install-sh missing
 	@${LN} -sf ${AUTOMAKE_DIR}/${file} ${WRKSRC}
 .endfor
+	@${REINPLACE_CMD} -e 's|connect(SigC::slot|connect(sigc::mem_fun|g ; \
+		s|#include <sigc++\/compatibility\.h>||g' \
+			${WRKSRC}/src/*.cc
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 205ecb72b172..de799d989870 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -50,4 +50,15 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|#include <sigc++\/compatibility\.h>||g ; \
+		s|SigC::Signal|sigc::signal|g ; \
+		s|SigC::slot_class|sigc::mem_fun|g ; \
+		s|SigC::Connection|sigc::connection|g ; \
+		s|SigC::Slot|sigc::slot|g ; \
+		s|SigC::Object|sigc::trackable|g ; \
+		s|SigC::slot|sigc::mem_fun|g' \
+			${WRKSRC}/frontend/gtkmm/src/*.* \
+			${WRKSRC}/frontend/plugin/*/gtkmm/src/*.*
+
 .include <bsd.port.post.mk>