Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Nov 2001 02:33:10 -0800 (PST)
From:      KATO Tsuguru <tkato@prontomail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/32214: Update port: deskutils/teapot to 1.04
Message-ID:  <200111231033.fANAXAb96233@freefall.freebsd.org>

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

>Number:         32214
>Category:       ports
>Synopsis:       Update port: deskutils/teapot to 1.04
>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:   Fri Nov 23 02:40:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.04

Remove file:
files/patch-aa

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/deskutils/teapot/Makefile deskutils/teapot/Makefile
--- /usr/ports/deskutils/teapot/Makefile	Sat Mar 17 15:08:47 2001
+++ deskutils/teapot/Makefile	Thu Nov 22 02:25:21 2001
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	teapot
-PORTVERSION=	1.03
-PORTREVISION=	2
+PORTVERSION=	1.04
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.moria.de/~michael/teapot/
 
 MAINTAINER=	ports@FreeBSD.org
 
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -I./.curses.h -DNO_POSIX_SOURCE" \
+		LDFLAGS="" LIBS="-lcurses -mytinfo -lm" MAKEDEPEND=""
 ALL_TARGET=	teapot
 MAN1=		teapot.1
 
@@ -21,20 +22,22 @@
 		examples/life.README examples/sqrt examples/sqrt.README
 PORTDOCS=	doc/teapot.doc doc/teapot.html doc/teapot.ps
 
+EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}
+
 post-build:
-	@ cd ${WRKSRC}/doc && ${MAKE} teapot.doc teapot.html teapot.ps
+	@cd ${WRKSRC}/doc && ${MAKE} teapot.doc teapot.html teapot.ps
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/teapot ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/teapot.1.en ${MANPREFIX}/man/man1/teapot.1
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/examples/teapot
+	@${MKDIR} ${EXAMPLESDIR}
 .for file in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/examples/teapot
+	${INSTALL_DATA} ${WRKSRC}/${file} ${EXAMPLESDIR}
 .endfor
-	@${MKDIR} ${PREFIX}/share/doc/teapot
+	@${MKDIR} ${DOCSDIR}
 .for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/teapot
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff -urN /usr/ports/deskutils/teapot/distinfo deskutils/teapot/distinfo
--- /usr/ports/deskutils/teapot/distinfo	Sat Mar 17 15:08:47 2001
+++ deskutils/teapot/distinfo	Wed Nov  7 03:38:47 2001
@@ -1 +1 @@
-MD5 (teapot-1.03.tar.gz) = 6d5348e6d051ca6b55e24ea36730c182
+MD5 (teapot-1.04.tar.gz) = 39a962abfa2ffb8965e08b86b5d4d3be
diff -urN /usr/ports/deskutils/teapot/files/patch-aa deskutils/teapot/files/patch-aa
--- /usr/ports/deskutils/teapot/files/patch-aa	Sat Mar 17 15:08:49 2001
+++ deskutils/teapot/files/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,37 +0,0 @@
---- 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
-+#CFLAGS=		-g -pipe -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -Wcast-qual -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-declarations -Wnested-externs -pedantic -fno-common
- # The XDR library needs _BSD_SOURCE :(
- CPPFLAGS=	-D_BSD_SOURCE
- #CPPFLAGS=	-DTHE_ELECTRIC_FENCE
- #CPPFLAGS=	-I/usr/dmalloc/include -DDMALLOC
--LDFLAGS=	-g
-+#LDFLAGS=	-g
- #LDFLAGS=	-g -L/usr/efence/lib
- #LDFLAGS=	-g -L/usr/dmalloc/lib
--LIBS=		-lcurses -lm
-+#LIBS=		-lcurses -lm
- #LIBS=		-lcurses -lm -lefence
- #LIBS=		-lcurses -lm -ldmalloc
--MAKEDEPEND=	mkdep -d
-+#MAKEDEPEND=	mkdep -d
- #}}}
- #{{{ Linux, Slackware/Redhat/Debian Distribution, gcc
- #CC=		gcc
-@@ -22,10 +22,9 @@
- #MAKEDEPEND=	gcc -MM
- #}}}
- #{{{ FreeBSD 2.x, gcc
--#CC=		gcc
--#CFLAGS=		-pipe -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -Wcast-qual -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-declarations -Wnested-externs -pedantic -fno-common
--#CPPFLAGS=	-I./.curses.h -DNO_POSIX_SOURCE
--#LIBS=		-lncurses -lmytinfo -lm
-+CC?=		gcc
-+CFLAGS+=	-pedantic -fno-common -I./.curses.h -DNO_POSIX_SOURCE
-+LIBS=		-lncurses -lmytinfo -lm
- #LDFLAGS=	
- #MAKEDEPEND=	gcc -MM
- #}}}
diff -urN /usr/ports/deskutils/teapot/pkg-descr deskutils/teapot/pkg-descr
--- /usr/ports/deskutils/teapot/pkg-descr	Wed Nov  1 21:47:58 2000
+++ deskutils/teapot/pkg-descr	Thu Nov 22 01:54:46 2001
@@ -19,4 +19,4 @@
 
 The following URLs tell you a little more about it:
 
-WWW: http://www.moria.de/~michael/teapot/teapot-en.html
+WWW: http://www.moria.de/~michael/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?200111231033.fANAXAb96233>