Update to version 3.41.

PR:		10074
Submitted by:	maintainer

6 files changed, 25 insertions, 129 deletions

diff --git a/lang/ptoc/Makefile b/lang/ptoc/Makefile
index 1412747..a9c18a8 100644
--- a/lang/ptoc/Makefile
+++ b/lang/ptoc/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	ptoc
-# Version required:			3.34
+# Version required:			3.41
 # Date created:				10 December 1997
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.5 1998/10/14 23:56:40 jseger Exp $
+# $Id: Makefile,v 1.6 1998/11/09 01:21:38 steve Exp $
 #
 
-DISTNAME=		ptoc_3.34
-PKGNAME=		ptoc-3.34
+DISTNAME=		ptoc-3.41
 CATEGORIES=		lang
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
+MASTER_SITES=		${MASTER_SITE_SUNSITE} \
+			http://www.ispras.ru/~knizhnik/
 MASTER_SITE_SUBDIR=	devel/lang/pascal
 
 MAINTAINER=		andy@icc.surw.chel.su
@@ -19,6 +19,11 @@ MAKEFILE=		makefile
 USE_XLIB=		yes
 WRKSRC=			${WRKDIR}/ptoc
 
+pre-build:
+	@ ${MV} ${WRKSRC}/makefile.bsd ${WRKSRC}/makefile
+	@ ${MV} ${WRKSRC}/Xbgi/makefile.bsd ${WRKSRC}/Xbgi/makefile
+	@ ${MV} ${WRKSRC}/examples/makefile.bsd ${WRKSRC}/examples/makefile
+
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/cganal ${PREFIX}/bin
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/ptoc ${PREFIX}/bin
@@ -38,6 +43,8 @@ do-install:
 .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
+
+post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${PREFIX}/share/doc/ptoc
 	@ ${INSTALL_DATA} ${WRKSRC}/Readme.htm ${PREFIX}/share/doc/ptoc
diff --git a/lang/ptoc/distinfo b/lang/ptoc/distinfo
index 9378090..34bd6b3 100644
--- a/lang/ptoc/distinfo
+++ b/lang/ptoc/distinfo
@@ -1 +1 @@
-MD5 (ptoc_3.34.tar.gz) = 975baf0f6220ec0f42741e4fcd00830e
+MD5 (ptoc-3.41.tar.gz) = 4db4d7730360264625fa293c361225b2
diff --git a/lang/ptoc/files/patch-aa b/lang/ptoc/files/patch-aa
index 0ff9b12..3ba3c2e 100644
--- a/lang/ptoc/files/patch-aa
+++ b/lang/ptoc/files/patch-aa
@@ -1,15 +1,11 @@
---- 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;
+--- main.cxx	Fri Nov  6 11:19:54 1998
++++ /home/andy/tmp/wrk/main.cxx	Sun Feb 14 15:11:06 1999
+@@ -319,7 +319,7 @@
+ #ifdef PREFIX
+     token::input(turbo_pascal 
+ 		 ? PREFIX "/share/ptoc/tptoc.pas" 
+-		 : PREFIX "/share/ptoc/ptoc.pas")); 
++		 : PREFIX "/share/ptoc/ptoc.pas"); 
+ #else
      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;
+  			 turbo_pascal ? "tptoc.pas" : "ptoc.pas")); 
diff --git a/lang/ptoc/files/patch-ab b/lang/ptoc/files/patch-ab
deleted file mode 100644
index ed1e56d..0000000
--- a/lang/ptoc/files/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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 @@
- 
- #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
- 
- extern bool  use_call_graph;
- extern bool  pio_init;
diff --git a/lang/ptoc/files/patch-ac b/lang/ptoc/files/patch-ac
deleted file mode 100644
index 7c9fd4c..0000000
--- a/lang/ptoc/files/patch-ac
+++ /dev/null
@@ -1,95 +0,0 @@
---- 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
- 
- #
--# Install path
-+# C/C++ compiler
- #
--INSTALL_LIB_DIR = /usr/lib
--INSTALL_BIN_DIR = /usr/bin
-+CC?= gcc
-+CXX?= g++
- 
- #
--# 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-descr b/lang/ptoc/pkg-descr
index 529bd37..0874570 100644
--- a/lang/ptoc/pkg-descr
+++ b/lang/ptoc/pkg-descr
@@ -15,3 +15,5 @@ extensions are supported only for C++ language.
 Also emulation libraries  of  Borland Graphics Interface (BGI) for
 X Window System  included in this  distribution (BGI emulators can
 be also used without converter for C programs using BGI).
+
+http://www.ispras.ru/~knizhnik/