diff --git a/devel/pccts/Makefile b/devel/pccts/Makefile
index f00c778a4662..5b321b66574b 100644
--- a/devel/pccts/Makefile
+++ b/devel/pccts/Makefile
@@ -1,25 +1,30 @@
 # New ports collection makefile for:	pccts
-# Version required:			1.33
+# Version required:			1.33.19
 # Date created:				22 June 1997
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.2 1998/11/21 20:04:34 steve Exp $
+# $Id: Makefile,v 1.3 1999/04/20 02:05:24 mharo Exp $
 #
 
-DISTNAME=		pccts
-PKGNAME=		pccts-1.33
+DISTNAME=		pccts133mr
+PKGNAME=		pccts-1.33.19
 CATEGORIES=		devel
-MASTER_SITES=		http://www.antlr.org/1.33/
+MASTER_SITES=		http://www.polhode.com/
 
 MAINTAINER=		andy@icc.surw.chel.su
 
-MAKEFILE=		makefile
+USE_ZIP=		yes
+WRKSRC=			${WRKDIR}/pccts
 ALL_TARGET=
+MAKEFILE=		makefile
+
 MAN1=			antlr.1 dlg.1 pccts.1
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/bin/antlr ${PREFIX}/bin/antlr
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/bin/dlg ${PREFIX}/bin/dlg
+	@ ${INSTALL_PROGRAM} ${WRKSRC}/bin/antlr ${PREFIX}/bin
+	@ ${INSTALL_PROGRAM} ${WRKSRC}/bin/dlg ${PREFIX}/bin
+	@ ${INSTALL_PROGRAM} ${WRKSRC}/bin/genmk ${PREFIX}/bin
+	@ ${INSTALL_PROGRAM} ${WRKSRC}/bin/sor ${PREFIX}/bin
 .for file in pccts antlr/antlr dlg/dlg
 	@ ${INSTALL_MAN} ${WRKSRC}/${file}.1 ${PREFIX}/man/man1
 .endfor
@@ -30,7 +35,7 @@ do-install:
 .for file in AParser ASTBase ATokPtr ATokenBuffer DLexer DLexerBase PCCTSAST SList
 	@ ${INSTALL_DATA} ${WRKSRC}/h/${file}.cpp ${PREFIX}/include/pccts/${file}.cpp
 .endfor
-.for file in AParser ASTBase ATokPtr AToken ATokenBuffer ATokenStream DLexerBase PBlackBox PCCTSAST SList antlr ast charbuf charptr config dlgauto dlgdef err int
+.for file in AParser ASTBase ATokPtr AToken ATokenBuffer ATokenStream DLexerBase PBlackBox PCCTSAST SList antlr ast charbuf charptr config dlgauto dlgdef err int pcctscfg pccts_assert pccts_setjmp pccts_stdarg pccts_stdio pccts_stdlib pccts_string pccts_iostream pccts_istream
 	@ ${INSTALL_DATA} ${WRKSRC}/h/${file}.h ${PREFIX}/include/pccts/${file}.h
 .endfor
 	@ ${MKDIR} ${PREFIX}/share/examples/pccts
@@ -40,9 +45,11 @@ do-install:
 .for file in makefile 1/makefile 1/test.g 2/MyLexer.cpp 2/MyLexer.h 2/makefile 2/test.g 3/MyLexer.cpp 3/MyLexer.h 3/makefile 3/mytokens.h 3/test.g 4/makefile 4/mytokens.h 4/test.g 5/input.h 5/makefile 5/test.g 6/file1 6/file2 6/main.cpp 6/makefile 6/makefile2 6/test.g 6/test2.g 7/makefile 7/test.g 8/main.cpp 8/makefile 8/test.g 9/makefile 9/test.g 10/makefile 10/test.g 11/input.h 11/makefile 11/test.g 12/makefile 12/test.g 13/makefile 13/test.g
 	@ ${INSTALL_DATA} ${WRKSRC}/testcpp/${file} ${PREFIX}/share/examples/pccts/${file}
 .endfor
+
+post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${PREFIX}/share/doc/pccts
-.for file in BOOK README RIGHTS SERVICES history.ps history.txt
+.for file in CHANGES_FROM_131.txt CHANGES_FROM_133.txt CHANGES_FROM_133_BEFORE_MR13.txt KNOWN_PROBLEMS.txt README RIGHTS SERVICES history.ps history.txt old_README
 	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/pccts/${file}
 .endfor
 .endif
diff --git a/devel/pccts/distinfo b/devel/pccts/distinfo
index a57bdc6529d8..a72053accd7a 100644
--- a/devel/pccts/distinfo
+++ b/devel/pccts/distinfo
@@ -1 +1 @@
-MD5 (pccts.tar.gz) = 1931d1c30805f5919cac2a400e66b474
+MD5 (pccts133mr.zip) = fc84eaf174097172a5cbeeb25185e9fc
diff --git a/devel/pccts/files/patch-ac b/devel/pccts/files/patch-ac
index c34cd9f42d92..3b57f8db2695 100644
--- a/devel/pccts/files/patch-ac
+++ b/devel/pccts/files/patch-ac
@@ -1,19 +1,11 @@
-*** testcpp/makefile	Tue Oct  3 23:48:53 1995
---- /home/andy/tmp/wrk/testcpp/makefile	Tue Jun 24 05:44:59 1997
-***************
-*** 5,11 ****
-  #
-  # For SGI machines, we recommend using "-woff 3262" in your CFLAGS
-  #
-! #CCC = g++
-  make:
-  	-(cd 1; make CCC=$(CCC))
-  	-(cd 2; make CCC=$(CCC))
---- 5,11 ----
-  #
-  # For SGI machines, we recommend using "-woff 3262" in your CFLAGS
-  #
-! CCC = g++
-  make:
-  	-(cd 1; make CCC=$(CCC))
-  	-(cd 2; make CCC=$(CCC))
+--- testcpp/makefile	Mon Jun 29 21:00:42 1998
++++ /home/andy/tmp/wrk/testcpp/makefile	Sun Jul  4 15:15:19 1999
+@@ -6,7 +6,7 @@
+ # For SGI machines, we recommend using "-woff 3262" in your CFLAGS
+ #
+ #CCC = g++
+-CCC = CC
++CCC = ${CXX}
+ make:
+ 	-(cd 1; make CCC=$(CCC))
+ 	-(cd 2; make CCC=$(CCC))
diff --git a/devel/pccts/files/patch-ad b/devel/pccts/files/patch-ad
index 66bb3ba26a92..50ca496d5b72 100644
--- a/devel/pccts/files/patch-ad
+++ b/devel/pccts/files/patch-ad
@@ -1,21 +1,13 @@
-*** testcpp/1/makefile	Sat Sep 23 22:33:26 1995
---- /home/andy/tmp/wrk/testcpp/1/makefile	Tue Jun 24 05:49:51 1997
-***************
-*** 16,23 ****
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = ../..
-! ANTLR_H = $(PCCTS)/h
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
---- 16,23 ----
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = /usr/local
-! ANTLR_H = $(PCCTS)/include/pccts
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
+--- testcpp/1/makefile	Wed Mar 25 19:56:40 1998
++++ /home/andy/tmp/wrk/testcpp/1/makefile	Sun Jul  4 15:34:32 1999
+@@ -16,8 +16,8 @@
+ ERR = err
+ HDR_FILE =
+ SCAN = DLGLexer
+-PCCTS = ../..
+-ANTLR_H = $(PCCTS)/h
++PCCTS = /usr/local
++ANTLR_H = $(PCCTS)/include/pccts
+ BIN = $(PCCTS)/bin
+ ANTLR = $(BIN)/antlr
+ DLG = $(BIN)/dlg
diff --git a/devel/pccts/files/patch-ae b/devel/pccts/files/patch-ae
index 527a9654aff9..04a09edb2135 100644
--- a/devel/pccts/files/patch-ae
+++ b/devel/pccts/files/patch-ae
@@ -1,21 +1,13 @@
-*** testcpp/2/makefile	Sat Sep 23 22:53:10 1995
---- /home/andy/tmp/wrk/testcpp/2/makefile	Tue Jun 24 05:50:47 1997
-***************
-*** 16,23 ****
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = ../..
-! ANTLR_H = $(PCCTS)/h
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
---- 16,23 ----
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = /usr/local
-! ANTLR_H = $(PCCTS)/include/pccts
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
+--- testcpp/2/makefile	Wed Mar 25 20:09:12 1998
++++ /home/andy/tmp/wrk/testcpp/2/makefile	Sun Jul  4 15:38:56 1999
+@@ -16,8 +16,8 @@
+ ERR = err
+ HDR_FILE =
+ SCAN = DLGLexer
+-PCCTS = ../..
+-ANTLR_H = $(PCCTS)/h
++PCCTS = /usr/local
++ANTLR_H = $(PCCTS)/include/pccts
+ BIN = $(PCCTS)/bin
+ ANTLR = $(BIN)/antlr
+ DLG = $(BIN)/dlg
diff --git a/devel/pccts/files/patch-af b/devel/pccts/files/patch-af
index 3d1ea0b45f84..2a2e2961eb42 100644
--- a/devel/pccts/files/patch-af
+++ b/devel/pccts/files/patch-af
@@ -1,21 +1,13 @@
-*** testcpp/3/makefile	Sat Sep 23 22:54:45 1995
---- /home/andy/tmp/wrk/testcpp/3/makefile	Tue Jun 24 05:51:21 1997
-***************
-*** 17,24 ****
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = ../..
-! ANTLR_H = $(PCCTS)/h
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
---- 17,24 ----
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = /usr/local
-! ANTLR_H = $(PCCTS)/include/pccts
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
+--- testcpp/3/makefile	Wed Mar 25 20:10:26 1998
++++ /home/andy/tmp/wrk/testcpp/3/makefile	Sun Jul  4 15:39:17 1999
+@@ -17,8 +17,8 @@
+ ERR = err
+ HDR_FILE =
+ SCAN = DLGLexer
+-PCCTS = ../..
+-ANTLR_H = $(PCCTS)/h
++PCCTS = /usr/local
++ANTLR_H = $(PCCTS)/include/pccts
+ BIN = $(PCCTS)/bin
+ ANTLR = $(BIN)/antlr
+ DLG = $(BIN)/dlg
diff --git a/devel/pccts/files/patch-ag b/devel/pccts/files/patch-ag
index 4959a3dab653..6e7be64ee537 100644
--- a/devel/pccts/files/patch-ag
+++ b/devel/pccts/files/patch-ag
@@ -1,21 +1,13 @@
-*** testcpp/4/makefile	Tue Oct  3 18:52:25 1995
---- /home/andy/tmp/wrk/testcpp/4/makefile	Tue Jun 24 05:51:58 1997
-***************
-*** 17,24 ****
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = ../..
-! ANTLR_H = $(PCCTS)/h
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
---- 17,24 ----
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = /usr/local
-! ANTLR_H = $(PCCTS)/include/pccts
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
+--- testcpp/4/makefile	Wed Mar 25 20:15:48 1998
++++ /home/andy/tmp/wrk/testcpp/4/makefile	Sun Jul  4 15:39:35 1999
+@@ -17,8 +17,8 @@
+ ERR = err
+ HDR_FILE =
+ SCAN = DLGLexer
+-PCCTS = ../..
+-ANTLR_H = $(PCCTS)/h
++PCCTS = /usr/local
++ANTLR_H = $(PCCTS)/include/pccts
+ BIN = $(PCCTS)/bin
+ ANTLR = $(BIN)/antlr
+ DLG = $(BIN)/dlg
diff --git a/devel/pccts/files/patch-ah b/devel/pccts/files/patch-ah
index 9542f75f6f84..71fc916b9410 100644
--- a/devel/pccts/files/patch-ah
+++ b/devel/pccts/files/patch-ah
@@ -1,21 +1,13 @@
-*** testcpp/5/makefile	Sat Sep 23 22:59:24 1995
---- /home/andy/tmp/wrk/testcpp/5/makefile	Tue Jun 24 05:52:25 1997
-***************
-*** 16,23 ****
-  ERR = err
-  HDR_FILE =
-  SCAN = Lexer
-! PCCTS = ../..
-! ANTLR_H = $(PCCTS)/h
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
---- 16,23 ----
-  ERR = err
-  HDR_FILE =
-  SCAN = Lexer
-! PCCTS = /usr/local
-! ANTLR_H = $(PCCTS)/include/pccts
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
+--- testcpp/5/makefile	Wed Mar 25 20:19:18 1998
++++ /home/andy/tmp/wrk/testcpp/5/makefile	Sun Jul  4 15:48:28 1999
+@@ -16,8 +16,8 @@
+ ERR = err
+ HDR_FILE =
+ SCAN = Lexer
+-PCCTS = ../..
+-ANTLR_H = $(PCCTS)/h
++PCCTS = /usr/local
++ANTLR_H = $(PCCTS)/include/pccts
+ BIN = $(PCCTS)/bin
+ ANTLR = $(BIN)/antlr
+ DLG = $(BIN)/dlg
diff --git a/devel/pccts/files/patch-ai b/devel/pccts/files/patch-ai
index 9aa7f02dca26..a458e8bde14c 100644
--- a/devel/pccts/files/patch-ai
+++ b/devel/pccts/files/patch-ai
@@ -1,21 +1,13 @@
-*** testcpp/6/makefile	Tue Oct  3 23:31:24 1995
---- /home/andy/tmp/wrk/testcpp/6/makefile	Tue Jun 24 05:53:19 1997
-***************
-*** 14,21 ****
-  ERR = A/err
-  HDR_FILE =
-  SCAN = A/ALexer
-! PCCTS = ../..
-! A_H = $(PCCTS)/h
-  BIN = $(PCCTS)/bin
-  A = $(BIN)/antlr
-  D = $(BIN)/dlg
---- 14,21 ----
-  ERR = A/err
-  HDR_FILE =
-  SCAN = A/ALexer
-! PCCTS = /usr/local
-! A_H = $(PCCTS)/include/pccts
-  BIN = $(PCCTS)/bin
-  A = $(BIN)/antlr
-  D = $(BIN)/dlg
+--- testcpp/6/makefile	Wed Mar 25 20:55:56 1998
++++ /home/andy/tmp/wrk/testcpp/6/makefile	Sun Jul  4 15:50:39 1999
+@@ -14,8 +14,8 @@
+ ERR = A/err
+ HDR_FILE =
+ SCAN = A/ALexer
+-PCCTS = ../..
+-A_H = $(PCCTS)/h
++PCCTS = /usr/local
++A_H = $(PCCTS)/include/pccts
+ BIN = $(PCCTS)/bin
+ A = $(BIN)/antlr
+ D = $(BIN)/dlg
diff --git a/devel/pccts/files/patch-aj b/devel/pccts/files/patch-aj
index 84e163bd09f8..610c1c4f1e3d 100644
--- a/devel/pccts/files/patch-aj
+++ b/devel/pccts/files/patch-aj
@@ -1,21 +1,13 @@
-*** testcpp/6/makefile2	Tue Oct  3 23:40:01 1995
---- /home/andy/tmp/wrk/testcpp/6/makefile2	Tue Jun 24 12:53:56 1997
-***************
-*** 14,21 ****
-  ERR = B/err
-  HDR_FILE = 
-  SCAN = B/BLexer
-! PCCTS = ../..
-! A_H = $(PCCTS)/h
-  BIN = $(PCCTS)/bin
-  A = $(BIN)/antlr
-  D = $(BIN)/dlg
---- 14,21 ----
-  ERR = B/err
-  HDR_FILE = 
-  SCAN = B/BLexer
-! PCCTS = /usr/local
-! A_H = $(PCCTS)/include/pccts
-  BIN = $(PCCTS)/bin
-  A = $(BIN)/antlr
-  D = $(BIN)/dlg
+--- testcpp/6/makefile2	Wed Oct  4 02:40:02 1995
++++ /home/andy/tmp/wrk/testcpp/6/makefile2	Sun Jul  4 16:01:45 1999
+@@ -14,8 +14,8 @@
+ ERR = B/err
+ HDR_FILE = 
+ SCAN = B/BLexer
+-PCCTS = ../..
+-A_H = $(PCCTS)/h
++PCCTS = /usr/local
++A_H = $(PCCTS)/include/pccts
+ BIN = $(PCCTS)/bin
+ A = $(BIN)/antlr
+ D = $(BIN)/dlg
diff --git a/devel/pccts/files/patch-ak b/devel/pccts/files/patch-ak
index 1debce4f8562..846b8441787e 100644
--- a/devel/pccts/files/patch-ak
+++ b/devel/pccts/files/patch-ak
@@ -1,21 +1,13 @@
-*** testcpp/7/makefile	Sat Sep 23 23:11:34 1995
---- /home/andy/tmp/wrk/testcpp/7/makefile	Tue Jun 24 05:54:51 1997
-***************
-*** 16,23 ****
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = ../..
-! ANTLR_H = $(PCCTS)/h
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
---- 16,23 ----
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = /usr/local
-! ANTLR_H = $(PCCTS)/include/pccts
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
+--- testcpp/7/makefile	Wed Mar 25 20:22:24 1998
++++ /home/andy/tmp/wrk/testcpp/7/makefile	Sun Jul  4 15:50:57 1999
+@@ -16,8 +16,8 @@
+ ERR = err
+ HDR_FILE =
+ SCAN = DLGLexer
+-PCCTS = ../..
+-ANTLR_H = $(PCCTS)/h
++PCCTS = /usr/local
++ANTLR_H = $(PCCTS)/include/pccts
+ BIN = $(PCCTS)/bin
+ ANTLR = $(BIN)/antlr
+ DLG = $(BIN)/dlg
diff --git a/devel/pccts/files/patch-al b/devel/pccts/files/patch-al
index 5f0d58d8b280..2dbfe45029ee 100644
--- a/devel/pccts/files/patch-al
+++ b/devel/pccts/files/patch-al
@@ -1,21 +1,13 @@
-*** testcpp/8/makefile	Sat Sep 23 23:50:56 1995
---- /home/andy/tmp/wrk/testcpp/8/makefile	Tue Jun 24 05:55:23 1997
-***************
-*** 16,23 ****
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = ../..
-! ANTLR_H = $(PCCTS)/h
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
---- 16,23 ----
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = /usr/local
-! ANTLR_H = $(PCCTS)/include/pccts
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
+--- testcpp/8/makefile	Wed Mar 25 20:24:12 1998
++++ /home/andy/tmp/wrk/testcpp/8/makefile	Sun Jul  4 15:51:13 1999
+@@ -16,8 +16,8 @@
+ ERR = err
+ HDR_FILE =
+ SCAN = DLGLexer
+-PCCTS = ../..
+-ANTLR_H = $(PCCTS)/h
++PCCTS = /usr/local
++ANTLR_H = $(PCCTS)/include/pccts
+ BIN = $(PCCTS)/bin
+ ANTLR = $(BIN)/antlr
+ DLG = $(BIN)/dlg
diff --git a/devel/pccts/files/patch-am b/devel/pccts/files/patch-am
index 702ac46c80d2..65ce5d0416aa 100644
--- a/devel/pccts/files/patch-am
+++ b/devel/pccts/files/patch-am
@@ -1,21 +1,13 @@
-*** testcpp/9/makefile	Sat Sep 23 23:52:19 1995
---- /home/andy/tmp/wrk/testcpp/9/makefile	Tue Jun 24 05:55:54 1997
-***************
-*** 16,23 ****
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = ../..
-! ANTLR_H = $(PCCTS)/h
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
---- 16,23 ----
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = /usr/local
-! ANTLR_H = $(PCCTS)/include/pccts
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
+--- testcpp/9/makefile	Wed Mar 25 20:25:46 1998
++++ /home/andy/tmp/wrk/testcpp/9/makefile	Sun Jul  4 15:51:27 1999
+@@ -16,8 +16,8 @@
+ ERR = err
+ HDR_FILE =
+ SCAN = DLGLexer
+-PCCTS = ../..
+-ANTLR_H = $(PCCTS)/h
++PCCTS = /usr/local
++ANTLR_H = $(PCCTS)/include/pccts
+ BIN = $(PCCTS)/bin
+ ANTLR = $(BIN)/antlr
+ DLG = $(BIN)/dlg
diff --git a/devel/pccts/files/patch-an b/devel/pccts/files/patch-an
index b70bc203485b..35bcf4376452 100644
--- a/devel/pccts/files/patch-an
+++ b/devel/pccts/files/patch-an
@@ -1,21 +1,13 @@
-*** testcpp/10/makefile	Sun Sep 24 00:01:13 1995
---- /home/andy/tmp/wrk/testcpp/10/makefile	Tue Jun 24 05:56:24 1997
-***************
-*** 16,23 ****
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = ../..
-! ANTLR_H = $(PCCTS)/h
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
---- 16,23 ----
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = /usr/local
-! ANTLR_H = $(PCCTS)/include/pccts
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
+--- testcpp/10/makefile	Wed Mar 25 20:27:28 1998
++++ /home/andy/tmp/wrk/testcpp/10/makefile	Sun Jul  4 15:51:42 1999
+@@ -16,8 +16,8 @@
+ ERR = err
+ HDR_FILE =
+ SCAN = DLGLexer
+-PCCTS = ../..
+-ANTLR_H = $(PCCTS)/h
++PCCTS = /usr/local
++ANTLR_H = $(PCCTS)/include/pccts
+ BIN = $(PCCTS)/bin
+ ANTLR = $(BIN)/antlr
+ DLG = $(BIN)/dlg
diff --git a/devel/pccts/files/patch-ao b/devel/pccts/files/patch-ao
index 23c24252ae6b..4d6b58fe91da 100644
--- a/devel/pccts/files/patch-ao
+++ b/devel/pccts/files/patch-ao
@@ -1,21 +1,13 @@
-*** testcpp/11/makefile	Sun Sep 24 00:02:11 1995
---- /home/andy/tmp/wrk/testcpp/11/makefile	Tue Jun 24 05:57:50 1997
-***************
-*** 16,23 ****
-  ERR = err
-  HDR_FILE =
-  SCAN = Lexer
-! PCCTS = ../..
-! ANTLR_H = $(PCCTS)/h
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
---- 16,23 ----
-  ERR = err
-  HDR_FILE =
-  SCAN = Lexer
-! PCCTS = /usr/local
-! ANTLR_H = $(PCCTS)/include/pccts
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
+--- testcpp/11/makefile	Wed Mar 25 20:28:50 1998
++++ /home/andy/tmp/wrk/testcpp/11/makefile	Sun Jul  4 15:51:57 1999
+@@ -16,8 +16,8 @@
+ ERR = err
+ HDR_FILE =
+ SCAN = Lexer
+-PCCTS = ../..
+-ANTLR_H = $(PCCTS)/h
++PCCTS = /usr/local
++ANTLR_H = $(PCCTS)/include/pccts
+ BIN = $(PCCTS)/bin
+ ANTLR = $(BIN)/antlr
+ DLG = $(BIN)/dlg
diff --git a/devel/pccts/files/patch-ap b/devel/pccts/files/patch-ap
index 08f9d27fa831..5f853f63d4e6 100644
--- a/devel/pccts/files/patch-ap
+++ b/devel/pccts/files/patch-ap
@@ -1,21 +1,13 @@
-*** testcpp/12/makefile	Sun Sep 24 00:05:31 1995
---- /home/andy/tmp/wrk/testcpp/12/makefile	Tue Jun 24 05:58:27 1997
-***************
-*** 16,23 ****
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = ../..
-! ANTLR_H = $(PCCTS)/h
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
---- 16,23 ----
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = /usr/local
-! ANTLR_H = $(PCCTS)/include/pccts
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
+--- testcpp/12/makefile	Wed Mar 25 20:30:32 1998
++++ /home/andy/tmp/wrk/testcpp/12/makefile	Sun Jul  4 15:52:14 1999
+@@ -16,8 +16,8 @@
+ ERR = err
+ HDR_FILE =
+ SCAN = DLGLexer
+-PCCTS = ../..
+-ANTLR_H = $(PCCTS)/h
++PCCTS = /usr/local
++ANTLR_H = $(PCCTS)/include/pccts
+ BIN = $(PCCTS)/bin
+ ANTLR = $(BIN)/antlr
+ DLG = $(BIN)/dlg
diff --git a/devel/pccts/files/patch-aq b/devel/pccts/files/patch-aq
index 27ad8025be61..3d018e0ce41d 100644
--- a/devel/pccts/files/patch-aq
+++ b/devel/pccts/files/patch-aq
@@ -1,21 +1,13 @@
-*** testcpp/13/makefile	Sun Sep 24 00:08:42 1995
---- /home/andy/tmp/wrk/testcpp/13/makefile	Tue Jun 24 05:58:53 1997
-***************
-*** 16,23 ****
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = ../..
-! ANTLR_H = $(PCCTS)/h
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
---- 16,23 ----
-  ERR = err
-  HDR_FILE =
-  SCAN = DLGLexer
-! PCCTS = /usr/local
-! ANTLR_H = $(PCCTS)/include/pccts
-  BIN = $(PCCTS)/bin
-  ANTLR = $(BIN)/antlr
-  DLG = $(BIN)/dlg
+--- testcpp/13/makefile	Wed Mar 25 20:31:50 1998
++++ /home/andy/tmp/wrk/testcpp/13/makefile	Sun Jul  4 15:52:31 1999
+@@ -16,8 +16,8 @@
+ ERR = err
+ HDR_FILE =
+ SCAN = DLGLexer
+-PCCTS = ../..
+-ANTLR_H = $(PCCTS)/h
++PCCTS = /usr/local
++ANTLR_H = $(PCCTS)/include/pccts
+ BIN = $(PCCTS)/bin
+ ANTLR = $(BIN)/antlr
+ DLG = $(BIN)/dlg
diff --git a/devel/pccts/pkg-descr b/devel/pccts/pkg-descr
index 25f224cbf40e..ab1c49d7cbaf 100644
--- a/devel/pccts/pkg-descr
+++ b/devel/pccts/pkg-descr
@@ -12,4 +12,4 @@ Tool for Language Recognition) corresponds to YACC and dlg
 make it easier to use for a wider range of translation
 problems.
 
-WWW: http://www.ANTLR.org/
+WWW: http://www.polnode.com/
diff --git a/devel/pccts/pkg-plist b/devel/pccts/pkg-plist
index a4bf942b23e2..153503116cdc 100644
--- a/devel/pccts/pkg-plist
+++ b/devel/pccts/pkg-plist
@@ -1,40 +1,55 @@
 bin/antlr
 bin/dlg
-include/pccts/charptr.c
-include/pccts/ast.c
-include/pccts/SList.cpp
-include/pccts/PCCTSAST.cpp
-include/pccts/DLexerBase.cpp
-include/pccts/DLexer.cpp
-include/pccts/ATokenBuffer.cpp
-include/pccts/ATokPtr.cpp
-include/pccts/ASTBase.cpp
+bin/genmk
+bin/sor
 include/pccts/AParser.cpp
-include/pccts/int.h
-include/pccts/err.h
+include/pccts/AParser.h
+include/pccts/ASTBase.cpp
+include/pccts/ASTBase.h
+include/pccts/ATokPtr.h
+include/pccts/ATokPtr.cpp
+include/pccts/ATokenBuffer.cpp
+include/pccts/AToken.h
+include/pccts/ATokenBuffer.h
+include/pccts/ATokenStream.h
+include/pccts/DLexer.cpp
+include/pccts/DLexerBase.cpp
+include/pccts/DLexerBase.h
+include/pccts/PBlackBox.h
+include/pccts/PCCTSAST.cpp
+include/pccts/PCCTSAST.h
+include/pccts/SList.cpp
+include/pccts/SList.h
+include/pccts/antlr.h
+include/pccts/ast.c
+include/pccts/ast.h
+include/pccts/charbuf.h
+include/pccts/charptr.c
+include/pccts/charptr.h
+include/pccts/config.h
 include/pccts/dlgdef.h
 include/pccts/dlgauto.h
-include/pccts/config.h
-include/pccts/charptr.h
-include/pccts/charbuf.h
-include/pccts/ast.h
-include/pccts/antlr.h
-include/pccts/SList.h
-include/pccts/PCCTSAST.h
-include/pccts/PBlackBox.h
-include/pccts/DLexerBase.h
-include/pccts/ATokenStream.h
-include/pccts/ATokenBuffer.h
-include/pccts/AToken.h
-include/pccts/ATokPtr.h
-include/pccts/ASTBase.h
-include/pccts/AParser.h
+include/pccts/err.h
+include/pccts/int.h
+include/pccts/pccts_assert.h
+include/pccts/pccts_iostream.h
+include/pccts/pccts_istream.h
+include/pccts/pccts_setjmp.h
+include/pccts/pccts_stdarg.h
+include/pccts/pccts_stdio.h
+include/pccts/pccts_stdlib.h
+include/pccts/pccts_string.h
+include/pccts/pcctscfg.h
+share/doc/pccts/CHANGES_FROM_131.txt
+share/doc/pccts/CHANGES_FROM_133.txt
+share/doc/pccts/CHANGES_FROM_133_BEFORE_MR13.txt
+share/doc/pccts/KNOWN_PROBLEMS.txt
+share/doc/pccts/README
+share/doc/pccts/RIGHTS
+share/doc/pccts/SERVICES
 share/doc/pccts/history.txt
 share/doc/pccts/history.ps
-share/doc/pccts/SERVICES
-share/doc/pccts/RIGHTS
-share/doc/pccts/README
-share/doc/pccts/BOOK
+share/doc/pccts/old_README
 share/examples/pccts/makefile
 share/examples/pccts/1/makefile
 share/examples/pccts/1/test.g