From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 14 06:50:29 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD60037B404 for ; Mon, 14 Jul 2003 06:50:29 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D386A43F75 for ; Mon, 14 Jul 2003 06:50:23 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h6EDoIUp037532 for ; Mon, 14 Jul 2003 06:50:18 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h6EDoIih037530; Mon, 14 Jul 2003 06:50:18 -0700 (PDT) Resent-Date: Mon, 14 Jul 2003 06:50:18 -0700 (PDT) Resent-Message-Id: <200307141350.h6EDoIih037530@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Ying-Chieh Chen" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 703F537B404 for ; Mon, 14 Jul 2003 06:42:04 -0700 (PDT) Received: from alumni.csie.nctu.edu.tw (alumni.csie.nctu.edu.tw [140.113.209.4]) by mx1.FreeBSD.org (Postfix) with ESMTP id 303F444028 for ; Mon, 14 Jul 2003 06:40:43 -0700 (PDT) (envelope-from yinjieh@csie.nctu.edu.tw) Received: from alumni.csie.nctu.edu.tw (yinjieh@localhost [127.0.0.1]) h6EDdr5x013873 for ; Mon, 14 Jul 2003 21:39:53 +0800 (CST) Received: (from yinjieh@localhost) by alumni.csie.nctu.edu.tw (8.12.9/8.12.3/Submit) id h6EDdrvY013872; Mon, 14 Jul 2003 21:39:53 +0800 (CST) Message-Id: <200307141339.h6EDdrvY013872@alumni.csie.nctu.edu.tw> Date: Mon, 14 Jul 2003 21:39:53 +0800 (CST) From: "Ying-Chieh Chen" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/54472: Upgrade ports/x11-toolkits/gtkmathview to 0.4.2 and take over maintainership X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Ying-Chieh Chen List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2003 13:50:30 -0000 >Number: 54472 >Category: ports >Synopsis: Upgrade ports/x11-toolkits/gtkmathview to 0.4.2 and take over maintainership >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jul 14 06:50:08 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Ying-Chieh Chen >Release: FreeBSD 4.8-RELEASE i386 >Organization: yinjieh's own lab >Environment: System: FreeBSD stable.yinjieh.com 4.8-RELEASE FreeBSD 4.8-RELEASE #0: Thu Apr 3 10:53:38 GMT 2003 root@freebsd-stable.sentex.ca:/usr/obj/usr/src/sys/GENERIC i386 >Description: Upgrade ports/x11-toolkits/gtkmathview to 0.4.2 and take over maintainership. Tested on 4.8-RELEASE, but build fails on 5.1-RELEASE. So I put BROKEN variable if ${OSVERSION} >= 500000. If anyone knows how to solve this problem, please let me know, thanks. Please commit it, thanks. >How-To-Repeat: Apply the following patch in "Fix:" section and make. >Fix: --- gtkmathview.patch begins here --- diff -ruN /usr/ports/x11-toolkits/gtkmathview/Makefile gtkmathview/Makefile --- /usr/ports/x11-toolkits/gtkmathview/Makefile Mon Jul 14 18:39:22 2003 +++ gtkmathview/Makefile Mon Jul 14 19:36:37 2003 @@ -3,38 +3,40 @@ # Date created: Oct 15, 2002 # Whom: ijliao # -# $FreeBSD: ports/x11-toolkits/gtkmathview/Makefile,v 1.8 2003/07/14 02:37:39 sf Exp $ +# $FreeBSD: ports/x11-toolkits/gtkmathview/Makefile,v 1.7 2003/06/04 17:45:54 kris Exp $ # PORTNAME= gtkmathview -PORTVERSION= 0.3.0 -PORTREVISION= 1 +PORTVERSION= 0.4.2 CATEGORIES= x11-toolkits MASTER_SITES= http://helm.cs.unibo.it/mml-widget/sources/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= yinjieh@csie.nctu.edu.tw COMMENT= A GTK Widget to Render MathML Documents LIB_DEPENDS= iconv:${PORTSDIR}/converters/libiconv \ t1:${PORTSDIR}/devel/t1lib \ - xml2:${PORTSDIR}/textproc/libxml2 \ + xml2.5:${PORTSDIR}/textproc/libxml2 \ gmetadom_gdome_cpp_smart:${PORTSDIR}/textproc/gmetadom -BROKEN= "Configure fails" - -USE_GETOPT_LONG=yes USE_REINPLACE= yes +USE_GETOPT_LONG= yes USE_X_PREFIX= yes USE_GNOME= glib12 gtk12 USE_LIBTOOL= yes -CPPFLAGS= -D__GNU_LIBRARY__ -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib -lm -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV= CPPFLAGS="-D__GNU_LIBRARY__ -I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt -lm" USE_GMAKE= yes INSTALLS_SHLIB= yes MAN1= mathmlviewer.1 mathml2ps.1 +.include + +.if ${OSVERSION} >= 500000 +BROKEN= Does not build on FreeBSD 5.x +.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} @@ -43,4 +45,4 @@ post-install: @install-info ${PREFIX}/info/gtkmathview.info ${PREFIX}/info/dir -.include +.include diff -ruN /usr/ports/x11-toolkits/gtkmathview/distinfo gtkmathview/distinfo --- /usr/ports/x11-toolkits/gtkmathview/distinfo Tue Oct 15 21:51:44 2002 +++ gtkmathview/distinfo Mon Jul 14 19:36:37 2003 @@ -1 +1 @@ -MD5 (gtkmathview-0.3.0.tar.gz) = 78d36a88c565c3f38ba52d9b159c951d +MD5 (gtkmathview-0.4.2.tar.gz) = 5ffae2f3d750bb1400e8c0862aed1868 diff -ruN /usr/ports/x11-toolkits/gtkmathview/files/patch-configure gtkmathview/files/patch-configure --- /usr/ports/x11-toolkits/gtkmathview/files/patch-configure Thu Jan 1 08:00:00 1970 +++ gtkmathview/files/patch-configure Mon Jul 14 19:36:37 2003 @@ -0,0 +1,40 @@ +--- 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 -ruN /usr/ports/x11-toolkits/gtkmathview/files/patch-src::String.cc gtkmathview/files/patch-src::String.cc --- /usr/ports/x11-toolkits/gtkmathview/files/patch-src::String.cc Thu Jan 1 08:00:00 1970 +++ gtkmathview/files/patch-src::String.cc Mon Jul 14 19:36:37 2003 @@ -0,0 +1,15 @@ +--- src/String.cc.orig Mon Jul 14 08:01:23 2003 ++++ src/String.cc Mon Jul 14 08:05:56 2003 +@@ -34,6 +34,12 @@ + #include "String.hh" + #include "Globals.hh" + ++#ifdef __FreeBSD__ ++#if (__FreeBSD_version < 500000) ++#define iswspace(c) ((c) == ' ' || (c) == '\t' || (c) == '\n') ++#endif ++#endif ++ + #ifdef DEBUG + int String::counter = 0; + #endif diff -ruN /usr/ports/x11-toolkits/gtkmathview/files/patch-src::StringTokenizer.cc gtkmathview/files/patch-src::StringTokenizer.cc --- /usr/ports/x11-toolkits/gtkmathview/files/patch-src::StringTokenizer.cc Thu Jan 1 08:00:00 1970 +++ gtkmathview/files/patch-src::StringTokenizer.cc Mon Jul 14 19:36:37 2003 @@ -0,0 +1,17 @@ +--- src/StringTokenizer.cc.orig Mon Jul 14 08:15:49 2003 ++++ src/StringTokenizer.cc Mon Jul 14 08:18:44 2003 +@@ -34,6 +34,14 @@ + #include "MathMLAttribute.hh" + #include "StringTokenizer.hh" + ++#ifdef __FreeBSD__ ++#if (__FreeBSD_version < 500000) ++#define iswxdigit isxdigit ++#define towupper toupper ++#define iswdigit isdigit ++#endif ++#endif ++ + static unsigned hexOfChar(Char ch) + { + assert(iswxdigit(ch)); diff -ruN /usr/ports/x11-toolkits/gtkmathview/files/patch-src::T1_FontManager.cc gtkmathview/files/patch-src::T1_FontManager.cc --- /usr/ports/x11-toolkits/gtkmathview/files/patch-src::T1_FontManager.cc Thu Jan 1 08:00:00 1970 +++ gtkmathview/files/patch-src::T1_FontManager.cc Mon Jul 14 19:36:37 2003 @@ -0,0 +1,11 @@ +--- 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 @@ + int + T1_FontManager::SearchT1FontId(const char* fileName) const + { +- int n = T1_Get_no_fonts(); ++ int n = T1_GetNoFonts(); + int i; + for (i = 0; i < n && strcmp(fileName, T1_GetFontFileName(i)); i++) ; + --- gtkmathview.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: