10 files changed, 104 insertions, 5 deletions

diff --git a/deskutils/abacus/Makefile b/deskutils/abacus/Makefile
index 4c4125de5e6b..0684e102ed4e 100644
--- a/deskutils/abacus/Makefile
+++ b/deskutils/abacus/Makefile
@@ -13,10 +13,13 @@ MASTER_SITES=	http://www-cad.eecs.berkeley.edu/HomePages/aml/abacus/ \
 		http://tahoe.inesc.pt/~aml/abacus/
 EXTRACT_SUFX=	.tgz
 
+PATCH_SITES=	http://www.freebsd.org/~steve/distfiles/
+PATCHFILES=	${PKGNAME}.patch.gz
+
 MAINTAINER=	andy@icc.surw.chel.su
 
-LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 \
-		tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
+		tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 ALL_TARGET=	dep tcl_interf/nxlc
 USE_GMAKE=	yes
@@ -25,6 +28,12 @@ WRKSRC=		${WRKDIR}/${PKGNAME}
 
 MAN1=		abacus.1
 
+pre-patch:
+	@ (cd ${WRKSRC}; find -d . -name RCS -exec ${RM} -rf {} \;)
+
+post-patch:
+	@ (cd ${WRKSRC}; ${RM} canvas; ${LN} -sf canvas-tcl8.2.2 canvas)
+
 do-install:
 	@ ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin
 	@ ${INSTALL_MAN} ${WRKSRC}/doc/${DISTNAME}.1 ${PREFIX}/man/man1
@@ -48,7 +57,7 @@ post-install:
 	@ ${RM} -fr ${WRKSRC}/doc/RCS ${WRKSRC}/doc/help/RCS
 	@ ${MKDIR} ${PREFIX}/share/doc/abacus
 	@ cd ${WRKSRC}/doc; tar --exclude ${DISTNAME}.1 -cf - . | \
-                (cd ${PREFIX}/share/doc/abacus; tar --unlink -xf - )
+		(cd ${PREFIX}/share/doc/abacus; tar --unlink -xf - )
 .endif
 
 .include <bsd.port.mk>
diff --git a/deskutils/abacus/distinfo b/deskutils/abacus/distinfo
index ab041cb0f155..cb70aa2cc2e1 100644
--- a/deskutils/abacus/distinfo
+++ b/deskutils/abacus/distinfo
@@ -1 +1,2 @@
 MD5 (abacus.tgz) = babbcb9bf71121657ef8ae4619d603cf
+MD5 (abacus-0.9.13.patch.gz) = e65c0b63b0d65cf867f1c11766077bfe
diff --git a/deskutils/abacus/files/patch-aa b/deskutils/abacus/files/patch-aa
index 3870fec3f190..a4e3db0a34ba 100644
--- a/deskutils/abacus/files/patch-aa
+++ b/deskutils/abacus/files/patch-aa
@@ -14,7 +14,7 @@
  
  # Add extra include dirs here
 -IFLAGS = -I$(IDIR)
-+IFLAGS = -I$(IDIR) -I$(X11BASE)/include -I$(LOCALBASE)/include/tcl8.0 -I$(LOCALBASE)/include/tk8.0
++IFLAGS = -I$(IDIR) -I$(X11BASE)/include -I$(LOCALBASE)/include/tcl8.2 -I$(LOCALBASE)/include/tk8.2
  
  # 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 a76c42935f46..104c25402a2e 100644
--- a/deskutils/abacus/files/patch-ac
+++ b/deskutils/abacus/files/patch-ac
@@ -5,7 +5,7 @@
  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 
++LIBS =  -ltk82 -ltcl82 -lX11 -lm 
  
  include ../Makefile.options
  
diff --git a/deskutils/abacus/files/patch-ad b/deskutils/abacus/files/patch-ad
new file mode 100644
index 000000000000..681f9baae528
--- /dev/null
+++ b/deskutils/abacus/files/patch-ad
@@ -0,0 +1,11 @@
+--- tcl_interf/format.hh.orig	Sun Nov 28 21:24:27 1999
++++ tcl_interf/format.hh	Sun Nov 28 21:25:22 1999
+@@ -51,7 +51,7 @@
+     char top_item_double, bottom_item_double;
+     char left_item_double, right_item_double;
+     Border() ;
+-    operator=(const Border &rig) ;
++    void operator=(const Border &rig) ;
+     Border(const Border &rig) ;
+ 
+     int isdefault() {
diff --git a/deskutils/abacus/files/patch-ae b/deskutils/abacus/files/patch-ae
new file mode 100644
index 000000000000..7e2ff8aaa990
--- /dev/null
+++ b/deskutils/abacus/files/patch-ae
@@ -0,0 +1,20 @@
+--- calc/rpn.hh.orig	Sun Nov 28 21:28:00 1999
++++ calc/rpn.hh	Sun Nov 28 21:28:25 1999
+@@ -108,7 +108,7 @@
+     Ref start;
+     Ref end;
+     
+-    normalize();
++    void normalize();
+ };
+ 
+ 
+@@ -145,7 +145,7 @@
+                   contents.string_val[0] = 0;
+                   contents.error_code = NO_ERROR;}
+     ~Stack_elem() {delete [] contents.string_val;}
+-    operator=(const Stack_elem &right) {
++    void operator=(const Stack_elem &right) {
+       type = right.type;
+       contents.fp_val = right.contents.fp_val;
+       contents.ref_val = right.contents.ref_val;
diff --git a/deskutils/abacus/files/patch-af b/deskutils/abacus/files/patch-af
new file mode 100644
index 000000000000..059e602ddab5
--- /dev/null
+++ b/deskutils/abacus/files/patch-af
@@ -0,0 +1,16 @@
+--- include/string.hh.orig	Sun Nov 28 21:29:10 1999
++++ include/string.hh	Sun Nov 28 21:29:34 1999
+@@ -57,11 +57,11 @@
+         }
+         else ptr = right.ptr;
+     }
+-    operator==(const string &right) {
++    int operator==(const string &right) {
+       return
+         strcmp(ptr,right.ptr) != 0 ? 0 : 1;
+     }
+-    operator!=(const string &right) {
++    int operator!=(const string &right) {
+       return
+         strcmp(ptr,right.ptr) != 0 ? 1 : 0;
+     }
diff --git a/deskutils/abacus/files/patch-ag b/deskutils/abacus/files/patch-ag
new file mode 100644
index 000000000000..43bf9bfc88c5
--- /dev/null
+++ b/deskutils/abacus/files/patch-ag
@@ -0,0 +1,11 @@
+--- tcl_interf/format.cc.orig	Sun Nov 28 21:31:39 1999
++++ tcl_interf/format.cc	Sun Nov 28 21:32:08 1999
+@@ -65,7 +65,7 @@
+     right_item_double = FALSE;
+ }
+ 
+-Border::operator=(const Border &rig) 
++void Border::operator=(const Border &rig) 
+ {
+   top = rig.top;
+   bottom = rig.bottom;
diff --git a/deskutils/abacus/files/patch-ah b/deskutils/abacus/files/patch-ah
new file mode 100644
index 000000000000..a2d76493894f
--- /dev/null
+++ b/deskutils/abacus/files/patch-ah
@@ -0,0 +1,20 @@
+--- tcl_interf/interf_aux.cc.orig	Thu Dec 30 12:30:22 1999
++++ tcl_interf/interf_aux.cc	Thu Dec 30 12:33:44 1999
+@@ -480,7 +480,7 @@
+       to->value=from->value;
+       to->ivalue=from->ivalue;
+       to->label=from->label;
+-      to->formula=&(Formula(strlen(aux_s),aux_s));
++      to->formula=new Formula(strlen(aux_s),aux_s);
+       free(aux_s);
+     }
+   if(from->type==CODE_NUMBER)
+@@ -512,7 +512,7 @@
+       to->value=from->value;
+       to->ivalue=from->ivalue;
+       to->label=from->label;
+-      to->formula=&(Formula(strlen(aux_s),aux_s));
++      to->formula=new Formula(strlen(aux_s),aux_s);
+       free(aux_s);
+     }
+ }
diff --git a/deskutils/abacus/files/patch-ai b/deskutils/abacus/files/patch-ai
new file mode 100644
index 000000000000..0d58ead207fa
--- /dev/null
+++ b/deskutils/abacus/files/patch-ai
@@ -0,0 +1,11 @@
+--- include/utils.hh.orig	Thu Dec 30 15:18:25 1999
++++ include/utils.hh	Thu Dec 30 15:18:48 1999
+@@ -45,7 +45,7 @@
+ #define MIN(a,b)		((a) < (b) ? (a) : (b))
+ #endif
+ 
+-#define panic(msg) err_print(msg)
++#define punt(msg) err_print(msg)
+ 
+ void err_print(char *message);
+ void err_print(char *message,int n);