From 2a53dfb520911909b575935ac77e7e23a7d1c7ae Mon Sep 17 00:00:00 2001 From: Nicola Vitale Date: Sun, 21 Nov 2010 22:28:03 +0000 Subject: - Update to 2.2.0 - Add files/patch-CMakeLists.txt - New MASTER_SITES, and WWW site - Remove files/patch-ab PR: ports/152418 Submitted by: Charlie Kester (maintainer) --- deskutils/teapot/Makefile | 41 +++++++---------- deskutils/teapot/distinfo | 7 +-- deskutils/teapot/files/patch-CMakeLists.txt | 46 +++++++++++++++++++ deskutils/teapot/files/patch-ab | 21 --------- deskutils/teapot/pkg-descr | 6 +-- deskutils/teapot/pkg-plist | 69 +++++++++++++++++++++++------ 6 files changed, 124 insertions(+), 66 deletions(-) create mode 100644 deskutils/teapot/files/patch-CMakeLists.txt delete mode 100644 deskutils/teapot/files/patch-ab diff --git a/deskutils/teapot/Makefile b/deskutils/teapot/Makefile index da851d9c13f7..61c765f131a8 100644 --- a/deskutils/teapot/Makefile +++ b/deskutils/teapot/Makefile @@ -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 +USE_CMAKE= yes -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 +# 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-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 +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 --git a/deskutils/teapot/distinfo b/deskutils/teapot/distinfo index 7d621ae83a9c..35500d1a9fd7 100644 --- a/deskutils/teapot/distinfo +++ b/deskutils/teapot/distinfo @@ -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 --git a/deskutils/teapot/files/patch-CMakeLists.txt b/deskutils/teapot/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..75005c6e6925 --- /dev/null +++ b/deskutils/teapot/files/patch-CMakeLists.txt @@ -0,0 +1,46 @@ +--- CMakeLists.txt 2010-10-04 22:41:32.000000000 +0200 ++++ CMakeLists.txt.port 2010-11-21 23:05:26.000000000 +0100 +@@ -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 +@@ -88,7 +69,7 @@ + set(HELPFILE "${CMAKE_INSTALL_PREFIX}/share/doc/teapot/html/index.html") + endif () + +-install(FILES COPYING README DESTINATION share/doc/teapot) ++#install(FILES COPYING README DESTINATION share/doc/teapot) + + add_custom_target(dist + COMMAND ${CMAKE_COMMAND} -E remove_directory teapot-${Teapot_VERSION_MAJOR}.${Teapot_VERSION_MINOR}.${Teapot_VERSION_PATCH} diff --git a/deskutils/teapot/files/patch-ab b/deskutils/teapot/files/patch-ab deleted file mode 100644 index d41188644d3d..000000000000 --- a/deskutils/teapot/files/patch-ab +++ /dev/null @@ -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