From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Nov 20 04:40:07 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D0E70106566B for ; Sat, 20 Nov 2010 04:40:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 902C38FC12 for ; Sat, 20 Nov 2010 04:40:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oAK4e7ZQ075047 for ; Sat, 20 Nov 2010 04:40:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oAK4e7kH075046; Sat, 20 Nov 2010 04:40:07 GMT (envelope-from gnats) Resent-Date: Sat, 20 Nov 2010 04:40:07 GMT Resent-Message-Id: <201011200440.oAK4e7kH075046@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Charlie Kester Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2602A106564A for ; Sat, 20 Nov 2010 04:38:01 +0000 (UTC) (envelope-from corky1951@comcast.net) Received: from qmta03.westchester.pa.mail.comcast.net (qmta03.westchester.pa.mail.comcast.net [76.96.62.32]) by mx1.freebsd.org (Postfix) with ESMTP id BD4708FC08 for ; Sat, 20 Nov 2010 04:38:00 +0000 (UTC) Received: from omta12.westchester.pa.mail.comcast.net ([76.96.62.44]) by qmta03.westchester.pa.mail.comcast.net with comcast id ZGd31f0040xGWP853Ge00i; Sat, 20 Nov 2010 04:38:00 +0000 Received: from comcast.net ([98.203.142.76]) by omta12.westchester.pa.mail.comcast.net with comcast id ZGdy1f0031f6R9u3YGdyWe; Sat, 20 Nov 2010 04:38:00 +0000 Received: by comcast.net (sSMTP sendmail emulation); Fri, 19 Nov 2010 20:37:56 -0800 Message-Id: <20101120043801.2602A106564A@hub.freebsd.org> Date: Fri, 19 Nov 2010 20:37:56 -0800 From: Charlie Kester To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/152418: [MAINTAINER] deskutils/teapot: update to 2.2.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Charlie Kester List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Nov 2010 04:40:07 -0000 >Number: 152418 >Category: ports >Synopsis: [MAINTAINER] deskutils/teapot: update to 2.2.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Nov 20 04:40:07 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Charlie Kester >Release: FreeBSD 8.1-STABLE i386 >Organization: >Environment: System: FreeBSD atom.local 8.1-STABLE FreeBSD 8.1-STABLE #0: Tue Nov 16 17:15:14 PST 2010 root@atom.local:/usr/obj/usr/src/sys/ATOM i386 >Description: Update to version 2.2.0 New upstream author and master site. Newest version includes a GUI interface, but this isn't supported yet on FreeBSD because it requires a newer version of FLTK than the one in ports. To avoid having to generate the pdf and html docs from the LyX sources, and thus incurring a build dependency on LyX, download the prebuilt Linux binary tarball from the author's site. >How-To-Repeat: >Fix: -------- Files Deleted: files/patch-ab -------- Files Added: files/patch-CMakeLists.txt -------- --- teapot-2.2.0.diff begins here --- diff -ruN /usr/ports/deskutils/teapot/Makefile ./teapot/Makefile --- /usr/ports/deskutils/teapot/Makefile 2010-03-20 12:20:42.000000000 -0700 +++ ./teapot/Makefile 2010-11-19 19:35:58.000000000 -0800 @@ -6,40 +6,31 @@ # PORTNAME= teapot -PORTVERSION= 1.09 +PORTVERSION= 2.2.0 CATEGORIES= deskutils -MASTER_SITES= http://www.moria.de/~michael/teapot/ \ - http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/ +MASTER_SITES= http://www.syntax-k.de/projekte/${PORTNAME}/ \ + http://www.syntax-k.de/projekte/${PORTNAME}/:docs +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:DEFAULT \ + ${DISTNAME:C/^./T/}-Linux-x86${EXTRACT_SUFX}:docs MAINTAINER= corky1951@comcast.net COMMENT= Full-screen curses based spread sheet program -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="" LIBS="-lcurses -lm" \ - MAKEDEPEND="" -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/graphtest.sh examples/sqrt \ - examples/sqrt.README -MYPORTDOCS= 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 ${MANPREFIX}/man/man1/teapot.1 +USE_CMAKE= yes + +# We download the prebuilt binary tarball for Linux in order to avoid +# having to generate the pdf and html docs from the LyX sourcecode. +WRKSRC_DOCS= ${WRKDIR}/${DISTNAME:C/^./T/}-Linux/share/doc/${PORTNAME} + +post-install: .if !defined(NOPORTDOCS) - @${MKDIR} ${EXAMPLESDIR} -.for file in ${EXAMPLES} - ${INSTALL_DATA} ${WRKSRC}/${file} ${EXAMPLESDIR} -.endfor @${MKDIR} ${DOCSDIR} -.for file in ${MYPORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -.endfor + @(cd ${WRKSRC_DOCS} && ${COPYTREE_SHARE} \* ${DOCSDIR}) +.endif + +.if !defined(NOPORTEXAMPLES) + @${MKDIR} ${EXAMPLESDIR} + @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}) .endif .include diff -ruN /usr/ports/deskutils/teapot/distinfo ./teapot/distinfo --- /usr/ports/deskutils/teapot/distinfo 2006-02-21 14:36:45.000000000 -0800 +++ ./teapot/distinfo 2010-11-19 18:24:57.000000000 -0800 @@ -1,3 +1,4 @@ -MD5 (teapot-1.09.tar.gz) = 21e1d1c1d04ba59af1fac6f49a4e2b1b -SHA256 (teapot-1.09.tar.gz) = 868312231182881ebc5b67c9680e43b027a86bdd53fc2641bf99a188597e5ca2 -SIZE (teapot-1.09.tar.gz) = 161409 +SHA256 (teapot-2.2.0.tar.gz) = 883c6298002e0f4f27abeeb08f1c0282ae69de8f5b70619437b46ad92bb70916 +SIZE (teapot-2.2.0.tar.gz) = 113903 +SHA256 (Teapot-2.2.0-Linux-x86.tar.gz) = ba841701f50e3c6a84603db3cf2135025037a8809b58a0786ecfa68b844ce517 +SIZE (Teapot-2.2.0-Linux-x86.tar.gz) = 686141 diff -ruN /usr/ports/deskutils/teapot/files/patch-CMakeLists.txt ./teapot/files/patch-CMakeLists.txt --- /usr/ports/deskutils/teapot/files/patch-CMakeLists.txt 1969-12-31 16:00:00.000000000 -0800 +++ ./teapot/files/patch-CMakeLists.txt 2010-11-19 17:40:05.000000000 -0800 @@ -0,0 +1,37 @@ +--- ./CMakeLists.txt.orig 2010-10-04 13:41:32.000000000 -0700 ++++ ./CMakeLists.txt 2010-11-19 17:39:57.000000000 -0800 +@@ -5,7 +5,7 @@ + set(Teapot_VERSION_MINOR 2) + set(Teapot_VERSION_PATCH 0) + +-option(ENABLE_HELP "Enable built-in documentation" ON) ++option(ENABLE_HELP "Enable built-in documentation" OFF) + option(ENABLE_UTF8 "Enable UTF-8 support" ON) + + add_library(teapotlib context.c csv.c eval.c func.c html.c latex.c main.c misc.c parser.c sc.c scanner.c sheet.c utf8.c wk1.c xdr.c) +@@ -36,25 +36,6 @@ + install(TARGETS teapot DESTINATION bin) + endif () + +-find_package(FLTK NO_MODULE) +-if (FLTK_FOUND) +- include(${FLTK_USE_FILE}) +- +- fltk_wrap_ui(fteapot fteapot.fl) +- add_executable(fteapot WIN32 ${fteapot_FLTK_UI_SRCS}) +- set(fteapot_DEB_DEPENDS ", libstdc++6 (>= 4.1.1), libx11-6, libxinerama1") +- if (FLTK_XFT_FOUND) +- set(fteapot_DEB_DEPENDS "${fteapot_DEB_DEPENDS}, libfontconfig1 (>= 2.4.0), libxft2 (>> 2.1.1)") +- endif () +- if (ENABLE_HELP) +- set(fteapot_DEB_DEPENDS "${fteapot_DEB_DEPENDS}, libjpeg62, libpng12-0 (>= 1.2.13-4)") +- target_link_libraries(fteapot teapotlib fltk fltk_images ${LIB_PORTABLEXDR}) +- else () +- target_link_libraries(fteapot teapotlib fltk ${LIB_PORTABLEXDR}) +- endif () +- install(TARGETS fteapot DESTINATION bin) +-endif () +- + if (ENABLE_HELP) + add_custom_command( + OUTPUT teapot.tex teapot.lyx diff -ruN /usr/ports/deskutils/teapot/files/patch-ab ./teapot/files/patch-ab --- /usr/ports/deskutils/teapot/files/patch-ab 2000-11-01 04:47:59.000000000 -0800 +++ ./teapot/files/patch-ab 1969-12-31 16:00:00.000000000 -0800 @@ -1,21 +0,0 @@ ---- 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 Release-Note: >Audit-Trail: >Unformatted: