From 2a18d3d44615ca0447de30af999e5476bb713448 Mon Sep 17 00:00:00 2001 From: asau Date: Thu, 13 Sep 2012 22:29:09 +0000 Subject: Update to Teapot 2.3.0 Project moved to another developer. The changes compared to 2.2.1 are: o visual garbage fixed (curses version) o made unquoted strings default, added "-q" flag to turn quotes back on o made attributes menu more user friendly: no more question when changing a single cell, one menu option optimized away o added "-H" command line flag to hide row/column headers; in FLTK, this means you can only change sheets via Ctrl-Shift-PgUp/PgDn o expanded command line help The changes compared to 2.2.0 are: o Help system improved o Compile fix for MacOS o Link shared by default. Set option ENABLE_STATIC to statically link FLTK. o Bugfixes for CSV export o Bugfixes for console mode o Added font styles bold and underline The changes compared to 2.1.0 are: o UTF-8 support for curses frontend o various bug fixes The changes compared to 2.0.2 are: o switched to CMake as build system o Win32 compatibility o usage improvements in the GUI version o various bug fixes The changes compared to 2.0.1 are: o Low-resource builds (leaving out the help system) o various bug fixes The changes compared to 2.0 are: o Fix a possible crash and some minor bugs o improve FLTK navigation and cell editing (moving around and selecting cells now works while editing a formula) o automatically start a string value when typing a letter o fix build system The changes compared to 1.09 are: o Several bug fixes and changes how files are handled o FLTK user interface o Built-in Help and About screen (currently only in FLTK) o License changed to GPL (see mbox file in doc folder for permission) --- math/teapot/Makefile | 39 ++++++++------------------------ math/teapot/PLIST | 17 +++----------- math/teapot/distinfo | 10 ++++---- math/teapot/patches/patch-CMakeLists.txt | 13 +++++++++++ math/teapot/patches/patch-aa | 23 ------------------- 5 files changed, 30 insertions(+), 72 deletions(-) create mode 100644 math/teapot/patches/patch-CMakeLists.txt delete mode 100644 math/teapot/patches/patch-aa (limited to 'math') diff --git a/math/teapot/Makefile b/math/teapot/Makefile index 493faf57a52..0a0db8f9200 100644 --- a/math/teapot/Makefile +++ b/math/teapot/Makefile @@ -1,39 +1,18 @@ -# $NetBSD: Makefile,v 1.2 2012/09/11 23:04:34 asau Exp $ -# +# $NetBSD: Makefile,v 1.3 2012/09/13 22:29:09 asau Exp $ -DISTNAME= teapot-1.09 +DISTNAME= teapot-2.3.0 CATEGORIES= math -MASTER_SITES= http://www.moria.de/~michael/teapot/ +MASTER_SITES= http://www.syntax-k.de/projekte/teapot/ MAINTAINER= hauke@NetBSD.org -HOMEPAGE= http://www.moria.de/~michael/teapot/ +HOMEPAGE= http://www.syntax-k.de/projekte/teapot/ COMMENT= Curses based spread sheet program -LICENSE= teapot-license +LICENSE= gnu-gpl-v3 -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${TEA_DOCSDIR} ${EGDIR} - -EGDIR= share/examples/teapot -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 -TEA_DOCSDIR= share/doc/teapot -TEA_DOCS= doc/teapot.doc doc/teapot.html doc/teapot.ps - -do-build: - cd ${WRKSRC} && ${MAKE_PROGRAM} ${MAKE_FLAGS} teapot - cd ${WRKSRC}/doc && ${MAKE} teapot.doc teapot.html teapot.ps - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/teapot ${DESTDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/teapot.1.en \ - ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/teapot.1 -.for file in ${EXAMPLES} - ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/${EGDIR} -.endfor -.for file in ${TEA_DOCS} - ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/${TEA_DOCSDIR} -.endfor +USE_LANGUAGES= c c++ +USE_CMAKE= yes +CMAKE_ARGS+= -DENABLE_HELP=NO +CMAKE_ARGS+= -DPKGMANDIR=${PKGMANDIR} .include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/teapot/PLIST b/math/teapot/PLIST index a1530d43497..df69682f5d7 100644 --- a/math/teapot/PLIST +++ b/math/teapot/PLIST @@ -1,16 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2010/05/04 14:45:32 hauke Exp $ +@comment $NetBSD: PLIST,v 1.2 2012/09/13 22:29:09 asau Exp $ bin/teapot man/man1/teapot.1 -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/graphtest.sh -share/examples/teapot/life -share/examples/teapot/life.README -share/examples/teapot/sqrt -share/examples/teapot/sqrt.README +share/doc/teapot/COPYING +share/doc/teapot/README diff --git a/math/teapot/distinfo b/math/teapot/distinfo index a76aa153a48..5bbf45cb9ea 100644 --- a/math/teapot/distinfo +++ b/math/teapot/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/05/04 14:45:32 hauke Exp $ +$NetBSD: distinfo,v 1.2 2012/09/13 22:29:10 asau Exp $ -SHA1 (teapot-1.09.tar.gz) = 5618bcc3c2e10ed6af73a0f8ee29599c7fc5967d -RMD160 (teapot-1.09.tar.gz) = e592ff0a193e3c0f3dc5d774c07e72692d211240 -Size (teapot-1.09.tar.gz) = 161409 bytes -SHA1 (patch-aa) = 5f849fc7436df413e6e925835056b598c3ffd237 +SHA1 (teapot-2.3.0.tar.gz) = cac70c7967ba72166cdbd1806b674cd8299399e7 +RMD160 (teapot-2.3.0.tar.gz) = 5848a39bfcd4ebc942ed3f5f354ecb367b068dab +Size (teapot-2.3.0.tar.gz) = 113647 bytes +SHA1 (patch-CMakeLists.txt) = ac06834092bfc397f7c1c323c7a6990d0d03f9a4 diff --git a/math/teapot/patches/patch-CMakeLists.txt b/math/teapot/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..8a839b60d8d --- /dev/null +++ b/math/teapot/patches/patch-CMakeLists.txt @@ -0,0 +1,13 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2012/09/13 22:29:11 asau Exp $ + +--- CMakeLists.txt.orig 2012-02-06 11:30:53.000000000 +0000 ++++ CMakeLists.txt +@@ -105,7 +105,7 @@ if (ENABLE_HELP) + endif () + + install(FILES COPYING README DESTINATION share/doc/teapot) +-install(FILES teapot.1 DESTINATION share/man/man1) ++install(FILES teapot.1 DESTINATION ${PKGMANDIR}/man1) + + add_custom_target(dist + COMMAND ${CMAKE_COMMAND} -E remove_directory teapot-${Teapot_VERSION_MAJOR}.${Teapot_VERSION_MINOR}.${Teapot_VERSION_PATCH} diff --git a/math/teapot/patches/patch-aa b/math/teapot/patches/patch-aa deleted file mode 100644 index a837fb23e30..00000000000 --- a/math/teapot/patches/patch-aa +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2010/05/04 14:45:32 hauke Exp $ - ---- doc/Makefile.orig 2003-09-22 22:24:03.000000000 +0200 -+++ doc/Makefile -@@ -5,15 +5,15 @@ teapot.mm: teapot.MM command.tbl.0 editl - soelim teapot.MM | grep -v '^\.lf' >teapot.mm - - command.html.0 command.tbl.0: command command.bat insTH.ed -- teapot -b command