From 02154816feeece0840df68d5f61801ae66fb24f3 Mon Sep 17 00:00:00 2001 From: Dirk Froemberg Date: Fri, 10 Sep 1999 16:39:13 +0000 Subject: Upgrade to 5.0.3gamma. PR: ports/13626 Submitted by: Lars Koeller --- math/grace/Makefile | 36 +++++++++++++---------- math/grace/distinfo | 2 +- math/grace/files/patch-aa | 75 ++++++++++++++++++++--------------------------- math/grace/files/patch-ab | 36 +++++++++++------------ math/grace/files/patch-ac | 10 +++---- math/grace/files/patch-ad | 24 +++++++-------- math/grace/files/patch-ae | 16 ++++++++++ math/grace/pkg-descr | 16 ++-------- math/grace/pkg-plist | 16 ++++++---- 9 files changed, 116 insertions(+), 115 deletions(-) create mode 100644 math/grace/files/patch-ae (limited to 'math') diff --git a/math/grace/Makefile b/math/grace/Makefile index afca69f503c1..efc04f7f3fd3 100644 --- a/math/grace/Makefile +++ b/math/grace/Makefile @@ -3,17 +3,16 @@ # Date created: Dec 28 1998 # Whom: Lars Koeller # -# $FreeBSD$ +# $Id: Makefile,v 1.1.1.1 1999/03/18 08:41:40 taoka Exp $ # -DISTNAME= grace-5.0.2beta -PKGNAME= grace-5.0.2b +DISTNAME= grace-5.0.3gamma +PKGNAME= grace-5.0.3g CATEGORIES= math print # # You never know when and why this caotic team moves it to ../src/old/ :-) # -MASTER_SITES= ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/ \ - ftp://plasma-gate.weizmann.ac.il/pub/grace/src/ \ +MASTER_SITES= ftp://plasma-gate.weizmann.ac.il/pub/grace/src/ \ ftp://plasma-gate.weizmann.ac.il/pub/grace/src/old/ \ ftp://abragam.med.utoronto.ca/pub/mirrors/grace/src/ \ ftp://abragam.med.utoronto.ca/pub/mirrors/grace/src/old/ \ @@ -22,33 +21,38 @@ MASTER_SITES= ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/ \ MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE -BUILD_DEPENDS= ${X11BASE}/lib/libhlpclient.a:${PORTSDIR}/x11/libhelp \ - ${LOCALBASE}/lib/libmfhdf.a:${PORTSDIR}/graphics/hdf \ - ${LOCALBASE}/lib/libgd.a:${PORTSDIR}/graphics/gd -LIB_DEPENDS= Xbae.6:${PORTSDIR}/x11-toolkits/xbae \ +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 + tiff.4:${PORTSDIR}/graphics/tiff \ + jpeg.9:${PORTSDIR}/graphics/jpeg \ + png.3:${PORTSDIR}/graphics/png -BROKEN= "rstdrv.o: undefined reference to gdImageGif" +MAN1= grace.1 xmgrace.1 gracebat.1 grconvert.1 USE_X_PREFIX= YES USE_GMAKE= YES -REQUIRES_MOTIF= YES +REQUIRE_MOTIF= YES HAS_CONFIGURE= YES CONFIGURE_ARGS= -prefix=${X11BASE} \ --enable-extra-incpath=${X11BASE}/include/X11:${LOCALBASE}/include:${LOCALBASE}/include/gd \ - --enable-extra-ldpath=${LOCALBASE}/lib --enable-libhelp \ - --enable-mfhdf --enable-grace-home=${X11BASE}/lib/X11/grace + --enable-libhelp \ + --enable-extra-ldpath=${LOCALBASE}/lib \ + --enable-grace-home=${X11BASE}/lib/X11/grace \ + --enable-config=generic ALL_TARGET= INSTALL_TARGET= install links post-patch: - ${MV} ${WRKSRC}/configure ${WRKSRC}/configure.input + ${CP} ${WRKSRC}/configure ${WRKSRC}/configure.input ${SED} "s%-lXm %${MOTIFLIB} %" ${WRKSRC}/configure.input > ${WRKSRC}/configure - ${CHMOD} 755 ${WRKSRC}/configure ${RM} -f ${WRKSRC}/configure.input +post-install: + ${LN} -s ${X11BASE}/lib/X11/grace/doc ${X11BASE}/share/doc/grace + .include diff --git a/math/grace/distinfo b/math/grace/distinfo index 08a432be0ccb..fd8fed99d98e 100644 --- a/math/grace/distinfo +++ b/math/grace/distinfo @@ -1 +1 @@ -MD5 (grace-5.0.2beta.tar.gz) = 7c65b81366aeb95e01766b41c6d4e32d +MD5 (grace-5.0.3gamma.tar.gz) = fe200b1fe353afa3cd0cb580ef9d2106 diff --git a/math/grace/files/patch-aa b/math/grace/files/patch-aa index 4e26813042c1..b8b15fb95109 100644 --- a/math/grace/files/patch-aa +++ b/math/grace/files/patch-aa @@ -1,53 +1,40 @@ -*** configure.orig Tue Sep 15 14:51:57 1998 ---- configure Wed Dec 23 16:46:57 1998 +*** configure.orig Sun Aug 22 12:11:35 1999 +--- configure Fri Sep 10 16:22:17 1999 *************** -*** 660,665 **** ---- 660,666 ---- - case "${host}" in - i?86-*-linux-*) CONF_FILE="ix86-linux";; - *-*-linux-*) CONF_FILE="linux";; -+ *-*-freebsd*) CONF_FILE="freebsd";; - i?86-*-sco-*) CONF_FILE="ix86-sco";; - i?86-*-cygwin32) CONF_FILE="ix86-cygwin32";; - alpha*-dec-osf4.*) CONF_FILE="alpha-osf4";; -*************** -*** 4729,4735 **** - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-ldf $LIBS" - cat > conftest.$ac_ext <&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lmfhdf -ldf -lz $LIBS" - cat > conftest.$ac_ext <&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 ---- *************** -*** 4753,4759 **** - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -! NETCDF_LIBS="$NETCDF_LIBS -ldf"; cat >> confdefs.h <<\EOF - #define HAVE_MFHDF 1 - EOF +*** 1832,1838 **** + # It thinks the first close brace ends the variable substitution. + test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +! test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +--- 1827,1833 ---- + # It thinks the first close brace ends the variable substitution. + test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +! test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555' ---- 4754,4760 ---- - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -! NETCDF_LIBS="$NETCDF_LIBS -lmfhdf -ldf -lz"; cat >> confdefs.h <<\EOF - #define HAVE_MFHDF 1 - EOF + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' *************** -*** 6858,6861 **** +*** 8939,8942 **** chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - ---- 6859,6861 ---- +--- 8934,8936 ---- diff --git a/math/grace/files/patch-ab b/math/grace/files/patch-ab index f27b3ec5b1bb..acae2878785d 100644 --- a/math/grace/files/patch-ab +++ b/math/grace/files/patch-ab @@ -1,19 +1,19 @@ -*** src/pdfdrv.c.org Wed Dec 23 12:55:06 1998 ---- src/pdfdrv.c Wed Dec 23 12:55:20 1998 +*** conf/Make.conf.in.org Fri Sep 10 09:32:03 1999 +--- conf/Make.conf.in Fri Sep 10 09:32:27 1999 *************** -*** 52,58 **** - #include "protos.h" - - /* uncomment this if the PDFlib was compiled w/ support for TIFF images */ -! /* #define USE_TIFF */ - #include - - #ifndef NONE_GUI ---- 52,58 ---- - #include "protos.h" - - /* uncomment this if the PDFlib was compiled w/ support for TIFF images */ -! #define USE_TIFF - #include - - #ifndef NONE_GUI +*** 93,98 **** +--- 93,99 ---- + # BSD install + INSTALL=@INSTALL@ + INSTALL_PROGRAM=@INSTALL_PROGRAM@ ++ INSTALL_SCRIPT=@INSTALL_SCRIPT@ + INSTALL_DATA=@INSTALL_DATA@ + MKINSTALLDIRS=@MKINSTALLDIRS@ + +*************** +*** 119,122 **** + + # HTML help viewer command + HELPVIEWER=@HELPVIEWER@ +- +--- 120,122 ---- diff --git a/math/grace/files/patch-ac b/math/grace/files/patch-ac index 4f7d88dedfc8..c15e4275b611 100644 --- a/math/grace/files/patch-ac +++ b/math/grace/files/patch-ac @@ -1,7 +1,7 @@ -*** examples/Makefile.orig Wed Dec 23 18:30:25 1998 ---- examples/Makefile Wed Dec 23 18:31:38 1998 +*** examples/Makefile.org Fri Sep 10 09:25:47 1999 +--- examples/Makefile Fri Sep 10 09:25:57 1999 *************** -*** 32,38 **** +*** 31,37 **** install : $(EXAMPLES) $(DOTEST) $(MKINSTALLDIRS) $(GRACE_HOME)/examples for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/examples; done @@ -9,11 +9,11 @@ links : dummy ---- 32,38 ---- +--- 31,37 ---- install : $(EXAMPLES) $(DOTEST) $(MKINSTALLDIRS) $(GRACE_HOME)/examples for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/examples; done -! $(INSTALL) -c -o root -g wheel -m 555 $(DOTEST) $(GRACE_HOME)/examples/$(DOTEST) +! $(INSTALL_SCRIPT) $(DOTEST) $(GRACE_HOME)/examples/$(DOTEST) links : dummy diff --git a/math/grace/files/patch-ad b/math/grace/files/patch-ad index 38d8e848533c..d1dcada7354c 100644 --- a/math/grace/files/patch-ad +++ b/math/grace/files/patch-ad @@ -1,19 +1,19 @@ -*** auxiliary/Makefile.org Mon Jul 20 23:51:55 1998 ---- auxiliary/Makefile Wed Dec 23 19:12:15 1998 +*** doc/Makefile.orig Fri Aug 20 00:31:44 1999 +--- doc/Makefile Fri Sep 10 11:06:06 1999 *************** -*** 22,28 **** - install : $(AUXILIARIES) fdf2fit - $(MKINSTALLDIRS) $(GRACE_HOME)/auxiliary - for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/auxiliary; done -! $(INSTALL_PROGRAM) fdf2fit $(GRACE_HOME)/auxiliary +*** 66,72 **** + $(MKINSTALLDIRS) $(PREFIX)/man + $(MKINSTALLDIRS) $(PREFIX)/man/man1 + cd $(PREFIX)/man/man1; \ +! for i in $? $(MANLINKS); do $(RM) $$i; $(LN_S) $(GRACE_HOME)/doc/$$i $$i; done tests : dummy ---- 22,28 ---- - install : $(AUXILIARIES) fdf2fit - $(MKINSTALLDIRS) $(GRACE_HOME)/auxiliary - for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/auxiliary; done -! $(INSTALL) -c -o root -g wheel -m 555 fdf2fit $(GRACE_HOME)/auxiliary +--- 66,72 ---- + $(MKINSTALLDIRS) $(PREFIX)/man + $(MKINSTALLDIRS) $(PREFIX)/man/man1 + cd $(PREFIX)/man/man1; \ +! for i in $? $(MANLINKS); do $(RM) $$i; $(INSTALL_DATA) $(GRACE_HOME)/doc/$$i $$i; done tests : dummy diff --git a/math/grace/files/patch-ae b/math/grace/files/patch-ae new file mode 100644 index 000000000000..dd55885be908 --- /dev/null +++ b/math/grace/files/patch-ae @@ -0,0 +1,16 @@ +--- 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" + ############################### diff --git a/math/grace/pkg-descr b/math/grace/pkg-descr index c3d9edf5ebbb..d4942ea0f2d4 100644 --- a/math/grace/pkg-descr +++ b/math/grace/pkg-descr @@ -1,5 +1,5 @@ -grace is an plotting tool for workstations or X-terminals using X. A few of -its features are: +grace is an plotting tool for workstations or X-terminals using X and the +successor of xmgr. A few of its features are: * User defined scaling, tick marks, labels, symbols, line styles, colors. * Batch mode for unattended plotting. @@ -11,15 +11,3 @@ its features are: While grace has a convenient point-and-click interface, most parameter settings and operations are available through a command line interface (found in Data/Commands). - -grace is the successor of the well known xmgr plotting tool! - -Known PROBLEMS: - - - GD-1.3 library of Thomas Boutell: - * patterned fills of ellipses make Grace crash - * complex polygons are filled incorrectly sometimes - - - PDFlib-0.6 library of Thomas Merz - * patterned fills are not implemented - * bitmapped text strings are not transparent diff --git a/math/grace/pkg-plist b/math/grace/pkg-plist index 3ec952aad8aa..000caf87cbaf 100644 --- a/math/grace/pkg-plist +++ b/math/grace/pkg-plist @@ -1,14 +1,14 @@ lib/X11/grace/auxiliary/README -lib/X11/grace/auxiliary/fdf2fit -lib/X11/grace/auxiliary/greg2jul.c -lib/X11/grace/auxiliary/jul2greg.c +lib/X11/grace/auxiliary/convcal.c lib/X11/grace/auxiliary/magic.grace lib/X11/grace/bin/gracebat lib/X11/grace/bin/grconvert +lib/X11/grace/bin/convcal lib/X11/grace/bin/xmgrace lib/X11/grace/doc/CHANGES.html lib/X11/grace/doc/FAQ.html lib/X11/grace/doc/GPL.html +lib/X11/grace/doc/nohelp.html lib/X11/grace/doc/10.1.dat lib/X11/grace/doc/10a.dat lib/X11/grace/doc/10b.dat @@ -26,7 +26,12 @@ lib/X11/grace/doc/UsersGuide.html lib/X11/grace/doc/mygraph.gif lib/X11/grace/doc/shiftdata.sh lib/X11/grace/doc/philosophical-gnu-sm.jpg +lib/X11/grace/doc/grace.1 +lib/X11/grace/doc/gracebat.1 +lib/X11/grace/doc/grconvert.1 +lib/X11/grace/doc/xmgrace.1 lib/X11/grace/examples/altaxis.par +lib/X11/grace/examples/arrows.agr lib/X11/grace/examples/au.agr lib/X11/grace/examples/axes.agr lib/X11/grace/examples/bar.agr @@ -48,14 +53,13 @@ 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/polar.agr lib/X11/grace/examples/props.agr lib/X11/grace/examples/regions.par -lib/X11/grace/examples/slideshow.d lib/X11/grace/examples/stackedb.agr lib/X11/grace/examples/symslines.agr lib/X11/grace/examples/terr.agr -lib/X11/grace/examples/terr2.agr lib/X11/grace/examples/test.com lib/X11/grace/examples/test.dat lib/X11/grace/examples/test1.par @@ -69,6 +73,7 @@ lib/X11/grace/examples/tmc.c lib/X11/grace/examples/tstack.agr lib/X11/grace/examples/txyr.agr lib/X11/grace/examples/typeset.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 @@ -119,3 +124,4 @@ bin/gracebat @dirrm lib/X11/grace/lib @dirrm lib/X11/grace/templates @dirrm lib/X11/grace +share/doc/grace -- cgit v1.2.3