- Update to 0.97.1

5 files changed, 14 insertions, 49 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 5e7cb0f81c87..7c2ab9413fd7 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	dia
-DISTVERSION=	0.97
-PORTREVISION=	3
+DISTVERSION=	0.97.1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
@@ -47,10 +46,12 @@ PLIST_SUB+=	PYTHON="@comment "
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
-LIB_DEPENDS+=	EMF.1:${PORTSDIR}/graphics/libemf
-PLIST_SUB+=	WMF=""
+LIB_DEPENDS+=		EMF.1:${PORTSDIR}/graphics/libemf
+CONFIGURE_ARGS+=	--enable-libemf
+PLIST_SUB+=		WMF=""
 .else
-PLIST_SUB+=	WMF="@comment "
+CONFIGURE_ARGS+=	--disable-libemf
+PLIST_SUB+=		WMF="@comment "
 .endif
 
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
@@ -79,9 +80,6 @@ post-patch:
 		's,\(^GTK_LIBS.*\),\1 ${PTHREAD_LIBS}, ; \
 		 s,\(^GTK_CFLAGS = \),\1 ${PTHREAD_CFLAGS} ,'
 .endif
-.if ${ARCH} != "i386"
-	@${REINPLACE_CMD} -e 's|wmf||g' ${WRKSRC}/plug-ins/Makefile.in
-.endif
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl|${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl| ; \
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index b13d9eba07bb..34ad5893ca7f 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/dia-0.97.tar.bz2) = 3d11f9aaa5a4923f0a5533962c87bdfb
-SHA256 (gnome2/dia-0.97.tar.bz2) = 9083382bd5435b6d6324fc601f359a7c759504e48adbcece0a7d5c45a76ccf5a
-SIZE (gnome2/dia-0.97.tar.bz2) = 6736670
+MD5 (gnome2/dia-0.97.1.tar.bz2) = 57e44bb9f387559a0506b52a134deaf0
+SHA256 (gnome2/dia-0.97.1.tar.bz2) = 8dfe8b2c9d87baf29834c8de5e3ec91497c2b17f2b77fb1b867afddf5c429142
+SIZE (gnome2/dia-0.97.1.tar.bz2) = 6836081
diff --git a/graphics/dia/files/patch-ad b/graphics/dia/files/patch-ad
index e1e40ee77aa1..c10cca88765e 100644
--- a/graphics/dia/files/patch-ad
+++ b/graphics/dia/files/patch-ad
@@ -1,23 +1,5 @@
 --- configure.orig	2009-07-11 00:18:11.000000000 +1000
 +++ configure	2009-07-11 00:18:11.000000000 +1000
-@@ -22005,7 +22005,7 @@ else
-   with_freetype=yes
- fi
- 
--if test "x$with_freetype" == "xyes"; then
-+if test "x$with_freetype" = "xyes"; then
- 
- pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for PANGOFT2" >&5
-@@ -23393,7 +23393,7 @@ $as_echo "no" >&6; }
- fi
- 
- 
--if test "$XGETTEXT" == none ; then
-+if test "$XGETTEXT" = none ; then
-    { { $as_echo "$as_me:$LINENO: error: xgettext program not found: $XGETTEXT." >&5
- $as_echo "$as_me: error: xgettext program not found: $XGETTEXT." >&2;}
-    { (exit 1); exit 1; }; }
 @@ -26619,7 +26619,7 @@ $as_echo_n "checking local Python config
  
    fi
@@ -45,21 +27,3 @@
  
  fi
  
-@@ -27022,7 +27022,7 @@ $as_echo "no" >&6; }
- fi
- 
- 
--if  test "x$dblatex" == "xno"; then
-+if  test "x$dblatex" = "xno"; then
-   if test "x$jw" != "xno"; then
-   WITH_JW_TRUE=
-   WITH_JW_FALSE='#'
-@@ -27043,7 +27043,7 @@ fi
- fi
- hardbook_ok=no
- xsltproc_ok=no
--if test "x$with_hardbooks" == "xno"; then
-+if test "x$with_hardbooks" = "xno"; then
-    if test "xno" != "xno"; then
-   WITH_JW_TRUE=
-   WITH_JW_FALSE='#'
diff --git a/graphics/dia/files/patch-doc_fr_Makefile.in b/graphics/dia/files/patch-doc_fr_Makefile.in
index 86e5b399fdbf..50205c91ceef 100644
--- a/graphics/dia/files/patch-doc_fr_Makefile.in
+++ b/graphics/dia/files/patch-doc_fr_Makefile.in
@@ -1,9 +1,9 @@
 --- doc/fr/Makefile.in.orig	2009-07-05 15:43:34.000000000 +1000
 +++ doc/fr/Makefile.in	2009-07-05 15:42:37.000000000 +1000
-@@ -298,7 +298,7 @@
- libexecdir = @libexecdir@
+@@ -304,7 +304,7 @@
  localedir = @localedir@
  localstatedir = @localstatedir@
+ lt_ECHO = @lt_ECHO@
 -mandir = $(datadir)/man/$(lang)
 +mandir = @mandir@/$(lang)
  mkdir_p = @mkdir_p@
diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist
index 22a3fff2b4d7..916646c33d1d 100644
--- a/graphics/dia/pkg-plist
+++ b/graphics/dia/pkg-plist
@@ -1727,6 +1727,7 @@ share/locale/be/LC_MESSAGES/dia.mo
 share/locale/bg/LC_MESSAGES/dia.mo
 share/locale/bs/LC_MESSAGES/dia.mo
 share/locale/ca/LC_MESSAGES/dia.mo
+share/locale/ca@valencia/LC_MESSAGES/dia.mo
 share/locale/cs/LC_MESSAGES/dia.mo
 share/locale/da/LC_MESSAGES/dia.mo
 share/locale/de/LC_MESSAGES/dia.mo
@@ -1757,6 +1758,7 @@ share/locale/mn/LC_MESSAGES/dia.mo
 share/locale/mr/LC_MESSAGES/dia.mo
 share/locale/ms/LC_MESSAGES/dia.mo
 share/locale/oc/LC_MESSAGES/dia.mo
+share/locale/or/LC_MESSAGES/dia.mo
 share/locale/nb/LC_MESSAGES/dia.mo
 share/locale/ne/LC_MESSAGES/dia.mo
 share/locale/nl/LC_MESSAGES/dia.mo
@@ -1774,6 +1776,7 @@ share/locale/sq/LC_MESSAGES/dia.mo
 share/locale/sr/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
 share/locale/th/LC_MESSAGES/dia.mo
 share/locale/tr/LC_MESSAGES/dia.mo
 share/locale/uk/LC_MESSAGES/dia.mo