6 files changed, 11 insertions, 156 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 3bc32c76e005..c44303b0027b 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -3,8 +3,7 @@
 #   $MCom: ports/graphics/dia/Makefile,v 1.16 2007/10/11 02:49:12 mezz Exp $
 
 PORTNAME=	dia
-DISTVERSION=	0.97.2
-PORTREVISION=	4
+PORTVERSION=	0.97.3
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
@@ -15,8 +14,7 @@ COMMENT=	Diagram creation program, similar to Visio
 
 OPTIONS_DEFINE=	DOCS
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
-		libpng15.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 
 USES=		desktop-file-utils gettext gmake libtool pathfix \
 		pkgconfig tar:xz
@@ -32,14 +30,14 @@ INSTALL_TARGET=	install-strip
 DOCS_BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == "i386"
-LIB_DEPENDS+=		libEMF.so:${PORTSDIR}/graphics/libemf
-CONFIGURE_ARGS+=	--enable-libemf
-PLIST_SUB+=		WMF=""
-.else
+#.if ${ARCH} == "i386"
+#LIB_DEPENDS+=		libEMF.so:${PORTSDIR}/graphics/libemf
+#CONFIGURE_ARGS+=	--enable-libemf
+#PLIST_SUB+=		WMF=""
+#.else
 CONFIGURE_ARGS+=	--disable-libemf
 PLIST_SUB+=		WMF="@comment "
-.endif
+#.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index 4201e4f28262..cfa1b2890755 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/dia-0.97.2.tar.xz) = a761478fb98697f71b00d3041d7c267f3db4b94fe33ac07c689cb89c4fe5eae1
-SIZE (gnome2/dia-0.97.2.tar.xz) = 5507004
+SHA256 (gnome2/dia-0.97.3.tar.xz) = 22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
+SIZE (gnome2/dia-0.97.3.tar.xz) = 5548500
diff --git a/graphics/dia/files/patch-app_render-gdk.c b/graphics/dia/files/patch-app_render-gdk.c
deleted file mode 100644
index 5db4bf59c3d7..000000000000
--- a/graphics/dia/files/patch-app_render-gdk.c
+++ /dev/null
@@ -1,101 +0,0 @@
-From 7ac3e9ffac09f99a1aa2fe97a4dc0a688c9746b0 Mon Sep 17 00:00:00 2001
-From: Hans Breuer <hans@breuer.org>
-Date: Sat, 16 Mar 2013 16:56:58 +0000
-Subject: Bug 694025 - GLib drop support for adding interfaces after class_init
-
-Without this Dia crashes at startup with new GLib version and the
-DiaGdkRenderer being default. Make a new DiaGdkInteractiveRenderer which
-follows the pattern also used for DiaCairoInteraciveRenderer. This should
-be functional equivalent to what was there before and should work for all
-current GLib versions.
-
-(cherry picked from commit 213bdfe956bf8fe57c86316f68a09408fef1647e)
----
-diff --git a/app/render_gdk.c b/app/render_gdk.c
-index 60ccb7a..b1e7ba4 100644
---- app/render_gdk.c
-+++ app/render_gdk.c
-@@ -50,7 +50,21 @@ static void copy_to_window (DiaRenderer *renderer,
-                 gpointer window,
-                 int x, int y, int width, int height);
- 
--static void dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
-+typedef struct _DiaGdkInteractiveRenderer DiaGdkInteractiveRenderer;
-+struct _DiaGdkInteractiveRenderer
-+{
-+  DiaGdkRenderer parent_instance; /*!< inheritance in object oriented C */
-+};
-+typedef struct _DiaGdkInteractiveRendererClass DiaGdkInteractiveRendererClass;
-+struct _DiaGdkInteractiveRendererClass
-+{
-+  DiaGdkRendererClass parent_class; /*!< the base class */
-+};
-+#define DIA_TYPE_GDK_INTERACTIVE_RENDERER           (dia_gdk_interactive_renderer_get_type ())
-+#define DIA_GDK_INTERACTIVE_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DIA_TYPE_GDK_INTERACTIVE_RENDERER, DiaGdkInteractiveRenderer))
-+
-+static void
-+dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
- {
-   iface->clip_region_clear = clip_region_clear;
-   iface->clip_region_add_rect = clip_region_add_rect;
-@@ -61,35 +75,35 @@ static void dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
-   iface->set_size = set_size;
- }
- 
-+G_DEFINE_TYPE_WITH_CODE (DiaGdkInteractiveRenderer, dia_gdk_interactive_renderer, DIA_TYPE_GDK_RENDERER,
-+			 G_IMPLEMENT_INTERFACE (DIA_TYPE_INTERACTIVE_RENDERER_INTERFACE, dia_gdk_renderer_iface_init));
-+
-+static void
-+dia_gdk_interactive_renderer_class_init(DiaGdkInteractiveRendererClass *klass)
-+{
-+}
-+static void
-+dia_gdk_interactive_renderer_init(DiaGdkInteractiveRenderer *object)
-+{
-+  DiaGdkInteractiveRenderer *ia_renderer = DIA_GDK_INTERACTIVE_RENDERER (object);
-+  DiaGdkRenderer *renderer = DIA_GDK_RENDERER(object);
-+  DiaRenderer *dia_renderer = DIA_RENDERER(object);
-+  
-+  dia_renderer->is_interactive = 1;
-+
-+  renderer->gc = NULL;
-+  renderer->pixmap = NULL;
-+  renderer->clip_region = NULL;
-+}
-+
- DiaRenderer *
- new_gdk_renderer(DDisplay *ddisp)
- {
-   DiaGdkRenderer *renderer;
-   GType renderer_type = 0;
- 
--  renderer = g_object_new (DIA_TYPE_GDK_RENDERER, NULL);
-+  renderer = g_object_new (DIA_TYPE_GDK_INTERACTIVE_RENDERER, NULL);
-   renderer->transform = dia_transform_new (&ddisp->visible, &ddisp->zoom_factor);
--  if (!DIA_GET_INTERACTIVE_RENDERER_INTERFACE (renderer))
--    {
--      static const GInterfaceInfo irenderer_iface_info = 
--      {
--        (GInterfaceInitFunc) dia_gdk_renderer_iface_init,
--        NULL,           /* iface_finalize */
--        NULL            /* iface_data     */
--      };
--
--      renderer_type = DIA_TYPE_GDK_RENDERER;
--      /* register the interactive renderer interface */
--      g_type_add_interface_static (renderer_type,
--                                   DIA_TYPE_INTERACTIVE_RENDERER_INTERFACE,
--                                   &irenderer_iface_info);
--
--    }
--  renderer->parent_instance.is_interactive = 1;
--  renderer->gc = NULL;
--
--  renderer->pixmap = NULL;
--  renderer->clip_region = NULL;
- 
-   return DIA_RENDERER(renderer);
- }
---
-cgit v0.9.2
-
diff --git a/graphics/dia/files/patch-configure b/graphics/dia/files/patch-configure
deleted file mode 100644
index c10cca88765e..000000000000
--- a/graphics/dia/files/patch-configure
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	2009-07-11 00:18:11.000000000 +1000
-+++ configure	2009-07-11 00:18:11.000000000 +1000
-@@ -26619,7 +26619,7 @@ $as_echo_n "checking local Python config
- 
-   fi
- 
--
-+  PYTHON_EXEC_PREFIX=${LOCALBASE}
- 
-   PYTHON_PLATFORM=`$PYTHON -c "import sys; print sys.platform"`
- 
-@@ -26681,12 +26681,12 @@ except ImportError:
- except:
-         sys.exit(0)
- sys.exit(0)"
--if $PYTHON -c "$prog" 1>&5 2>&5
--  then
-+#if $PYTHON -c "$prog" 1>&5 2>&5
-+#  then
-     eval "py_cv_mod_$py_mod_var=yes"
--  else
--    eval "py_cv_mod_$py_mod_var=no"
--  fi
-+#  else
-+#    eval "py_cv_mod_$py_mod_var=no"
-+#  fi
- 
- fi
- 
diff --git a/graphics/dia/files/patch-plug-ins_postscript_diapsft2renderer.c b/graphics/dia/files/patch-plug-ins_postscript_diapsft2renderer.c
deleted file mode 100644
index 4250f058ebce..000000000000
--- a/graphics/dia/files/patch-plug-ins_postscript_diapsft2renderer.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- plug-ins/postscript/diapsft2renderer.c.orig	2013-12-14 12:29:51.000000000 +0100
-+++ plug-ins/postscript/diapsft2renderer.c	2013-12-14 12:31:31.000000000 +0100
-@@ -29,8 +29,9 @@
- #include <pango/pangoft2.h>
- #include <pango/pango-engine.h>
- /* I'd really rather avoid this */
--#include <freetype/ftglyph.h>
--#include <freetype/ftoutln.h>
-+#include <ft2build.h>
-+#include FT_GLYPH_H
-+#include FT_OUTLINE_H
- 
- #define DPI 300
- 
diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist
index a521674b5f19..134b42e063dd 100644
--- a/graphics/dia/pkg-plist
+++ b/graphics/dia/pkg-plist
@@ -1742,6 +1742,7 @@ share/locale/sk/LC_MESSAGES/dia.mo
 share/locale/sl/LC_MESSAGES/dia.mo
 share/locale/sq/LC_MESSAGES/dia.mo
 share/locale/sr/LC_MESSAGES/dia.mo
+share/locale/sr@latin/LC_MESSAGES/dia.mo
 share/locale/sr@Latn/LC_MESSAGES/dia.mo
 share/locale/sv/LC_MESSAGES/dia.mo
 share/locale/ta/LC_MESSAGES/dia.mo