Upgrade from 2.1.5 to 2.2.2p4.

Prompted by:	old version's dissapearance from master site
Notified by:	pointyhat (kris)

7 files changed, 30 insertions, 29 deletions

diff --git a/devel/frink/Makefile b/devel/frink/Makefile
index 16c0c798ee08..5dfb570dc23c 100644
--- a/devel/frink/Makefile
+++ b/devel/frink/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	frink
-PORTVERSION=	2.1.5
+PORTVERSION=	2.2.2p4
 CATEGORIES=	devel
 MASTER_SITES=	ftp://catless.ncl.ac.uk/pub/
 
@@ -15,15 +15,14 @@ COMMENT=	A tcl formatter and static tester
 
 #MAN1=		${PORTNAME}.1
 MANCOMPRESSED=	maybe
+WRKSRC=		${WRKDIR}/${PORTNAME}-2.2.2
 
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 
 .ifndef NOPORTDOCS
-PLIST_SUB+=	DOCSDIR=${DOCSDIR:S,${PREFIX:S,/$,,}/,,}
 post-install:
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/README \
-		${WRKSRC}/README.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/frink/distinfo b/devel/frink/distinfo
index efe11280a3ec..d5bc21ce744e 100644
--- a/devel/frink/distinfo
+++ b/devel/frink/distinfo
@@ -1,2 +1,2 @@
-MD5 (frink-2.1.5.tar.gz) = 3115ca10c8b5707da44343862b2ab3d5
-SIZE (frink-2.1.5.tar.gz) = 47969
+MD5 (frink-2.2.2p4.tar.gz) = 5d980f3caf6377f590477621f49336e6
+SIZE (frink-2.2.2p4.tar.gz) = 99642
diff --git a/devel/frink/files/Makefile.bsd b/devel/frink/files/Makefile.bsd
index 0faad905f035..6cf72382aad4 100644
--- a/devel/frink/files/Makefile.bsd
+++ b/devel/frink/files/Makefile.bsd
@@ -1,5 +1,6 @@
 PROG=	frink
-SRCS=	frink.c output.c token.c tcl.c config.c
+SRCS=	blocks.c config.c frink.c output.c tcl.c token.c util.c vars.c
+CFLAGS+=-I${.CURDIR}
 
 BINDIR=	${PREFIX}/bin
 MANDIR=	${PREFIX}/man/man
diff --git a/devel/frink/files/patch-indent b/devel/frink/files/patch-indent
index 7defc2e83e30..cd800c6206e1 100644
--- a/devel/frink/files/patch-indent
+++ b/devel/frink/files/patch-indent
@@ -12,19 +12,6 @@ style(9) guidelines.
 -          set indent for each level to n. default = 4
 +          set indent for each level to n. default = 8
  
---- README.html	Thu Jun 21 10:49:12 2001
-+++ README.html	Fri May 31 15:04:48 2002
-@@ -49,3 +49,3 @@
- 
--<dd>set further indent for continuations to n. default = 2</dd>
-+<dd>set further indent for continuations to n. default = 4</dd>
- 
-@@ -150,3 +150,3 @@
- 
--<dd>set indent for each level to n. default = 4</dd>
-+<dd>set indent for each level to n. default = 8</dd>
- 
-Common subdirectories: work/frink-2.1.5/Windows and frink-2.1.5/Windows
 --- frink.c	Thu Jun 21 10:49:12 2001
 +++ frink.c	Fri May 31 15:05:31 2002
 @@ -37,4 +37,4 @@
diff --git a/devel/frink/files/patch-malloc b/devel/frink/files/patch-malloc
deleted file mode 100644
index b33f132bb6e6..000000000000
--- a/devel/frink/files/patch-malloc
+++ /dev/null
@@ -1,7 +0,0 @@
---- tcl.c	Mon Apr 23 10:31:13 2001
-+++ tcl.c	Tue May  8 15:30:28 2001
-@@ -23,3 +23,3 @@
- #else
--#include <malloc.h>
-+#include <stdlib.h>
- #endif
diff --git a/devel/frink/files/patch-strdup b/devel/frink/files/patch-strdup
new file mode 100644
index 000000000000..6f806066e99e
--- /dev/null
+++ b/devel/frink/files/patch-strdup
@@ -0,0 +1,22 @@
+--- util.h	Wed Dec 11 17:21:48 2002
++++ util.h	Mon Feb 14 11:47:14 2005
+@@ -58,5 +58,5 @@
+ extern void lapply(List *, void(*)(void *));
+ 
+-extern char *newString(char *);
++#define newString(t)	strdup(t)
+ extern int doTest(enum Heuristics);
+ 
+--- util.c	Wed Dec 11 18:07:50 2002
++++ util.c	Mon Feb 14 11:49:40 2005
+@@ -105,10 +105,4 @@
+ }
+ 
+-char * newString(char *t)
+-{
+-    return strcpy(malloc(strlen(t)+1), t);
+-}
+-
+-
+ int doTest(enum Heuristics x)
+ {
diff --git a/devel/frink/pkg-plist b/devel/frink/pkg-plist
index a3a08d2adc20..ce94f30787fb 100644
--- a/devel/frink/pkg-plist
+++ b/devel/frink/pkg-plist
@@ -1,5 +1,4 @@
 bin/frink
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%