Update to 0.5.1.

Unmark BROKEN for 5.x.

PR:		ports/58110
Submitted by:	Ying-Chieh Chen <yinjieh@csie.nctu.edu.tw> (MAINTAINER)

6 files changed, 11 insertions, 65 deletions

diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index 433aab8f99c4..6fb61fc75fe7 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gtkmathview
-PORTVERSION=	0.4.2
+PORTVERSION=	0.5.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://helm.cs.unibo.it/mml-widget/sources/
 
@@ -22,7 +22,7 @@ LIB_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv \
 USE_REINPLACE=	yes
 USE_GETOPT_LONG=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	glib12 gtk12
+USE_GNOME=	glib20 gtk20
 USE_LIBTOOL=	yes
 CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
 LDFLAGS=	-L${LOCALBASE}/lib
@@ -32,15 +32,9 @@ INSTALLS_SHLIB=	yes
 
 MAN1=	mathmlviewer.1 mathml2ps.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 post-patch:
 .for file in src/stringAux.cc src/PS_T1_FontManager.cc
 	@${REINPLACE_CMD} -e "s|malloc.h|stdlib.h|g" ${WRKSRC}/${file}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmathview/distinfo b/x11-toolkits/gtkmathview/distinfo
index 7f1025aa38ea..323918b22301 100644
--- a/x11-toolkits/gtkmathview/distinfo
+++ b/x11-toolkits/gtkmathview/distinfo
@@ -1 +1 @@
-MD5 (gtkmathview-0.4.2.tar.gz) = 5ffae2f3d750bb1400e8c0862aed1868
+MD5 (gtkmathview-0.5.1.tar.gz) = 64313fd6d06bf8cd9d8f12087b7fab1c
diff --git a/x11-toolkits/gtkmathview/files/patch-configure b/x11-toolkits/gtkmathview/files/patch-configure
deleted file mode 100644
index 65a05d0f504a..000000000000
--- a/x11-toolkits/gtkmathview/files/patch-configure
+++ /dev/null
@@ -1,40 +0,0 @@
---- configure.orig	Mon Jul 14 08:49:26 2003
-+++ configure	Mon Jul 14 08:50:23 2003
-@@ -10352,23 +10352,23 @@
-   else
-      PKG_CONFIG_MIN_VERSION=0.9.0
-      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        echo "$as_me:$LINENO: checking for gtk" >&5
--echo $ECHO_N "checking for gtk... $ECHO_C" >&6
-+        echo "$as_me:$LINENO: checking for gtk+" >&5
-+echo $ECHO_N "checking for gtk+... $ECHO_C" >&6
- 
--        if $PKG_CONFIG --exists "gtk" ; then
-+        if $PKG_CONFIG --exists "gtk+" ; then
-             echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-             succeeded=yes
- 
-             echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
- echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6
--            GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk"`
-+            GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+"`
-             echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
- echo "${ECHO_T}$GTK_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking GTK_LIBS" >&5
- echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6
--            GTK_LIBS=`$PKG_CONFIG --libs "gtk"`
-+            GTK_LIBS=`$PKG_CONFIG --libs "gtk+"`
-             echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
- echo "${ECHO_T}$GTK_LIBS" >&6
-         else
-@@ -10376,7 +10376,7 @@
-             GTK_LIBS=""
-             ## If we have a custom action on failure, don't print errors, but
-             ## do set a variable so people can do so.
--            GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk"`
-+            GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+"`
- 
-         fi
- 
diff --git a/x11-toolkits/gtkmathview/files/patch-src::ChildList.cc b/x11-toolkits/gtkmathview/files/patch-src::ChildList.cc
deleted file mode 100644
index 1fd531139f60..000000000000
--- a/x11-toolkits/gtkmathview/files/patch-src::ChildList.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/ChildList.cc.orig	Sun Jul 27 02:06:29 2003
-+++ src/ChildList.cc	Sun Jul 27 02:06:46 2003
-@@ -21,6 +21,7 @@
- // <luca.padovani@cs.unibo.it>
- 
- #include <config.h>
-+#include <assert.h>
- 
- #include "ChildList.hh"
- 
diff --git a/x11-toolkits/gtkmathview/files/patch-src::T1_FontManager.cc b/x11-toolkits/gtkmathview/files/patch-src::T1_FontManager.cc
index 2946c0fb31c7..941c007e2dba 100644
--- a/x11-toolkits/gtkmathview/files/patch-src::T1_FontManager.cc
+++ b/x11-toolkits/gtkmathview/files/patch-src::T1_FontManager.cc
@@ -1,11 +1,13 @@
---- src/T1_FontManager.cc.orig	Mon Jul 14 08:30:07 2003
-+++ src/T1_FontManager.cc	Mon Jul 14 08:30:33 2003
-@@ -77,7 +77,7 @@
+--- src/T1_FontManager.cc.orig	Thu Jul 17 18:18:13 2003
++++ src/T1_FontManager.cc	Thu Oct 16 15:09:23 2003
+@@ -77,8 +77,8 @@
  int
  T1_FontManager::SearchT1FontId(const char* fileName) const
  {
+-  //int n = T1_GetNoFonts(); // version 5.0 of t1lib
 -  int n = T1_Get_no_fonts();
-+  int n = T1_GetNoFonts();
++  int n = T1_GetNoFonts(); // version 5.0 of t1lib
++  //int n = T1_Get_no_fonts();
    int i;
    for (i = 0; i < n && strcmp(fileName, T1_GetFontFileName(i)); i++) ;
  
diff --git a/x11-toolkits/gtkmathview/pkg-plist b/x11-toolkits/gtkmathview/pkg-plist
index 90331889c7d2..07f1a3f77973 100644
--- a/x11-toolkits/gtkmathview/pkg-plist
+++ b/x11-toolkits/gtkmathview/pkg-plist
@@ -7,7 +7,7 @@ include/gtkmathview/gtkmathview.h
 lib/libgtkmathview.a
 lib/libgtkmathview.la
 lib/libgtkmathview.so
-lib/libgtkmathview.so.4
+lib/libgtkmathview.so.5
 lib/pkgconfig/gtkmathview.pc
 share/gtkmathview/dictionary-combining.xml
 share/gtkmathview/dictionary-local.xml