Date: Sat, 10 Nov 2012 20:27:44 +0100 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/173537: [PATCH] graphics/autoq3d: take maintainership, Makefile changed, OptionsNG, changed pkg-plist Message-ID: <20121110192746.CD220B6@hub.freebsd.org> Resent-Message-ID: <201211101930.qAAJU0Cm037283@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173537
>Category: ports
>Synopsis: [PATCH] graphics/autoq3d: take maintainership, Makefile changed, OptionsNG, changed pkg-plist
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Nov 10 19:30:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: nemysis
>Release: FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC
>Description:
- Take maintainership
Added file(s):
- files/patch-src-cmds-cmds.cpp
- files/patch-src-fgui-cadform.cpp
- files/patch-src-fgui-glapparea.cpp
Removed file(s): because have used
- files/patch-src__cmds__cmds.cpp
- files/patch-src__fgui__cadform.cpp
- files/patch-src__fgui__glapparea.cpp
Makefile changed:
+LICENSE= GPLv2
+USE_DOS2UNIX= *.pro *.cpp
+PORTDOCS= *.txt
+.include <bsd.port.options.mk>
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
Changed and refined:
do-configure:
do-install:
pkg-plist
Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
portlint -A
looks fine.
port test: clean
Can't give build log, because RedPorts not works at the time.
>Fix:
--- autoq3d-1.40_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/autoq3d/Makefile ./Makefile
--- /usr/ports/graphics/autoq3d/Makefile 2012-07-29 13:17:02.000000000 +0200
+++ ./Makefile 2012-11-09 22:54:39.000000000 +0100
@@ -7,29 +7,28 @@
PORTNAME= autoq3d
DISTVERSION= 1.40
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/AutoQ3D%20${PORTVERSION}
DISTNAME= AutoQ3DCommunity${PORTVERSION:C/\./-/}qt4source
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= nemysis@gmx.ch
COMMENT= Complete QT quick 3D model editor program
-LICENSE= GPLv2 GPLv3
-LICENSE_COMB= dual
+LICENSE= GPLv2
USE_GL= glu
USE_ZIP= yes
-USE_QT4= corelib gui opengl \
- moc_build qmake_build
+USE_DOS2UNIX= *.pro *.cpp
+USE_QT4= moc_build qmake_build corelib gui opengl
MAKE_JOBS_SAFE= yes
-DESKTOP_ENTRIES= "AutoQ3D" \
- "A complete QT quick 3d model editor program" \
- "AutoQ3D" \
- "AutoQ3D" \
- "Qt;KDE;Graphics;" \
- "false"
+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
@@ -38,20 +37,19 @@
.endfor
do-configure:
- @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
+ @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/AutoQ3D ${PREFIX}/bin
- @${MKDIR} ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/*.htm ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/*.qm ${DATADIR}
- @${MKDIR} ${DATADIR}/images
- ${INSTALL_DATA} ${WRKSRC}/images/*.png ${DATADIR}/images
- @${MKDIR} ${PREFIX}/share/pixmaps
+ ${MKDIR} ${DATADIR}
+ @(cd ${WRKSRC} && ${COPYTREE_SHARE} "images *.htm *.qm" ${DATADIR})
${INSTALL_DATA} ${WRKSRC}/AutoQ3D.png ${PREFIX}/share/pixmaps
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+ ${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}
.endif
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/autoq3d/files/patch-AutoQ3D.pro ./files/patch-AutoQ3D.pro
--- /usr/ports/graphics/autoq3d/files/patch-AutoQ3D.pro 2012-05-20 04:10:15.000000000 +0200
+++ ./files/patch-AutoQ3D.pro 2012-11-09 22:22:15.000000000 +0100
@@ -1,10 +1,10 @@
---- AutoQ3D.pro~ 2012-05-19 22:52:00.000000000 -0300
-+++ AutoQ3D.pro 2012-05-19 22:56:52.000000000 -0300
-@@ -8,6 +8,7 @@
- win32:LIBS+= -L$(QTDIR)/plugins/imageformats -lqjpeg4
-
- QT += opengl
-+LIBS += -lGLU
- DEPENDPATH += . \
- src \
- src/cmds \
+--- AutoQ3D.pro.orig 2012-11-09 22:10:38.000000000 +0100
++++ AutoQ3D.pro 2012-11-09 22:13:42.000000000 +0100
+@@ -8,6 +8,7 @@
+ win32:LIBS+= -L$(QTDIR)/plugins/imageformats -lqjpeg4
+
+ QT += opengl
++LIBS += -lGLU
+ DEPENDPATH += . \
+ src \
+ src/cmds \
diff -ruN --exclude=CVS /usr/ports/graphics/autoq3d/files/patch-src-cmds-cmds.cpp ./files/patch-src-cmds-cmds.cpp
--- /usr/ports/graphics/autoq3d/files/patch-src-cmds-cmds.cpp 1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-src-cmds-cmds.cpp 2012-11-09 22:24:58.000000000 +0100
@@ -0,0 +1,15 @@
+--- 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);
+
diff -ruN --exclude=CVS /usr/ports/graphics/autoq3d/files/patch-src-fgui-cadform.cpp ./files/patch-src-fgui-cadform.cpp
--- /usr/ports/graphics/autoq3d/files/patch-src-fgui-cadform.cpp 1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-src-fgui-cadform.cpp 2012-11-09 22:28:08.000000000 +0100
@@ -0,0 +1,24 @@
+--- 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){
diff -ruN --exclude=CVS /usr/ports/graphics/autoq3d/files/patch-src-fgui-glapparea.cpp ./files/patch-src-fgui-glapparea.cpp
--- /usr/ports/graphics/autoq3d/files/patch-src-fgui-glapparea.cpp 1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-src-fgui-glapparea.cpp 2012-11-09 22:29:25.000000000 +0100
@@ -0,0 +1,10 @@
+--- src/fgui/glapparea.cpp.orig 2012-11-09 22:10:38.000000000 +0100
++++ src/fgui/glapparea.cpp 2012-11-09 22:19:32.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <qtimer.h>
+ #include <math.h>
+
++#include <GL/glu.h>
+
+ GLAppArea::GLAppArea( QWidget* parent,QStringList* strlista)
+ : QGLWidget( parent)
diff -ruN --exclude=CVS /usr/ports/graphics/autoq3d/files/patch-src__cmds__cmds.cpp ./files/patch-src__cmds__cmds.cpp
--- /usr/ports/graphics/autoq3d/files/patch-src__cmds__cmds.cpp 2012-05-20 04:07:30.000000000 +0200
+++ ./files/patch-src__cmds__cmds.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
---- 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);
-
diff -ruN --exclude=CVS /usr/ports/graphics/autoq3d/files/patch-src__fgui__cadform.cpp ./files/patch-src__fgui__cadform.cpp
--- /usr/ports/graphics/autoq3d/files/patch-src__fgui__cadform.cpp 2012-05-20 04:07:30.000000000 +0200
+++ ./files/patch-src__fgui__cadform.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
---- 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){
diff -ruN --exclude=CVS /usr/ports/graphics/autoq3d/files/patch-src__fgui__glapparea.cpp ./files/patch-src__fgui__glapparea.cpp
--- /usr/ports/graphics/autoq3d/files/patch-src__fgui__glapparea.cpp 2012-05-20 04:10:15.000000000 +0200
+++ ./files/patch-src__fgui__glapparea.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- src/fgui/glapparea.cpp~ 2012-05-19 22:54:35.000000000 -0300
-+++ src/fgui/glapparea.cpp 2012-05-19 22:54:50.000000000 -0300
-@@ -24,6 +24,8 @@
- #include <qtimer.h>
- #include <math.h>
-
-+#include <GL/glu.h>
-+
-
- GLAppArea::GLAppArea( QWidget* parent,QStringList* strlista)
- : QGLWidget( parent)
diff -ruN --exclude=CVS /usr/ports/graphics/autoq3d/pkg-descr ./pkg-descr
--- /usr/ports/graphics/autoq3d/pkg-descr 2011-08-10 18:24:36.000000000 +0200
+++ ./pkg-descr 2012-11-09 20:40:32.000000000 +0100
@@ -2,3 +2,4 @@
this 3D modeling application.
WWW: http://www.autoq3d.com/
+WWW: http://sourceforge.net/projects/autoq3d/
diff -ruN --exclude=CVS /usr/ports/graphics/autoq3d/pkg-plist ./pkg-plist
--- /usr/ports/graphics/autoq3d/pkg-plist 2009-10-14 15:45:11.000000000 +0200
+++ ./pkg-plist 2012-11-09 22:54:04.000000000 +0100
@@ -52,11 +52,6 @@
%%DATADIR%%/lan_sp.qm
%%DATADIR%%/qref.htm
%%DATADIR%%/qref_sp.htm
-%%PORTDOCS%%%%DOCSDIR%%/3DQformat.txt
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.txt
-%%PORTDOCS%%%%DOCSDIR%%/Install.txt
-%%PORTDOCS%%%%DOCSDIR%%/license.txt
share/pixmaps/AutoQ3D.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/images
@dirrm %%DATADIR%%
--- autoq3d-1.40_3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121110192746.CD220B6>