From owner-freebsd-ports Tue Jan 5 04:10:09 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id EAA07147 for freebsd-ports-outgoing; Tue, 5 Jan 1999 04:10:09 -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 EAA07142 for ; Tue, 5 Jan 1999 04:10:08 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id EAA03157; Tue, 5 Jan 1999 04:10:02 -0800 (PST) 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 EAA07041 for ; Tue, 5 Jan 1999 04:09:15 -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 PAA27472; Tue, 5 Jan 1999 15:04:24 +0300 (MSK) (envelope-from andy) Message-Id: <199901051204.PAA27472@icc.surw.chel.su> Date: Tue, 5 Jan 1999 15:04:24 +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/9326: Update port: deskutils/abacus Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 9326 >Category: ports >Synopsis: Update port: deskutils/abacus >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: Tue Jan 5 04:10:01 PST 1999 >Closed-Date: >Last-Modified: >Originator: Andrey Zakhvatov >Release: FreeBSD 2.2.7-RELEASE i386 >Organization: South Ural Railway ICC >Environment: >Description: This is a patch to update deskutils/abacus port. diff -Nru abacus/Makefile abacus-0.9.13/Makefile --- abacus/Makefile Fri Sep 25 10:22:47 1998 +++ abacus-0.9.13/Makefile Tue Jan 5 18:13:58 1999 @@ -1,5 +1,5 @@ # New ports collection makefile for: abacus -# Version required: 0.9.3 +# Version required: 0.9.13 # Date created: 18 August 1998 # Whom: Andrey Zakhvatov # @@ -7,9 +7,10 @@ # DISTNAME= abacus -PKGNAME= abacus-0.9.3 +PKGNAME= abacus-0.9.13 CATEGORIES= deskutils -MASTER_SITES= http://www-cad.eecs.berkeley.edu/HomePages/aml/abacus/ +MASTER_SITES= http://www-cad.eecs.berkeley.edu/HomePages/aml/abacus/ \ + http://tahoe.inesc.pt/~aml/abacus/ EXTRACT_SUFX= .tgz MAINTAINER= andy@icc.surw.chel.su @@ -20,13 +21,13 @@ ALL_TARGET= dep tcl_interf/nxlc USE_GMAKE= yes USE_X_PREFIX= yes -WRKSRC= ${WRKDIR} +WRKSRC= ${WRKDIR}/${PKGNAME} -post-extract: - @ ${RM} -fr ${WRKSRC}/RCS +MAN1= abacus.1 do-install: @ ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin + @ ${INSTALL_MAN} ${WRKSRC}/doc/${DISTNAME}.1 ${PREFIX}/man/man1 @ ${MKDIR} ${PREFIX}/share/abacus @ ${MKDIR} ${PREFIX}/share/abacus/display @ ${INSTALL_DATA} ${WRKSRC}/display/*.tcl ${PREFIX}/share/abacus/display @@ -42,9 +43,12 @@ @ ${MKDIR} ${PREFIX}/share/examples/abacus @ ${INSTALL_DATA} ${WRKSRC}/regressive/* ${PREFIX}/share/examples/abacus +post-install: .if !defined(NOPORTDOCS) + @ ${RM} -fr ${WRKSRC}/doc/RCS ${WRKSRC}/doc/help/RCS ${WRKSRC}/doc/abacus.1 @ ${MKDIR} ${PREFIX}/share/doc/abacus - @ ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/abacus + @ cd ${WRKSRC}/doc; tar cf - * | \ + (cd ${PREFIX}/share/doc/abacus; tar --unlink -xf - ) .endif .include diff -Nru abacus/files/md5 abacus-0.9.13/files/md5 --- abacus/files/md5 Wed Sep 9 19:22:37 1998 +++ abacus-0.9.13/files/md5 Tue Jan 5 16:16:08 1999 @@ -1 +1 @@ -MD5 (abacus.tgz) = 2144e59f49a8336fc232bb58228ccc99 +MD5 (abacus.tgz) = babbcb9bf71121657ef8ae4619d603cf diff -Nru abacus/patches/patch-aa abacus-0.9.13/patches/patch-aa --- abacus/patches/patch-aa Mon Sep 14 10:21:43 1998 +++ abacus-0.9.13/patches/patch-aa Tue Jan 5 17:17:45 1999 @@ -1,20 +1,20 @@ ---- Makefile Thu Aug 6 21:15:12 1998 -+++ /home/andy/tmp/wrk/Makefile Tue Aug 18 15:24:56 1998 -@@ -8,7 +8,7 @@ - # explicit permission of the copyright holder. - # +--- Makefile.options Tue Oct 20 20:19:08 1998 ++++ /home/andy/tmp/wrk/Makefile.options Tue Jan 5 17:08:02 1999 +@@ -18,7 +18,7 @@ + LEX = flex --CCFLAGS= -g -+CCFLAGS= $(CFLAGS) -I$(X11BASE)/include -I$(LOCALBASE)/include/tcl8.0 -I$(LOCALBASE)/include/tk8.0 - TARGET = tcl_interf/nxlc - DIRS = display calc io graphics include runlib lib canvas tcl_interf - TARDIRS = $(DIRS) lib RCS tests regressive doc -@@ -32,7 +32,7 @@ - rm -f *~ gmon.out tests/* regressive/*.bck + # Favourite flags for favourite compiler +-CCFLAGS = -g ++CCFLAGS = $(CFLAGS) - dep : version -- for i in $(DIRS); do $(MAKE) dep -C $$i; done -+ for i in $(DIRS); do $(MAKE) dep -C $$i CCFLAGS="$(CCFLAGS)"; done - rm -f *~ + # Please don't change the next three lines unless you know what you are doing.. + AROPTIONS = rc +@@ -26,7 +26,7 @@ + LIBDIR = ../lib + # Add extra include dirs here +-IFLAGS = -I$(IDIR) ++IFLAGS = -I$(IDIR) -I$(X11BASE)/include -I$(LOCALBASE)/include/tcl8.0 -I$(LOCALBASE)/include/tk8.0 + # Add extra directories where you want the abacus to search for libraries here + LFLAGS = -L/usr/local/lib -L/usr/X11R6/lib -L$(LIBDIR) -L. diff -Nru abacus/patches/patch-ac abacus-0.9.13/patches/patch-ac --- abacus/patches/patch-ac Wed Sep 9 19:22:37 1998 +++ abacus-0.9.13/patches/patch-ac Tue Jan 5 17:08:45 1999 @@ -1,11 +1,11 @@ ---- calc/Makefile Thu Nov 6 00:30:09 1997 -+++ /home/andy/tmp/wrk/calc/Makefile Tue Aug 18 15:32:43 1998 -@@ -58,7 +58,7 @@ - $(LEX) -i -t scan.l > scan.c +--- tcl_interf/Makefile Sun Oct 25 23:39:45 1998 ++++ /home/andy/tmp/wrk/tcl_interf/Makefile Tue Jan 5 17:05:51 1999 +@@ -14,7 +14,7 @@ + OTHERSOURCES = + SOURCES = $(CSOURCES) $(OTHERSOURCES) + XXL_LIBS = $(LIBDIR)/libcalc.a $(LIBDIR)/libio.a $(LIBDIR)/libcanvas.a +-LIBS = -ltk8.0 -ltcl8.0 -lX11 -ldl -lm ++LIBS = -ltk80 -ltcl80 -lX11 -lm - gram.o: gram.cc -- $(CCC) $(IFLAGS) -g gram.cc -o gram.o -c -+ $(CCC) $(CCFLAGS) $(IFLAGS) -g gram.cc -o gram.o -c + include ../Makefile.options - gram.cc: gram.y scan.c - $(YACC) -d gram.y diff -Nru abacus/patches/patch-ad abacus-0.9.13/patches/patch-ad --- abacus/patches/patch-ad Wed Sep 9 19:22:37 1998 +++ abacus-0.9.13/patches/patch-ad Thu Jan 1 00:00:00 1970 @@ -1,11 +0,0 @@ ---- tcl_interf/Makefile Thu Aug 6 21:08:39 1998 -+++ /home/andy/tmp/wrk/tcl_interf/Makefile Tue Aug 18 15:37:43 1998 -@@ -23,7 +23,7 @@ - LIBDIR = ../lib - - XXL_LIBS = $(LIBDIR)/libcalc.a $(LIBDIR)/libio.a $(LIBDIR)/libcanvas.a --LIBS = -ltk8.0 -ltcl8.0 -lX11 -ldl -lm -+LIBS = -ltk80 -ltcl80 -lX11 -lm - - CC = gcc - CCC = g++ diff -Nru abacus/pkg/PLIST abacus-0.9.13/pkg/PLIST --- abacus/pkg/PLIST Wed Sep 9 19:22:37 1998 +++ abacus-0.9.13/pkg/PLIST Tue Jan 5 17:59:19 1999 @@ -6,12 +6,14 @@ share/abacus/display/display.tcl share/abacus/display/edit.tcl share/abacus/display/entry.tcl +share/abacus/display/find.tcl share/abacus/display/font.tcl share/abacus/display/format.tcl share/abacus/display/funcmenu.tcl share/abacus/display/funcs.tcl share/abacus/display/globals.tcl share/abacus/display/graphs.tcl +share/abacus/display/help.tcl share/abacus/display/init.tcl share/abacus/display/io.tcl share/abacus/display/menubar.tcl @@ -19,7 +21,6 @@ share/abacus/display/sheet.tcl share/abacus/display/sort.tcl share/abacus/display/standard.tcl -share/abacus/display/teste.tcl share/abacus/display/user_interf.tcl share/abacus/display/utils.tcl share/abacus/graphics/bar.tcl @@ -87,14 +88,54 @@ share/abacus/runlib/bitmaps/xxl_bck.gif share/abacus/tcl_interf/nxlc share/doc/abacus/TODO +share/doc/abacus/abacus.ps share/doc/abacus/user_interf.fig share/doc/abacus/wsff1.txt share/doc/abacus/wsff2.txt share/doc/abacus/wsff3.txt share/doc/abacus/wsff4.txt +share/doc/abacus/benchmarks/README +share/doc/abacus/benchmarks/erase_cr.tcl +share/doc/abacus/benchmarks/graphs.tcl +share/doc/abacus/benchmarks/morerefs.tcl +share/doc/abacus/benchmarks/refs.tcl +share/doc/abacus/benchmarks/sort.tcl +share/doc/abacus/help/abacus +share/doc/abacus/help/about +share/doc/abacus/help/functions +share/doc/abacus/help/help +share/doc/abacus/help/installing +share/doc/abacus/presentation/README +share/doc/abacus/presentation/Undo_objectos.gif +share/doc/abacus/presentation/abacus-graphs.gif +share/doc/abacus/presentation/abacus-layout.gif +share/doc/abacus/presentation/abacus-presentation.tcl +share/doc/abacus/presentation/arquitectura_do_abacus.gif +share/doc/abacus/presentation/demo-help.gif +share/doc/abacus/presentation/display.gif +share/doc/abacus/presentation/estados_graficos.gif +share/doc/abacus/presentation/estrutura_de_dados.gif +share/doc/abacus/presentation/globalstate1.gif +share/doc/abacus/presentation/globalstate2.gif +share/doc/abacus/presentation/globalstate3.gif +share/doc/abacus/presentation/modelo_em_espiral.gif +share/doc/abacus/presentation/open-box.gif +share/doc/abacus/presentation/paste-special.gif +share/doc/abacus/presentation/save-2-slides.tcl +share/doc/abacus/presentation/slides.tcl +share/doc/abacus/presentation/undo_funcionamento.gif +share/doc/abacus/presentation/xxl.gif +share/doc/abacus/website/abacus.cgi +share/doc/abacus/website/abacus.html +share/doc/abacus/website/abacus.html~ +share/doc/abacus/website/screen.html +share/doc/abacus/website/screen1.gif +share/doc/abacus/website/screen2.gif share/examples/abacus/allfuncs.wk1 +share/examples/abacus/desp_97.wk1 share/examples/abacus/emprestimo.wk1 share/examples/abacus/example.wk1 +share/examples/abacus/macro_example_1.tcl share/examples/abacus/notas.wk1 share/examples/abacus/notas_plain.wk1 share/examples/abacus/obras.wk1 @@ -107,5 +148,9 @@ @dirrm share/abacus/runlib @dirrm share/abacus/tcl_interf @dirrm share/abacus +@dirrm share/doc/abacus/benchmarks +@dirrm share/doc/abacus/help +@dirrm share/doc/abacus/presentation +@dirrm share/doc/abacus/website @dirrm share/doc/abacus @dirrm share/examples/abacus >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