From owner-freebsd-ports@FreeBSD.ORG Thu Oct 23 12:47:45 2003 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 58FFD16A4B3; Thu, 23 Oct 2003 12:47:45 -0700 (PDT) Received: from helo.liwing.de (helo.liwing.de [213.70.188.163]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9ECE43F75; Thu, 23 Oct 2003 12:47:43 -0700 (PDT) (envelope-from root@helo.liwing.de) Received: from helo.liwing.de (localhost.liwing.de [127.0.0.1]) by helo.liwing.de (8.12.9p2/8.12.9) with ESMTP id h9NJlgUn084671; Thu, 23 Oct 2003 19:47:42 GMT (envelope-from root@helo.liwing.de) Received: (from root@localhost) by helo.liwing.de (8.12.9p2/8.12.9/Submit) id h9NJlgwb084670; Thu, 23 Oct 2003 19:47:42 GMT (envelope-from root) Date: Thu, 23 Oct 2003 19:47:42 GMT Message-Id: <200310231947.h9NJlgwb084670@helo.liwing.de> To: FreeBSD-gnats-submit@freebsd.org From: Jens Rehsack X-send-pr-version: 3.113 X-GNATS-Notify: cc: ports@freebsd.org cc: Jens Rehsack Subject: [PATCH] textproc/gxmlviewer configure fix X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Jens Rehsack List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Oct 2003 19:47:45 -0000 >Submitter-Id: current-users >Originator: Jens Rehsack >Organization: LiWing IT-Services >Confidential: no >Synopsis: [PATCH] textproc/gxmlviewer configure fix >Severity: serious >Priority: medium >Category: ports >Class: sw-bug >Release: FreeBSD 5.1-CURRENT i386 >Environment: System: FreeBSD statler 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Tue Oct 21 09:54:47 GMT 2003 root@statler:/usr/obj/usr/src/sys/STATLER i386 >Description: See: >How-To-Repeat: >Fix: --- patch-configure begins here --- --- /dev/null Thu Oct 23 19:41:40 2003 +++ textproc/gxmlviewer/files/patch-configure Thu Oct 23 19:41:18 2003 @@ -0,0 +1,25 @@ +--- configure.orig Thu Oct 23 19:31:15 2003 ++++ configure Thu Oct 23 19:41:08 2003 +@@ -4106,7 +4106,7 @@ + else + echo $ac_n "checking version of bison""... $ac_c" 1>&6 + echo "configure:4109: checking version of bison" >&5 +- ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'` ++ ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) +@@ -4195,9 +4195,10 @@ + echo $ac_n "checking for libxml >= 2.3.1""... $ac_c" 1>&6 + echo "configure:4197: checking for libxml >= 2.3.1" >&5 + if xml2-config --libs > /dev/null 2>&1; then +- vers=`xml2-config --version | sed -e "s/xml-//" -e 's/cvs$//' -e 's/pre$//' | \ +- awk 'BEGIN { FS = "."; } { print $3;}'` +- if test "$vers" -ge 1; then ++ vers=`xml2-config --version | sed -e "s/xml-//" -e 's/cvs$//' -e 's/pre$//'` ++ vers_minor=`echo ${vers} | awk 'BEGIN { FS = "."; } { print $2;}'` ++ vers_rev=`echo ${vers} | awk 'BEGIN { FS = "."; } { print $3;}'` ++ if test "$vers_minor" -gt 3 -o "$vers_minor" -ge 3 -a "$vers_rev" -ge 1; then + echo "$ac_t""found ("$vers")" 1>&6 + XML_CFLAGS="`xml2-config --cflags`" + XML_LIBS="`xml2-config --libs`" --- patch-configure ends here ---