6 files changed, 84 insertions, 46 deletions

diff --git a/deskutils/abacus/Makefile b/deskutils/abacus/Makefile
index e35df3cc6534..de8facdec964 100644
--- a/deskutils/abacus/Makefile
+++ b/deskutils/abacus/Makefile
@@ -1,15 +1,16 @@
 # New ports collection makefile for:	abacus
-# Version required:			0.9.3
+# Version required:			0.9.13
 # Date created:				18 August 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.2 1998/09/25 10:05:06 asami Exp $
+# $Id: Makefile,v 1.3 1998/09/25 10:07:44 asami Exp $
 #
 
 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 @@ LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 \
 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 @@ do-install:
 	@ ${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
 	@ ${MKDIR} ${PREFIX}/share/doc/abacus
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/abacus
+	@ cd ${WRKSRC}/doc; tar --exclude ${DISTNAME}.1 -cf - . | \
+                (cd ${PREFIX}/share/doc/abacus; tar --unlink -xf - )
 .endif
 
 .include <bsd.port.mk>
diff --git a/deskutils/abacus/distinfo b/deskutils/abacus/distinfo
index 6918617aafd0..ab041cb0f155 100644
--- a/deskutils/abacus/distinfo
+++ b/deskutils/abacus/distinfo
@@ -1 +1 @@
-MD5 (abacus.tgz) = 2144e59f49a8336fc232bb58228ccc99
+MD5 (abacus.tgz) = babbcb9bf71121657ef8ae4619d603cf
diff --git a/deskutils/abacus/files/patch-aa b/deskutils/abacus/files/patch-aa
index a010ce80b4d6..3870fec3f190 100644
--- a/deskutils/abacus/files/patch-aa
+++ b/deskutils/abacus/files/patch-aa
@@ -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 --git a/deskutils/abacus/files/patch-ac b/deskutils/abacus/files/patch-ac
index a02c27fd29eb..a76c42935f46 100644
--- a/deskutils/abacus/files/patch-ac
+++ b/deskutils/abacus/files/patch-ac
@@ -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 --git a/deskutils/abacus/files/patch-ad b/deskutils/abacus/files/patch-ad
deleted file mode 100644
index 7d2cc019c2da..000000000000
--- a/deskutils/abacus/files/patch-ad
+++ /dev/null
@@ -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 --git a/deskutils/abacus/pkg-plist b/deskutils/abacus/pkg-plist
index e910d8f4a190..753eb92a3a21 100644
--- a/deskutils/abacus/pkg-plist
+++ b/deskutils/abacus/pkg-plist
@@ -6,12 +6,14 @@ share/abacus/display/defaults.tcl
 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/print.tcl
 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/xxl2.gif
 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 @@ share/examples/abacus/tables.wk1
 @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