6 files changed, 65 insertions, 21 deletions

diff --git a/deskutils/teapot/Makefile b/deskutils/teapot/Makefile
index 74e1019dde87..ac6ca76922c0 100644
--- a/deskutils/teapot/Makefile
+++ b/deskutils/teapot/Makefile
@@ -7,28 +7,35 @@
 
 PORTNAME=	teapot
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	deskutils
-MASTER_SITES=	ftp://cantor.informatik.rwth-aachen.de/pub/unix/ \
-		http://www.moria.de/~michael/teapot/
+MASTER_SITES=	http://www.moria.de/~michael/teapot/
 
 MAINTAINER=	ports@FreeBSD.org
 
-ALL_TARGET=
+ALL_TARGET=	teapot
 MAN1=		teapot.1
 
+EXAMPLES=	examples/asqrt examples/asqrt.README examples/blink \
+		examples/counter examples/counter.README examples/life \
+		examples/life.README examples/sqrt examples/sqrt.README
+PORTDOCS=	README-de.html README-en.html README-nl.html \
+		doc/teapot.doc doc/teapot.html doc/teapot.ps
+
+post-build:
+	@ cd ${WRKSRC}/doc && ${MAKE} teapot.doc teapot.html teapot.ps
+
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/teapot ${PREFIX}/bin
-	@ cd ${WRKSRC}/doc; make teapot.doc teapot.html teapot.ps
-	@ ${INSTALL_MAN} ${WRKSRC}/teapot.1.en ${PREFIX}/man/man1/teapot.1
-	@ ${MKDIR} ${PREFIX}/share/examples/teapot
-.for file in asqrt asqrt.README counter counter.README life life.README sqrt sqrt.README
-	@ ${INSTALL_DATA} ${WRKSRC}/examples/${file} ${PREFIX}/share/examples/teapot
+	${INSTALL_PROGRAM} ${WRKSRC}/teapot ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/teapot.1.en ${PREFIX}/man/man1/teapot.1
+	@${MKDIR} ${PREFIX}/share/examples/teapot
+.for file in ${EXAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/examples/teapot
 .endfor
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/teapot
-	@ ${INSTALL_DATA} ${WRKSRC}/README-en.html ${PREFIX}/share/doc/teapot/README.html
-.for file in teapot.doc teapot.html teapot.ps
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/teapot
+	@${MKDIR} ${PREFIX}/share/doc/teapot
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/teapot
 .endfor
 .endif
 
diff --git a/deskutils/teapot/distinfo b/deskutils/teapot/distinfo
index d7ae73c57fa4..8f2c75ff3bd4 100644
--- a/deskutils/teapot/distinfo
+++ b/deskutils/teapot/distinfo
@@ -1 +1 @@
-MD5 (teapot-1.03.tar.gz) = c06d01c1cd8f260c4eeecf0e514fd89f
+MD5 (teapot-1.03.tar.gz) = bde47000a712313c738e1150617576d8
diff --git a/deskutils/teapot/files/patch-aa b/deskutils/teapot/files/patch-aa
index 944865319128..37299750585a 100644
--- a/deskutils/teapot/files/patch-aa
+++ b/deskutils/teapot/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun Jun 14 08:11:40 1998
-+++ Makefile	Sat May  1 14:52:37 1999
+--- Makefile.orig	Tue Nov 10 06:31:26 1998
++++ Makefile	Sat Oct 28 06:38:38 2000
 @@ -1,16 +1,16 @@
  #{{{script}}}#{{{ Linux, moria machines, gcc
 -CFLAGS=		-g -pipe -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -Wcast-qual -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-declarations -Wnested-externs -pedantic -fno-common
@@ -30,8 +30,21 @@
 -#CPPFLAGS=	-I./.curses.h -DNO_POSIX_SOURCE
 -#LIBS=		-lncurses -lmytinfo -lm
 +CC?=		gcc
-+CFLAGS+=	-Wmissing-prototypes -Wstrict-prototypes -Wcast-qual -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-declarations -Wnested-externs -pedantic -fno-common -I./.curses.h -DNO_POSIX_SOURCE
++CFLAGS+=	-pedantic -fno-common -I./.curses.h -DNO_POSIX_SOURCE
 +LIBS=		-lncurses -lmytinfo -lm
  #LDFLAGS=	
  #MAKEDEPEND=	gcc -MM
  #}}}
+@@ -68,9 +67,9 @@
+ #MAKEDEPEND=	makedepend -f-
+ #}}}
+ #{{{ DEC OSF/1, cc
+-CFLAGS=		-O -std1 $(CPPFLAGS)
+-CPPFLAGS=	-D_XOPEN_SOURCE -D_OSF_SOURCE
+-LIBS=		-lcurses -lm
++#CFLAGS=		-O -std1 $(CPPFLAGS)
++#CPPFLAGS=	-D_XOPEN_SOURCE -D_OSF_SOURCE
++#LIBS=		-lcurses -lm
+ MAKEDEPEND=	mkdep -d
+ #}}}
+ #{{{ AIX 3, xlc
diff --git a/deskutils/teapot/files/patch-ab b/deskutils/teapot/files/patch-ab
new file mode 100644
index 000000000000..d41188644d3d
--- /dev/null
+++ b/deskutils/teapot/files/patch-ab
@@ -0,0 +1,21 @@
+--- doc/Makefile.orig	Thu Mar 19 03:12:57 1998
++++ doc/Makefile	Sat Oct 28 06:36:44 2000
+@@ -5,15 +5,15 @@
+ 		soelim teapot.MM | grep -v '^\.lf' >teapot.mm
+ 
+ command.html.0 command.tbl.0:	command command.bat insTH.ed
+-		teapot -b command <command.bat
++		../teapot -b command <command.bat
+ 		ed command.tbl.0 <insTH.ed
+ 
+ editline.html.0 editline.tbl.0:	editline editline.bat insTH.ed
+-		teapot -b editline <editline.bat
++		../teapot -b editline <editline.bat
+ 		ed editline.tbl.0 <insTH.ed
+ 
+ unsorted.html.0 unsorted.tbl.0:	unsorted unsorted.bat unsorted.ed
+-		teapot -b unsorted <unsorted.bat
++		../teapot -b unsorted <unsorted.bat
+ 		ed unsorted.tbl.0 <unsorted.ed
+ 
+ teapot.ps:	teapot.mm
diff --git a/deskutils/teapot/pkg-descr b/deskutils/teapot/pkg-descr
index c2db1619cfe6..b4f5f6029dc2 100644
--- a/deskutils/teapot/pkg-descr
+++ b/deskutils/teapot/pkg-descr
@@ -1,5 +1,5 @@
-This is release 0.9 beta of teapot (Table Editor And Planner, Or:
-Teapot), a new spread sheet program for UNIX.
+This is teapot (Table Editor And Planner, Or: Teapot), a new spread sheet 
+program for UNIX.
 
 The current release has the following features:
 
diff --git a/deskutils/teapot/pkg-plist b/deskutils/teapot/pkg-plist
index 2334d7d38ba3..d96eda371848 100644
--- a/deskutils/teapot/pkg-plist
+++ b/deskutils/teapot/pkg-plist
@@ -1,15 +1,18 @@
 bin/teapot
-share/doc/teapot/README.html
+share/doc/teapot/README-de.html
+share/doc/teapot/README-en.html
+share/doc/teapot/README-nl.html
 share/doc/teapot/teapot.doc
 share/doc/teapot/teapot.html
 share/doc/teapot/teapot.ps
 share/examples/teapot/asqrt
 share/examples/teapot/asqrt.README
+share/examples/teapot/blink
 share/examples/teapot/counter
 share/examples/teapot/counter.README
 share/examples/teapot/life
 share/examples/teapot/life.README
 share/examples/teapot/sqrt
 share/examples/teapot/sqrt.README
-@dirrm share/doc/teapot
 @dirrm share/examples/teapot
+@dirrm share/doc/teapot