Attachment #129538 for bug #173537

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





PORTNAME=	autoq3d
DISTVERSION=	1.40
PORTREVISION=	3
CATEGORIES=	graphics
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/AutoQ3D%20${PORTVERSION}
DISTNAME=	AutoQ3DCommunity${PORTVERSION:C/\./-/}qt4source

MAINTAINER=	nemysis@gmx.ch
COMMENT=	Complete QT quick 3D model editor program

LICENSE=	GPLv2
LICENSE_COMB=	dual

USE_GL=		glu
USE_ZIP=	yes
USE_DOS2UNIX=	*.pro *.cpp
USE_QT4=	moc_build qmake_build corelib gui opengl
MAKE_JOBS_SAFE=	yes

PORTDOCS=	*.txt

DESKTOP_ENTRIES="AutoQ3D" "${COMMENT}" "AutoQ3D" \
		"AutoQ3D" "Qt;KDE;Graphics;" ${FALSE}

.include <bsd.port.options.mk>

post-patch:
.for file in src/main.cpp src/fgui/cadform.cpp src/dialogs/prgsettings.cpp

.endfor

do-configure:
	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/AutoQ3D ${PREFIX}/bin
	${MKDIR} ${DATADIR}
	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "images *.htm *.qm" ${DATADIR})
	${INSTALL_DATA} ${WRKSRC}/*.qm ${DATADIR}
	@${MKDIR} ${DATADIR}/images
	${INSTALL_DATA} ${WRKSRC}/images/*.png ${DATADIR}/images
	@${MKDIR} ${PREFIX}/share/pixmaps
	${INSTALL_DATA} ${WRKSRC}/AutoQ3D.png ${PREFIX}/share/pixmaps

post-install:
.if ${PORT_OPTIONS:MDOCS}
	${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}
.endif

.include <bsd.port.mk>

Lines 1-10 Link Here

(-)./files/patch-AutoQ3D.pro (-10 / +10 lines)
1	--- AutoQ3D.pro~ 2012-05-19 22:52:00.000000000 -0300	1	--- AutoQ3D.pro.orig 2012-11-09 22:10:38.000000000 +0100
2	+++ AutoQ3D.pro 2012-05-19 22:56:52.000000000 -0300	2	+++ AutoQ3D.pro 2012-11-09 22:13:42.000000000 +0100
3	@@ -8,6 +8,7 @@	3	@@ -8,6 +8,7 @@
4	win32:LIBS+= -L$(QTDIR)/plugins/imageformats -lqjpeg4	4	win32:LIBS+= -L$(QTDIR)/plugins/imageformats -lqjpeg4
5		5
6	QT += opengl	6	QT += opengl
7	+LIBS += -lGLU	7	+LIBS += -lGLU
8	DEPENDPATH += . \	8	DEPENDPATH += . \
9	src \	9	src \
10	src/cmds \	10	src/cmds \




--- src/cmds/cmds.cpp.orig	2012-11-09 22:10:38.000000000 +0100
+++ src/cmds/cmds.cpp	2012-11-09 22:15:49.000000000 +0100
@@ -89,9 +89,9 @@
 
 
 	QPalette newPalette = QPalette();
-	newPalette.setColor(QPalette::Background, QColor::QColor(170,170,255));
-	newPalette.setColor(QPalette::Foreground, QColor::QColor(0,0,0));
-	newPalette.setColor(QPalette::Base, QColor::QColor(170,170,255));
+	newPalette.setColor(QPalette::Background, QColor(170,170,255));
+	newPalette.setColor(QPalette::Background, QColor(170,170,255));
+	newPalette.setColor(QPalette::Base, QColor(170,170,255));
 
 	setPalette(newPalette);
 	




--- src/fgui/cadform.cpp.orig	2012-11-09 22:10:38.000000000 +0100
+++ src/fgui/cadform.cpp	2012-11-09 22:18:04.000000000 +0100
@@ -475,9 +475,9 @@
 
 
 	QPalette newPalette = palette();
-	newPalette.setColor(QPalette::Background, QColor::QColor(170,170,255));
-	newPalette.setColor(QPalette::Foreground, QColor::QColor(0,0,0));
-	newPalette.setColor(QPalette::Base, QColor::QColor(170,170,255));
+	newPalette.setColor(QPalette::Background, QColor(170,170,255));
+	newPalette.setColor(QPalette::Foreground, QColor(0,0,0));
+	newPalette.setColor(QPalette::Base, QColor(170,170,255));
 
 
 
@@ -800,7 +800,7 @@
 	w->GLThisArea->cscalari=hcmd->cscalari;
 	w->GLThisArea->View=View;
 
-	w->setWindowTitle(QString::QString(tr("ViewPort-%1")).arg(numDoc++));w->setWindowIcon( QPixmap(ProgramPath+"images/document.png") );
+	w->setWindowTitle(QString(tr("ViewPort-%1")).arg(numDoc++));w->setWindowIcon( QPixmap(ProgramPath+"images/document.png") );
 	w->show();
 	QWidgetList windoL=ws->windowList(QWorkspace::CreationOrder);
 	if ( windoL.count()==1){

Line 0 Link Here

(-)./files/patch-src-fgui-glapparea.cpp (+10 lines)
	1	--- src/fgui/glapparea.cpp.orig 2012-11-09 22:10:38.000000000 +0100
	2	+++ src/fgui/glapparea.cpp 2012-11-09 22:19:32.000000000 +0100
	3	@@ -24,6 +24,7 @@
	4	#include <qtimer.h>
	5	#include <math.h>
	6
	7	+#include <GL/glu.h>
	8
	9	GLAppArea::GLAppArea( QWidget* parent,QStringList* strlista)
	10	: QGLWidget( parent)




--- src/cmds/cmds.cpp~	2012-05-19 22:44:14.000000000 -0300
+++ src/cmds/cmds.cpp	2012-05-19 22:44:25.000000000 -0300
@@ -89,9 +89,9 @@
 
 
 	QPalette newPalette = QPalette();
-	newPalette.setColor(QPalette::Background, QColor::QColor(170,170,255));
-	newPalette.setColor(QPalette::Foreground, QColor::QColor(0,0,0));
-	newPalette.setColor(QPalette::Base, QColor::QColor(170,170,255));
+	newPalette.setColor(QPalette::Background, QColor(170,170,255));
+	newPalette.setColor(QPalette::Foreground, QColor(0,0,0));
+	newPalette.setColor(QPalette::Base, QColor(170,170,255));
 
 	setPalette(newPalette);
 	




--- src/fgui/cadform.cpp~	2012-05-19 22:45:11.000000000 -0300
+++ src/fgui/cadform.cpp	2012-05-19 22:46:08.000000000 -0300
@@ -475,9 +475,9 @@
 
 
 	QPalette newPalette = palette();
-	newPalette.setColor(QPalette::Background, QColor::QColor(170,170,255));
-	newPalette.setColor(QPalette::Foreground, QColor::QColor(0,0,0));
-	newPalette.setColor(QPalette::Base, QColor::QColor(170,170,255));
+	newPalette.setColor(QPalette::Background, QColor(170,170,255));
+	newPalette.setColor(QPalette::Foreground, QColor(0,0,0));
+	newPalette.setColor(QPalette::Base, QColor(170,170,255));
 
 
 
@@ -800,7 +800,7 @@
 	w->GLThisArea->cscalari=hcmd->cscalari;
 	w->GLThisArea->View=View;
 
-	w->setWindowTitle(QString::QString(tr("ViewPort-%1")).arg(numDoc++));w->setWindowIcon( QPixmap(ProgramPath+"images/document.png") );
+	w->setWindowTitle(QString(tr("ViewPort-%1")).arg(numDoc++));w->setWindowIcon( QPixmap(ProgramPath+"images/document.png") );
 	w->show();
 	QWidgetList windoL=ws->windowList(QWorkspace::CreationOrder);
 	if ( windoL.count()==1){

Lines 1-11 Link Here

(-)./files/patch-src__fgui__glapparea.cpp (-11 lines)
1	--- src/fgui/glapparea.cpp~ 2012-05-19 22:54:35.000000000 -0300
2	+++ src/fgui/glapparea.cpp 2012-05-19 22:54:50.000000000 -0300
3	@@ -24,6 +24,8 @@
4	#include <qtimer.h>
5	#include <math.h>
6
7	+#include <GL/glu.h>
8	+
9
10	GLAppArea::GLAppArea( QWidget* parent,QStringList* strlista)
11	: QGLWidget( parent)

Lines 2-4 Link Here

(-)./pkg-descr (+1 lines)
2	this 3D modeling application.	2	this 3D modeling application.
3		3
4	WWW: http://www.autoq3d.com/	4	WWW: http://www.autoq3d.com/
		5	WWW: http://sourceforge.net/projects/autoq3d/

Lines 52-62 Link Here

(-)./pkg-plist (-5 lines)
52	%%DATADIR%%/lan_sp.qm	52	%%DATADIR%%/lan_sp.qm
53	%%DATADIR%%/qref.htm	53	%%DATADIR%%/qref.htm
54	%%DATADIR%%/qref_sp.htm	54	%%DATADIR%%/qref_sp.htm
55	%%PORTDOCS%%%%DOCSDIR%%/3DQformat.txt
56	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.txt
57	%%PORTDOCS%%%%DOCSDIR%%/Install.txt
58	%%PORTDOCS%%%%DOCSDIR%%/license.txt
59	share/pixmaps/AutoQ3D.png	55	share/pixmaps/AutoQ3D.png
60	%%PORTDOCS%%@dirrm %%DOCSDIR%%
61	@dirrm %%DATADIR%%/images	56	@dirrm %%DATADIR%%/images
62	@dirrm %%DATADIR%%	57	@dirrm %%DATADIR%%

Return to bug 173537

Lines 7-35 Link Here

(-)./Makefile (-22 / +20 lines)
7		7
8	PORTNAME= autoq3d	8	PORTNAME= autoq3d
9	DISTVERSION= 1.40	9	DISTVERSION= 1.40
10	PORTREVISION= 2	10	PORTREVISION= 3
11	CATEGORIES= graphics	11	CATEGORIES= graphics
12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/AutoQ3D%20${PORTVERSION}	12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/AutoQ3D%20${PORTVERSION}
13	DISTNAME= AutoQ3DCommunity${PORTVERSION:C/\./-/}qt4source	13	DISTNAME= AutoQ3DCommunity${PORTVERSION:C/\./-/}qt4source
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= nemysis@gmx.ch
16	COMMENT= Complete QT quick 3D model editor program	16	COMMENT= Complete QT quick 3D model editor program
17		17
18	LICENSE= GPLv2 GPLv3	18	LICENSE= GPLv2
19	LICENSE_COMB= dual
20		19
21	USE_GL= glu	20	USE_GL= glu
22	USE_ZIP= yes	21	USE_ZIP= yes
23	USE_QT4= corelib gui opengl \	22	USE_DOS2UNIX= .pro .cpp
24	moc_build qmake_build	23	USE_QT4= moc_build qmake_build corelib gui opengl
25	MAKE_JOBS_SAFE= yes	24	MAKE_JOBS_SAFE= yes
26		25
27	DESKTOP_ENTRIES= "AutoQ3D" \	26	PORTDOCS= *.txt
28	"A complete QT quick 3d model editor program" \	27
29	"AutoQ3D" \	28	DESKTOP_ENTRIES="AutoQ3D" "${COMMENT}" "AutoQ3D" \
30	"AutoQ3D" \	29	"AutoQ3D" "Qt;KDE;Graphics;" ${FALSE}
31	"Qt;KDE;Graphics;" \	30
32	"false"	31	.include <bsd.port.options.mk>
33		32
34	post-patch:	33	post-patch:
35	.for file in src/main.cpp src/fgui/cadform.cpp src/dialogs/prgsettings.cpp	34	.for file in src/main.cpp src/fgui/cadform.cpp src/dialogs/prgsettings.cpp
Lines 38-57 Link Here
38	.endfor	37	.endfor
39		38
40	do-configure:	39	do-configure:
41	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})	40	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
		41	${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
42		42
43	do-install:	43	do-install:
44	${INSTALL_PROGRAM} ${WRKSRC}/AutoQ3D ${PREFIX}/bin	44	${INSTALL_PROGRAM} ${WRKSRC}/AutoQ3D ${PREFIX}/bin
45	@${MKDIR} ${DATADIR}	45	${MKDIR} ${DATADIR}
46	${INSTALL_DATA} ${WRKSRC}/*.htm ${DATADIR}	46	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "images .htm .qm" ${DATADIR})
47	${INSTALL_DATA} ${WRKSRC}/*.qm ${DATADIR}
48	@${MKDIR} ${DATADIR}/images
49	${INSTALL_DATA} ${WRKSRC}/images/*.png ${DATADIR}/images
50	@${MKDIR} ${PREFIX}/share/pixmaps
51	${INSTALL_DATA} ${WRKSRC}/AutoQ3D.png ${PREFIX}/share/pixmaps	47	${INSTALL_DATA} ${WRKSRC}/AutoQ3D.png ${PREFIX}/share/pixmaps
52	.if !defined(NOPORTDOCS)	48
53	@${MKDIR} ${DOCSDIR}	49	post-install:
54	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}	50	.if ${PORT_OPTIONS:MDOCS}
		51	${MKDIR} ${DOCSDIR}
		52	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/docs/\|} ${DOCSDIR}
55	.endif	53	.endif
56		54
57	.include <bsd.port.mk>	55	.include <bsd.port.mk>

Line 0 Link Here

(-)./files/patch-src-cmds-cmds.cpp (+15 lines)
	1	--- src/cmds/cmds.cpp.orig 2012-11-09 22:10:38.000000000 +0100
	2	+++ src/cmds/cmds.cpp 2012-11-09 22:15:49.000000000 +0100
	3	@@ -89,9 +89,9 @@
	4
	5
	6	QPalette newPalette = QPalette();
	7	- newPalette.setColor(QPalette::Background, QColor::QColor(170,170,255));
	8	- newPalette.setColor(QPalette::Foreground, QColor::QColor(0,0,0));
	9	- newPalette.setColor(QPalette::Base, QColor::QColor(170,170,255));
	10	+ newPalette.setColor(QPalette::Background, QColor(170,170,255));
	11	+ newPalette.setColor(QPalette::Background, QColor(170,170,255));
	12	+ newPalette.setColor(QPalette::Base, QColor(170,170,255));
	13
	14	setPalette(newPalette);
	15

Line 0 Link Here

(-)./files/patch-src-fgui-cadform.cpp (+24 lines)
	1	--- src/fgui/cadform.cpp.orig 2012-11-09 22:10:38.000000000 +0100
	2	+++ src/fgui/cadform.cpp 2012-11-09 22:18:04.000000000 +0100
	3	@@ -475,9 +475,9 @@
	4
	5
	6	QPalette newPalette = palette();
	7	- newPalette.setColor(QPalette::Background, QColor::QColor(170,170,255));
	8	- newPalette.setColor(QPalette::Foreground, QColor::QColor(0,0,0));
	9	- newPalette.setColor(QPalette::Base, QColor::QColor(170,170,255));
	10	+ newPalette.setColor(QPalette::Background, QColor(170,170,255));
	11	+ newPalette.setColor(QPalette::Foreground, QColor(0,0,0));
	12	+ newPalette.setColor(QPalette::Base, QColor(170,170,255));
	13
	14
	15
	16	@@ -800,7 +800,7 @@
	17	w->GLThisArea->cscalari=hcmd->cscalari;
	18	w->GLThisArea->View=View;
	19
	20	- w->setWindowTitle(QString::QString(tr("ViewPort-%1")).arg(numDoc++));w->setWindowIcon( QPixmap(ProgramPath+"images/document.png") );
	21	+ w->setWindowTitle(QString(tr("ViewPort-%1")).arg(numDoc++));w->setWindowIcon( QPixmap(ProgramPath+"images/document.png") );
	22	w->show();
	23	QWidgetList windoL=ws->windowList(QWorkspace::CreationOrder);
	24	if ( windoL.count()==1){

Lines 1-15 Link Here

(-)./files/patch-src__cmds__cmds.cpp (-15 lines)
1	--- src/cmds/cmds.cpp~ 2012-05-19 22:44:14.000000000 -0300
2	+++ src/cmds/cmds.cpp 2012-05-19 22:44:25.000000000 -0300
3	@@ -89,9 +89,9 @@
4
5
6	QPalette newPalette = QPalette();
7	- newPalette.setColor(QPalette::Background, QColor::QColor(170,170,255));
8	- newPalette.setColor(QPalette::Foreground, QColor::QColor(0,0,0));
9	- newPalette.setColor(QPalette::Base, QColor::QColor(170,170,255));
10	+ newPalette.setColor(QPalette::Background, QColor(170,170,255));
11	+ newPalette.setColor(QPalette::Foreground, QColor(0,0,0));
12	+ newPalette.setColor(QPalette::Base, QColor(170,170,255));
13
14	setPalette(newPalette);
15

Lines 1-24 Link Here

(-)./files/patch-src__fgui__cadform.cpp (-24 lines)
1	--- src/fgui/cadform.cpp~ 2012-05-19 22:45:11.000000000 -0300
2	+++ src/fgui/cadform.cpp 2012-05-19 22:46:08.000000000 -0300
3	@@ -475,9 +475,9 @@
4
5
6	QPalette newPalette = palette();
7	- newPalette.setColor(QPalette::Background, QColor::QColor(170,170,255));
8	- newPalette.setColor(QPalette::Foreground, QColor::QColor(0,0,0));
9	- newPalette.setColor(QPalette::Base, QColor::QColor(170,170,255));
10	+ newPalette.setColor(QPalette::Background, QColor(170,170,255));
11	+ newPalette.setColor(QPalette::Foreground, QColor(0,0,0));
12	+ newPalette.setColor(QPalette::Base, QColor(170,170,255));
13
14
15
16	@@ -800,7 +800,7 @@
17	w->GLThisArea->cscalari=hcmd->cscalari;
18	w->GLThisArea->View=View;
19
20	- w->setWindowTitle(QString::QString(tr("ViewPort-%1")).arg(numDoc++));w->setWindowIcon( QPixmap(ProgramPath+"images/document.png") );
21	+ w->setWindowTitle(QString(tr("ViewPort-%1")).arg(numDoc++));w->setWindowIcon( QPixmap(ProgramPath+"images/document.png") );
22	w->show();
23	QWidgetList windoL=ws->windowList(QWorkspace::CreationOrder);
24	if ( windoL.count()==1){