Index: head/graphics/autoq3d/Makefile =================================================================== --- head/graphics/autoq3d/Makefile (revision 456608) +++ head/graphics/autoq3d/Makefile (revision 456609) @@ -1,46 +1,48 @@ # Created by: Yinghong.Liu # $FreeBSD$ PORTNAME= autoq3d PORTVERSION= 1.40 PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/AutoQ3D%20${PORTVERSION} DISTNAME= AutoQ3DCommunity${PORTVERSION:C/\./-/}qt4source MAINTAINER= ports@FreeBSD.org COMMENT= Qt 4 quick 3D model editor -LICENSE= GPLv2 GPLv3 -LICENSE_COMB= dual +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/docs/license.txt USES= dos2unix qmake zip DOS2UNIX_FILES= *.pro src/cmds/*.cpp src/fgui/*.cpp docs/*.txt DOS2UNIX_REGEX= .*.[^p][^n][^g]$ USE_GL= glu USE_QT4= corelib gui opengl moc_build PORTDOCS= 3DQformat.txt ChangeLog.txt -OPTIONS_DEFINE= DOCS DESKTOP_ENTRIES="AutoQ3D" "" "AutoQ3D" \ "AutoQ3D" "Graphics;3DGraphics;Qt;" "" +OPTIONS_DEFINE= DOCS + post-patch: .for file in src/main.cpp src/fgui/cadform.cpp src/dialogs/prgsettings.cpp @${REINPLACE_CMD} \ -e 's|/usr/share/AutoQ3D-Community|${DATADIR}|g' \ ${WRKSRC}/${file} .endfor do-install: ${INSTALL_PROGRAM} ${WRKSRC}/AutoQ3D ${STAGEDIR}${PREFIX}/bin/ @(cd ${WRKSRC} && ${COPYTREE_SHARE} "images *.htm *.qm" \ ${STAGEDIR}${DATADIR}) ${INSTALL_DATA} ${WRKSRC}/AutoQ3D.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR} .include Index: head/graphics/autoq3d/files/patch-AutoQ3D.pro =================================================================== --- head/graphics/autoq3d/files/patch-AutoQ3D.pro (revision 456608) +++ head/graphics/autoq3d/files/patch-AutoQ3D.pro (revision 456609) @@ -1,10 +1,10 @@ ---- ./AutoQ3D.pro.orig 2012-12-02 18:48:47.000000000 -0500 -+++ ./AutoQ3D.pro 2012-12-02 18:48:47.000000000 -0500 -@@ -8,6 +8,7 @@ +--- AutoQ3D.pro.orig 2016-03-24 23:43:09 UTC ++++ AutoQ3D.pro +@@ -8,6 +8,7 @@ RC_FILE=AutoQ3D.rc win32:LIBS+= -L$(QTDIR)/plugins/imageformats -lqjpeg4 QT += opengl +LIBS += -lGLU DEPENDPATH += . \ src \ src/cmds \ Index: head/graphics/autoq3d/files/patch-src__cmds__cmds.cpp =================================================================== --- head/graphics/autoq3d/files/patch-src__cmds__cmds.cpp (revision 456608) +++ head/graphics/autoq3d/files/patch-src__cmds__cmds.cpp (revision 456609) @@ -1,15 +1,15 @@ ---- ./src/cmds/cmds.cpp.orig 2012-12-02 18:48:47.000000000 -0500 -+++ ./src/cmds/cmds.cpp 2012-12-02 18:54:38.000000000 -0500 -@@ -89,9 +89,9 @@ +--- src/cmds/cmds.cpp.orig 2016-03-24 23:43:09 UTC ++++ src/cmds/cmds.cpp +@@ -89,9 +89,9 @@ cmds::cmds( QWidget* parent) 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); Index: head/graphics/autoq3d/files/patch-src__fgui__cadform.cpp =================================================================== --- head/graphics/autoq3d/files/patch-src__fgui__cadform.cpp (revision 456608) +++ head/graphics/autoq3d/files/patch-src__fgui__cadform.cpp (revision 456609) @@ -1,24 +1,24 @@ ---- ./src/fgui/cadform.cpp.orig 2012-12-02 18:48:47.000000000 -0500 -+++ ./src/fgui/cadform.cpp 2012-12-02 18:51:14.000000000 -0500 -@@ -475,9 +475,9 @@ +--- src/fgui/cadform.cpp.orig 2016-03-24 23:43:09 UTC ++++ src/fgui/cadform.cpp +@@ -475,9 +475,9 @@ CadForm::CadForm() 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 @@ +@@ -800,7 +800,7 @@ GLApp* CadForm::newViewPort() 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){ Index: head/graphics/autoq3d/files/patch-src__fgui__glapparea.cpp =================================================================== --- head/graphics/autoq3d/files/patch-src__fgui__glapparea.cpp (revision 456608) +++ head/graphics/autoq3d/files/patch-src__fgui__glapparea.cpp (revision 456609) @@ -1,10 +1,10 @@ ---- ./src/fgui/glapparea.cpp.orig 2012-12-02 18:48:47.000000000 -0500 -+++ ./src/fgui/glapparea.cpp 2012-12-02 18:58:20.000000000 -0500 +--- src/fgui/glapparea.cpp.orig 2016-03-24 23:43:09 UTC ++++ src/fgui/glapparea.cpp @@ -23,6 +23,7 @@ #include #include #include +#include GLAppArea::GLAppArea( QWidget* parent,QStringList* strlista)