Attachment #27004 for bug #45934

View | Details | Raw Unified | Return to bug 45934
Collapse All | Expand All




#

PORTNAME=	tuxcards
PORTVERSION=	1.0.b2
PORTREVISION=	1
CATEGORIES=	deskutils
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}

QTDIR?=		${X11BASE}

USE_QT_VER=	3
USE_REINPLACE=	yes
MAKE_ENV=	QTDIR="${QTDIR}"

post-patch:
	@${REINPLACE_CMD} -e 's|warn_on|warn_on thread|g' ${WRKSRC}/tuxcards.pro

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

.include <bsd.port.mk>
	@${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>

Line 1 Link Here

(-)deskutils/tuxcards/distinfo (-1 / +1 lines)
1	MD5 (tuxcards-0.8-ohneCactus.tar.gz) = d83c5ff630fececca3975724facc8d65	1	MD5 (tuxcards-1.0beta2.tar.gz) = bd0132214590ba1d0ae8336e5eaee15c

Line 0 Link Here

(-)deskutils/tuxcards/files/patch-src::commandlineoptions.cpp (+11 lines)
	1	--- src/commandlineoptions.cpp.orig Thu Sep 19 22:30:01 2002
	2	+++ src/commandlineoptions.cpp Tue Dec 3 05:13:09 2002
	3	@@ -24,6 +24,8 @@
	4	#include "./information/htmlwriter.h"
	5	#include "version.h"
	6
	7	+using namespace std;
	8	+
	9	CommandLineOptions::CommandLineOptions(int argc, char** argv){
	10	this->argc=argc;
	11	this->argv=argv;

Line 0 Link Here

(-)deskutils/tuxcards/files/patch-src::gui::cactusbar::cactusbar.cpp (+11 lines)
	1	--- src/gui/cactusbar/cactusbar.cpp.orig Sat Aug 17 23:48:28 2002
	2	+++ src/gui/cactusbar/cactusbar.cpp Tue Dec 3 00:51:19 2002
	3	@@ -20,7 +20,7 @@
	4
	5	#include <qtimer.h>
	6
	7	-CactusBar::CactusBar(QWidget* parent, QString name="")
	8	+CactusBar::CactusBar(QWidget* parent, QString name)
	9	:ColorBar(parent, name){
	10	}
	11

Line 0 Link Here

(-)deskutils/tuxcards/files/patch-src::gui::colorbar::colorbar.cpp (+11 lines)
	1	--- src/gui/colorbar/colorbar.cpp.orig Mon Dec 10 19:33:04 2001
	2	+++ src/gui/colorbar/colorbar.cpp Tue Dec 3 00:56:14 2002
	3	@@ -21,7 +21,7 @@
	4	* Default-constructor with default values for the colors and the strings.
	5	* the proberties should be reset with 'change(..)'
	6	*/
	7	-ColorBar::ColorBar(QWidget* parent, QString s="")
	8	+ColorBar::ColorBar(QWidget* parent, QString s)
	9	:QWidget(parent, s){
	10
	11	colorTop=QColor(123,34,76);

Line 0 Link Here

(-)deskutils/tuxcards/files/patch-src::gui::editor::editor.cpp (+11 lines)
	1	--- src/gui/editor/editor.cpp.orig Thu Sep 5 22:27:38 2002
	2	+++ src/gui/editor/editor.cpp Tue Dec 3 05:14:10 2002
	3	@@ -19,6 +19,8 @@
	4	#include <qstylesheet.h>
	5	#include <qregexp.h>
	6
	7	+using namespace std;
	8	+
	9	Editor::Editor(QWidget parent, const char name)
	10	:QTextEdit( parent, name)
	11	{

Line 0 Link Here

(-)deskutils/tuxcards/files/patch-src::information::informationcollection.cpp (+11 lines)
	1	--- src/information/informationcollection.cpp.orig Sun Sep 8 04:53:58 2002
	2	+++ src/information/informationcollection.cpp Tue Dec 3 01:19:58 2002
	3	@@ -20,7 +20,7 @@
	4	#include "treeinformationelement.h"
	5	#include <qdom.h>
	6
	7	-InformationCollection::InformationCollection(InformationElement* root=0){
	8	+InformationCollection::InformationCollection(InformationElement* root){
	9	setRootElement(root);
	10	}
	11




--- 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++;
 	




--- 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);

Line 0 Link Here

(-)deskutils/tuxcards/files/patch-src::mainwindow.cpp (+11 lines)
	1	--- src/mainwindow.cpp.orig Tue Sep 24 02:25:46 2002
	2	+++ src/mainwindow.cpp Tue Dec 3 05:15:08 2002
	3	@@ -52,6 +52,8 @@
	4
	5	#include "version.h"
	6
	7	+using namespace std;
	8	+
	9
	10	const bool MainWindow::DEBUG = false;
	11	const bool MainWindow::QUICKLOADER = false;

Line 0 Link Here

(-)deskutils/tuxcards/files/patch-src::test.cpp (+11 lines)
	1	--- src/test.cpp.orig Sun Sep 8 04:31:36 2002
	2	+++ src/test.cpp Tue Dec 3 05:15:45 2002
	3	@@ -19,6 +19,8 @@
	4
	5	#include <iostream>
	6
	7	+using namespace std;
	8	+
	9	Test::Test(){
	10	cout<<"Testing .."<<endl;
	11	setUp();

Line 0 Link Here

(-)deskutils/tuxcards/files/patch-src::utilities::strings.cpp (+11 lines)
	1	--- src/utilities/strings.cpp.orig Fri Jul 19 21:46:08 2002
	2	+++ src/utilities/strings.cpp Tue Dec 3 00:59:37 2002
	3	@@ -20,7 +20,7 @@
	4	/**
	5	* returns a string that has length 'n' and is filled with spaces
	6	*/
	7	-QString Strings::spaces(int n=0){
	8	+QString Strings::spaces(int n){
	9	QString result="";
	10	for (int i=0; i<n; i++)
	11	result+=" ";

Lines 1-4 Link Here

(-)deskutils/tuxcards/pkg-plist (+12 lines)
1	bin/tuxcards	1	bin/tuxcards
		2	%%PORTDOCS%%share/doc/tuxcards/TuxCardsBunt.gif
		3	%%PORTDOCS%%share/doc/tuxcards/addKnoten.gif
		4	%%PORTDOCS%%share/doc/tuxcards/changeProberty.gif
		5	%%PORTDOCS%%share/doc/tuxcards/deleteKnoten.gif
2	%%PORTDOCS%%share/doc/tuxcards/index-1.html	6	%%PORTDOCS%%share/doc/tuxcards/index-1.html
3	%%PORTDOCS%%share/doc/tuxcards/index-2.html	7	%%PORTDOCS%%share/doc/tuxcards/index-2.html
4	%%PORTDOCS%%share/doc/tuxcards/index-3.html	8	%%PORTDOCS%%share/doc/tuxcards/index-3.html
Lines 6-9 Link Here
6	%%PORTDOCS%%share/doc/tuxcards/index-5.html	10	%%PORTDOCS%%share/doc/tuxcards/index-5.html
7	%%PORTDOCS%%share/doc/tuxcards/index-6.html	11	%%PORTDOCS%%share/doc/tuxcards/index-6.html
8	%%PORTDOCS%%share/doc/tuxcards/index.html	12	%%PORTDOCS%%share/doc/tuxcards/index.html
		13	%%PORTDOCS%%share/doc/tuxcards/index.nif
		14	%%PORTDOCS%%share/doc/tuxcards/index.sgml
		15	%%PORTDOCS%%share/doc/tuxcards/logotp3.png
		16	%%PORTDOCS%%share/doc/tuxcards/new.gif
		17	%%PORTDOCS%%share/doc/tuxcards/open.gif
		18	%%PORTDOCS%%share/doc/tuxcards/save.gif
		19	%%PORTDOCS%%share/doc/tuxcards/search.gif
		20	%%PORTDOCS%%share/doc/tuxcards/whatis.gif
9	%%PORTDOCS%%@dirrm share/doc/tuxcards	21	%%PORTDOCS%%@dirrm share/doc/tuxcards

Return to bug 45934

Lines 6-39 Link Here

(-)deskutils/tuxcards/Makefile (-21 / +21 lines)
6	#	6	#
7		7
8	PORTNAME= tuxcards	8	PORTNAME= tuxcards
9	PORTVERSION= 0.8	9	PORTVERSION= 1.0.b2
10	PORTREVISION= 1
11	CATEGORIES= deskutils	10	CATEGORIES= deskutils
12	MASTER_SITES= http://www.arved.de/bsd/src/	11	MASTER_SITES= http://www.stud.uni-karlsruhe.de/~ut3c/ \
13	DISTNAME= ${PORTNAME}-${PORTVERSION}-ohneCactus	12	http://www.arved.de/bsd/src/
		13	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/beta/}
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
16		16
17	WRKSRC= ${WRKDIR}/${PORTNAME}	17	WRKSRC= ${WRKDIR}/${PORTNAME}
18	USE_GMAKE= yes	18
19	USE_QT_VER= 2	19	QTDIR?= ${X11BASE}
20	HAS_CONFIGURE= yes	20
21	CONFIGURE_ARGS= --prefix=${PREFIX}	21	USE_QT_VER= 3
22	USE_REINPLACE= yes	22	USE_REINPLACE= yes
		23	MAKE_ENV= QTDIR="${QTDIR}"
23		24
24	.include <bsd.port.pre.mk>	25	post-patch:
		26	@${REINPLACE_CMD} -e 's\|warn_on\|warn_on thread\|g' ${WRKSRC}/tuxcards.pro
25		27
26	.if ${OSVERSION} > 500038	28	do-configure:
27	BROKEN= "Does not build with gcc 3.1"	29	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
		30	-spec ${X11BASE}/mkspecs/freebsd-g++ tuxcards.pro
		31
		32	do-install:
		33	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
		34	.if !defined(NOPORTDOCS)
		35	@${MKDIR} ${DOCSDIR}
		36	${INSTALL_DATA} ${WRKSRC}/docs/en/. ${DOCSDIR}
28	.endif	37	.endif
29		38
30	pre-patch:	39	.include <bsd.port.mk>
31	@${REINPLACE_CMD} -e 's\|[$$](prefix)/doc\|\$$\(prefix\)/share/doc\|' \
32	${WRKSRC}/tuxcards/docs/en/Makefile.in
33	@${REINPLACE_CMD} -e 's\|-O2\|\|' ${WRKSRC}/configure
34	.ifdef(NOPORTDOCS)
35	@${REINPLACE_CMD} -e 's\|install-data-am\: install-data-local\|\|' \
36	${WRKSRC}/tuxcards/docs/en/Makefile.in
37	.endif #NOPORTDOCS
38
39	.include <bsd.port.post.mk>

Line 0 Link Here

(-)deskutils/tuxcards/files/patch-src::information::informationelement.cpp (+24 lines)
	1	--- src/information/informationelement.cpp.orig Sun Sep 8 04:53:58 2002
	2	+++ src/information/informationelement.cpp Tue Dec 3 01:14:52 2002
	3	@@ -19,9 +19,9 @@
	4	#include "../utilities/strings.h"
	5
	6	InformationElement::InformationElement(InformationElement* parent,
	7	- QString description="",
	8	- QString information="",
	9	- InformationFormat* format=&InformationFormat::NONE,
	10	+ QString description,
	11	+ QString information,
	12	+ InformationFormat* format,
	13	QPixmap icon)
	14	{
	15	this->parent=parent;
	16	@@ -123,7 +123,7 @@
	17	return result;
	18	}
	19
	20	-QString InformationElement::getTreeString(int tab=0){
	21	+QString InformationElement::getTreeString(int tab){
	22	QString result = Strings::spaces(tab)+description+"\n";
	23	tab++;
	24

Line 0 Link Here

(-)deskutils/tuxcards/files/patch-src::information::treeinformationelement.cpp (+19 lines)
	1	--- src/information/treeinformationelement.cpp.orig Sun Sep 8 04:53:58 2002
	2	+++ src/information/treeinformationelement.cpp Tue Dec 3 01:18:31 2002
	3	@@ -17,11 +17,11 @@
	4
	5	#include "treeinformationelement.h"
	6
	7	-TreeInformationElement::TreeInformationElement(InformationElement* parent=0,
	8	- QString description="",
	9	- QString information="",
	10	- InformationFormat* format=&InformationFormat::NONE,
	11	- QPixmap icon=0, bool open=false)
	12	+TreeInformationElement::TreeInformationElement(InformationElement* parent,
	13	+ QString description,
	14	+ QString information,
	15	+ InformationFormat* format,
	16	+ QPixmap icon, bool open)
	17	:InformationElement(parent, description, information, format, icon)
	18	{
	19	setOpen(open);