Update to version 3.34.

PR:		8551
Submitted by:	maintainer

6 files changed, 139 insertions, 68 deletions

diff --git a/lang/ptoc/Makefile b/lang/ptoc/Makefile
index e6b5787f7aa1..1412747c36f7 100644
--- a/lang/ptoc/Makefile
+++ b/lang/ptoc/Makefile
@@ -1,27 +1,23 @@
 # New ports collection makefile for:	ptoc
-# Version required:			2.01
+# Version required:			3.34
 # Date created:				10 December 1997
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.4 1998/10/14 03:44:43 jseger Exp $
+# $Id: Makefile,v 1.5 1998/10/14 23:56:40 jseger Exp $
 #
 
-DISTNAME=		ptoc
-PKGNAME=		ptoc-2.01
+DISTNAME=		ptoc_3.34
+PKGNAME=		ptoc-3.34
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	devel/lang/pascal
-EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		andy@icc.surw.chel.su
 
 MAKEFILE=		makefile
 
-USE_GMAKE=		yes
-
-pre-build:
-	@ ${RM} ${WRKSRC}/libXbgi.a
-	@ ${RM} ${WRKSRC}/libptoc.a
+USE_XLIB=		yes
+WRKSRC=			${WRKDIR}/ptoc
 
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/cganal ${PREFIX}/bin
@@ -34,16 +30,17 @@ do-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/include/ptoc
 .endfor
 	@ ${MKDIR} ${PREFIX}/share/ptoc
-.for file in ptoc.pas tptoc.pas graph.pas
+.for file in graph.pas ptoc.pas tptoc.pas
 	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/ptoc
 .endfor
-	@ ${MKDIR} ${PREFIX}/share/doc/ptoc
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ptoc
-	@ ${INSTALL_DATA} ${WRKSRC}/paslib.doc ${PREFIX}/share/doc/ptoc
 	@ ${MKDIR} ${PREFIX}/share/examples/ptoc
-	@ ${INSTALL_DATA} ${FILESDIR}/Makefile ${PREFIX}/share/examples/ptoc
-.for file in bgidemo.pas coord.txt hello.pas impact.pas lister.pas polut2.pas printer.pas q2.txt random.txt rename.pas set.pas test.pas tpascal.pas trinor.pas vibrkinp.pas vibrkinp.txt vibrtabl.pas war2.pas xy2orig.txt
+	@ ${INSTALL_DATA} ${WRKSRC}/examples/makefile ${PREFIX}/share/examples/ptoc/Makefile
+.for file in bgidemo.pas coord.txt hello.pas impact.pas lister.pas polut2.pas printer.pas q2.txt random.txt rename.pas set.pas test.pas tpascal.pas trinor.pas vibrkinp.pas vibrkinp.txt vibrtabl.pas war2.pas war2.txt xy2orig.txt
 	@ ${INSTALL_DATA} ${WRKSRC}/examples/${file} ${PREFIX}/share/examples/ptoc
 .endfor
+.if !defined(NOPORTDOCS)
+	@ ${MKDIR} ${PREFIX}/share/doc/ptoc
+	@ ${INSTALL_DATA} ${WRKSRC}/Readme.htm ${PREFIX}/share/doc/ptoc
+.endif
 
 .include <bsd.port.mk>
diff --git a/lang/ptoc/distinfo b/lang/ptoc/distinfo
index 7c3574cdee25..937809043fc1 100644
--- a/lang/ptoc/distinfo
+++ b/lang/ptoc/distinfo
@@ -1 +1 @@
-MD5 (ptoc.tgz) = 41115dc1b6e74ce8cd9048644c2ef41f
+MD5 (ptoc_3.34.tar.gz) = 975baf0f6220ec0f42741e4fcd00830e
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.
diff --git a/lang/ptoc/pkg-plist b/lang/ptoc/pkg-plist
index dca2934a6be4..1b72cd604be8 100644
--- a/lang/ptoc/pkg-plist
+++ b/lang/ptoc/pkg-plist
@@ -9,11 +9,7 @@ include/ptoc/ptoc.h
 include/ptoc/set.h
 lib/libptoc.a
 lib/libXbgi.a
-share/doc/ptoc/README
-share/doc/ptoc/paslib.doc
-share/ptoc/ptoc.pas
-share/ptoc/tptoc.pas
-share/ptoc/graph.pas
+share/doc/ptoc/Readme.htm
 share/examples/ptoc/Makefile
 share/examples/ptoc/bgidemo.pas
 share/examples/ptoc/coord.txt
@@ -33,7 +29,11 @@ share/examples/ptoc/vibrkinp.pas
 share/examples/ptoc/vibrkinp.txt
 share/examples/ptoc/vibrtabl.pas
 share/examples/ptoc/war2.pas
+share/examples/ptoc/war2.txt
 share/examples/ptoc/xy2orig.txt
+share/ptoc/ptoc.pas
+share/ptoc/tptoc.pas
+share/ptoc/graph.pas
 @dirrm include/ptoc
 @dirrm share/doc/ptoc
 @dirrm share/examples/ptoc