Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 31 Oct 2000 11:24:33 -0800 (PST)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/22446: Update port: deskutils/teapot
Message-ID:  <20001031192433.08B2A37B479@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         22446
>Category:       ports
>Synopsis:       Update port: deskutils/teapot
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 31 11:30:00 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix MASTER_SITES
- Update checksum
- Remove version number from pkg-descr

New file:
files/patch-ab

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/deskutils/teapot/Makefile deskutils/teapot/Makefile
--- /usr/ports/deskutils/teapot/Makefile	Sun Apr  9 15:44:18 2000
+++ deskutils/teapot/Makefile	Wed Nov  1 00:44:19 2000
@@ -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 -urN /usr/ports/deskutils/teapot/distinfo deskutils/teapot/distinfo
--- /usr/ports/deskutils/teapot/distinfo	Mon May  3 11:11:18 1999
+++ deskutils/teapot/distinfo	Sat Oct 28 06:24:57 2000
@@ -1 +1 @@
-MD5 (teapot-1.03.tar.gz) = c06d01c1cd8f260c4eeecf0e514fd89f
+MD5 (teapot-1.03.tar.gz) = bde47000a712313c738e1150617576d8
diff -urN /usr/ports/deskutils/teapot/files/patch-aa deskutils/teapot/files/patch-aa
--- /usr/ports/deskutils/teapot/files/patch-aa	Mon May  3 11:11:19 1999
+++ deskutils/teapot/files/patch-aa	Sat Oct 28 06:38:44 2000
@@ -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 -urN /usr/ports/deskutils/teapot/files/patch-ab deskutils/teapot/files/patch-ab
--- /usr/ports/deskutils/teapot/files/patch-ab	Thu Jan  1 09:00:00 1970
+++ deskutils/teapot/files/patch-ab	Sat Oct 28 06:48:10 2000
@@ -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 -urN /usr/ports/deskutils/teapot/pkg-descr deskutils/teapot/pkg-descr
--- /usr/ports/deskutils/teapot/pkg-descr	Fri Sep 24 18:18:30 1999
+++ deskutils/teapot/pkg-descr	Sat Oct 28 06:19:13 2000
@@ -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 -urN /usr/ports/deskutils/teapot/pkg-plist deskutils/teapot/pkg-plist
--- /usr/ports/deskutils/teapot/pkg-plist	Mon Aug 17 17:39:14 1998
+++ deskutils/teapot/pkg-plist	Wed Nov  1 00:45:15 2000
@@ -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


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001031192433.08B2A37B479>