Attachment #31648 for bug #52643

View | Details | Raw Unified | Return to bug 52643
Collapse All | Expand All

Lines 7-13 Link Here

(-)ploticus/Makefile (-1 / +1 lines)
7	#	7	#
8		8
9	PORTNAME= ploticus	9	PORTNAME= ploticus
10	PORTVERSION= 2.10	10	PORTVERSION= 2.11
11	CATEGORIES= math	11	CATEGORIES= math
12	MASTER_SITES= http://ploticus.sourceforge.net/download/	12	MASTER_SITES= http://ploticus.sourceforge.net/download/
13	DISTNAME= plsrc${PORTVERSION:S/.//}	13	DISTNAME= plsrc${PORTVERSION:S/.//}

Line 1 Link Here

(-)ploticus/distinfo (-1 / +1 lines)
1	MD5 (plsrc210.tar.gz) = 2f37a537f998e8894399871ebffb7711	1	MD5 (plsrc211.tar.gz) = c62dce203d8aeecb589c10ee9e585594




--- 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
 
 #### For Linux and FreeBSD uncomment the following..
-# XLIBS = -L/usr/X11R6/lib -lX11
-# XINCLUDEDIR = -I/usr/X11R6/include
+XLIBS = -L${X11BASE}/lib -lX11
+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
@@ -79,7 +80,7 @@
 ########         Choose ONE of the following.  All others should be commented out.
 
 #### For pseudo-GIF (only) uncomment the following..  (no libs required)
-ploticus: pl 
+# ploticus: pl 
 
 #### For PNG (only) uncomment the following.. (you must have libpng and zlib)
 # ploticus: plpng 
@@ -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 = 
-# GDFREETYPE = -DGDFREETYPE
-# ZFLAG = -DWZ
+ploticus: plgd18 
+GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
+GD18H = -I${LOCALBASE}/include/gd
+GDFREETYPE = -DGDFREETYPE
+ZFLAG = -DWZ
 
 #### To disable all GD image support (no GIF, PNG, JPEG, etc) uncomment the following..
 # ploticus: plnogd 
@@ -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 = "${PREFIX}/share/ploticus"
 
 #### For LOCALE support (non-roman alphabets & collation), uncomment the following..
-# LOCALEOBJ = localef.o
-# LOCALE_FLAG = -DLOCALE
+LOCALEOBJ = localef.o
+LOCALE_FLAG = -DLOCALE
 
 #### 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.
@@ -165,7 +166,7 @@
 
 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 \

Lines 1-10 Link Here

(-)ploticus/files/patch-reslimits.c (-10 lines)
1	--- reslimits.c.orig Thu Mar 7 16:11:25 2002
2	+++ reslimits.c Thu Mar 7 16:11:48 2002
3	@@ -9,6 +9,7 @@
4	#ifndef NORLIMIT
5
6	#include <stdio.h>
7	+#include <sys/types.h>
8	#include <sys/time.h>
9	#include <sys/resource.h>
10




--- Makefile.orig	Sat May 24 15:00:02 2003
+++ Makefile		Sat May 24 15:06:19 2003
@@ -23,7 +23,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
@@ -41,7 +41,8 @@
 XLIBS = -L/usr/X11R6/lib -lX11
 XINCLUDEDIR = -I/usr/X11R6/include
 #### For FreeBSD uncomment the following and find GD16H or GD18H below and set to -I/usr/local/include
-# ADDLIBS = -L/usr/local/lib
+ADDLIBS = -L${LOCALBASE}/lib
+FLAGS = -I${LOCALBASE}/include
 
 #### For Solaris 2.x uncomment the following..
 # XLIBS = -L/usr/openwin/lib -lX11
@@ -105,11 +106,11 @@
 # ploticus: pl 
 
 #### For PNG (only) uncomment the following.. (you must have libpng and zlib)
-ploticus: plpng 
-PLPNG = pl 
-GD16LIBS = -lpng -lz
-GD16H = 
-ZFLAG = -DWZ
+#ploticus: plpng 
+#PLPNG = pl 
+#GD16LIBS = -lpng -lz
+#GD16H = 
+#ZFLAG = -DWZ
 
 #### For both pseudo-GIF & PNG uncomment the following..  (you must have libpng and zlib)
 # ploticus: pl plpng 
@@ -121,18 +122,18 @@
 #### (you must have gd 1.84+, libpng, zlib, libjpeg)
 # ploticus: plgd18 
 # GD18LIBS = -lgd -lpng -lz -ljpeg 
-# GD18H = 
-# GDFREETYPE = 
+# GD18H = -I${LOCALBASE}/include/gd
+# GDFREETYPE = -DGDFREETYPE
 # ZFLAG = -DWZ
 
 #### For JPEG, WBMP, PNG, and 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
-# ploticus: plgd18 
-# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
-# GD18H = 
-# GDFREETYPE = -DGDFREETYPE
-# ZFLAG = -DWZ
+ploticus: plgd18 
+GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
+GD18H = -I${LOCALBASE}/include/gd 
+GDFREETYPE = -DGDFREETYPE
+ZFLAG = -DWZ
 
 #### To disable all GD image support (no PNG, JPEG, GIF, etc) uncomment the following..
 # ploticus: plnogd 
@@ -149,11 +150,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 = "${PREFIX}/share/ploticus"
 
 #### For LOCALE support (non-roman alphabets & collation), uncomment the following..
-# LOCALEOBJ = localef.o
-# LOCALE_FLAG = -DLOCALE
+LOCALEOBJ = localef.o
+LOCALE_FLAG = -DLOCALE
 
 #### SVG output is always available by default.
 #### If you want compressed SVG (.svgz), and you selected "GIF only", "GIF & PNG", or "disable GD" above, 
@@ -197,7 +198,7 @@
 
 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) $(NOPSFLAG) $(NOSVGFLAG) $(NOSWFFLAG) $(XINCLUDEDIR) \
   $(MINGH) $(NORLIMFLAG) -DPREFABS_DIR=\"$(PREFABS_DIR)\"
 

Line 0 Link Here

(-)ploticus/files/patch-src::reslimits.c (+10 lines)
	1	--- reslimits.c.orig Sat May 24 15:07:41 2003
	2	+++ reslimits.c Sat May 24 15:08:01 2003
	3	@@ -9,6 +9,7 @@
	4	#ifndef NORLIMIT
	5
	6	#include <stdio.h>
	7	+#include <sys/types.h>
	8	#include <sys/time.h>
	9	#include <sys/resource.h>
	10

Return to bug 52643

Lines 1-82 Link Here

(-)ploticus/files/patch-Makefile (-82 lines)
1	--- Makefile.orig Wed Dec 11 22:24:51 2002
2	+++ Makefile Sat Dec 14 01:30:46 2002
3	@@ -12,7 +12,7 @@
4	######## Covered by GPL; see the file ./Copyright for details.
5
6	# defaults..
7	-CC = gcc
8	+CC ?= gcc
9	PLATFORM = UNIX
10	RMCOM = rm -f
11	XOBJ = x11.o interact.o
12	@@ -25,14 +25,15 @@
13	######## Choose one of the following. All others should be commented out.
14
15	#### For Solaris 2.x uncomment the following..
16	-XLIBS = -L/usr/openwin/lib -lX11
17	-XINCLUDEDIR = -I/usr/openwin/include
18	+# XLIBS = -L/usr/openwin/lib -lX11
19	+# XINCLUDEDIR = -I/usr/openwin/include
20
21	#### For Linux and FreeBSD uncomment the following..
22	-# XLIBS = -L/usr/X11R6/lib -lX11
23	-# XINCLUDEDIR = -I/usr/X11R6/include
24	+XLIBS = -L${X11BASE}/lib -lX11
25	+XINCLUDEDIR = -I${X11BASE}/include
26	#### For FreeBSD uncomment the following and find GD16H or GD18H below and set to -I/usr/local/include
27	-# ADDLIBS = -L/usr/local/lib
28	+FLAGS = -I${LOCALBASE}/include
29	+ADDLIBS = -L${LOCALBASE}/lib
30
31	#### For Cygwin uncomment the following..
32	# PLATFORM = WIN32
33	@@ -79,7 +80,7 @@
34	######## Choose ONE of the following. All others should be commented out.
35
36	#### For pseudo-GIF (only) uncomment the following.. (no libs required)
37	-ploticus: pl
38	+# ploticus: pl
39
40	#### For PNG (only) uncomment the following.. (you must have libpng and zlib)
41	# ploticus: plpng
42	@@ -104,11 +105,11 @@
43	#### For JPEG, WBMP, PNG, with FreeType2, using your copy of GD 1.84 or higher,
44	#### uncomment the following.. (you must have gd 1.84+, libpng, zlib, libjpeg, libfreetype)
45	#### (set environment var GDFONTPATH to directory containing .ttf files)
46	-# ploticus: plgd18
47	-# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
48	-# GD18H =
49	-# GDFREETYPE = -DGDFREETYPE
50	-# ZFLAG = -DWZ
51	+ploticus: plgd18
52	+GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
53	+GD18H = -I${LOCALBASE}/include/gd
54	+GDFREETYPE = -DGDFREETYPE
55	+ZFLAG = -DWZ
56
57	#### To disable all GD image support (no GIF, PNG, JPEG, etc) uncomment the following..
58	# ploticus: plnogd
59	@@ -126,11 +127,11 @@
60	#### To set a hard-coded directory for prefabs files, uncomment & edit the following..
61	#### If done, users won't be required to have PLOTICUS_PREFABS environment variable defined.
62	#### This option not available for win32
63	-# PREFABS_DIR = "/usr/lib/ploticus"
64	+PREFABS_DIR = "${PREFIX}/share/ploticus"
65
66	#### For LOCALE support (non-roman alphabets & collation), uncomment the following..
67	-# LOCALEOBJ = localef.o
68	-# LOCALE_FLAG = -DLOCALE
69	+LOCALEOBJ = localef.o
70	+LOCALE_FLAG = -DLOCALE
71
72	#### If you want compressed svg (.svgz), and you selected "GIF only", "GIF & PNG", or "disable GD" above,
73	#### uncomment the following. You need to have zlib. If necessary change -lz to location of zlib.
74	@@ -165,7 +166,7 @@
75
76	LIBS = $(XLIBS) -lm $(ADDLIBS)
77
78	-CFLAGS = -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \
79	+CFLAGS += -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \
80	$(NOGDFLAG) $(NOXFLAG) $(XINCLUDEDIR) $(NORLIMFLAG) -DPREFABS_DIR=\"$(PREFABS_DIR)\"
81
82	OBJ = proc_annotate.o proc_areadef.o proc_axis.o proc_bars.o proc_rect.o proc_breakaxis.o \

Line 0 Link Here

(-)ploticus/files/patch-src::Makefile (+88 lines)
		1	--- Makefile.orig Sat May 24 15:00:02 2003
		2	+++ Makefile Sat May 24 15:06:19 2003
		3	@@ -23,7 +23,7 @@
		4	######## Covered by GPL; see the file ./Copyright for details.
		5
		6	# defaults..
		7	-CC = gcc
		8	+CC ?= gcc
		9	PLATFORM = UNIX
		10	RMCOM = rm -f
		11	XOBJ = x11.o interact.o
		12	@@ -41,7 +41,8 @@
		13	XLIBS = -L/usr/X11R6/lib -lX11
		14	XINCLUDEDIR = -I/usr/X11R6/include
		15	#### For FreeBSD uncomment the following and find GD16H or GD18H below and set to -I/usr/local/include
		16	-# ADDLIBS = -L/usr/local/lib
		17	+ADDLIBS = -L${LOCALBASE}/lib
		18	+FLAGS = -I${LOCALBASE}/include
		19
		20	#### For Solaris 2.x uncomment the following..
		21	# XLIBS = -L/usr/openwin/lib -lX11
		22	@@ -105,11 +106,11 @@
		23	# ploticus: pl
		24
		25	#### For PNG (only) uncomment the following.. (you must have libpng and zlib)
		26	-ploticus: plpng
		27	-PLPNG = pl
		28	-GD16LIBS = -lpng -lz
		29	-GD16H =
		30	-ZFLAG = -DWZ
		31	+#ploticus: plpng
		32	+#PLPNG = pl
		33	+#GD16LIBS = -lpng -lz
		34	+#GD16H =
		35	+#ZFLAG = -DWZ
		36
		37	#### For both pseudo-GIF & PNG uncomment the following.. (you must have libpng and zlib)
		38	# ploticus: pl plpng
		39	@@ -121,18 +122,18 @@
		40	#### (you must have gd 1.84+, libpng, zlib, libjpeg)
		41	# ploticus: plgd18
		42	# GD18LIBS = -lgd -lpng -lz -ljpeg
		43	-# GD18H =
		44	-# GDFREETYPE =
		45	+# GD18H = -I${LOCALBASE}/include/gd
		46	+# GDFREETYPE = -DGDFREETYPE
		47	# ZFLAG = -DWZ
		48
		49	#### For JPEG, WBMP, PNG, and FreeType2, using your copy of GD 1.84+, uncomment the following..
		50	#### (you must have gd 1.84+, libpng, zlib, libjpeg, libfreetype)
		51	#### Before using set environment var GDFONTPATH to directory containing .ttf files
		52	-# ploticus: plgd18
		53	-# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
		54	-# GD18H =
		55	-# GDFREETYPE = -DGDFREETYPE
		56	-# ZFLAG = -DWZ
		57	+ploticus: plgd18
		58	+GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
		59	+GD18H = -I${LOCALBASE}/include/gd
		60	+GDFREETYPE = -DGDFREETYPE
		61	+ZFLAG = -DWZ
		62
		63	#### To disable all GD image support (no PNG, JPEG, GIF, etc) uncomment the following..
		64	# ploticus: plnogd
65	@@ -149,11 +150,11 @@
66	#### To set a hard-coded directory for prefabs files, uncomment & edit the following..
67	#### If done, users won't be required to have PLOTICUS_PREFABS environment variable defined.
68	#### This option not available for win32
69	-# PREFABS_DIR = "/usr/lib/ploticus"
70	+PREFABS_DIR = "${PREFIX}/share/ploticus"
71
72	#### For LOCALE support (non-roman alphabets & collation), uncomment the following..
73	-# LOCALEOBJ = localef.o
74	-# LOCALE_FLAG = -DLOCALE
75	+LOCALEOBJ = localef.o
76	+LOCALE_FLAG = -DLOCALE
77
78	#### SVG output is always available by default.
79	#### If you want compressed SVG (.svgz), and you selected "GIF only", "GIF & PNG", or "disable GD" above,
80	@@ -197,7 +198,7 @@
81
82	LIBS = $(XLIBS) -lm $(ADDLIBS)
83
84	-CFLAGS = -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \
85	+CFLAGS += -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \
86	$(NOGDFLAG) $(NOXFLAG) $(NOPSFLAG) $(NOSVGFLAG) $(NOSWFFLAG) $(XINCLUDEDIR) \
87	$(MINGH) $(NORLIMFLAG) -DPREFABS_DIR=\"$(PREFABS_DIR)\"
88

Lines 18-23 Link Here

(-)ploticus/pkg-plist (+2 lines)
18	%%PORTDOCS%%share/doc/ploticus/axis.html	18	%%PORTDOCS%%share/doc/ploticus/axis.html
19	%%PORTDOCS%%share/doc/ploticus/bars.html	19	%%PORTDOCS%%share/doc/ploticus/bars.html
20	%%PORTDOCS%%share/doc/ploticus/breakaxis.html	20	%%PORTDOCS%%share/doc/ploticus/breakaxis.html
		21	%%PORTDOCS%%share/doc/ploticus/categories.html
21	%%PORTDOCS%%share/doc/ploticus/catslide.html	22	%%PORTDOCS%%share/doc/ploticus/catslide.html
22	%%PORTDOCS%%share/doc/ploticus/cgi.html	23	%%PORTDOCS%%share/doc/ploticus/cgi.html
23	%%PORTDOCS%%share/doc/ploticus/changes20.html	24	%%PORTDOCS%%share/doc/ploticus/changes20.html
Lines 87-92 Link Here
87	%%PORTDOCS%%share/doc/ploticus/specialchars.html	88	%%PORTDOCS%%share/doc/ploticus/specialchars.html
88	%%PORTDOCS%%share/doc/ploticus/sql.html	89	%%PORTDOCS%%share/doc/ploticus/sql.html
89	%%PORTDOCS%%share/doc/ploticus/svg.html	90	%%PORTDOCS%%share/doc/ploticus/svg.html
		91	%%PORTDOCS%%share/doc/ploticus/swf.html
90	%%PORTDOCS%%share/doc/ploticus/symboldetails.html	92	%%PORTDOCS%%share/doc/ploticus/symboldetails.html
91	%%PORTDOCS%%share/doc/ploticus/tabulate.html	93	%%PORTDOCS%%share/doc/ploticus/tabulate.html
92	%%PORTDOCS%%share/doc/ploticus/textdetails.html	94	%%PORTDOCS%%share/doc/ploticus/textdetails.html