upgrade to 2.10

PR:		46310
Submitted by:	Ports Fury

1 files changed, 31 insertions, 24 deletions

diff --git a/math/ploticus/files/patch-Makefile b/math/ploticus/files/patch-Makefile
index 9bf81a78815f..6a51610e9335 100644
--- a/math/ploticus/files/patch-Makefile
+++ b/math/ploticus/files/patch-Makefile
@@ -1,13 +1,22 @@
---- Makefile.orig	Fri Jun 14 21:58:53 2002
-+++ Makefile	Mon Jun 17 00:12:22 2002
-@@ -23,14 +23,14 @@
- ######## Choose one of the following.   All others should be commented out.
+--- Makefile.orig	Wed Dec 11 22:24:51 2002
++++ Makefile	Sat Dec 14 01:30:46 2002
+@@ -12,7 +12,7 @@
+ ######## Covered by GPL; see the file ./Copyright for details. 
+ 
+ # defaults..
+-CC = gcc
++CC ?= gcc
+ PLATFORM = UNIX
+ RMCOM = rm -f
+ XOBJ = x11.o interact.o
+@@ -25,14 +25,15 @@
+ ########         Choose one of the following.   All others should be commented out.
  
  #### For Solaris 2.x uncomment the following..
 -XLIBS = -L/usr/openwin/lib -lX11
 -XINCLUDEDIR = -I/usr/openwin/include
-+#XLIBS = -L/usr/openwin/lib -lX11
-+#XINCLUDEDIR = -I/usr/openwin/include
++# XLIBS = -L/usr/openwin/lib -lX11
++# XINCLUDEDIR = -I/usr/openwin/include
  
  #### For Linux and FreeBSD uncomment the following..
 -# XLIBS = -L/usr/X11R6/lib -lX11
@@ -16,23 +25,24 @@
 +XINCLUDEDIR = -I${X11BASE}/include
  #### For FreeBSD uncomment the following and find GD16H or GD18H below and set to -I/usr/local/include
 -# ADDLIBS = -L/usr/local/lib
++FLAGS = -I${LOCALBASE}/include
 +ADDLIBS = -L${LOCALBASE}/lib
  
  #### For Cygwin uncomment the following..
  # PLATFORM = WIN32
-@@ -78,7 +78,7 @@
- ######## Choose ONE of the following.  All others should be commented out.
+@@ -79,7 +80,7 @@
+ ########         Choose ONE of the following.  All others should be commented out.
  
- #### For pseudo-GIF uncomment the following..  (no libs required)
+ #### For pseudo-GIF (only) uncomment the following..  (no libs required)
 -ploticus: pl 
-+#ploticus: pl 
++# ploticus: pl 
  
- #### For PNG uncomment the following.. (you must have libpng and zlib)
+ #### For PNG (only) uncomment the following.. (you must have libpng and zlib)
  # ploticus: plpng 
-@@ -103,11 +103,11 @@
- #### For JPEG, WBMP, and PNG & FreeType2 using your copy of GD 1.84+ uncomment the following..
- #### (you must have gd 1.84+, libpng, zlib, libjpeg, libfreetype)
- #### Before using set environment var GDFONTPATH to directory containing .ttf files
+@@ -104,11 +105,11 @@
+ #### For JPEG, WBMP, PNG, with FreeType2, using your copy of GD 1.84 or higher,
+ ####  uncomment the following..   (you must have gd 1.84+, libpng, zlib, libjpeg, libfreetype)
+ ####  (set environment var GDFONTPATH to directory containing .ttf files)
 -# ploticus: plgd18 
 -# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
 -# GD18H = 
@@ -44,14 +54,14 @@
 +GDFREETYPE = -DGDFREETYPE
 +ZFLAG = -DWZ
  
- #### To disable GD image support (no GIF, PNG, JPEG, etc) uncomment the following..
+ #### To disable all GD image support (no GIF, PNG, JPEG, etc) uncomment the following..
  # ploticus: plnogd 
-@@ -125,11 +125,11 @@
+@@ -126,11 +127,11 @@
  #### To set a hard-coded directory for prefabs files, uncomment & edit the following.. 
  #### If done, users won't be required to have PLOTICUS_PREFABS environment variable defined.
  #### This option not available for win32
 -# PREFABS_DIR = "/usr/lib/ploticus"
-+PREFABS_DIR = "${LOCALBASE}/share/ploticus"
++PREFABS_DIR = "${PREFIX}/share/ploticus"
  
  #### For LOCALE support (non-roman alphabets & collation), uncomment the following..
 -# LOCALEOBJ = localef.o
@@ -61,15 +71,12 @@
  
  #### If you want compressed svg (.svgz), and you selected "GIF only", "GIF & PNG", or "disable GD" above, 
  #### uncomment the following.  You need to have zlib.  If necessary change -lz to location of zlib.
-@@ -156,9 +156,9 @@
- GD = gdfontg.o gdfontl.o gdfontmb.o gdfonts.o gdfontt.o
- 
+@@ -165,7 +166,7 @@
  
--LIBS = $(XLIBS) -lm $(ADDLIBS) 
-+LIBS += $(XLIBS) -lm $(ADDLIBS) 
+ LIBS = $(XLIBS) -lm $(ADDLIBS) 
  
 -CFLAGS = -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \
 +CFLAGS += -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \
    $(NOGDFLAG) $(NOXFLAG) $(XINCLUDEDIR) $(NORLIMFLAG) -DPREFABS_DIR=\"$(PREFABS_DIR)\"
  
- OBJ = 	proc_annotate.o proc_areadef.o proc_axis.o proc_bars.o proc_rect.o proc_breakaxis.o \
+ OBJ = proc_annotate.o proc_areadef.o proc_axis.o proc_bars.o proc_rect.o proc_breakaxis.o \