Index: head/lang/ptoc/Makefile
===================================================================
--- head/lang/ptoc/Makefile	(revision 469967)
+++ head/lang/ptoc/Makefile	(revision 469968)
@@ -1,52 +1,53 @@
 # Created by: Andrey Zakhvatov
 # $FreeBSD$
 
 PORTNAME=	ptoc
 PORTVERSION=	3.58
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.garret.ru/
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	ANSI/Turbo Pascal to C/C++ converter
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_XORG=	x11
 USES=		bison
 
 EXAMPLES=	arr.pas bgidemo.pas ccall.pas coord.txt dos.h dos.pas \
 		func.pas hello.pas impact.pas lister.pas makefile.bsd \
 		nested.pas objpas.pas polut2.pas printer.pas q2.txt \
 		random.txt rename.cxx rename.pas set.pas str.pas test.c \
 		test.cxx test.pas test.txt tpascal.pas trinor.pas \
 		vibrkinp.pas vibrkinp.txt vibrtabl.pas war2.pas war2.txt \
 		xy2.txt xy2orig.txt
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 pre-build:
 	@${LN} -sf makefile.bsd ${WRKSRC}/Makefile
 	@${LN} -sf makefile.bsd ${WRKSRC}/Xbgi/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cganal ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/ptoc ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/ptoc.cfg ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/libptoc.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/libXbgi.a ${STAGEDIR}${PREFIX}/lib
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/ptoc
 .for f in array.h graph.h io.h paslib.h ptoc.h set.h
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/include/ptoc
 .endfor
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in graph.pas ptoc.pas tptoc.pas
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in ${EXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Readme.htm ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/lang/ptoc/files/patch-makefile.bsd
===================================================================
--- head/lang/ptoc/files/patch-makefile.bsd	(revision 469967)
+++ head/lang/ptoc/files/patch-makefile.bsd	(revision 469968)
@@ -1,11 +1,47 @@
---- makefile.bsd.orig	Sat Nov  7 10:10:50 1998
-+++ makefile.bsd	Sat Oct 21 05:54:55 2000
+--- makefile.bsd.orig	1998-11-06 21:10:50.000000000 -0500
++++ makefile.bsd	2018-05-14 12:46:15.288108000 -0400
+@@ -10,21 +10,21 @@
+ #
+ # C/C++ compiler
+ #
+-CC?= gcc
+-CXX?= g++
++CC?= cc
++CXX?= c++
+ 
+ #
+ # C/C++ flags
+ #
+-CFLAGS?= -O5 -g -Wall -c
+-CXXFLAGS?= -O5 -g -Wall -c
++CFLAGS?= -Wall -c
++CXXFLAGS= -Wall -c -std=c++98
+ #CFLAGS= -fno-exceptions -O5 -g -Wall -c
+ #CXXFLAGS= -fno-exceptions -O5 -g -Wall -c
+ 
+ #
+ # X Window System directory
+ #
+-X11BASE?= /usr/X11R6
++X11BASE?= /usr/local
+ 
+ #
+ # Local packages directory
+@@ -94,7 +94,7 @@
+ 		$(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -o $@ -c $<
+ 
+ .c.o : 
+-		$(CC) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -o $@ -c $<
++		$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -o $@ -c $<
+ 
+ #
+ # Custom targets.
 @@ -131,7 +131,7 @@
  	$(LD) $(LDFLAGS) -o $@ $(OBJS)
  
  libXbgi.a: 
 -	(cd Xbgi; make)
 +	(cd Xbgi; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" X11BASE="$(LOCALBASE)")
  
  all : $(BINS) $(LIBS)