4 files changed, 21 insertions, 38 deletions

diff --git a/deskutils/teapot/Makefile b/deskutils/teapot/Makefile
index ac6ca76922c0..010528fc7e00 100644
--- a/deskutils/teapot/Makefile
+++ b/deskutils/teapot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	teapot
 PORTVERSION=	1.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.moria.de/~michael/teapot/
 
@@ -19,20 +19,19 @@ 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
+PORTDOCS=	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
-	${INSTALL_MAN} ${WRKSRC}/teapot.1.en ${PREFIX}/man/man1/teapot.1
+	${INSTALL_MAN} ${WRKSRC}/teapot.1.en ${MANPREFIX}/man/man1/teapot.1
+.if !defined(NOPORTDOCS)
 	@${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
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/teapot
diff --git a/deskutils/teapot/distinfo b/deskutils/teapot/distinfo
index 8f2c75ff3bd4..20d8266551eb 100644
--- a/deskutils/teapot/distinfo
+++ b/deskutils/teapot/distinfo
@@ -1 +1 @@
-MD5 (teapot-1.03.tar.gz) = bde47000a712313c738e1150617576d8
+MD5 (teapot-1.03.tar.gz) = 6d5348e6d051ca6b55e24ea36730c182
diff --git a/deskutils/teapot/files/patch-aa b/deskutils/teapot/files/patch-aa
index 37299750585a..83898a86c791 100644
--- a/deskutils/teapot/files/patch-aa
+++ b/deskutils/teapot/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Nov 10 06:31:26 1998
-+++ Makefile	Sat Oct 28 06:38:38 2000
+--- Makefile.orig	Fri Mar  9 04:50:04 2001
++++ Makefile	Wed Mar 14 20:22:07 2001
 @@ -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
@@ -35,16 +35,3 @@
  #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/pkg-plist b/deskutils/teapot/pkg-plist
index d96eda371848..0762a993732a 100644
--- a/deskutils/teapot/pkg-plist
+++ b/deskutils/teapot/pkg-plist
@@ -1,18 +1,15 @@
 bin/teapot
-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/examples/teapot
-@dirrm share/doc/teapot
+%%PORTDOCS%%share/doc/teapot/teapot.doc
+%%PORTDOCS%%share/doc/teapot/teapot.html
+%%PORTDOCS%%share/doc/teapot/teapot.ps
+%%PORTDOCS%%share/examples/teapot/asqrt
+%%PORTDOCS%%share/examples/teapot/asqrt.README
+%%PORTDOCS%%share/examples/teapot/blink
+%%PORTDOCS%%share/examples/teapot/counter
+%%PORTDOCS%%share/examples/teapot/counter.README
+%%PORTDOCS%%share/examples/teapot/life
+%%PORTDOCS%%share/examples/teapot/life.README
+%%PORTDOCS%%share/examples/teapot/sqrt
+%%PORTDOCS%%share/examples/teapot/sqrt.README
+%%PORTDOCS%%@dirrm share/examples/teapot
+%%PORTDOCS%%@dirrm share/doc/teapot