- Convert to USES=libtool

- Replace -lstdc++ patches with post-patch command and apply it to more
  makefiles

4 files changed, 37 insertions, 68 deletions

diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index d9e8e072a7e3..416e335ea139 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gtkmathview
 PORTVERSION=	0.8.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://helm.cs.unibo.it/mml-widget/sources/
 
@@ -15,12 +15,22 @@ LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
 		libt1.so:${PORTSDIR}/devel/t1lib \
 		libgmetadom_gdome_cpp_smart.so:${PORTSDIR}/textproc/gmetadom
 
-USES=		gmake pathfix pkgconfig
+GNU_CONFIGURE=	yes
+USES=		gmake libtool pathfix pkgconfig
 USE_GNOME=	gtk20 libxml2 pangox-compat
-USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+post-patch:
+	@${REINPLACE_CMD} '/-lstdc++/d' ${WRKSRC}/src/Makefile.in \
+		${WRKSRC}/src/view/Makefile.in ${WRKSRC}/viewer/Makefile.in
+	@${REINPLACE_CMD} '/^mathmlps_LDADD =/s|=|= ../src/libmathview.la|' \
+		${WRKSRC}/mathmlps/Makefile.in
+	@${REINPLACE_CMD} '/^mathmlsvg_LDADD =/s|=|= $$(XML_LIBS) ../src/libmathview.la|' \
+		${WRKSRC}/mathmlsvg/Makefile.in
+	@${REINPLACE_CMD} '/^test_rendering_LDADD =/s|=|= ../src/libmathview.la|' \
+		${WRKSRC}/viewer/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmathview/files/patch-src_Makefile.in b/x11-toolkits/gtkmathview/files/patch-src_Makefile.in
deleted file mode 100644
index 0d321de019d0..000000000000
--- a/x11-toolkits/gtkmathview/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig	2013-10-04 15:01:01.000000000 +0200
-+++ src/Makefile.in	2013-10-04 15:01:12.000000000 +0200
-@@ -285,7 +285,6 @@
-   $(MAYBE_BOXML_LIBADD) \
-   $(top_builddir)/src/engine/common/libengine_common.la \
-   $(top_builddir)/src/common/libcommon.la \
--  -lstdc++ \
-   $(NULL)
- 
- all: all-recursive
diff --git a/x11-toolkits/gtkmathview/files/patch-src_view_Makefile.in b/x11-toolkits/gtkmathview/files/patch-src_view_Makefile.in
deleted file mode 100644
index bec718995823..000000000000
--- a/x11-toolkits/gtkmathview/files/patch-src_view_Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/view/Makefile.in.orig	2013-10-04 15:02:02.000000000 +0200
-+++ src/view/Makefile.in	2013-10-04 15:02:20.000000000 +0200
-@@ -305,28 +305,24 @@
-   $(top_builddir)/src/frontend/libxml2_reader/libfrontend_libxml2_reader.la \
-   $(top_builddir)/src/frontend/custom_reader/libfrontend_custom_reader.la \
-   $(top_builddir)/src/libmathview.la \
--  -lstdc++ \
-   $(NULL)
- 
- libmathview_frontend_libxml2_reader_la_LIBADD = \
-   $(XML_LIBS) \
-   $(top_builddir)/src/frontend/libxml2_reader/libfrontend_libxml2_reader.la \
-   $(top_builddir)/src/libmathview.la \
--  -lstdc++ \
-   $(NULL)
- 
- libmathview_frontend_libxml2_la_LIBADD = \
-   $(XML_LIBS) \
-   $(top_builddir)/src/frontend/libxml2/libfrontend_libxml2.la \
-   $(top_builddir)/src/libmathview.la \
--  -lstdc++ \
-   $(NULL)
- 
- libmathview_frontend_gmetadom_la_LIBADD = \
-   $(DOM_LIBS) \
-   $(top_builddir)/src/frontend/gmetadom/libfrontend_gmetadom.la \
-   $(top_builddir)/src/libmathview.la \
--  -lstdc++ \
-   $(NULL)
- 
- libmathview_frontend_custom_reader_la_CPPFLAGS = -DGMV_FrontEnd_DLL
diff --git a/x11-toolkits/gtkmathview/pkg-plist b/x11-toolkits/gtkmathview/pkg-plist
index d46061f59dd2..c5a654a8ae1e 100644
--- a/x11-toolkits/gtkmathview/pkg-plist
+++ b/x11-toolkits/gtkmathview/pkg-plist
@@ -129,53 +129,53 @@ include/gtkmathview/gtk/gtkmathview_gmetadom.h
 include/gtkmathview/gtk/gtkmathview_libxml2.h
 include/gtkmathview/gtk/gtkmathview_libxml2_reader.h
 lib/libgtkmathview_custom_reader.a
-lib/libgtkmathview_custom_reader.la
 lib/libgtkmathview_custom_reader.so
-lib/libgtkmathview_custom_reader.so.8
+lib/libgtkmathview_custom_reader.so.0
+lib/libgtkmathview_custom_reader.so.0.8.0
 lib/libgtkmathview_gmetadom.a
-lib/libgtkmathview_gmetadom.la
 lib/libgtkmathview_gmetadom.so
-lib/libgtkmathview_gmetadom.so.8
+lib/libgtkmathview_gmetadom.so.0
+lib/libgtkmathview_gmetadom.so.0.8.0
 lib/libgtkmathview_libxml2.a
-lib/libgtkmathview_libxml2.la
 lib/libgtkmathview_libxml2.so
-lib/libgtkmathview_libxml2.so.8
+lib/libgtkmathview_libxml2.so.0
+lib/libgtkmathview_libxml2.so.0.8.0
 lib/libgtkmathview_libxml2_reader.a
-lib/libgtkmathview_libxml2_reader.la
 lib/libgtkmathview_libxml2_reader.so
-lib/libgtkmathview_libxml2_reader.so.8
+lib/libgtkmathview_libxml2_reader.so.0
+lib/libgtkmathview_libxml2_reader.so.0.8.0
 lib/libmathview.a
-lib/libmathview.la
 lib/libmathview.so
-lib/libmathview.so.8
+lib/libmathview.so.0
+lib/libmathview.so.0.8.0
 lib/libmathview_backend_gtk.a
-lib/libmathview_backend_gtk.la
 lib/libmathview_backend_gtk.so
-lib/libmathview_backend_gtk.so.8
+lib/libmathview_backend_gtk.so.0
+lib/libmathview_backend_gtk.so.0.8.0
 lib/libmathview_backend_ps.a
-lib/libmathview_backend_ps.la
 lib/libmathview_backend_ps.so
-lib/libmathview_backend_ps.so.8
+lib/libmathview_backend_ps.so.0
+lib/libmathview_backend_ps.so.0.8.0
 lib/libmathview_backend_svg.a
-lib/libmathview_backend_svg.la
 lib/libmathview_backend_svg.so
-lib/libmathview_backend_svg.so.8
+lib/libmathview_backend_svg.so.0
+lib/libmathview_backend_svg.so.0.8.0
 lib/libmathview_frontend_custom_reader.a
-lib/libmathview_frontend_custom_reader.la
 lib/libmathview_frontend_custom_reader.so
-lib/libmathview_frontend_custom_reader.so.8
+lib/libmathview_frontend_custom_reader.so.0
+lib/libmathview_frontend_custom_reader.so.0.8.0
 lib/libmathview_frontend_gmetadom.a
-lib/libmathview_frontend_gmetadom.la
 lib/libmathview_frontend_gmetadom.so
-lib/libmathview_frontend_gmetadom.so.8
+lib/libmathview_frontend_gmetadom.so.0
+lib/libmathview_frontend_gmetadom.so.0.8.0
 lib/libmathview_frontend_libxml2.a
-lib/libmathview_frontend_libxml2.la
 lib/libmathview_frontend_libxml2.so
-lib/libmathview_frontend_libxml2.so.8
+lib/libmathview_frontend_libxml2.so.0
+lib/libmathview_frontend_libxml2.so.0.8.0
 lib/libmathview_frontend_libxml2_reader.a
-lib/libmathview_frontend_libxml2_reader.la
 lib/libmathview_frontend_libxml2_reader.so
-lib/libmathview_frontend_libxml2_reader.so.8
+lib/libmathview_frontend_libxml2_reader.so.0
+lib/libmathview_frontend_libxml2_reader.so.0.8.0
 libdata/pkgconfig/gtkmathview-custom-reader.pc
 libdata/pkgconfig/gtkmathview-gmetadom.pc
 libdata/pkgconfig/gtkmathview-libxml2-reader.pc