diff options
| author | Chuck Robey <chuckr@FreeBSD.org> | 1999-09-05 18:25:55 +0000 |
|---|---|---|
| committer | Chuck Robey <chuckr@FreeBSD.org> | 1999-09-05 18:25:55 +0000 |
| commit | 316cf389faaa004bdca8003d70d4591c2a4e04a3 (patch) | |
| tree | f7e4079a4b18b20f9230e8f91cf143f5ebd71697 /math | |
| parent | Add Freefall to MASTER_SITES. (diff) | |
changed this to make us of the gd-old library (and include files)
instead of gd, so that the old gd port, which had the required gif
support, is now working.
Notes
Notes:
svn path=/head/; revision=21277
Diffstat (limited to 'math')
| -rw-r--r-- | math/gnuplot/Makefile | 2 | ||||
| -rw-r--r-- | math/gnuplot/files/patch-aa | 44 |
2 files changed, 42 insertions, 4 deletions
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile index 08264c66ad6d..38e5d8e8c413 100644 --- a/math/gnuplot/Makefile +++ b/math/gnuplot/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.gnuplot.vt.edu/pub/gnuplot/ MAINTAINER= chuckr@FreeBSD.org LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png -BUILD_DEPENDS= ${LOCALBASE}/lib/libgd.a:${PORTSDIR}/graphics/gd +BUILD_DEPENDS= ${LOCALBASE}/lib/libgd-old.a:${PORTSDIR}/graphics/gd-old USE_XLIB= yes GNU_CONFIGURE= yes diff --git a/math/gnuplot/files/patch-aa b/math/gnuplot/files/patch-aa index d1bfc51adac5..117fe8ad77f0 100644 --- a/math/gnuplot/files/patch-aa +++ b/math/gnuplot/files/patch-aa @@ -1,11 +1,49 @@ ---- configure.orig Fri Jan 15 06:13:23 1999 -+++ configure Tue Feb 9 23:20:50 1999 +--- configure.orig Thu Jan 14 14:43:23 1999 ++++ configure Sun Sep 5 14:04:35 1999 +@@ -3871,8 +3871,8 @@ + fi + + if test "$with_gd" != no; then +- echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6 +-echo "configure:3876: checking for gdImageCreate in -lgd" >&5 ++ echo $ac_n "checking for gdImageCreate in -lgd-old""... $ac_c" 1>&6 ++echo "configure:3876: checking for gdImageCreate in -lgd-old" >&5 + gp_save_TERMLIBS="$TERMLIBS" + gp_tr_lib=HAVE_LIB`echo gd | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +@@ -3880,7 +3880,7 @@ + yes|no) + gp_lib_list="";; + *) +- gp_lib_path=`echo $with_gd | sed -e 's%/libgd\.a$%%'` ++ gp_lib_path=`echo $with_gd | sed -e 's%/libgd-old\.a$%%'` + gp_lib_prefix=`echo $gp_lib_path | sed 's%/lib$%%'` + gp_lib_list="$gp_lib_prefix $gp_lib_prefix/lib $gp_lib_path" + esac +@@ -3888,7 +3888,7 @@ + TERMLIBS="`test x${ac_dir} != x && echo -L${ac_dir}` $gp_save_TERMLIBS" + ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'` + ac_save_LIBS="$LIBS" +-LIBS="$TERMLIBS $TERMXLIBS -lgd $LIBS" ++LIBS="$TERMLIBS $TERMXLIBS -lgd-old $LIBS" + cat > conftest.$ac_ext <<EOF + #line 3894 "configure" + #include "confdefs.h" +@@ -3913,7 +3913,7 @@ + rm -f conftest* + LIBS="$ac_save_LIBS" + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- TERMLIBS="$TERMLIBS -lgd"; break ++ TERMLIBS="$TERMLIBS -lgd-old"; break + else + TERMLIBS="$gp_save_TERMLIBS" + fi @@ -3930,7 +3930,7 @@ echo "configure:3931: checking for gd.h" >&5 ac_safe=`echo "gd.h" | sed 'y%./+-%__p_%'` gp_save_CPPFLAGS="$CPPFLAGS" -for ac_dir in '' /usr/local/include $gp_lib_prefix $gp_lib_prefix/include ; do -+for ac_dir in '' /usr/local/include/gd $gp_lib_prefix $gp_lib_prefix/include ; do ++for ac_dir in '' /usr/local/include/gd-old $gp_lib_prefix $gp_lib_prefix/include ; do CPPFLAGS="$gp_save_CPPFLAGS `test x${ac_dir} != x && echo -I${ac_dir}`" cat > conftest.$ac_ext <<EOF #line 3937 "configure" |