From owner-freebsd-ports Wed Oct 11 14:50:16 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D43C937B66E for ; Wed, 11 Oct 2000 14:50:00 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id OAA56415; Wed, 11 Oct 2000 14:50:00 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from henoch.cc.fh-lippe.de (henoch.cc.fh-lippe.de [193.16.112.72]) by hub.freebsd.org (Postfix) with ESMTP id E855737B503 for ; Wed, 11 Oct 2000 14:42:20 -0700 (PDT) Received: from spock.cc.fh-lippe.de([193.16.118.120]) (14644 bytes) by henoch.cc.fh-lippe.de via sendmail with P:esmtp/R:inet_hosts/T:smtp (sender: ) id for ; Wed, 11 Oct 2000 23:42:19 +0200 (MET DST) (Smail-3.2.0.111 2000-Feb-17 #1 built 2000-Mar-17) Received: from door.lippe.de(thaddeus.cc.fh-lippe.de[193.16.112.190]) (14266 bytes) by spock.cc.fh-lippe.de via sendmail with P:smtp/R:smart_host/T:smtp (sender: ) id for ; Wed, 11 Oct 2000 23:42:16 +0200 (MET DST) (Smail-3.2.0.111 2000-Feb-17 #1 built 2000-Mar-17) Received: from odie.lippe.de (root@odie.lippe.de [192.168.4.2]) by door.lippe.de (8.9.3/8.9.3) with ESMTP id WAA22036 for ; Wed, 11 Oct 2000 22:43:24 +0200 (CEST) (envelope-from lkoeller@lippe.de) Received: from odie.lippe.de (lkoeller@localhost [127.0.0.1]) by odie.lippe.de (8.9.3/8.9.3) with ESMTP id WAA34775 for ; Wed, 11 Oct 2000 22:43:24 +0200 (CEST) (envelope-from lkoeller@odie.lippe.de) Received: from odie.lippe.de (root@odie.lippe.de [192.168.4.2]) by door.lippe.de (8.9.3/8.9.3) with ESMTP id UAA19529 for ; Tue, 10 Oct 2000 20:49:14 +0200 (CEST) (envelope-from root@odie.lippe.de) Received: (from root@localhost) by odie.lippe.de (8.9.3/8.9.3) id UAA22883; Tue, 10 Oct 2000 20:49:13 +0200 (CEST) (envelope-from root) Message-Id: <200010101849.UAA22883@odie.lippe.de> Date: Tue, 10 Oct 2000 20:49:13 +0200 (CEST) From: lkoeller@cc.fh-lippe.de Reply-To: lkoeller@cc.fh-lippe.de To: FreeBSD-gnats-submit@freebsd.org Cc: lkoeller@cc.fh-lippe.de X-Send-Pr-Version: 3.2 Subject: ports/21919: Port update of grace to version 5.1.2 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 21919 >Category: ports >Synopsis: port update of grace to verion 5.1.2 >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Oct 11 14:50:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Charlie & >Release: FreeBSD 3.4-RELEASE i386 >Organization: Fachhochschule Lippe, Lemgo, Germany >Environment: FreeBSD 3.4-RELEASE i386 >Description: Update of the math/grace port to version 5.1.2. This is the second try to update grace, cause the first (5.1.1) wasn't commited due to a pdf3 hack. Now pdflib3 is in the ports and nothing speaks against the update of grace. I've tested the port with my own PHD-thesis and no porblems occured. Absolutely necessary is the update on XmHTML to version 1.1.7 (see my PR ports/21836). Grace uses a lot of libs, ldd gives for the linked binary: 65374 : ldd /usr/X11/bin/xmgrace /usr/X11/bin/xmgrace: libXmHTML.so.1 => /usr/X11R6/lib/libXmHTML.so.1 (0x280ff000) libXbae.so.4 => /usr/local/lib/libXbae.so.4 (0x28160000) libXm.so.2 => /usr/X11R6/lib/libXm.so.2 (0x2819c000) libXp.so.6 => /usr/X11R6/lib/libXp.so.6 (0x28331000) libXpm.so.4 => /usr/X11R6/lib/libXpm.so.4 (0x28337000) libXmu.so.6 => /usr/X11R6/lib/libXmu.so.6 (0x28344000) libXt.so.6 => /usr/X11R6/lib/libXt.so.6 (0x28355000) libXext.so.6 => /usr/X11R6/lib/libXext.so.6 (0x28393000) libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x2839d000) libSM.so.6 => /usr/X11R6/lib/libSM.so.6 (0x28430000) libICE.so.6 => /usr/X11R6/lib/libICE.so.6 (0x28438000) libnetcdf.so => /usr/local/lib/libnetcdf.so (0x2844c000) libfftw.so.2 => /usr/local/lib/libfftw.so.2 (0x2847a000) libt1.so.1 => /usr/local/lib/libt1.so.1 (0x284a9000) libpdf.so.3 => /usr/local/lib/libpdf.so.3 (0x284e4000) libtiff.so.4 => /usr/local/lib/libtiff.so.4 (0x28508000) libjpeg.so.9 => /usr/local/lib/libjpeg.so.9 (0x28547000) libpng.so.4 => /usr/local/lib/libpng.so.4 (0x28563000) libm.so.2 => /usr/lib/libm.so.2 (0x28580000) libc.so.3 => /usr/lib/libc.so.3 (0x2859b000) libz.so.2 => /usr/lib/libz.so.2 (0x2861c000) >How-To-Repeat: - >Fix: commit the diffs below to the current ports tree. I always get an error (rejected diff) for the Makefile, when testing it with patch -C < ..... Don't know why. diff -ruN grace.org/Makefile grace/Makefile --- grace.org/Makefile Thu Aug 3 11:25:37 2000 +++ grace/Makefile Tue Oct 10 20:17:13 2000 @@ -2,11 +2,11 @@ # Date created: Dec 28 1998 # Whom: Lars Koeller # -# $FreeBSD: ports/math/grace/Makefile,v 1.13 2000/08/03 09:25:37 asami Exp $ +# $FreeBSD: ports/math/grace/Makefile,v 1.11 2000/04/14 07:20:08 asami Exp $ # PORTNAME= grace -PORTVERSION= 5.0.3g +PORTVERSION= 5.1.2 CATEGORIES= math print # # You never know when and why this caotic team moves it to ../src/old/ :-) @@ -17,33 +17,30 @@ ftp://abragam.med.utoronto.ca/pub/mirrors/grace/src/old/ \ ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/grace/src/old/ \ ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/grace/src/ -DISTNAME= grace-5.0.3gamma MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE -BUILD_DEPENDS= ${X11BASE}/lib/libhlpclient.a:${PORTSDIR}/x11/libhelp LIB_DEPENDS= Xbae.7:${PORTSDIR}/x11-toolkits/xbae \ + Xpm.4:${PORTSDIR}/graphics/xpm \ netcdf.1:${PORTSDIR}/math/netcdf \ fftw.2:${PORTSDIR}/math/fftw \ - pdf.2:${PORTSDIR}/print/pdflib \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.4:${PORTSDIR}/graphics/png \ - t1.1:${PORTSDIR}/devel/t1lib + png.3:${PORTSDIR}/graphics/png \ + t1.1:${PORTSDIR}/devel/t1lib \ + XmHTML.1:${PORTSDIR}/x11-toolkits/xmhtml \ + pdf.3:${PORTSDIR}/print/pdflib3 MAN1= grace.1 xmgrace.1 gracebat.1 grconvert.1 USE_X_PREFIX= YES -USE_XPM= yes USE_GMAKE= YES REQUIRES_MOTIF= YES HAS_CONFIGURE= YES CONFIGURE_ARGS= -prefix=${X11BASE} \ - --enable-extra-incpath=${X11BASE}/include/X11:${LOCALBASE}/include:${LOCALBASE}/include/gd \ - --enable-libhelp \ - --enable-extra-ldpath=${LOCALBASE}/lib \ - --enable-grace-home=${X11BASE}/lib/X11/grace \ - --enable-config=generic + --with-extra-incpath=${X11BASE}/include/X11:${LOCALBASE}/include \ + --with-extra-ldpath=${LOCALBASE}/lib \ + --enable-grace-home=${X11BASE}/lib/X11/grace ALL_TARGET= INSTALL_TARGET= install links @@ -54,6 +51,8 @@ ${RM} -f ${WRKSRC}/configure.input post-install: - ${LN} -s ${X11BASE}/lib/X11/grace/doc ${X11BASE}/share/doc/grace + if [ ! -e ${X11BASE}/share/doc/grace ]; then \ + ${LN} -s ${X11BASE}/lib/X11/grace/doc ${X11BASE}/share/doc/grace; \ + fi .include diff -ruN grace.org/files/freebsd grace/files/freebsd --- grace.org/files/freebsd Thu Mar 18 09:41:40 1999 +++ grace/files/freebsd Thu Jan 1 01:00:00 1970 @@ -1,27 +0,0 @@ -#**************************************** -#* Intel Linux with X11R6 and Motif 2.0 * -#**************************************** - -############################### -# Compiler -# -CC="gcc" -############################### - -############################### -# C flags -# -CFLAGS="-Wall -pedantic" -############################### - -############################### -# Misc optimization flags -# -OPTIMIZE="-O2" -############################### - -############################### -# Flags used for debugging -# -DEBUG="-g -O2" -############################### diff -ruN grace.org/files/md5 grace/files/md5 --- grace.org/files/md5 Fri Sep 10 18:39:13 1999 +++ grace/files/md5 Sun Oct 8 21:02:57 2000 @@ -1 +1 @@ -MD5 (grace-5.0.3gamma.tar.gz) = fe200b1fe353afa3cd0cb580ef9d2106 +MD5 (grace-5.1.2.tar.gz) = 3f630258a3572d9988aa6010a8167e39 diff -ruN grace.org/patches/patch-aa grace/patches/patch-aa --- grace.org/patches/patch-aa Fri Sep 10 18:39:13 1999 +++ grace/patches/patch-aa Mon Jul 31 21:10:07 2000 @@ -1,21 +1,7 @@ -*** configure.orig Sun Aug 22 12:11:35 1999 ---- configure Fri Sep 10 16:22:17 1999 +*** configure.orig Mon May 22 19:54:43 2000 +--- configure Mon May 22 19:54:47 2000 *************** -*** 1096,1106 **** - - if test "x${GCC}" = "xyes" - then -- case "${host}" in -- i?86-*-linux-*) CFLAGS="-m486 -malign-double $CFLAGS";; -- i?86-*) CFLAGS="-m486 $CFLAGS";; -- esac -- - echo $ac_n "checking "for gcc strength-reduce bug"""... $ac_c" 1>&6 - echo "configure:1106: checking "for gcc strength-reduce bug"" >&5 - if eval "test \"`echo '$''{'ac_cv_c_gcc_strength_bug'+set}'`\" = set"; then ---- 1096,1101 ---- -*************** -*** 1832,1838 **** +*** 2590,2596 **** # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' @@ -23,7 +9,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' ---- 1827,1833 ---- +--- 2590,2596 ---- # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' @@ -31,10 +17,3 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -*************** -*** 8939,8942 **** - chmod +x $CONFIG_STATUS - rm -fr confdefs* $ac_clean_files - test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 -- ---- 8934,8936 ---- diff -ruN grace.org/patches/patch-ab grace/patches/patch-ab --- grace.org/patches/patch-ab Fri Sep 10 18:39:13 1999 +++ grace/patches/patch-ab Mon Jul 31 21:10:07 2000 @@ -1,8 +1,8 @@ -*** conf/Make.conf.in.org Fri Sep 10 09:32:03 1999 ---- conf/Make.conf.in Fri Sep 10 09:32:27 1999 +*** ac-tools/Make.conf.in.orig Mon May 22 19:57:32 2000 +--- ac-tools/Make.conf.in Mon May 22 19:57:36 2000 *************** -*** 93,98 **** ---- 93,99 ---- +*** 90,95 **** +--- 90,96 ---- # BSD install INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -10,10 +10,3 @@ INSTALL_DATA=@INSTALL_DATA@ MKINSTALLDIRS=@MKINSTALLDIRS@ -*************** -*** 119,122 **** - - # HTML help viewer command - HELPVIEWER=@HELPVIEWER@ -- ---- 120,122 ---- diff -ruN grace.org/patches/patch-ac grace/patches/patch-ac --- grace.org/patches/patch-ac Fri Sep 10 18:39:13 1999 +++ grace/patches/patch-ac Mon Jul 31 21:10:07 2000 @@ -1,7 +1,7 @@ -*** examples/Makefile.org Fri Sep 10 09:25:47 1999 ---- examples/Makefile Fri Sep 10 09:25:57 1999 +*** examples/Makefile.orig Mon May 22 19:58:45 2000 +--- examples/Makefile Mon May 22 19:59:07 2000 *************** -*** 31,37 **** +*** 33,39 **** install : $(EXAMPLES) $(DOTEST) $(MKINSTALLDIRS) $(GRACE_HOME)/examples for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/examples; done @@ -9,7 +9,7 @@ links : dummy ---- 31,37 ---- +--- 33,39 ---- install : $(EXAMPLES) $(DOTEST) $(MKINSTALLDIRS) $(GRACE_HOME)/examples for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/examples; done diff -ruN grace.org/patches/patch-ad grace/patches/patch-ad --- grace.org/patches/patch-ad Fri Sep 10 18:39:13 1999 +++ grace/patches/patch-ad Mon Jul 31 21:10:07 2000 @@ -1,7 +1,7 @@ -*** doc/Makefile.orig Fri Aug 20 00:31:44 1999 ---- doc/Makefile Fri Sep 10 11:06:06 1999 +*** doc/Makefile.orig Mon May 22 20:00:24 2000 +--- doc/Makefile Mon May 22 20:00:51 2000 *************** -*** 66,72 **** +*** 78,84 **** $(MKINSTALLDIRS) $(PREFIX)/man $(MKINSTALLDIRS) $(PREFIX)/man/man1 cd $(PREFIX)/man/man1; \ @@ -9,7 +9,7 @@ tests : dummy ---- 66,72 ---- +--- 78,84 ---- $(MKINSTALLDIRS) $(PREFIX)/man $(MKINSTALLDIRS) $(PREFIX)/man/man1 cd $(PREFIX)/man/man1; \ diff -ruN grace.org/patches/patch-ae grace/patches/patch-ae --- grace.org/patches/patch-ae Fri Sep 10 18:39:13 1999 +++ grace/patches/patch-ae Thu Aug 3 21:25:46 2000 @@ -1,16 +1,13 @@ ---- conf/generic.orig Mon Mar 29 01:02:41 1999 -+++ conf/generic Fri Sep 10 16:10:36 1999 -@@ -17,11 +17,11 @@ - ############################### - # Misc optimization flags - # --OPTIMIZE="-O" -+#OPTIMIZE="-O" - ############################### - - ############################### - # Flags used for debugging - # --DEBUG="-g" -+#DEBUG="-g" - ############################### +*** src/pdfdrv.c.org Thu Apr 20 22:34:34 2000 +--- src/pdfdrv.c Thu Aug 3 21:23:05 2000 +*************** +*** 57,62 **** +--- 57,64 ---- + # include "motifinc.h" + #endif + ++ #define PDF_set_fillrule(handle, rule) PDF_set_parameter(handle, "fillrule", rule) ++ + static void pdf_error_handler(PDF *p, int type, const char* msg); + + static unsigned long page_scale; diff -ruN grace.org/pkg/PLIST grace/pkg/PLIST --- grace.org/pkg/PLIST Tue Feb 22 18:07:13 2000 +++ grace/pkg/PLIST Sat Aug 5 20:12:32 2000 @@ -28,7 +28,7 @@ lib/X11/grace/doc/grace.1 lib/X11/grace/doc/gracebat.1 lib/X11/grace/doc/grconvert.1 -lib/X11/grace/doc/mygraph.gif +lib/X11/grace/doc/mygraph.png lib/X11/grace/doc/nohelp.html lib/X11/grace/doc/philosophical-gnu-sm.jpg lib/X11/grace/doc/shiftdata.sh @@ -38,6 +38,7 @@ lib/X11/grace/examples/au.agr lib/X11/grace/examples/axes.agr lib/X11/grace/examples/bar.agr +lib/X11/grace/examples/boxplot.agr lib/X11/grace/examples/brw.dat lib/X11/grace/examples/chartebar.agr lib/X11/grace/examples/charts.agr @@ -52,14 +53,16 @@ lib/X11/grace/examples/log2.agr lib/X11/grace/examples/logistic.agr lib/X11/grace/examples/logistic.fit +lib/X11/grace/examples/logit.agr lib/X11/grace/examples/logtest.par lib/X11/grace/examples/manygraphs.agr lib/X11/grace/examples/mlo.dat -lib/X11/grace/examples/moresyms.agr lib/X11/grace/examples/motif.agr +lib/X11/grace/examples/pie.agr lib/X11/grace/examples/polar.agr lib/X11/grace/examples/props.agr lib/X11/grace/examples/regions.par +lib/X11/grace/examples/spectrum.agr lib/X11/grace/examples/stackedb.agr lib/X11/grace/examples/symslines.agr lib/X11/grace/examples/terr.agr @@ -74,12 +77,20 @@ lib/X11/grace/examples/tlog.agr lib/X11/grace/examples/tmc.c lib/X11/grace/examples/tstack.agr +lib/X11/grace/examples/txttrans.agr lib/X11/grace/examples/txyr.agr lib/X11/grace/examples/typeset.agr +lib/X11/grace/examples/vmap.agr +lib/X11/grace/examples/xysize.agr lib/X11/grace/examples/xyz.agr lib/X11/grace/fonts/FontDataBase lib/X11/grace/fonts/enc/IsoLatin1.enc lib/X11/grace/fonts/enc/IsoLatin2.enc +lib/X11/grace/fonts/enc/IsoLatin9.enc +lib/X11/grace/fonts/enc/MacRoman.enc +lib/X11/grace/fonts/enc/PDFDoc.enc +lib/X11/grace/fonts/enc/PSLatin1.enc +lib/X11/grace/fonts/enc/WinAnsi.enc lib/X11/grace/fonts/type1/d050000l.afm lib/X11/grace/fonts/type1/d050000l.pfb lib/X11/grace/fonts/type1/n019003l.afm diff -ruN grace.org/scripts/configure grace/scripts/configure --- grace.org/scripts/configure Thu Mar 18 09:41:40 1999 +++ grace/scripts/configure Thu Jan 1 01:00:00 1970 @@ -1,3 +0,0 @@ -#! /bin/sh - -cp ${FILESDIR}/freebsd ${WRKSRC}/conf/freebsd >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message