From owner-freebsd-ports Sun Feb 14 04:30:08 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id EAA24242 for freebsd-ports-outgoing; Sun, 14 Feb 1999 04:30:08 -0800 (PST) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id EAA24214 for ; Sun, 14 Feb 1999 04:30:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id EAA29713; Sun, 14 Feb 1999 04:30:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from icc.surw.chel.su (surw.chel.su [195.54.2.162]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id EAA23756 for ; Sun, 14 Feb 1999 04:25:10 -0800 (PST) (envelope-from andy@icc.surw.chel.su) Received: (from andy@localhost) by icc.surw.chel.su (8.8.8/8.8.8) id PAA17131; Sun, 14 Feb 1999 15:25:28 +0300 (MSK) (envelope-from andy) Message-Id: <199902141225.PAA17131@icc.surw.chel.su> Date: Sun, 14 Feb 1999 15:25:28 +0300 (MSK) From: Andrey Zakhvatov Reply-To: andy@icc.surw.chel.su To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/10074: Update port: lang/ptoc Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 10074 >Category: ports >Synopsis: Update port: lang/ptoc >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Feb 14 04:30:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Andrey Zakhvatov >Release: FreeBSD 2.2.8-RELEASE i386 >Organization: South Ural Railway ICC >Environment: >Description: This is a patch to update lang/ptoc port. diff -Nru ptoc/Makefile ptoc-3.41/Makefile --- ptoc/Makefile Mon Nov 9 14:16:00 1998 +++ ptoc-3.41/Makefile Sun Feb 14 15:21:12 1999 @@ -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.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 @@ 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 @@ .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 -Nru ptoc/files/md5 ptoc-3.41/files/md5 --- ptoc/files/md5 Mon Nov 9 14:16:15 1998 +++ ptoc-3.41/files/md5 Sun Feb 14 14:57:23 1999 @@ -1 +1 @@ -MD5 (ptoc_3.34.tar.gz) = 975baf0f6220ec0f42741e4fcd00830e +MD5 (ptoc-3.41.tar.gz) = 4db4d7730360264625fa293c361225b2 diff -Nru ptoc/patches/patch-aa ptoc-3.41/patches/patch-aa --- ptoc/patches/patch-aa Mon Nov 9 14:16:15 1998 +++ ptoc-3.41/patches/patch-aa Sun Feb 14 15:11:47 1999 @@ -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 -Nru ptoc/patches/patch-ab ptoc-3.41/patches/patch-ab --- ptoc/patches/patch-ab Mon Nov 9 14:16:15 1998 +++ ptoc-3.41/patches/patch-ab Thu Jan 1 03:00:00 1970 @@ -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 -Nru ptoc/patches/patch-ac ptoc-3.41/patches/patch-ac --- ptoc/patches/patch-ac Mon Nov 9 14:16:15 1998 +++ ptoc-3.41/patches/patch-ac Thu Jan 1 03:00:00 1970 @@ -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 -Nru ptoc/patches/patch-ad ptoc-3.41/patches/patch-ad --- ptoc/patches/patch-ad Mon Nov 9 14:16:16 1998 +++ ptoc-3.41/patches/patch-ad Thu Jan 1 03:00:00 1970 @@ -1,29 +0,0 @@ ---- Xbgi/makefile Wed Jun 25 16:43:30 1997 -+++ /home/andy/tmp/wrk/Xbgi/makefile Wed Oct 28 22:12:25 1998 -@@ -43,19 +43,22 @@ - - LIB = ../libXbgi.a - --CC = gcc --CCFLAGS = -O2 -g -+# C compiler -+CC?= gcc -+CFLAGS?= -O2 -g - AR = ar - ARFLAGS = rc -+X11BASE?= /usr/X11R6 -+ - - .c.o: -- $(CC) $(CCFLAGS) -c $< -+ $(CC) $(CFLAGS) -I$(X11BASE)/include -c $< - - ../libXbgi.a: $(OBJ) - $(AR) $(ARFLAGS) $(LIB) $(OBJ) - - demo: demo.c -- gcc -O -g -o demo demo.c ../libXbgi.a -L/usr/X11/lib -lX11 -lm -+ gcc -O -g -o demo demo.c ../libXbgi.a -L$(X11BASE)/lib -lX11 -lm - - clean: - rm -f $(OBJ) *~ usleep.o demo diff -Nru ptoc/patches/patch-ae ptoc-3.41/patches/patch-ae --- ptoc/patches/patch-ae Mon Nov 9 04:21:42 1998 +++ ptoc-3.41/patches/patch-ae Thu Jan 1 03:00:00 1970 @@ -1,160 +0,0 @@ ---- examples/makefile Sun Mar 1 01:37:02 1998 -+++ /home/andy/tmp/wrk/examples/makefile Tue Nov 3 19:00:11 1998 -@@ -1,10 +1,18 @@ --#CC = gcc -g -O5 -fno-exceptions --CC = gcc -g -O5 --CGANAL = ../cganal --PTOC = ../ptoc --PTOC_LIB = ../libptoc.a --BGI_LIB = ../libXbgi.a --GRAPH_LIB = -L/usr/X11/lib -lX11 -+# -+# Compilers -+# -+CC?= cc -+CXX?= c++ -+CGANAL = cganal -+PTOC = ptoc -+ -+# -+# Include files and libraries -+# -+PTOC_INC = -I/usr/local/include/ptoc -+PTOC_LIB = -L/usr/local/lib -lptoc -+BGI_LIB = -L/usr/local/lib -lXbgi -+GRAPH_LIB = -L/usr/X11R6/lib -lX11 - MATH_LIB = -lm - - EXE = hello_c hello_cxx impact war2 trinor tpascal set_c set_cxx lister polut2 vibrkinp vibrtabl bgidemo -@@ -24,11 +32,11 @@ - hello.cxx: hello.pas - $(PTOC) -in hello.pas - --hello_c: hello.c $(PTOC_LIB) -- $(CC) -I.. -o hello_c hello.c $(PTOC_LIB) -+hello_c: hello.c -+ $(CC) $(PTOC_INC) -o hello_c hello.c $(PTOC_LIB) - --hello_cxx: hello.cxx $(PTOC_LIB) -- $(CC) -I.. -o hello_cxx hello.cxx $(PTOC_LIB) -+hello_cxx: hello.cxx -+ $(CXX) $(PTOC_INC) -o hello_cxx hello.cxx $(PTOC_LIB) - - #---------------------------------------------------------------- - # Graphic example: BGIDEMO -@@ -36,8 +44,8 @@ - bgidemo.cxx: bgidemo.pas - $(PTOC) -turbo -preserve -analyze -in bgidemo.pas - --bgidemo: bgidemo.cxx $(PTOC_LIB) $(BGI_LIB) -- $(CC) -I.. -DTURBO_PASCAL -funsigned-char -o bgidemo bgidemo.cxx $(PTOC_LIB) $(BGI_LIB) $(GRAPH_LIB) $(MATH_LIB) -+bgidemo: bgidemo.cxx -+ $(CXX) $(PTOC_INC) -DTURBO_PASCAL -funsigned-char -o bgidemo bgidemo.cxx $(PTOC_LIB) $(BGI_LIB) $(GRAPH_LIB) $(MATH_LIB) - - #---------------------------------------------------------------- - # Some numeric programs for Turbo Pascal -@@ -47,42 +55,42 @@ - vibrtabl.cxx: vibrtabl.pas - $(PTOC) -turbo -in vibrtabl.pas - --vibrtabl: vibrtabl.cxx $(PTOC_LIB) $(BGI_LIB) -- $(CC) -I.. -DTURBO_PASCAL -o vibrtabl vibrtabl.cxx $(PTOC_LIB) $(BGI_LIB) $(GRAPH_LIB) $(MATH_LIB) -+vibrtabl: vibrtabl.cxx -+ $(CXX) $(PTOC_INC) -DTURBO_PASCAL -o vibrtabl vibrtabl.cxx $(PTOC_LIB) $(BGI_LIB) $(GRAPH_LIB) $(MATH_LIB) - - - vibrkinp.cxx: vibrkinp.pas - $(PTOC) -turbo -in vibrkinp.pas - --vibrkinp: vibrkinp.cxx $(PTOC_LIB) $(BGI_LIB) -- $(CC) -I.. -DTURBO_PASCAL -o vibrkinp vibrkinp.cxx $(PTOC_LIB) $(BGI_LIB) $(GRAPH_LIB) $(MATH_LIB) -+vibrkinp: vibrkinp.cxx -+ $(CXX) $(PTOC_INC) -DTURBO_PASCAL -o vibrkinp vibrkinp.cxx $(PTOC_LIB) $(BGI_LIB) $(GRAPH_LIB) $(MATH_LIB) - - - polut2.cxx: polut2.pas - $(PTOC) -turbo -in polut2.pas - --polut2: polut2.cxx $(PTOC_LIB) $(BGI_LIB) -- $(CC) -I.. -DTURBO_PASCAL -o polut2 polut2.cxx $(PTOC_LIB) $(BGI_LIB) $(GRAPH_LIB) $(MATH_LIB) -+polut2: polut2.cxx -+ $(CXX) $(PTOC_INC) -DTURBO_PASCAL -o polut2 polut2.cxx $(PTOC_LIB) $(BGI_LIB) $(GRAPH_LIB) $(MATH_LIB) - - - impact.cxx: impact.pas - $(PTOC) -turbo -in impact.pas - --impact: impact.cxx $(PTOC_LIB) -- $(CC) -I.. -DTURBO_PASCAL -o impact impact.cxx $(PTOC_LIB) $(MATH_LIB) -+impact: impact.cxx -+ $(CXX) $(PTOC_INC) -DTURBO_PASCAL -o impact impact.cxx $(PTOC_LIB) $(MATH_LIB) - - trinor.cxx: trinor.pas - $(PTOC) -turbo -in trinor.pas - --trinor: trinor.cxx $(PTOC_LIB) -- $(CC) -I.. -DTURBO_PASCAL -o trinor trinor.cxx $(PTOC_LIB) $(MATH_LIB) -+trinor: trinor.cxx -+ $(CXX) $(PTOC_INC) -DTURBO_PASCAL -o trinor trinor.cxx $(PTOC_LIB) $(MATH_LIB) - - - war2.cxx: war2.pas - $(PTOC) -turbo -in war2.pas - --war2: war2.cxx $(PTOC_LIB) -- $(CC) -I.. -DTURBO_PASCAL -o war2 war2.cxx $(PTOC_LIB) $(MATH_LIB) -+war2: war2.cxx -+ $(CXX) $(PTOC_INC) -DTURBO_PASCAL -o war2 war2.cxx $(PTOC_LIB) $(MATH_LIB) - # This program reads data from files war2.txt, random.txt, coord.txt - # and produce file xy2.txt. Your can compare this file with xy2orig.txt - # produced by original Pascal program. -@@ -97,8 +105,8 @@ - printer.cxx: printer.pas - $(PTOC) -turbo -init -in printer.pas - --lister: lister.cxx printer.cxx $(PTOC_LIB) -- $(CC) -g -I.. -DTURBO_PASCAL -o lister lister.cxx printer.cxx $(PTOC_LIB) -+lister: lister.cxx printer.cxx -+ $(CXX) $(PTOC_INC) -DTURBO_PASCAL -o lister lister.cxx printer.cxx $(PTOC_LIB) - - #------------------------------------------------------------------- - # Some tests for converter. This programms produce dummy output. -@@ -128,11 +136,11 @@ - set.c: set.pas - $(PTOC) -c -intset -in set.pas - --set_cxx: set.cxx $(PTOC_LIB) -- $(CC) -I.. -o set_cxx set.cxx $(PTOC_LIB) -+set_cxx: set.cxx -+ $(CXX) $(PTOC_INC) -o set_cxx set.cxx $(PTOC_LIB) - --set_c: set.c $(PTOC_LIB) -- $(CC) -I.. -o set_c set.c $(PTOC_LIB) -+set_c: set.c -+ $(CC) $(PTOC_INC) -o set_c set.c $(PTOC_LIB) - - # Test for Turbo Pascal - -@@ -140,14 +148,16 @@ - $(PTOC) -turbo -cstring -in tpascal.pas - - tpascal: tpascal.cxx -- $(CC) -I.. -o tpascal -DTURBO_PASCAL tpascal.cxx $(PTOC_LIB) -- -- -+ $(CXX) $(PTOC_INC) -o tpascal -DTURBO_PASCAL tpascal.cxx $(PTOC_LIB) - - -+# -+# Erase intermediate files after generating binaries -+# - - clean: -- rm -f $(EXE) *~ *.o core call.grp recur.prc -- -- -+ rm -f $(EXE) $(convert) *~ *.o *.core call.grp recur.prc \ -+ hello.c hello.cxx impact.cxx war2.cxx trinor.cxx tpascal.cxx \ -+ set.c set.cxx lister.cxx polut2.cxx vibrkinp.cxx vibrtabl.cxx \ -+ bgidemo.cxx printer.cxx printer.h - diff -Nru ptoc/pkg/DESCR ptoc-3.41/pkg/DESCR --- ptoc/pkg/DESCR Fri Mar 27 13:51:23 1998 +++ ptoc-3.41/pkg/DESCR Sun Feb 14 15:22:26 1999 @@ -15,3 +15,5 @@ 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/ >How-To-Repeat: >Fix: Please, check and apply this patch. >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message