Date: Tue, 3 Dec 2002 07:08:56 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/45934: Update port: deskutils/tuxcards to 1.0.b2 Message-ID: <20021203070856.6c9909b4.tkato@prontomail.com>
next in thread | raw e-mail | index | archive | help
>Number: 45934 >Category: ports >Synopsis: Update port: deskutils/tuxcards to 1.0.b2 >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: Mon Dec 02 14:20:06 PST 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.7-RELEASE-p2 i386 >Organization: >Environment: >Description: - Update to version 1.0beta2 New file: files/patch-src::commandlineoptions.cpp files/patch-src::gui::cactusbar::cactusbar.cpp files/patch-src::gui::colorbar::colorbar.cpp files/patch-src::gui::editor::editor.cpp files/patch-src::information::informationcollection.cpp files/patch-src::information::informationelement.cpp files/patch-src::information::treeinformationelement.cpp files/patch-src::mainwindow.cpp files/patch-src::test.cpp files/patch-src::utilities::strings.cpp >How-To-Repeat: >Fix: diff -urN /usr/ports/deskutils/tuxcards/Makefile deskutils/tuxcards/Makefile --- /usr/ports/deskutils/tuxcards/Makefile Mon Dec 2 19:02:12 2002 +++ deskutils/tuxcards/Makefile Tue Dec 3 05:08:47 2002 @@ -6,34 +6,34 @@ # PORTNAME= tuxcards -PORTVERSION= 0.8 -PORTREVISION= 1 +PORTVERSION= 1.0.b2 CATEGORIES= deskutils -MASTER_SITES= http://www.arved.de/bsd/src/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-ohneCactus +MASTER_SITES= http://www.stud.uni-karlsruhe.de/~ut3c/ \ + http://www.arved.de/bsd/src/ +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/beta/} MAINTAINER= ports@FreeBSD.org WRKSRC= ${WRKDIR}/${PORTNAME} -USE_GMAKE= yes -USE_QT_VER= 2 -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} + +QTDIR?= ${X11BASE} + +USE_QT_VER= 3 USE_REINPLACE= yes +MAKE_ENV= QTDIR="${QTDIR}" -.include <bsd.port.pre.mk> +post-patch: + @${REINPLACE_CMD} -e 's|warn_on|warn_on thread|g' ${WRKSRC}/tuxcards.pro -.if ${OSVERSION} > 500038 -BROKEN= "Does not build with gcc 3.1" +do-configure: + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \ + -spec ${X11BASE}/mkspecs/freebsd-g++ tuxcards.pro + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/en/*.* ${DOCSDIR} .endif -pre-patch: - @${REINPLACE_CMD} -e 's|[$$](prefix)/doc|\$$\(prefix\)/share/doc|' \ - ${WRKSRC}/tuxcards/docs/en/Makefile.in - @${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure -.ifdef(NOPORTDOCS) - @${REINPLACE_CMD} -e 's|install-data-am\: install-data-local||' \ - ${WRKSRC}/tuxcards/docs/en/Makefile.in -.endif #NOPORTDOCS - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -urN /usr/ports/deskutils/tuxcards/distinfo deskutils/tuxcards/distinfo --- /usr/ports/deskutils/tuxcards/distinfo Sat May 18 04:23:30 2002 +++ deskutils/tuxcards/distinfo Tue Dec 3 05:08:47 2002 @@ -1 +1 @@ -MD5 (tuxcards-0.8-ohneCactus.tar.gz) = d83c5ff630fececca3975724facc8d65 +MD5 (tuxcards-1.0beta2.tar.gz) = bd0132214590ba1d0ae8336e5eaee15c diff -urN /usr/ports/deskutils/tuxcards/files/patch-src::commandlineoptions.cpp deskutils/tuxcards/files/patch-src::commandlineoptions.cpp --- /usr/ports/deskutils/tuxcards/files/patch-src::commandlineoptions.cpp Thu Jan 1 09:00:00 1970 +++ deskutils/tuxcards/files/patch-src::commandlineoptions.cpp Tue Dec 3 05:13:21 2002 @@ -0,0 +1,11 @@ +--- src/commandlineoptions.cpp.orig Thu Sep 19 22:30:01 2002 ++++ src/commandlineoptions.cpp Tue Dec 3 05:13:09 2002 +@@ -24,6 +24,8 @@ + #include "./information/htmlwriter.h" + #include "version.h" + ++using namespace std; ++ + CommandLineOptions::CommandLineOptions(int argc, char** argv){ + this->argc=argc; + this->argv=argv; diff -urN /usr/ports/deskutils/tuxcards/files/patch-src::gui::cactusbar::cactusbar.cpp deskutils/tuxcards/files/patch-src::gui::cactusbar::cactusbar.cpp --- /usr/ports/deskutils/tuxcards/files/patch-src::gui::cactusbar::cactusbar.cpp Thu Jan 1 09:00:00 1970 +++ deskutils/tuxcards/files/patch-src::gui::cactusbar::cactusbar.cpp Tue Dec 3 05:08:47 2002 @@ -0,0 +1,11 @@ +--- src/gui/cactusbar/cactusbar.cpp.orig Sat Aug 17 23:48:28 2002 ++++ src/gui/cactusbar/cactusbar.cpp Tue Dec 3 00:51:19 2002 +@@ -20,7 +20,7 @@ + + #include <qtimer.h> + +-CactusBar::CactusBar(QWidget* parent, QString name="") ++CactusBar::CactusBar(QWidget* parent, QString name) + :ColorBar(parent, name){ + } + diff -urN /usr/ports/deskutils/tuxcards/files/patch-src::gui::colorbar::colorbar.cpp deskutils/tuxcards/files/patch-src::gui::colorbar::colorbar.cpp --- /usr/ports/deskutils/tuxcards/files/patch-src::gui::colorbar::colorbar.cpp Thu Jan 1 09:00:00 1970 +++ deskutils/tuxcards/files/patch-src::gui::colorbar::colorbar.cpp Tue Dec 3 05:08:47 2002 @@ -0,0 +1,11 @@ +--- src/gui/colorbar/colorbar.cpp.orig Mon Dec 10 19:33:04 2001 ++++ src/gui/colorbar/colorbar.cpp Tue Dec 3 00:56:14 2002 +@@ -21,7 +21,7 @@ + * Default-constructor with default values for the colors and the strings. + * the proberties should be reset with 'change(..)' + */ +-ColorBar::ColorBar(QWidget* parent, QString s="") ++ColorBar::ColorBar(QWidget* parent, QString s) + :QWidget(parent, s){ + + colorTop=QColor(123,34,76); diff -urN /usr/ports/deskutils/tuxcards/files/patch-src::gui::editor::editor.cpp deskutils/tuxcards/files/patch-src::gui::editor::editor.cpp --- /usr/ports/deskutils/tuxcards/files/patch-src::gui::editor::editor.cpp Thu Jan 1 09:00:00 1970 +++ deskutils/tuxcards/files/patch-src::gui::editor::editor.cpp Tue Dec 3 05:14:26 2002 @@ -0,0 +1,11 @@ +--- src/gui/editor/editor.cpp.orig Thu Sep 5 22:27:38 2002 ++++ src/gui/editor/editor.cpp Tue Dec 3 05:14:10 2002 +@@ -19,6 +19,8 @@ + #include <qstylesheet.h> + #include <qregexp.h> + ++using namespace std; ++ + Editor::Editor(QWidget *parent, const char *name) + :QTextEdit( parent, name) + { diff -urN /usr/ports/deskutils/tuxcards/files/patch-src::information::informationcollection.cpp deskutils/tuxcards/files/patch-src::information::informationcollection.cpp --- /usr/ports/deskutils/tuxcards/files/patch-src::information::informationcollection.cpp Thu Jan 1 09:00:00 1970 +++ deskutils/tuxcards/files/patch-src::information::informationcollection.cpp Tue Dec 3 05:10:56 2002 @@ -0,0 +1,11 @@ +--- src/information/informationcollection.cpp.orig Sun Sep 8 04:53:58 2002 ++++ src/information/informationcollection.cpp Tue Dec 3 01:19:58 2002 +@@ -20,7 +20,7 @@ + #include "treeinformationelement.h" + #include <qdom.h> + +-InformationCollection::InformationCollection(InformationElement* root=0){ ++InformationCollection::InformationCollection(InformationElement* root){ + setRootElement(root); + } + diff -urN /usr/ports/deskutils/tuxcards/files/patch-src::information::informationelement.cpp deskutils/tuxcards/files/patch-src::information::informationelement.cpp --- /usr/ports/deskutils/tuxcards/files/patch-src::information::informationelement.cpp Thu Jan 1 09:00:00 1970 +++ deskutils/tuxcards/files/patch-src::information::informationelement.cpp Tue Dec 3 05:08:47 2002 @@ -0,0 +1,24 @@ +--- src/information/informationelement.cpp.orig Sun Sep 8 04:53:58 2002 ++++ src/information/informationelement.cpp Tue Dec 3 01:14:52 2002 +@@ -19,9 +19,9 @@ + #include "../utilities/strings.h" + + InformationElement::InformationElement(InformationElement* parent, +- QString description="", +- QString information="", +- InformationFormat* format=&InformationFormat::NONE, ++ QString description, ++ QString information, ++ InformationFormat* format, + QPixmap icon) + { + this->parent=parent; +@@ -123,7 +123,7 @@ + return result; + } + +-QString InformationElement::getTreeString(int tab=0){ ++QString InformationElement::getTreeString(int tab){ + QString result = Strings::spaces(tab)+description+"\n"; + tab++; + diff -urN /usr/ports/deskutils/tuxcards/files/patch-src::information::treeinformationelement.cpp deskutils/tuxcards/files/patch-src::information::treeinformationelement.cpp --- /usr/ports/deskutils/tuxcards/files/patch-src::information::treeinformationelement.cpp Thu Jan 1 09:00:00 1970 +++ deskutils/tuxcards/files/patch-src::information::treeinformationelement.cpp Tue Dec 3 05:08:47 2002 @@ -0,0 +1,19 @@ +--- src/information/treeinformationelement.cpp.orig Sun Sep 8 04:53:58 2002 ++++ src/information/treeinformationelement.cpp Tue Dec 3 01:18:31 2002 +@@ -17,11 +17,11 @@ + + #include "treeinformationelement.h" + +-TreeInformationElement::TreeInformationElement(InformationElement* parent=0, +- QString description="", +- QString information="", +- InformationFormat* format=&InformationFormat::NONE, +- QPixmap icon=0, bool open=false) ++TreeInformationElement::TreeInformationElement(InformationElement* parent, ++ QString description, ++ QString information, ++ InformationFormat* format, ++ QPixmap icon, bool open) + :InformationElement(parent, description, information, format, icon) + { + setOpen(open); diff -urN /usr/ports/deskutils/tuxcards/files/patch-src::mainwindow.cpp deskutils/tuxcards/files/patch-src::mainwindow.cpp --- /usr/ports/deskutils/tuxcards/files/patch-src::mainwindow.cpp Thu Jan 1 09:00:00 1970 +++ deskutils/tuxcards/files/patch-src::mainwindow.cpp Tue Dec 3 05:15:19 2002 @@ -0,0 +1,11 @@ +--- src/mainwindow.cpp.orig Tue Sep 24 02:25:46 2002 ++++ src/mainwindow.cpp Tue Dec 3 05:15:08 2002 +@@ -52,6 +52,8 @@ + + #include "version.h" + ++using namespace std; ++ + + const bool MainWindow::DEBUG = false; + const bool MainWindow::QUICKLOADER = false; diff -urN /usr/ports/deskutils/tuxcards/files/patch-src::test.cpp deskutils/tuxcards/files/patch-src::test.cpp --- /usr/ports/deskutils/tuxcards/files/patch-src::test.cpp Thu Jan 1 09:00:00 1970 +++ deskutils/tuxcards/files/patch-src::test.cpp Tue Dec 3 05:35:07 2002 @@ -0,0 +1,11 @@ +--- src/test.cpp.orig Sun Sep 8 04:31:36 2002 ++++ src/test.cpp Tue Dec 3 05:15:45 2002 +@@ -19,6 +19,8 @@ + + #include <iostream> + ++using namespace std; ++ + Test::Test(){ + cout<<"Testing .."<<endl; + setUp(); diff -urN /usr/ports/deskutils/tuxcards/files/patch-src::utilities::strings.cpp deskutils/tuxcards/files/patch-src::utilities::strings.cpp --- /usr/ports/deskutils/tuxcards/files/patch-src::utilities::strings.cpp Thu Jan 1 09:00:00 1970 +++ deskutils/tuxcards/files/patch-src::utilities::strings.cpp Tue Dec 3 05:08:47 2002 @@ -0,0 +1,11 @@ +--- src/utilities/strings.cpp.orig Fri Jul 19 21:46:08 2002 ++++ src/utilities/strings.cpp Tue Dec 3 00:59:37 2002 +@@ -20,7 +20,7 @@ + /** + * returns a string that has length 'n' and is filled with spaces + */ +-QString Strings::spaces(int n=0){ ++QString Strings::spaces(int n){ + QString result=""; + for (int i=0; i<n; i++) + result+=" "; diff -urN /usr/ports/deskutils/tuxcards/pkg-plist deskutils/tuxcards/pkg-plist --- /usr/ports/deskutils/tuxcards/pkg-plist Sat Jan 12 08:36:07 2002 +++ deskutils/tuxcards/pkg-plist Tue Dec 3 05:08:48 2002 @@ -1,4 +1,8 @@ bin/tuxcards +%%PORTDOCS%%share/doc/tuxcards/TuxCardsBunt.gif +%%PORTDOCS%%share/doc/tuxcards/addKnoten.gif +%%PORTDOCS%%share/doc/tuxcards/changeProberty.gif +%%PORTDOCS%%share/doc/tuxcards/deleteKnoten.gif %%PORTDOCS%%share/doc/tuxcards/index-1.html %%PORTDOCS%%share/doc/tuxcards/index-2.html %%PORTDOCS%%share/doc/tuxcards/index-3.html @@ -6,4 +10,12 @@ %%PORTDOCS%%share/doc/tuxcards/index-5.html %%PORTDOCS%%share/doc/tuxcards/index-6.html %%PORTDOCS%%share/doc/tuxcards/index.html +%%PORTDOCS%%share/doc/tuxcards/index.nif +%%PORTDOCS%%share/doc/tuxcards/index.sgml +%%PORTDOCS%%share/doc/tuxcards/logotp3.png +%%PORTDOCS%%share/doc/tuxcards/new.gif +%%PORTDOCS%%share/doc/tuxcards/open.gif +%%PORTDOCS%%share/doc/tuxcards/save.gif +%%PORTDOCS%%share/doc/tuxcards/search.gif +%%PORTDOCS%%share/doc/tuxcards/whatis.gif %%PORTDOCS%%@dirrm share/doc/tuxcards >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?20021203070856.6c9909b4.tkato>