Update to version 3.34.

PR:		8551
Submitted by:	maintainer

3 files changed, 120 insertions, 46 deletions

diff --git a/lang/ptoc/files/patch-aa b/lang/ptoc/files/patch-aa
index 70f7f0227596..0ff9b12453b3 100644
--- a/lang/ptoc/files/patch-aa
+++ b/lang/ptoc/files/patch-aa
@@ -1,22 +1,15 @@
---- makefile	Tue Sep  2 08:49:02 1997
-+++ /home/andy/tmp/wrk/makefile	Wed Dec 10 11:26:08 1997
-@@ -18,8 +18,8 @@
- # Chose compiler You prefere.
- #
- 
--CC =		gcc -O5 -g -Wall -c
--CFLAGS =
-+CC =		gcc
-+CFLAGS+=	-c
- 
- DEFINES = 
- INCLUDES =	-I.
-@@ -31,7 +31,7 @@
- # Chose linker You prefere.
- #
- 
--LD =		gcc -static 
-+LD =		gcc
- #LD =		cxx -non_shared
- LDFLAGS =
- 
+--- main.cxx	Wed Jun  3 13:18:44 1998
++++ /home/andy/tmp/wrk/main.cxx	Wed Oct 28 22:12:00 1998
+@@ -309,7 +309,12 @@
+ 
+     compile_system_library = TRUE;
+     token::input(dprintf("%s%s", prog_path, 
++#ifdef PREFIX
++			 turbo_pascal ? PREFIX "/share/ptoc/tptoc.pas" :
++                                        PREFIX "/share/ptoc/ptoc.pas")); 
++#else
+ 			 turbo_pascal ? "tptoc.pas" : "ptoc.pas")); 
++#endif
+     zzparse(); 
+ 
+     compile_system_library = FALSE;
diff --git a/lang/ptoc/files/patch-ab b/lang/ptoc/files/patch-ab
index b710a851fc96..ed1e56d9de1c 100644
--- a/lang/ptoc/files/patch-ab
+++ b/lang/ptoc/files/patch-ab
@@ -1,17 +1,14 @@
---- Xbgi/makefile	Thu Jun 26 14:43:30 1997
-+++ /home/andy/tmp/wrk/Xbgi/makefile	Mon Dec  8 17:01:03 1997
-@@ -44,12 +44,12 @@
- LIB = ../libXbgi.a
+--- main.h	Wed Jun  3 13:20:28 1998
++++ /home/andy/tmp/wrk/main.h	Wed Oct 28 22:12:08 1998
+@@ -37,7 +37,11 @@
  
- CC = gcc
--CCFLAGS = -O2 -g
-+CFLAGS+= -I/usr/X11R6/include
- AR = ar
- ARFLAGS = rc
+ #define CALL_GRAPH_FILE     "call.grp"
+ #define RECURSIVE_PROC_FILE "recur.prc"
++#ifdef PREFIX
++#define CONFIG_FILE         PREFIX "/etc/ptoc.cfg"
++#else
+ #define CONFIG_FILE         "ptoc.cfg"
++#endif
  
- .c.o:
--	$(CC) $(CCFLAGS) -c $<
-+	$(CC) $(CFLAGS) -c $<
- 
- ../libXbgi.a: $(OBJ)
- 	$(AR) $(ARFLAGS) $(LIB) $(OBJ)
+ extern bool  use_call_graph;
+ extern bool  pio_init;
diff --git a/lang/ptoc/files/patch-ac b/lang/ptoc/files/patch-ac
index 5c213037e784..7c9fd4c92ce9 100644
--- a/lang/ptoc/files/patch-ac
+++ b/lang/ptoc/files/patch-ac
@@ -1,11 +1,95 @@
---- main.h	Tue Aug 26 21:16:28 1997
-+++ /home/andy/tmp/wrk/main.h	Mon Dec  8 17:58:12 1997
-@@ -31,7 +31,7 @@
+--- makefile	Wed Apr 15 09:28:48 1998
++++ /home/andy/tmp/wrk/makefile	Mon Nov  2 14:49:09 1998
+@@ -8,29 +8,54 @@
+ default : all
  
- #define CALL_GRAPH_FILE     "call.grp"
- #define RECURSIVE_PROC_FILE "recur.prc"
--#define CONFIG_FILE         "ptoc.cfg"
-+#define CONFIG_FILE         "/usr/local/etc/ptoc.cfg"
+ #
+-# Install path
++# C/C++ compiler
+ #
+-INSTALL_LIB_DIR = /usr/lib
+-INSTALL_BIN_DIR = /usr/bin
++CC?= gcc
++CXX?= g++
  
- extern bool  use_call_graph;
- extern bool  pio_init;
+ #
+-# Target.
++# C/C++ flags
+ #
++CFLAGS?= -O5 -g -Wall -c
++CXXFLAGS?= -O5 -g -Wall -c
++#CFLAGS= -fno-exceptions -O5 -g -Wall -c
++#CXXFLAGS= -fno-exceptions -O5 -g -Wall -c
+ 
+-BINS =	ptoc cganal 
+-LIBS =  libptoc.a libXbgi.a 
++#
++# X Window System directory
++#
++X11BASE?= /usr/X11R6
++
++#
++# Local packages directory
++#
++LOCALBASE?= /usr/local
++
++#
++# Installation directory
++#
++PREFIX?= $(LOCALBASE)
++
++#
++# Config file
++#
++CONFIG_FILE?= $(LOCALBASE)/etc/ptoc.conf
+ 
+ #
+-# Chose compiler You prefer.
++# Install path
+ #
++INSTALL_LIB_DIR = $(PREFIX)/lib
++INSTALL_BIN_DIR = $(PREFIX)/bin
+ 
+-#CC =	cxx
+-CC =	gcc
+-CCFLAGS = -O5 -g -Wall -c
+-#CCFLAGS = -fno-exceptions -O5 -g -Wall -c
++#
++# Target.
++#
++
++BINS =	ptoc cganal 
++LIBS =  libptoc.a libXbgi.a 
+ 
+-DEFINES = 
+-INCLUDES =	-I.
++DEFINES = -DPREFIX=\"$(PREFIX)\"
++INCLUDES = -I. -I$(X11BASE)/include
+ 
+ YACC =		bison -d -p zz 
+ LEX =		flex -i -F -8
+@@ -39,9 +64,9 @@
+ # Chose linker You prefer.
+ #
+ 
+-LD =		$(CC)
++LD =		$(CXX)
+ #LDFLAGS =	-non_shared
+-LDFLAGS =	-static
++#LDFLAGS =	-static
+ 
+ 
+ AR =            ar
+@@ -66,10 +91,10 @@
+ #
+ 
+ .cxx.o : 
+-		$(CC) $(CCFLAGS) $(DEFINES) $(INCLUDES) -o $@ $<
++		$(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -o $@ -c $<
+ 
+ .c.o : 
+-		$(CC) $(CCFLAGS) $(DEFINES) $(INCLUDES) -o $@ $<
++		$(CC) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -o $@ -c $<
+ 
+ #
+ # Custom targets.